pass seed to noise functions

2026-06-19 07:11:14 +00:00 · 2021-07-19 19:24:54 -07:00
parent 7acfc5e3d0
commit 3bf8fe7901
79 changed files with 299 additions and 382 deletions
@@ -29,7 +29,7 @@ public class BiomeHolderImpl implements BiomeHolder {
    }

    @Override
-    public BiomeHolder expand(BiomeExpander expander) {
+    public BiomeHolder expand(BiomeExpander expander, long seed) {
        TerraBiome[][] old = biomes;
        int newWidth = width * 2 - 1;

@@ -39,31 +39,31 @@ public class BiomeHolderImpl implements BiomeHolder {
            for(int z = 0; z < width; z++) {
                biomes[x * 2][z * 2] = old[x][z];
                if(z != width - 1)
-                    biomes[x * 2][z * 2 + 1] = expander.getBetween(x + origin.getX(), z + 1 + origin.getZ(), old[x][z], old[x][z + 1]);
+                    biomes[x * 2][z * 2 + 1] = expander.getBetween(x + origin.getX(), z + 1 + origin.getZ(), seed, old[x][z], old[x][z + 1]);
                if(x != width - 1)
-                    biomes[x * 2 + 1][z * 2] = expander.getBetween(x + 1 + origin.getX(), z + origin.getZ(), old[x][z], old[x + 1][z]);
+                    biomes[x * 2 + 1][z * 2] = expander.getBetween(x + 1 + origin.getX(), z + origin.getZ(), seed, old[x][z], old[x + 1][z]);
                if(x != width - 1 && z != width - 1)
-                    biomes[x * 2 + 1][z * 2 + 1] = expander.getBetween(x + 1 + origin.getX(), z + 1 + origin.getZ(), old[x][z], old[x + 1][z + 1], old[x][z + 1], old[x + 1][z]);
+                    biomes[x * 2 + 1][z * 2 + 1] = expander.getBetween(x + 1 + origin.getX(), z + 1 + origin.getZ(), seed, old[x][z], old[x + 1][z + 1], old[x][z + 1], old[x + 1][z]);
            }
        }
        return new BiomeHolderImpl(biomes, origin.setX(origin.getX() * 2 - 1).setZ(origin.getZ() * 2 - 1), newWidth, offset);
    }

    @Override
-    public void mutate(BiomeMutator mutator) {
+    public void mutate(BiomeMutator mutator, long seed) {
        for(int x = 0; x < width; x++) {
            for(int z = 0; z < width; z++) {
                BiomeMutator.ViewPoint viewPoint = new BiomeMutator.ViewPoint(this, x, z);
-                biomes[x][z] = mutator.mutate(viewPoint, x + origin.getX(), z + origin.getZ());
+                biomes[x][z] = mutator.mutate(viewPoint, x + origin.getX(), z + origin.getZ(), seed);
            }
        }
    }

    @Override
-    public void fill(BiomeSource source) {
+    public void fill(BiomeSource source, long seed) {
        for(int x = 0; x < width; x++) {
            for(int z = 0; z < width; z++) {
-                biomes[x][z] = source.getBiome(origin.getX() + x, origin.getZ() + z);
+                biomes[x][z] = source.getBiome(origin.getX() + x, origin.getZ() + z, seed);
            }
        }
    }
@@ -29,10 +29,10 @@ public class BiomePipelineImpl {
     * @param z Chunk Z coord
     * @return BiomeHolder containing biomes.
     */
-    public BiomeHolder getBiomes(int x, int z) {
+    public BiomeHolder getBiomes(int x, int z, long seed) {
        BiomeHolder holder = new BiomeHolderImpl(init, new Vector2(x * (init - 1), z * (init - 1)));
-        holder.fill(source);
-        for(Stage stage : stages) holder = stage.apply(holder);
+        holder.fill(source, seed);
+        for(Stage stage : stages) holder = stage.apply(holder, seed);
        return holder;
    }

@@ -13,25 +13,23 @@ import net.jafama.FastMath;
 import org.jetbrains.annotations.NotNull;

 public class StandardBiomeProvider implements BiomeProvider {
-    private final LoadingCache<Vector2, BiomeHolder> holderCache;
+    private final LoadingCache<SeededVector, BiomeHolder> holderCache;
    private final BiomePipelineImpl pipeline;
    private final int resolution;
    private final NoiseSampler mutator;
    private final double noiseAmp;
-    private final int seed;

    public StandardBiomeProvider(BiomePipelineImpl pipeline, TerraPlugin main, int resolution, NoiseSampler mutator, double noiseAmp, int seed) {
        this.resolution = resolution;
        this.mutator = mutator;
        this.noiseAmp = noiseAmp;
-        this.seed = seed;
        holderCache = CacheBuilder.newBuilder()
                .maximumSize(main == null ? 32 : main.getTerraConfig().getProviderCache())
                .build(
-                        new CacheLoader<Vector2, BiomeHolder>() {
+                        new CacheLoader<SeededVector, BiomeHolder>() {
                            @Override
-                            public BiomeHolder load(@NotNull Vector2 key) {
-                                return pipeline.getBiomes(key.getBlockX(), key.getBlockZ());
+                            public BiomeHolder load(@NotNull SeededVector key) {
+                                return pipeline.getBiomes(key.x, key.z, key.seed);
                            }
                        }
                );
@@ -39,9 +37,9 @@ public class StandardBiomeProvider implements BiomeProvider {
    }

    @Override
-    public TerraBiome getBiome(int x, int z) {
-        x += mutator.getNoiseSeeded(seed, x, z) * noiseAmp;
-        z += mutator.getNoiseSeeded(1 + seed, x, z) * noiseAmp;
+    public TerraBiome getBiome(int x, int z, long seed) {
+        x += mutator.getNoiseSeeded(seed + 1, x, z) * noiseAmp;
+        z += mutator.getNoiseSeeded(seed + 2, x, z) * noiseAmp;


        x = FastMath.floorToInt(FastMath.floorDiv(x, resolution));
@@ -50,6 +48,35 @@ public class StandardBiomeProvider implements BiomeProvider {

        int fdX = FastMath.floorDiv(x, pipeline.getSize());
        int fdZ = FastMath.floorDiv(z, pipeline.getSize());
-        return holderCache.getUnchecked(new Vector2(fdX, fdZ)).getBiome(x - fdX * pipeline.getSize(), z - fdZ * pipeline.getSize());
+        return holderCache.getUnchecked(new SeededVector(fdX, fdZ, seed)).getBiome(x - fdX * pipeline.getSize(), z - fdZ * pipeline.getSize());
+    }
+
+    private static final class SeededVector {
+        private final int x;
+        private final int z;
+        private final long seed;
+
+        private SeededVector(int x, int z, long seed) {
+            this.x = x;
+            this.z = z;
+            this.seed = seed;
+        }
+
+        @Override
+        public int hashCode() {
+            int result = 0;
+            result = 31 * result + ((int) (seed ^ (seed >>> 32)));
+            result = 31 * result + x;
+            result = 31 * result + z;
+            return result;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if(!(obj instanceof SeededVector)) return false;
+            SeededVector that = (SeededVector) obj;
+
+            return this.seed == that.seed && this.x == that.x && this.z == that.z;
+        }
    }
 }
@@ -3,5 +3,5 @@ package com.dfsek.terra.addons.biome.pipeline.api;
 import com.dfsek.terra.api.world.biome.TerraBiome;

 public interface BiomeExpander {
-    TerraBiome getBetween(double x, double z, TerraBiome... others);
+    TerraBiome getBetween(double x, double z, long seed, TerraBiome... others);
 }
@@ -4,11 +4,11 @@ import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeSource;

 public interface BiomeHolder {
-    BiomeHolder expand(BiomeExpander expander);
+    BiomeHolder expand(BiomeExpander expander, long seed);

-    void mutate(BiomeMutator mutator);
+    void mutate(BiomeMutator mutator, long seed);

-    void fill(BiomeSource source);
+    void fill(BiomeSource source, long seed);

    TerraBiome getBiome(int x, int z);

@@ -3,7 +3,7 @@ package com.dfsek.terra.addons.biome.pipeline.api;
 import com.dfsek.terra.api.world.biome.TerraBiome;

 public interface BiomeMutator {
-    TerraBiome mutate(ViewPoint viewPoint, double x, double z);
+    TerraBiome mutate(ViewPoint viewPoint, double x, double z, long seed);

    class ViewPoint {
        private final BiomeHolder biomes;
@@ -3,6 +3,6 @@ package com.dfsek.terra.addons.biome.pipeline.api;
 public interface Stage {
    boolean isExpansion();

-    BiomeHolder apply(BiomeHolder in);
+    BiomeHolder apply(BiomeHolder in, long seed);

 }
@@ -13,7 +13,7 @@ public class FractalExpander implements BiomeExpander {
    }

    @Override
-    public TerraBiome getBetween(double x, double z, TerraBiome... others) {
-        return others[MathUtil.normalizeIndex(sampler.getNoise(x, z), others.length)];
+    public TerraBiome getBetween(double x, double z, long seed, TerraBiome... others) {
+        return others[MathUtil.normalizeIndex(sampler.getNoiseSeeded(seed, x, z), others.length)];
    }
 }
@@ -23,7 +23,7 @@ public class BorderListMutator implements BiomeMutator {
    }

    @Override
-    public TerraBiome mutate(ViewPoint viewPoint, double x, double z) {
+    public TerraBiome mutate(ViewPoint viewPoint, double x, double z, long seed) {
        TerraBiome origin = viewPoint.getBiome(0, 0);
        if(origin.getTags().contains(defaultReplace)) {
            for(int xi = -1; xi <= 1; xi++) {
@@ -33,10 +33,10 @@ public class BorderListMutator implements BiomeMutator {
                    if(current == null) continue;
                    if(current.getTags().contains(border)) {
                        if(replace.containsKey(origin)) {
-                            TerraBiome biome = replace.get(origin).get(noiseSampler, x, z);
+                            TerraBiome biome = replace.get(origin).get(noiseSampler, x, z, seed);
                            return biome == null ? origin : biome;
                        }
-                        TerraBiome biome = replaceDefault.get(noiseSampler, x, z);
+                        TerraBiome biome = replaceDefault.get(noiseSampler, x, z, seed);
                        return biome == null ? origin : biome;
                    }
                }
@@ -19,7 +19,7 @@ public class BorderMutator implements BiomeMutator {
    }

    @Override
-    public TerraBiome mutate(ViewPoint viewPoint, double x, double z) {
+    public TerraBiome mutate(ViewPoint viewPoint, double x, double z, long seed) {
        TerraBiome origin = viewPoint.getBiome(0, 0);
        if(origin.getTags().contains(replaceTag)) {
            for(int xi = -1; xi <= 1; xi++) {
@@ -28,7 +28,7 @@ public class BorderMutator implements BiomeMutator {
                    TerraBiome current = viewPoint.getBiome(xi, zi);
                    if(current == null) continue;
                    if(current.getTags().contains(border)) {
-                        TerraBiome biome = replace.get(noiseSampler, x, z);
+                        TerraBiome biome = replace.get(noiseSampler, x, z, seed);
                        return biome == null ? origin : biome;
                    }
                }
@@ -21,14 +21,14 @@ public class ReplaceListMutator implements BiomeMutator {
    }

    @Override
-    public TerraBiome mutate(ViewPoint viewPoint, double x, double z) {
+    public TerraBiome mutate(ViewPoint viewPoint, double x, double z, long seed) {
        TerraBiome center = viewPoint.getBiome(0, 0);
        if(replace.containsKey(center)) {
-            TerraBiome biome = replace.get(center).get(sampler, x, z);
+            TerraBiome biome = replace.get(center).get(sampler, x, z, seed);
            return biome == null ? viewPoint.getBiome(0, 0) : biome;
        }
        if(viewPoint.getBiome(0, 0).getTags().contains(defaultTag)) {
-            TerraBiome biome = replaceDefault.get(sampler, x, z);
+            TerraBiome biome = replaceDefault.get(sampler, x, z, seed);
            return biome == null ? viewPoint.getBiome(0, 0) : biome;
        }
        return center;
@@ -17,9 +17,9 @@ public class ReplaceMutator implements BiomeMutator {
    }

    @Override
-    public TerraBiome mutate(ViewPoint viewPoint, double x, double z) {
+    public TerraBiome mutate(ViewPoint viewPoint, double x, double z, long seed) {
        if(viewPoint.getBiome(0, 0).getTags().contains(replaceableTag)) {
-            TerraBiome biome = replace.get(sampler, x, z);
+            TerraBiome biome = replace.get(sampler, x, z, seed);
            return biome == null ? viewPoint.getBiome(0, 0) : biome;
        }
        return viewPoint.getBiome(0, 0);
@@ -16,7 +16,7 @@ public class SmoothMutator implements BiomeMutator {
    }

    @Override
-    public TerraBiome mutate(ViewPoint viewPoint, double x, double z) {
+    public TerraBiome mutate(ViewPoint viewPoint, double x, double z, long seed) {
        TerraBiome top = viewPoint.getBiome(1, 0);
        TerraBiome bottom = viewPoint.getBiome(-1, 0);
        TerraBiome left = viewPoint.getBiome(0, 1);
@@ -27,7 +27,7 @@ public class SmoothMutator implements BiomeMutator {
        boolean horiz = Objects.equals(left, right) && left != null;

        if(vert && horiz) {
-            return MathUtil.normalizeIndex(sampler.getNoise(x, z), 2) == 0 ? left : top;
+            return MathUtil.normalizeIndex(sampler.getNoiseSeeded(seed, x, z), 2) == 0 ? left : top;
        }

        if(vert) return top;
@@ -15,7 +15,7 @@ public class RandomSource implements BiomeSource {
    }

    @Override
-    public TerraBiome getBiome(double x, double z) {
-        return biomes.get(sampler, x, z);
+    public TerraBiome getBiome(double x, double z, long seed) {
+        return biomes.get(sampler, x, z, seed);
    }
 }
@@ -17,8 +17,8 @@ public class ExpanderStage implements Stage {
    }

    @Override
-    public BiomeHolder apply(BiomeHolder in) {
-        return in.expand(expander);
+    public BiomeHolder apply(BiomeHolder in, long seed) {
+        return in.expand(expander, seed);
    }

    public enum Type {
@@ -17,8 +17,8 @@ public class MutatorStage implements Stage {
    }

    @Override
-    public BiomeHolder apply(BiomeHolder in) {
-        in.mutate(mutator);
+    public BiomeHolder apply(BiomeHolder in, long seed) {
+        in.mutate(mutator, seed);
        return in;
    }