mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-04-08 16:56:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

protect against biome cell overflow

Browse Source
This commit is contained in:
dfsek
2021-01-13 22:12:18 -07:00
parent 56a0d5d15b
commit 244f0fba11
5 changed files with 36 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/com/dfsek/terra/biome/StandardBiomeProvider.java
View File

@@ -16,7 +16,7 @@ import java.util.concurrent.ExecutionException;
public class StandardBiomeProvider implements BiomeProvider {
private final BiomePipeline pipeline;
private final LoadingCache<Vector2, BiomeHolder> holderCache = CacheBuilder.newBuilder()
.maximumSize(1024)
.maximumSize(64)
.build(
new CacheLoader<Vector2, BiomeHolder>() {
@Override

2
common/src/main/java/com/dfsek/terra/biome/pipeline/BiomeHolder.java
View File

@@ -13,4 +13,6 @@ public interface BiomeHolder {
void fill(BiomeSource source);
TerraBiome getBiome(int x, int z);
TerraBiome getBiomeRaw(int x, int z);
}

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

@@ -10,17 +10,21 @@ public class TerraBiomeHolder implements BiomeHolder {
private final Vector2 origin;
private final int width;
private TerraBiome[][] biomes;
private final int offset;
public TerraBiomeHolder(int width, Vector2 origin) {
width += 2;
this.width = width;
biomes = new TerraBiome[width][width];
this.origin = origin;
this.offset = 1;
}
private TerraBiomeHolder(TerraBiome[][] biomes, Vector2 origin, int width) {
private TerraBiomeHolder(TerraBiome[][] biomes, Vector2 origin, int width, int offset) {
this.biomes = biomes;
this.origin = origin;
this.width = width;
this.offset = 2 * offset;
}
@Override
@@ -41,7 +45,7 @@ public class TerraBiomeHolder implements BiomeHolder {
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]);
}
}
return new TerraBiomeHolder(biomes, origin.setX(origin.getX() * 2 - 1).setZ(origin.getZ() * 2 - 1), newWidth);
return new TerraBiomeHolder(biomes, origin.setX(origin.getX() * 2 - 1).setZ(origin.getZ() * 2 - 1), newWidth, offset);
}
@Override
@@ -65,6 +69,13 @@ public class TerraBiomeHolder implements BiomeHolder {
@Override
public TerraBiome getBiome(int x, int z) {
x += offset;
z += offset;
return getBiomeRaw(x, z);
}
@Override
public TerraBiome getBiomeRaw(int x, int z) {
if(x >= width || z >= width || x < 0 || z < 0) return null;
return biomes[x][z];
}

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

@@ -19,7 +19,7 @@ public interface BiomeMutator {
public TerraBiome getBiome(int x, int z) {
return biomes.getBiome(x + offX, z + offZ);
return biomes.getBiomeRaw(x + offX, z + offZ);
}
}
}