Treer
/
amidstest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Find exact land height in v5 if land is above sea level 

Implements a proper search function for land height, allowing accurate alpine biomes.
master
Treer 2018-04-22 13:44:40 +10:00
parent 160ab17044
commit 0cd857a894
4 changed files with 90 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/amidst/minetest/world/oracle/BiomeDataOracleFlat.java
View File

@ -31,6 +31,9 @@ public class BiomeDataOracleFlat extends MinetestBiomeDataOracle {
@Override
public short populateArray(CoordinatesInWorld corner, short[][] result, boolean useQuarterResolution) {
// FYI: at the time of writing this, the mapgen for Flat is not yet officially stable
// See https://forum.minetest.net/viewtopic.php?f=18&t=19132
int width = result.length;
if (width > 0) {
Resolution resolution = Resolution.from(useQuarterResolution);

121
src/main/java/amidst/minetest/world/oracle/BiomeDataOracleV5.java
View File

@ -14,12 +14,12 @@ import amidst.settings.biomeprofile.BiomeProfileSelection;
public class BiomeDataOracleV5 extends MinetestBiomeDataOracle {
private MapgenV5Params v5params = null;
private Noise noise_factor;
private Noise noise_height;
private Noise noise_ground;
public BiomeDataOracleV5(MapgenParams params, BiomeProfileSelection biomeProfileSelection, long seed) {
super(params, biomeProfileSelection, seed);
try {
@ -29,21 +29,24 @@ public class BiomeDataOracleV5 extends MinetestBiomeDataOracle {
AmidstLogger.error("Error: BiomeDataOracleV5 cannot cast params to v5params. Using defaults instead.");
this.params = v5params = new MapgenV5Params();
}
noise_factor = new Noise(v5params.np_factor, this.seed, params.chunk_length_x, params.chunk_length_z);
noise_height = new Noise(v5params.np_height, this.seed, params.chunk_length_x, params.chunk_length_z);
// 3D terrain noise
// 1-up 1-down overgeneration
noise_ground = new Noise(v5params.np_ground, this.seed, params.chunk_length_x, params.chunk_length_y, params.chunk_length_z);
} catch (InvalidNoiseParamsException ex) {
AmidstLogger.error("Invalid v5params from Minetest game. " + ex);
ex.printStackTrace();
}
ex.printStackTrace();
}
}
@Override
public short populateArray(CoordinatesInWorld corner, short[][] result, boolean useQuarterResolution) {
// FYI: at the time of writing this, the mapgen for v5 is not yet officially stable
// See https://forum.minetest.net/viewtopic.php?f=18&t=19132
int width = result.length;
if (width > 0) {
@ -57,42 +60,44 @@ public class BiomeDataOracleV5 extends MinetestBiomeDataOracle {
int world_x;
short biomeValue;
MinetestBiome[] biomes = getBiomeArray();
/* part of (faster) version of oceans not working yet
noise_factor.perlinMap2D(left, top, null);
noise_height.perlinMap2D(left, top, null);
noise_ground.perlinMap3D(left, 1, top, null);
*/
try {
try {
int index3d = 0;
int index2d = 0;
for (int z = 0; z < height; z++) {
world_z = top + (z << shift);
world_x = left;
// Use -world_z because Minetest uses left-handed coordinates, while Minecraft
// Use -world_z because Minetest uses left-handed coordinates, while Minecraft
// and Amidst use right-handed coordinates.
world_z = -world_z;
int lastHeight = Short.MIN_VALUE; // minvalue will be the "not-known" value
for (int x = 0; x < width; x++, index2d++, index3d++) {
biomeValue = 0;
//float f = 0.55f + noise_factor._result[index2d];
float f = 0.55f + Noise.NoisePerlin2D(noise_factor.np, world_x, world_z, seed);
float f = 0.55f + Noise.NoisePerlin2D(noise_factor.np, world_x, world_z, seed);
if (f < 0.01) {
f = 0.01f;
} else if (f >= 1.0) {
f *= 1.6f;
}
//float h = noise_height._result[index2d];
float h = Noise.NoisePerlin2D(noise_height.np, world_x, world_z, seed);
float h = Noise.NoisePerlin2D(noise_height.np, world_x, world_z, seed);
// boolean isOcean = (noise_ground._result[index3d] * f < - h)
boolean isOcean = (Noise.NoisePerlin3D(noise_ground.np, world_x, params.water_level, world_z, seed) * f < params.water_level - h);
boolean isOcean = Noise.NoisePerlin3D(noise_ground.np, world_x, params.water_level, world_z, seed) * f < params.water_level - h;
// Very roughly calculate the surface height
int surface_y;
if (isOcean) {
@ -100,31 +105,61 @@ public class BiomeDataOracleV5 extends MinetestBiomeDataOracle {
// pick a value lower than a normal beach biome
surface_y = -10;
} else {
// figure out exact height, so that beaches are drawn
// TODO binary search
int testFromHeight = params.water_level + 6;
if (Noise.NoisePerlin3D(noise_ground.np, world_x, testFromHeight, world_z, seed) * f < testFromHeight - h) {
// found air, so surface_y is less than testFromHeight
surface_y = testFromHeight - 1;
for (int i = params.water_level + 1; i < testFromHeight; i++) {
if (Noise.NoisePerlin3D(noise_ground.np, world_x, i, world_z, seed) *f < i - h) {
// found air
surface_y = i - 1;
break;
// Figure out exact height. so that beaches are drawn correctly, and in the case of mods like Ethereal,
// alpine and mountain biomes are found correctly.
// Do this via a logarithmic-ish search for some ground with air directly above.
// (If it's the top of a floating island or ground beneath an underhang then tough, but because we start
// low, it should find what the player will consider the ground most of the time)
int highestGround = params.water_level; // We already know there is ground at sea level
int lowestAir = Short.MAX_VALUE; // We don't know where the air starts
int testHeight = highestGround + 4; // Seems like a good start point if we don't know anything else (most of the time this value is overwritten with lastAirHeight, so it's not too important).
if (lastHeight != Short.MIN_VALUE) {
// Perhaps the height hasn't changed and we can save some tests with this information: We can check if
// height is the same with only two tests (and only 1 will be needed if lastHeight was sea level).
int lastAirHeight = lastHeight + 1;
boolean isAir = Noise.NoisePerlin3D(noise_ground.np, world_x, lastAirHeight, world_z, seed) * f < lastAirHeight - h;
if (isAir) {
lowestAir = lastAirHeight;
testHeight = lastHeight;
} else {
// Nope, height has changed, we will have to do a proper search
highestGround = lastAirHeight;
testHeight = lastAirHeight + 1; // perhaps the land has only raised by 1, we can live in hope
}
}
while (highestGround + 1 < lowestAir) {
boolean isAir = Noise.NoisePerlin3D(noise_ground.np, world_x, testHeight, world_z, seed) * f < testHeight - h;
if (isAir) {
lowestAir = testHeight;
testHeight -= ((testHeight - highestGround) / 2);
} else {
int previousHighestGround = highestGround;
highestGround = testHeight;
if (lowestAir == Short.MAX_VALUE) {
testHeight += 2 * (testHeight - previousHighestGround);
} else {
testHeight += (lowestAir - testHeight) / 2;
}
}
} else {
// pick a value higher than a normal beach biome
surface_y = +10;
}
}
}
// In theory we have now found the height
surface_y = highestGround;
lastHeight = surface_y;
if (highestGround + 1 != lowestAir) {
AmidstLogger.error("Ground search alg failed! highestGround: " + highestGround + ", lowestAir: " + lowestAir);
}
}
// Add the biome index.
// (noise_height 'offset' is the average level of terrain. At least 50% of
// terrain will be below this)
biomeValue |= calcBiomeAtPoint(biomes, world_x, surface_y, world_z).getIndex();
result[x][z] = biomeValue;
// terrain will be below this)
biomeValue |= calcBiomeAtPoint(biomes, world_x, surface_y, world_z).getIndex();
result[x][z] = biomeValue;
world_x += step;
}
}
@ -134,6 +169,6 @@ public class BiomeDataOracleV5 extends MinetestBiomeDataOracle {
}
}
return MASK_BITPLANES;
}
}
}

3
src/main/java/amidst/minetest/world/oracle/BiomeDataOracleV6.java
View File

@ -183,6 +183,9 @@ public class BiomeDataOracleV6 extends MinetestBiomeDataOracle {
@Override
public short populateArray(CoordinatesInWorld corner, short[][] result, boolean useQuarterResolution) {
// The v6 mapgen has been officially stable since 2012
// See https://forum.minetest.net/viewtopic.php?f=18&t=19132
int width = result.length;
if (width > 0) {
Resolution resolution = Resolution.from(useQuarterResolution);

6
src/main/java/amidst/minetest/world/oracle/BiomeDataOracleV7.java
View File

@ -140,6 +140,12 @@ public class BiomeDataOracleV7 extends MinetestBiomeDataOracle {
@Override
public short populateArray(CoordinatesInWorld corner, short[][] result, boolean useQuarterResolution) {
// The v7 mapgen terrain has been officially stable since 0.4.16 when it was made the default
// mapgen, however the optional floatlands (disabled by default) are not stable yet, maybe they
// will be for 0.5.0.
// See https://forum.minetest.net/viewtopic.php?f=18&t=19132
int width = result.length;
if (width > 0) {
Resolution resolution = Resolution.from(useQuarterResolution);