mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2025-07-03 16:35:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

properly access 3d biomes in LazilyEvaluatedInterpolator

Browse Source
This commit is contained in:
dfsek 2022-06-15 19:55:06 -07:00
parent 23a35f8097
commit d73872a1c6
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/LazilyEvaluatedInterpolator.java
View File

@ -3,16 +3,13 @@ package com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation;
import net.jafama.FastMath; import net.jafama.FastMath;
import com.dfsek.terra.addons.chunkgenerator.config.noise.BiomeNoiseProperties; import com.dfsek.terra.addons.chunkgenerator.config.noise.BiomeNoiseProperties;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import static com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation.Interpolator.lerp; import static com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation.Interpolator.lerp;
public class LazilyEvaluatedInterpolator { public class LazilyEvaluatedInterpolator {
private final Double[][][] samples; private final Double[] samples; //
private final NoiseSampler[][] samplers;
private final int chunkX; private final int chunkX;
private final int chunkZ; private final int chunkZ;
@ -25,12 +22,14 @@ public class LazilyEvaluatedInterpolator {
private final long seed; private final long seed;
private final int min; private final int min;
private final int zMul, yMul;
public LazilyEvaluatedInterpolator(BiomeProvider biomeProvider, int cx, int cz, int max, int min, int horizontalRes, int verticalRes, public LazilyEvaluatedInterpolator(BiomeProvider biomeProvider, int cx, int cz, int max, int min, int horizontalRes, int verticalRes,
long seed) { long seed) {
int hSamples = FastMath.ceilToInt(16.0 / horizontalRes); int hSamples = FastMath.ceilToInt(16.0 / horizontalRes);
int vSamples = FastMath.ceilToInt((double) (max - min) / verticalRes); int vSamples = FastMath.ceilToInt((double) (max - min) / verticalRes);
samples = new Double[hSamples + 1][vSamples + 1][hSamples + 1]; this.zMul = (hSamples + 1);
samplers = new NoiseSampler[hSamples + 1][hSamples + 1]; this.yMul = zMul * zMul;
samples = new Double[yMul * (vSamples + 1)];
this.chunkX = cx << 4; this.chunkX = cx << 4;
this.chunkZ = cz << 4; this.chunkZ = cz << 4;
this.horizontalRes = horizontalRes; this.horizontalRes = horizontalRes;
@ -41,19 +40,19 @@ public class LazilyEvaluatedInterpolator {
} }
private double sample(int x, int y, int z, int ox, int oy, int oz) { private double sample(int x, int y, int z, int ox, int oy, int oz) {
Double sample = samples[x][y][z]; int index = x + (z * zMul) + (y * yMul);
Double sample = samples[index];
if(sample == null) { if(sample == null) {
int xi = ox + chunkX; int xi = ox + chunkX;
int zi = oz + chunkZ; int zi = oz + chunkZ;
NoiseSampler sampler = samplers[x][z]; sample = biomeProvider
if(sampler == null) { .getBiome(xi, y, zi, seed)
sampler = biomeProvider.getBiome(xi, y, zi, seed).getContext().get(BiomeNoiseProperties.class).carving(); .getContext()
samplers[x][z] = sampler; .get(BiomeNoiseProperties.class)
} .carving()
.noise(seed, xi, oy, zi);
sample = sampler.noise(seed, xi, oy, zi); samples[index] = sample;
samples[x][y][z] = sample;
} }
return sample; return sample;
} }