minenux/minetest-engine-multicraft2
1
0
Fork 0
Code Releases Activity

Vein ore: Fix bug caused by changing perlinmap Y size (#7371)

Browse Source 
Because vein ore uses 3D noise (all the other ores use 2D noise) the
perlinmap Y size can be different in different mapchunks when close
to the ore Y limits.
Previously this caused bugs in the vein structure because changes in
perlinmap Y size did not recreate the noise objects.

Delete and recreate the noise objects with the new Y size if Y size
has changed.
This commit is contained in:
Paramat 2018-05-24 22:20:06 +01:00 committed by GitHub
parent d6a6d3176e
commit 5c1edc58ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/mapgen/mg_ore.cpp
View File

@ -371,17 +371,23 @@ void OreVein::generate(MMVManip *vm, int mapseed, u32 blockseed,
PcgRandom pr(blockseed + 520); PcgRandom pr(blockseed + 520);
MapNode n_ore(c_ore, 0, ore_param2); MapNode n_ore(c_ore, 0, ore_param2);
u32 sizex = (nmax.X - nmin.X + 1); int sizex = nmax.X - nmin.X + 1;
int sizey = nmax.Y - nmin.Y + 1;
if (!noise) { // Because this ore uses 3D noise the perlinmap Y size can be different in
int sx = nmax.X - nmin.X + 1; // different mapchunks due to ore Y limits. So recreate the noise objects
int sy = nmax.Y - nmin.Y + 1; // if Y size has changed.
int sz = nmax.Z - nmin.Z + 1; // Because these noise objects are created multiple times for this ore type
noise = new Noise(&np, mapseed, sx, sy, sz); // it is necessary to 'delete' them here.
noise2 = new Noise(&np, mapseed + 436, sx, sy, sz); if (!noise || sizey != sizey_prev) {
delete noise;
delete noise2;
int sizez = nmax.Z - nmin.Z + 1;
noise = new Noise(&np, mapseed, sizex, sizey, sizez);
noise2 = new Noise(&np, mapseed + 436, sizex, sizey, sizez);
sizey_prev = sizey;
} }
bool noise_generated = false;
bool noise_generated = false;
size_t index = 0; size_t index = 0;
for (int z = nmin.Z; z <= nmax.Z; z++) for (int z = nmin.Z; z <= nmax.Z; z++)
for (int y = nmin.Y; y <= nmax.Y; y++) for (int y = nmin.Y; y <= nmax.Y; y++)

1
src/mapgen/mg_ore.h
View File

@ -126,6 +126,7 @@ public:
float random_factor; float random_factor;
Noise *noise2 = nullptr; Noise *noise2 = nullptr;
int sizey_prev = 0;
OreVein() = default; OreVein() = default;
virtual ~OreVein(); virtual ~OreVein();