Fixup previous comit

PolyhedralDev · Sep 23, 2024 · f88f0a2 · f88f0a2
1 parent ce320b0
commit f88f0a2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 21 deletions.
diff --git a/...n/java/com/dfsek/terra/addons/noise/config/templates/noise/DerivativeFractalTemplate.java b/...n/java/com/dfsek/terra/addons/noise/config/templates/noise/DerivativeFractalTemplate.java
@@ -7,7 +7,7 @@
 import com.dfsek.terra.addons.noise.samplers.noise.simplex.DerivativeFractal;
 
 
-public class DerivativeFractalTemplate extends SamplerTemplate<DerivativeFractal> {
+public class DerivativeFractalTemplate extends NoiseTemplate<DerivativeFractal> {
 
     @Value("octaves")
     @Default
@@ -21,12 +21,11 @@ public class DerivativeFractalTemplate extends SamplerTemplate<DerivativeFractal
     @Default
     private double lacunarity = 2.0;
 
-    @Value("frequency")
-    @Default
-    private double frequency = 0.02;
-
     @Override
     public DerivativeFractal get() {
-        return new DerivativeFractal(octaves, gain, lacunarity, frequency);
+        DerivativeFractal derivativeFractal = new DerivativeFractal(octaves, gain, lacunarity);
+        derivativeFractal.setFrequency(frequency);
+        derivativeFractal.setSalt(salt);
+        return derivativeFractal;
     }
 }
diff --git a/.../main/java/com/dfsek/terra/addons/noise/config/templates/noise/PseudoErosionTemplate.java b/.../main/java/com/dfsek/terra/addons/noise/config/templates/noise/PseudoErosionTemplate.java
@@ -8,7 +8,7 @@
 import com.dfsek.terra.api.noise.DerivativeNoiseSampler;
 
 
-public class PseudoErosionTemplate extends SamplerTemplate<PseudoErosionSampler> {
+public class PseudoErosionTemplate extends NoiseTemplate<PseudoErosionSampler> {
 
     @Value("octaves")
     @Default
@@ -63,8 +63,9 @@ public class PseudoErosionTemplate extends SamplerTemplate<PseudoErosionSampler>
 
     @Override
     public PseudoErosionSampler get() {
-        return new PseudoErosionSampler(octaves, gain, lacunarity,
-            slopeStrength, branchStrength, strength,
-            erosionFrequency, heightSampler, slopeMask, slopeMaskFull, slopeMaskNone, jitterModifier, averageErosionImpulses);
+        PseudoErosionSampler pseudoErosionSampler = new PseudoErosionSampler(octaves, lacunarity, gain, slopeStrength, branchStrength, strength, erosionFrequency, heightSampler, slopeMask, slopeMaskNone, slopeMaskFull, jitterModifier, averageErosionImpulses);
+        pseudoErosionSampler.setFrequency(frequency);
+        pseudoErosionSampler.setSalt(salt);
+        return pseudoErosionSampler;
     }
 }
diff --git a/...ction/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/PseudoErosionSampler.java b/...ction/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/PseudoErosionSampler.java
@@ -71,11 +71,6 @@ public static float fract(float x) {
         return (x - (float) Math.floor(x));
     }
 
-    public static double exp(double val) {
-        final long tmp = (long) (1512775 * val + 1072632447);
-        return Double.longBitsToDouble(tmp << 32);
-    }
-
     public static float smoothstep(float edge0, float edge1, float x) {
         // Scale, bias and saturate x to 0..1 range
         x = clamp((x - edge0) / (edge1 - edge0), 0.0f, 1.0f);
@@ -183,6 +178,6 @@ public double getNoiseRaw(long seed, double x, double y) {
 
     @Override
     public double getNoiseRaw(long seed, double x, double y, double z) {
-        return noise(seed, x, z);
+        return getNoiseRaw(seed, x, z);
     }
 }
diff --git a/.../src/main/java/com/dfsek/terra/addons/noise/samplers/noise/simplex/DerivativeFractal.java b/.../src/main/java/com/dfsek/terra/addons/noise/samplers/noise/simplex/DerivativeFractal.java
@@ -19,13 +19,11 @@ public class DerivativeFractal extends DerivativeNoiseFunction {
     private final int heightOctaves;
     private final double heightGain;
     private final double heightLacunarity;
-    private final double frequency;
 
-    public DerivativeFractal(int octaves, double gain, double lacunarity, double frequency) {
+    public DerivativeFractal(int octaves, double gain, double lacunarity) {
         this.heightOctaves = octaves;
         this.heightGain = gain;
         this.heightLacunarity = lacunarity;
-        this.frequency = frequency;
     }
 
     private static float[] baseNoise(float px, float py) {
@@ -75,8 +73,6 @@ public boolean isDifferentiable() {
 
     @Override
     public double[] noised(long seed, double x, double y) {
-        x *= frequency;
-        y *= frequency;
         double[] out = { 0.0f, 0.0f, 0.0f };
         float heightFreq = 1.0f;
         float heightAmp = 1f;