From 7a0750a59c6a5eddcaf53e08a71037dc0a08d83c Mon Sep 17 00:00:00 2001 From: Astrash Date: Fri, 16 Sep 2022 12:55:50 +1000 Subject: [PATCH] Add parameter to turn off salting cellular lookup --- .../config/templates/noise/CellularNoiseTemplate.java | 5 +++++ .../addons/noise/samplers/noise/CellularSampler.java | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/CellularNoiseTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/CellularNoiseTemplate.java index 48468b995..cd4a0eec5 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/CellularNoiseTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/CellularNoiseTemplate.java @@ -35,6 +35,10 @@ public class CellularNoiseTemplate extends NoiseTemplate { @Default private @Meta NoiseSampler lookup = new OpenSimplex2Sampler(); + @Value("salt-lookup") + @Default + private @Meta boolean saltLookup = true; + @Override public NoiseSampler get() { CellularSampler sampler = new CellularSampler(); @@ -44,6 +48,7 @@ public class CellularNoiseTemplate extends NoiseTemplate { sampler.setReturnType(cellularReturnType); sampler.setDistanceFunction(cellularDistanceFunction); sampler.setSalt(salt); + sampler.setSaltLookup(saltLookup); return sampler; } } diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/CellularSampler.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/CellularSampler.java index f31f81a3f..e923d4d05 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/CellularSampler.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/CellularSampler.java @@ -200,6 +200,8 @@ public class CellularSampler extends NoiseFunction { private NoiseSampler noiseLookup; + private boolean saltLookup; + public CellularSampler() { noiseLookup = new OpenSimplex2Sampler(); } @@ -220,6 +222,10 @@ public class CellularSampler extends NoiseFunction { this.returnType = returnType; } + public void setSaltLookup(boolean saltLookup) { + this.saltLookup = saltLookup; + } + @Override public double getNoiseRaw(long sl, double x, double y) { int seed = (int) sl; @@ -350,7 +356,7 @@ public class CellularSampler extends NoiseFunction { case Distance2Sub -> distance1 - distance0 - 1; case Distance2Mul -> distance1 * distance0 * 0.5 - 1; case Distance2Div -> distance0 / distance1 - 1; - case NoiseLookup -> noiseLookup.noise(sl, centerX, centerY); + case NoiseLookup -> noiseLookup.noise(sl - (saltLookup ? 0 : salt), centerX, centerY); case Distance3 -> distance2 - 1; case Distance3Add -> (distance2 + distance0) * 0.5 - 1; case Distance3Sub -> distance2 - distance0 - 1; @@ -513,7 +519,7 @@ public class CellularSampler extends NoiseFunction { case Distance2Sub -> distance1 - distance0 - 1; case Distance2Mul -> distance1 * distance0 * 0.5 - 1; case Distance2Div -> distance0 / distance1 - 1; - case NoiseLookup -> noiseLookup.noise(sl, centerX, centerY, centerZ); + case NoiseLookup -> noiseLookup.noise(sl - (saltLookup ? 0 : salt), centerX, centerY, centerZ); case Distance3 -> distance2 - 1; case Distance3Add -> (distance2 + distance0) * 0.5 - 1; case Distance3Sub -> distance2 - distance0 - 1;