mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-02-16 10:30:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

smoothing stuff

Browse Source
This commit is contained in:
dfsek
2021-01-12 17:22:49 -07:00
parent 883124d8ab
commit 9c50dc2ef9
5 changed files with 105 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/src/main/java/com/dfsek/terra/biome/pipeline/TerraBiomeHolder.java
View File

@@ -30,7 +30,7 @@ public class TerraBiomeHolder implements BiomeHolder {
if(z != oldWidth - 1) biomes[x * 2][z * 2 + 1] = expander.getBetween(new Position(x, z + 1), old[x][z], old[x][z + 1]);
if(x != oldWidth - 1) biomes[x * 2 + 1][z * 2] = expander.getBetween(new Position(x + 1, z), old[x][z], old[x + 1][z]);
if(x != oldWidth - 1 && z != oldWidth - 1)
biomes[x * 2 + 1][z * 2 + 1] = expander.getBetween(new Position(x + 1, z + 1), old[x][z], old[x + 1][z + 1]);
biomes[x * 2 + 1][z * 2 + 1] = expander.getBetween(new Position(x + 1, z + 1), old[x][z], old[x + 1][z + 1], old[x][z + 1], old[x + 1][z]);
}
}
@@ -38,7 +38,16 @@ public class TerraBiomeHolder implements BiomeHolder {
@Override
public void mutate(BiomeMutator mutator) {
for(int x = 0; x < width; x++) {
for(int z = 0; z < width; z++) {
BiomeMutator.ViewPoint viewPoint = new BiomeMutator.ViewPoint(new Biome[][] {
{getBiome(x - 1, z + 1), getBiome(x, z + 1), getBiome(x + 1, z + 1)},
{getBiome(x - 1, z), getBiome(x, z), getBiome(x + 1, z)},
{getBiome(x - 1, z - 1), getBiome(x, z - 1), getBiome(x + 1, z - 1)}
});
biomes[x][z] = mutator.mutate(viewPoint, new Position(x, z));
}
}
}
@Override
@@ -52,6 +61,7 @@ public class TerraBiomeHolder implements BiomeHolder {
@Override
public Biome getBiome(int x, int z) {
if(x >= width || z >= width || x < 0 || z < 0) return null;
return biomes[x][z];
}
}

16
common/src/main/java/com/dfsek/terra/biome/pipeline/mutator/BiomeMutator.java
View File

@@ -1,4 +1,20 @@
package com.dfsek.terra.biome.pipeline.mutator;
import com.dfsek.terra.api.world.biome.Biome;
import com.dfsek.terra.biome.pipeline.Position;
public interface BiomeMutator {
Biome mutate(ViewPoint viewPoint, Position position);
class ViewPoint {
private final Biome[][] biomes;
public ViewPoint(Biome[][] biomes) {
this.biomes = biomes;
}
public Biome getBiome(int x, int z) {
return biomes[x + 1][z + 1];
}
}
}

25
common/src/main/java/com/dfsek/terra/biome/pipeline/mutator/ReplaceMutator.java Normal file
View File

@@ -0,0 +1,25 @@
package com.dfsek.terra.biome.pipeline.mutator;
import com.dfsek.terra.api.math.ProbabilityCollection;
import com.dfsek.terra.api.math.noise.samplers.NoiseSampler;
import com.dfsek.terra.api.world.biome.Biome;
import com.dfsek.terra.biome.pipeline.Position;
import java.util.Set;
public class ReplaceMutator implements BiomeMutator {
private final Set<Biome> replaceable;
private final ProbabilityCollection<Biome> replace;
private final NoiseSampler sampler;
public ReplaceMutator(Set<Biome> replaceable, ProbabilityCollection<Biome> replace, NoiseSampler sampler) {
this.replaceable = replaceable;
this.replace = replace;
this.sampler = sampler;
}
@Override
public Biome mutate(ViewPoint viewPoint, Position position) {
return replaceable.contains(viewPoint.getBiome(0, 0)) ? replace.get(sampler, position.getX(), position.getY()) : viewPoint.getBiome(0, 0);
}
}

38
common/src/main/java/com/dfsek/terra/biome/pipeline/mutator/SmoothMutator.java Normal file
View File

@@ -0,0 +1,38 @@
package com.dfsek.terra.biome.pipeline.mutator;
import com.dfsek.terra.api.math.MathUtil;
import com.dfsek.terra.api.math.noise.samplers.NoiseSampler;
import com.dfsek.terra.api.world.biome.Biome;
import com.dfsek.terra.biome.pipeline.Position;
import java.util.Objects;
public class SmoothMutator implements BiomeMutator {
private final NoiseSampler sampler;
public SmoothMutator(NoiseSampler sampler) {
this.sampler = sampler;
}
@Override
public Biome mutate(ViewPoint viewPoint, Position position) {
Biome top = viewPoint.getBiome(1, 0);
Biome bottom = viewPoint.getBiome(-1, 0);
Biome left = viewPoint.getBiome(0, 1);
Biome right = viewPoint.getBiome(0, -1);
boolean vert = Objects.equals(top, bottom) && top != null;
boolean horiz = Objects.equals(left, right) && left != null;
if(vert && horiz) {
return MathUtil.normalizeIndex(sampler.getNoise(position.getX(), position.getY()), 2) == 0 ? left : top;
}
if(vert) return top;
if(horiz) return left;
return viewPoint.getBiome(0, 0);
}
}

14
common/src/test/java/biome/BiomeTest.java
View File

@@ -9,6 +9,7 @@ import com.dfsek.terra.api.world.biome.Generator;
import com.dfsek.terra.biome.pipeline.Position;
import com.dfsek.terra.biome.pipeline.TerraBiomeHolder;
import com.dfsek.terra.biome.pipeline.expand.FractalExpander;
import com.dfsek.terra.biome.pipeline.mutator.SmoothMutator;
import com.dfsek.terra.biome.pipeline.source.BiomeSource;
import com.dfsek.terra.biome.pipeline.source.RandomSource;
import org.junit.jupiter.api.Test;
@@ -37,15 +38,28 @@ public class BiomeTest {
TerraBiomeHolder holder = new TerraBiomeHolder(size, new Position(0, 0));
long s = System.nanoTime();
holder.fill(source);
holder.expand(new FractalExpander(whiteNoise(4)));
holder.expand(new FractalExpander(whiteNoise(3)));
holder.expand(new FractalExpander(whiteNoise(2)));
holder.mutate(new SmoothMutator(whiteNoise(34)));
holder.expand(new FractalExpander(whiteNoise(5)));
holder.expand(new FractalExpander(whiteNoise(7)));
holder.expand(new FractalExpander(whiteNoise(6)));
holder.mutate(new SmoothMutator(whiteNoise(35)));
long e = System.nanoTime();
double time = e - s;
time /= 1000000;
for(int i = 0; i < expand; i++) size = size * 2 - 1;
System.out.println(time + "ms for " + size + "x" + size);
BufferedImage image = new BufferedImage(size, size, BufferedImage.TYPE_INT_ARGB);