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

Limit world generation to Minetest world boundaries 

Implements #16
I can't think of much reason to view the terrain that can't exist, and the boundary is a rather important terrain feature.
master
Treer 2020-07-13 23:32:28 +10:00
parent 361a21a2c9
commit aa188604c0
8 changed files with 70 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/amidst/minetest/world/oracle/BiomeDataOracleCarpathian.java
View File

@ -157,7 +157,7 @@ public class BiomeDataOracleCarpathian extends MinetestBiomeDataOracle {
}
@Override
public short populateArray(CoordinatesInWorld corner, short[][] result, boolean useQuarterResolution) {
public short populateArray_unbounded(CoordinatesInWorld corner, short[][] result, boolean useQuarterResolution) {
// The Carpathian mapgen terrain is not yet stable.
// See https://forum.minetest.net/viewtopic.php?f=18&t=19132

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

@ -29,7 +29,7 @@ public class BiomeDataOracleFlat extends MinetestBiomeDataOracle {
}
@Override
public short populateArray(CoordinatesInWorld corner, short[][] result, boolean useQuarterResolution) {
public short populateArray_unbounded(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

2
src/main/java/amidst/minetest/world/oracle/BiomeDataOracleHallelujah.java
View File

@ -175,7 +175,7 @@ public class BiomeDataOracleHallelujah extends MinetestBiomeDataOracle {
}
@Override
public short populateArray(CoordinatesInWorld corner, short[][] result, boolean useQuarterResolution) {
public short populateArray_unbounded(CoordinatesInWorld corner, short[][] result, boolean useQuarterResolution) {
int width = result.length;
if (width > 0) {

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

@ -43,7 +43,7 @@ public class BiomeDataOracleV5 extends MinetestBiomeDataOracle {
}
@Override
public short populateArray(CoordinatesInWorld corner, short[][] result, boolean useQuarterResolution) {
public short populateArray_unbounded(CoordinatesInWorld corner, short[][] result, boolean useQuarterResolution) {
// The v5 mapgen terrain became officially stable in Minetest v5, Dec 2018
// See https://github.com/minetest/minetest/commit/40007351569413fd9dcff861ee00562d0c405722

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

@ -180,7 +180,7 @@ public class BiomeDataOracleV6 extends MinetestBiomeDataOracle {
}
@Override
public short populateArray(CoordinatesInWorld corner, short[][] result, boolean useQuarterResolution) {
public short populateArray_unbounded(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

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

@ -190,7 +190,7 @@ public class BiomeDataOracleV7 extends MinetestBiomeDataOracle {
}
@Override
public short populateArray(CoordinatesInWorld corner, short[][] result, boolean useQuarterResolution) {
public short populateArray_unbounded(CoordinatesInWorld corner, short[][] result, boolean useQuarterResolution) {
return isFloatlands ?
populateArray_floatlands(corner, result, useQuarterResolution) :
populateArray_groundlevel(corner, result, useQuarterResolution);

2
src/main/java/amidst/minetest/world/oracle/BiomeDataOracleValleys.java
View File

@ -374,7 +374,7 @@ public class BiomeDataOracleValleys extends MinetestBiomeDataOracle implements I
@Override
public short populateArray(CoordinatesInWorld corner, short[][] result, boolean useQuarterResolution) {
public short populateArray_unbounded(CoordinatesInWorld corner, short[][] result, boolean useQuarterResolution) {
// The Valleys mapgen terrain is not yet stable.
// See https://forum.minetest.net/viewtopic.php?f=18&t=19132

67
src/main/java/amidst/minetest/world/oracle/MinetestBiomeDataOracle.java
View File

@ -13,6 +13,8 @@ import amidst.minetest.world.mapgen.MapgenParams;
import amidst.minetest.world.mapgen.MinetestBiome;
import amidst.minetest.world.mapgen.MinetestBiomeProfileImpl;
import amidst.minetest.world.mapgen.Noise;
import amidst.mojangapi.world.coordinates.CoordinatesInWorld;
import amidst.mojangapi.world.coordinates.Resolution;
import amidst.settings.biomeprofile.BiomeProfile;
import amidst.settings.biomeprofile.BiomeProfileSelection;
import amidst.settings.biomeprofile.BiomeProfileUpdateListener;
@ -30,8 +32,8 @@ public abstract class MinetestBiomeDataOracle implements IBiomeDataOracle, Biome
public static final int BITPLANE_OCEAN = 0x2000;
public static final int BITPLANE_MOUNTAIN = 0x1000;
public static final int MASK_BITPLANES = ~(BITPLANE_RIVER | BITPLANE_OCEAN | BITPLANE_MOUNTAIN);
public MinetestBiomeDataOracle(MapgenParams params, BiomeProfileSelection biomeProfileSelection, long seed) {
//this.seed = (int)(seed & 0xFFFFFFFFL);
this.seed = (int)seed;
@ -47,11 +49,68 @@ public abstract class MinetestBiomeDataOracle implements IBiomeDataOracle, Biome
biomeProfileSelection.addUpdateListener(this);
}
}
/**
* The same as populateArray(), but if a subclass implements this instead of overriding
* populateArray() then clipping to Minetest world boundaries will get handled by the superclass.
*/
protected abstract short populateArray_unbounded(CoordinatesInWorld corner, short[][] result, boolean useQuarterResolution);
public short populateArray(CoordinatesInWorld corner, short[][] result, boolean useQuarterResolution) {
// invoke populateArray_unbounded() then clip the results to world boundaries
short ret = MASK_BITPLANES;
int width = result.length;
if (width > 0) {
// Minetest world boundaries are X=30927, X=−30912, Z=30927 and Z=−30912
Resolution resolution = Resolution.from(useQuarterResolution);
int height = result[0].length;
int left = (int) corner.getX();
int top = (int) corner.getY();
int step = resolution.getStep();
int right = left + (width - 1) * step;
int bottom = top + (height - 1) * step;
// Use -top and -bottom because Minetest uses left-handed coordinates, while Amidst uses
// right-handed coordinates, and we want to compare against Minetest boundaries
top = -top;
bottom = -bottom;
if (right >= -30912 && left <= 30927 && top >= -30912 && bottom <= 30927) {
ret = populateArray_unbounded(corner, result, useQuarterResolution);
if (left < -30912 || right > 30927 || bottom < -30912 || top > 30927) {
// part of this fragment is outside the world-bounds, erase that part
short blank_index = (short) MinetestBiome.VOID.getIndex();
int world_z = top;
for (int z = 0; z < height; z++, world_z -= step) {
int world_x = left;
for (int x = 0; x < width; x++, world_x += step) {
if (world_x < -30912 || world_x > 30927 || world_z < -30912 || world_z > 30927) {
result[x][z] = blank_index;
}
}
}
}
} else {
// the entire fragment is outside the world-bounds
short blank_index = (short) MinetestBiome.VOID.getIndex();
for (int y = 0; y < height; y++) {
for (int x = 0; x < width; x++) {
result[x][y] = blank_index;
}
}
}
}
return ret;
}
public MapgenParams getMapgenParams() {
return params;
}
protected MinetestBiome[] getBiomeArray() {
MinetestBiome[] result;