From 84a6f43106cd1465b0ac90c9d1c53caa6f2830fa Mon Sep 17 00:00:00 2001 From: Zoe Gidiere Date: Sat, 21 Sep 2024 17:48:57 -0600 Subject: [PATCH] Pseudoerosion changes --- .../noise/PseudoErosionTemplate.java | 2 +- .../noise/{simplex => }/PseudoErosion.java | 2 +- .../noise/simplex/DerivativeFractal.java | 8 ++++---- .../noise/simplex/OpenSimplex2Sampler.java | 20 ++++++++++++++++++- 4 files changed, 25 insertions(+), 7 deletions(-) rename common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/{simplex => }/PseudoErosion.java (99%) diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/PseudoErosionTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/PseudoErosionTemplate.java index f5e1ac46c..6c067fc15 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/PseudoErosionTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/PseudoErosionTemplate.java @@ -4,7 +4,7 @@ import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.terra.addons.noise.config.templates.SamplerTemplate; -import com.dfsek.terra.addons.noise.samplers.noise.simplex.PseudoErosion; +import com.dfsek.terra.addons.noise.samplers.noise.PseudoErosion; import com.dfsek.terra.api.noise.DerivativeNoiseSampler; diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/simplex/PseudoErosion.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/PseudoErosion.java similarity index 99% rename from common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/simplex/PseudoErosion.java rename to common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/PseudoErosion.java index 41b1e2db8..e20cc067f 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/simplex/PseudoErosion.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/PseudoErosion.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.addons.noise.samplers.noise.simplex; +package com.dfsek.terra.addons.noise.samplers.noise; import com.dfsek.terra.api.noise.DerivativeNoiseSampler; diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/simplex/DerivativeFractal.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/simplex/DerivativeFractal.java index 91fa69e0e..4db8ad24b 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/simplex/DerivativeFractal.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/simplex/DerivativeFractal.java @@ -2,10 +2,10 @@ package com.dfsek.terra.addons.noise.samplers.noise.simplex; import com.dfsek.terra.api.noise.DerivativeNoiseSampler; -import static com.dfsek.terra.addons.noise.samplers.noise.simplex.PseudoErosion.dot; -import static com.dfsek.terra.addons.noise.samplers.noise.simplex.PseudoErosion.hash; -import static com.dfsek.terra.addons.noise.samplers.noise.simplex.PseudoErosion.hashX; -import static com.dfsek.terra.addons.noise.samplers.noise.simplex.PseudoErosion.hashY; +import static com.dfsek.terra.addons.noise.samplers.noise.PseudoErosion.dot; +import static com.dfsek.terra.addons.noise.samplers.noise.PseudoErosion.hash; +import static com.dfsek.terra.addons.noise.samplers.noise.PseudoErosion.hashX; +import static com.dfsek.terra.addons.noise.samplers.noise.PseudoErosion.hashY; /** diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/simplex/OpenSimplex2Sampler.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/simplex/OpenSimplex2Sampler.java index e4da85a5b..0249f2af3 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/simplex/OpenSimplex2Sampler.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/simplex/OpenSimplex2Sampler.java @@ -7,10 +7,13 @@ package com.dfsek.terra.addons.noise.samplers.noise.simplex; +import com.dfsek.terra.api.noise.DerivativeNoiseSampler; + + /** * NoiseSampler implementation to provide OpenSimplex2 noise. */ -public class OpenSimplex2Sampler extends SimplexStyleSampler { +public class OpenSimplex2Sampler extends SimplexStyleSampler implements DerivativeNoiseSampler { private static final double SQRT3 = 1.7320508075688772935274463415059; @Override @@ -157,4 +160,19 @@ public class OpenSimplex2Sampler extends SimplexStyleSampler { return value * 32.69428253173828125; } + + @Override + public boolean isDifferentiable() { + return false; + } + + @Override + public double[] noised(long seed, double x, double y) { + return new double[0]; + } + + @Override + public double[] noised(long seed, double x, double y, double z) { + return new double[0]; + } }