From 8c721bc0b00ff471166bc42eb517073deb4c235c Mon Sep 17 00:00:00 2001 From: dfsek Date: Wed, 17 Nov 2021 16:28:38 -0700 Subject: [PATCH] format --- .../java/com/dfsek/terra/addons/noise/NoiseAddon.java | 4 ---- .../dfsek/terra/addons/noise/NoiseConfigPackTemplate.java | 1 + .../templates/noise/ExpressionFunctionTemplate.java | 8 ++------ .../noise/config/templates/noise/GaborNoiseTemplate.java | 1 + .../noise/paralithic/defined/UserDefinedFunction.java | 1 - .../addons/noise/paralithic/noise/NoiseFunction2.java | 1 - .../addons/noise/paralithic/noise/NoiseFunction3.java | 1 - .../addons/noise/samplers/noise/GaborNoiseSampler.java | 6 +++--- 8 files changed, 7 insertions(+), 16 deletions(-) diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java index ba977a620..b0ac302a7 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java @@ -34,10 +34,6 @@ import com.dfsek.terra.addons.noise.samplers.noise.value.ValueCubicSampler; import com.dfsek.terra.addons.noise.samplers.noise.value.ValueSampler; import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.addon.BaseAddon; -import com.dfsek.terra.api.addon.TerraAddon; -import com.dfsek.terra.api.addon.annotations.Addon; -import com.dfsek.terra.api.addon.annotations.Author; -import com.dfsek.terra.api.addon.annotations.Version; import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent; import com.dfsek.terra.api.event.functional.FunctionalEventHandler; import com.dfsek.terra.api.inject.annotations.Inject; diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseConfigPackTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseConfigPackTemplate.java index 355a4509b..d96320f2b 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseConfigPackTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseConfigPackTemplate.java @@ -12,6 +12,7 @@ import com.dfsek.terra.addons.noise.config.templates.FunctionTemplate; import com.dfsek.terra.api.config.meta.Meta; +@SuppressWarnings("FieldMayBeFinal") public class NoiseConfigPackTemplate implements ConfigTemplate { @Value("noise") private @Meta Map noiseBuilderMap; diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/ExpressionFunctionTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/ExpressionFunctionTemplate.java index 27c2d39e8..2fce4d6f4 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/ExpressionFunctionTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/ExpressionFunctionTemplate.java @@ -26,23 +26,19 @@ import com.dfsek.terra.api.noise.NoiseSampler; @SuppressWarnings({ "FieldMayBeFinal", "unused" }) public class ExpressionFunctionTemplate extends SamplerTemplate { private final Map otherFunctions; + private final Map globalFunctions; @Value("variables") @Default private @Meta Map vars = new HashMap<>(); - @Value("expression") private @Meta String equation; - @Value("samplers") @Default private @Meta LinkedHashMap samplers = new LinkedHashMap<>(); - @Value("functions") @Default private @Meta LinkedHashMap functions = new LinkedHashMap<>(); - private final Map globalFunctions; - public ExpressionFunctionTemplate(Map otherFunctions, Map samplers) { this.otherFunctions = otherFunctions; this.globalFunctions = samplers; @@ -71,7 +67,7 @@ public class ExpressionFunctionTemplate extends SamplerTemplate generateFunctions() throws ParseException { Map noiseFunctionMap = new HashMap<>(); - + for(Map.Entry entry : globalFunctions.entrySet()) { noiseFunctionMap.put(entry.getKey(), UserDefinedFunction.newInstance(entry.getValue(), new Parser(), new Scope())); } diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/GaborNoiseTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/GaborNoiseTemplate.java index 2fb5c20dd..590f70596 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/GaborNoiseTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/GaborNoiseTemplate.java @@ -8,6 +8,7 @@ import com.dfsek.terra.api.config.meta.Meta; import com.dfsek.terra.api.noise.NoiseSampler; +@SuppressWarnings("FieldMayBeFinal") public class GaborNoiseTemplate extends NoiseTemplate { @Value("rotation") @Default diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/defined/UserDefinedFunction.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/defined/UserDefinedFunction.java index db01b9a11..0f3fcfab6 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/defined/UserDefinedFunction.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/defined/UserDefinedFunction.java @@ -6,7 +6,6 @@ import com.dfsek.paralithic.eval.parser.Scope; import com.dfsek.paralithic.eval.tokenizer.ParseException; import com.dfsek.paralithic.functions.dynamic.Context; import com.dfsek.paralithic.functions.dynamic.DynamicFunction; - import com.dfsek.paralithic.node.Statefulness; import com.dfsek.terra.addons.noise.config.templates.FunctionTemplate; diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/noise/NoiseFunction2.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/noise/NoiseFunction2.java index 74f2c7a2c..a83cd4d59 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/noise/NoiseFunction2.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/noise/NoiseFunction2.java @@ -2,7 +2,6 @@ package com.dfsek.terra.addons.noise.paralithic.noise; import com.dfsek.paralithic.functions.dynamic.Context; import com.dfsek.paralithic.functions.dynamic.DynamicFunction; - import com.dfsek.paralithic.node.Statefulness; import com.dfsek.terra.api.noise.NoiseSampler; diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/noise/NoiseFunction3.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/noise/NoiseFunction3.java index bba832440..d7c9e165d 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/noise/NoiseFunction3.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/noise/NoiseFunction3.java @@ -2,7 +2,6 @@ package com.dfsek.terra.addons.noise.paralithic.noise; import com.dfsek.paralithic.functions.dynamic.Context; import com.dfsek.paralithic.functions.dynamic.DynamicFunction; - import com.dfsek.paralithic.node.Statefulness; import com.dfsek.terra.api.noise.NoiseSampler; diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/GaborNoiseSampler.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/GaborNoiseSampler.java index fbe7afdae..c138a82d6 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/GaborNoiseSampler.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/GaborNoiseSampler.java @@ -11,12 +11,12 @@ public class GaborNoiseSampler extends NoiseFunction { private double a = 0.1; private double f0 = 0.625; private double kernelRadius = (FastMath.sqrt(-FastMath.log(0.05) / Math.PI) / a); - private double omega0 = Math.PI * 0.25; - private boolean isotropic = true; - private double impulsesPerKernel = 64d; private double impulseDensity = (impulsesPerKernel / (Math.PI * kernelRadius * kernelRadius)); private double impulsesPerCell = impulseDensity * kernelRadius * kernelRadius; private double g = FastMath.exp(-impulsesPerCell); + private double omega0 = Math.PI * 0.25; + private boolean isotropic = true; + private double impulsesPerKernel = 64d; public GaborNoiseSampler() {