normalization options

common/src/main/java/com/dfsek/terra/api/GenericLoaders.java

@@ -4,6 +4,7 @@ import com.dfsek.tectonic.loading.TypeRegistry;
 import com.dfsek.terra.api.math.GridSpawn;
 import com.dfsek.terra.api.math.ProbabilityCollection;
 import com.dfsek.terra.api.math.Range;
+import com.dfsek.terra.api.math.noise.samplers.Normalizer;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.biome.grid.master.TerraBiomeGrid;
 import com.dfsek.terra.biome.palette.PaletteHolder;
@@ -48,16 +49,17 @@ public class GenericLoaders implements LoaderRegistrar {
                 .registerLoader(PaletteHolder.class, new PaletteHolderLoader())
                 .registerLoader(PaletteLayer.class, new PaletteLayerLoader())
                 .registerLoader(FloraLayer.class, new FloraLayerLoader())
-                .registerLoader(Ore.Type.class, (t, o, l) -> Ore.Type.valueOf((String) o))
+                .registerLoader(Ore.Type.class, (t, o, l) -> Ore.Type.valueOf(o.toString()))
                 .registerLoader(OreConfig.class, new OreConfigLoader())
                 .registerLoader(NoiseBuilder.class, new NoiseBuilderLoader())
                 .registerLoader(TreeLayer.class, new TreeLayerLoader())
                 .registerLoader(MaterialSet.class, new MaterialSetLoader())
                 .registerLoader(OreHolder.class, new OreHolderLoader())
                 .registerLoader(ImageLoader.class, new ImageLoaderLoader())
-                .registerLoader(TerraBiomeGrid.Type.class, (t, o, l) -> TerraBiomeGrid.Type.valueOf((String) o))
+                .registerLoader(TerraBiomeGrid.Type.class, (t, o, l) -> TerraBiomeGrid.Type.valueOf(o.toString()))
-                .registerLoader(ImageLoader.Channel.class, (t, o, l) -> ImageLoader.Channel.valueOf((String) o))
+                .registerLoader(ImageLoader.Channel.class, (t, o, l) -> ImageLoader.Channel.valueOf(o.toString()))
-                .registerLoader(ImageLoader.Align.class, (t, o, l) -> ImageLoader.Align.valueOf((String) o))
+                .registerLoader(ImageLoader.Align.class, (t, o, l) -> ImageLoader.Align.valueOf(o.toString()))
-                .registerLoader(TerraFlora.Search.class, (t, o, l) -> TerraFlora.Search.valueOf((String) o));
+                .registerLoader(TerraFlora.Search.class, (t, o, l) -> TerraFlora.Search.valueOf(o.toString()))
+                .registerLoader(Normalizer.NormalType.class, (t, o, l) -> Normalizer.NormalType.valueOf(o.toString().toUpperCase()));
     }
 }

common/src/main/java/com/dfsek/terra/api/math/noise/samplers/LinearNormalizer.java

@@ -0,0 +1,17 @@
+package com.dfsek.terra.api.math.noise.samplers;
+
+public class LinearNormalizer extends Normalizer {
+    private final double min;
+    private final double max;
+
+    public LinearNormalizer(NoiseSampler sampler, double min, double max) {
+        super(sampler);
+        this.min = min;
+        this.max = max;
+    }
+
+    @Override
+    public double normalize(double in) {
+        return (in - min) * (2 / (max - min)) - 1;
+    }
+}

common/src/main/java/com/dfsek/terra/api/math/noise/samplers/Normalizer.java

@@ -3,7 +3,7 @@ package com.dfsek.terra.api.math.noise.samplers;
 public abstract class Normalizer implements NoiseSampler {
     private final NoiseSampler sampler;
 
-    protected Normalizer(NoiseSampler sampler) {
+    public Normalizer(NoiseSampler sampler) {
         this.sampler = sampler;
     }
 
@@ -18,4 +18,8 @@ public abstract class Normalizer implements NoiseSampler {
     public double getNoise(double x, double y, double z) {
         return normalize(sampler.getNoise(x, y, z));
     }
+
+    public enum NormalType {
+        LINEAR, NONE
+    }
 }

common/src/main/java/com/dfsek/terra/config/loaders/config/NoiseBuilderLoader.java

@@ -6,6 +6,7 @@ import com.dfsek.tectonic.exception.LoadException;
 import com.dfsek.tectonic.loading.ConfigLoader;
 import com.dfsek.tectonic.loading.TypeLoader;
 import com.dfsek.terra.api.math.noise.samplers.FastNoiseLite;
+import com.dfsek.terra.api.math.noise.samplers.Normalizer;
 import com.dfsek.terra.generation.config.NoiseBuilder;
 
 import java.lang.reflect.Type;
@@ -16,13 +17,14 @@ public class NoiseBuilderLoader implements TypeLoader<NoiseBuilder> {
     private static final ConfigLoader LOADER = new ConfigLoader();
 
     static {
-        LOADER.registerLoader(FastNoiseLite.NoiseType.class, (t, object, cf) -> FastNoiseLite.NoiseType.valueOf((String) object));
+        LOADER.registerLoader(FastNoiseLite.NoiseType.class, (t, object, cf) -> FastNoiseLite.NoiseType.valueOf((String) object))
-        LOADER.registerLoader(FastNoiseLite.FractalType.class, (t, object, cf) -> FastNoiseLite.FractalType.valueOf((String) object));
+                .registerLoader(FastNoiseLite.FractalType.class, (t, object, cf) -> FastNoiseLite.FractalType.valueOf((String) object))
-        LOADER.registerLoader(FastNoiseLite.DomainWarpType.class, (t, object, cf) -> FastNoiseLite.DomainWarpType.valueOf((String) object));
+                .registerLoader(FastNoiseLite.DomainWarpType.class, (t, object, cf) -> FastNoiseLite.DomainWarpType.valueOf((String) object))
-        LOADER.registerLoader(FastNoiseLite.RotationType3D.class, (t, object, cf) -> FastNoiseLite.RotationType3D.valueOf((String) object));
+                .registerLoader(FastNoiseLite.RotationType3D.class, (t, object, cf) -> FastNoiseLite.RotationType3D.valueOf((String) object))
-        LOADER.registerLoader(FastNoiseLite.CellularReturnType.class, (t, object, cf) -> FastNoiseLite.CellularReturnType.valueOf((String) object));
+                .registerLoader(FastNoiseLite.CellularReturnType.class, (t, object, cf) -> FastNoiseLite.CellularReturnType.valueOf((String) object))
-        LOADER.registerLoader(FastNoiseLite.CellularDistanceFunction.class, (t, object, cf) -> FastNoiseLite.CellularDistanceFunction.valueOf((String) object));
+                .registerLoader(FastNoiseLite.CellularDistanceFunction.class, (t, object, cf) -> FastNoiseLite.CellularDistanceFunction.valueOf((String) object))
-        LOADER.registerLoader(NoiseBuilder.class, new NoiseBuilderLoader());
+                .registerLoader(NoiseBuilder.class, new NoiseBuilderLoader())
+                .registerLoader(Normalizer.NormalType.class, (t, o, l) -> Normalizer.NormalType.valueOf(o.toString().toUpperCase()));
     }
 
     @Override

common/src/main/java/com/dfsek/terra/generation/config/NoiseBuilder.java

@@ -4,7 +4,9 @@ import com.dfsek.tectonic.annotations.Default;
 import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.tectonic.config.ConfigTemplate;
 import com.dfsek.terra.api.math.noise.samplers.FastNoiseLite;
+import com.dfsek.terra.api.math.noise.samplers.LinearNormalizer;
 import com.dfsek.terra.api.math.noise.samplers.NoiseSampler;
+import com.dfsek.terra.api.math.noise.samplers.Normalizer;
 
 @SuppressWarnings("FieldMayBeFinal")
 public class NoiseBuilder implements ConfigTemplate {
@@ -76,6 +78,18 @@ public class NoiseBuilder implements ConfigTemplate {
     @Default
     private NoiseBuilder lookup;
 
+    @Value("normalize.type")
+    @Default
+    private Normalizer.NormalType normalType = Normalizer.NormalType.NONE;
+
+    @Value("normalize.linear.min")
+    @Default
+    private double linearMin = -1D;
+
+    @Value("normalize.linear.max")
+    @Default
+    private double linearMax = 1D;
+
     public NoiseSampler build(int seed) {
         FastNoiseLite noise = new FastNoiseLite(seed + seedOffset);
         if(!fractalType.equals(FastNoiseLite.FractalType.None)) {
@@ -101,6 +115,7 @@ public class NoiseBuilder implements ConfigTemplate {
         noise.setRotationType3D(rotationType3D);
 
         noise.setFrequency(frequency);
+        if(!normalType.equals(Normalizer.NormalType.NONE)) return new LinearNormalizer(noise, linearMin, linearMax);
         return noise;
     }