pgimeno
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mgv7, mgflat, mgfractal: Tunnel generation code optimisation

master
paramat 2016-04-12 04:43:22 +01:00
parent e661d8b32c
commit 4fdf66bbf4
3 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mapgen_flat.cpp
View File

@ -591,17 +591,18 @@ void MapgenFlat::generateCaves(s16 max_stone_y)
// Ground // Ground
float d1 = contour(noise_cave1->result[index3d]); float d1 = contour(noise_cave1->result[index3d]);
float d2 = contour(noise_cave2->result[index3d]); float d2 = contour(noise_cave2->result[index3d]);
if (d1 * d2 > 0.3f && ndef->get(c).is_ground_content) { if (d1 * d2 > 0.3f && ndef->get(c).is_ground_content) {
// In tunnel and ground content, excavate // In tunnel and ground content, excavate
vm->m_data[vi] = MapNode(CONTENT_AIR); vm->m_data[vi] = MapNode(CONTENT_AIR);
is_tunnel = true; is_tunnel = true;
} else if (is_tunnel && column_is_open && } else {
(c == biome->c_filler || c == biome->c_stone)) { // Not in tunnel or not ground content
if (is_tunnel && column_is_open &&
(c == biome->c_filler || c == biome->c_stone))
// Tunnel entrance floor // Tunnel entrance floor
vm->m_data[vi] = MapNode(biome->c_top); vm->m_data[vi] = MapNode(biome->c_top);
column_is_open = false;
is_tunnel = false;
} else {
column_is_open = false; column_is_open = false;
is_tunnel = false; is_tunnel = false;
} }

11
src/mapgen_fractal.cpp
View File

@ -719,17 +719,18 @@ void MapgenFractal::generateCaves(s16 max_stone_y)
// Ground // Ground
float d1 = contour(noise_cave1->result[index3d]); float d1 = contour(noise_cave1->result[index3d]);
float d2 = contour(noise_cave2->result[index3d]); float d2 = contour(noise_cave2->result[index3d]);
if (d1 * d2 > 0.3f && ndef->get(c).is_ground_content) { if (d1 * d2 > 0.3f && ndef->get(c).is_ground_content) {
// In tunnel and ground content, excavate // In tunnel and ground content, excavate
vm->m_data[vi] = MapNode(CONTENT_AIR); vm->m_data[vi] = MapNode(CONTENT_AIR);
is_tunnel = true; is_tunnel = true;
} else if (is_tunnel && column_is_open && } else {
(c == biome->c_filler || c == biome->c_stone)) { // Not in tunnel or not ground content
if (is_tunnel && column_is_open &&
(c == biome->c_filler || c == biome->c_stone))
// Tunnel entrance floor // Tunnel entrance floor
vm->m_data[vi] = MapNode(biome->c_top); vm->m_data[vi] = MapNode(biome->c_top);
column_is_open = false;
is_tunnel = false;
} else {
column_is_open = false; column_is_open = false;
is_tunnel = false; is_tunnel = false;
} }

11
src/mapgen_v7.cpp
View File

@ -772,17 +772,18 @@ void MapgenV7::generateCaves(s16 max_stone_y)
// Ground // Ground
float d1 = contour(noise_cave1->result[index3d]); float d1 = contour(noise_cave1->result[index3d]);
float d2 = contour(noise_cave2->result[index3d]); float d2 = contour(noise_cave2->result[index3d]);
if (d1 * d2 > 0.3f && ndef->get(c).is_ground_content) { if (d1 * d2 > 0.3f && ndef->get(c).is_ground_content) {
// In tunnel and ground content, excavate // In tunnel and ground content, excavate
vm->m_data[vi] = MapNode(CONTENT_AIR); vm->m_data[vi] = MapNode(CONTENT_AIR);
is_tunnel = true; is_tunnel = true;
} else if (is_tunnel && column_is_open && } else {
(c == biome->c_filler || c == biome->c_stone)) { // Not in tunnel or not ground content
if (is_tunnel && column_is_open &&
(c == biome->c_filler || c == biome->c_stone))
// Tunnel entrance floor // Tunnel entrance floor
vm->m_data[vi] = MapNode(biome->c_top); vm->m_data[vi] = MapNode(biome->c_top);
column_is_open = false;
is_tunnel = false;
} else {
column_is_open = false; column_is_open = false;
is_tunnel = false; is_tunnel = false;
} }