Fix mapgen using unitialised height map values

[oweals/minetest.git] / src / mapgen.cpp

diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index 880ea1eea911e0edc0b4955d7852b6e0dd77b313..17aa1dd92e2c33847bd02af326694653945485b6 100644 (file)
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -20,6 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mapgen.h"
 #include "voxel.h"
 #include "noise.h"
+#include "gamedef.h"
 #include "mg_biome.h"
 #include "mapblock.h"
 #include "mapnode.h"
@@ -40,6 +41,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 const char *GenElementManager::ELEMENT_TITLE = "element";
 
+static const s16 INVALID_HEIGHT = MAP_GENERATION_LIMIT + 1;
+
 FlagDesc flagdesc_mapgen[] = {
        {"trees",    MG_TREES},
        {"caves",    MG_CAVES},
@@ -100,6 +103,23 @@ Mapgen::~Mapgen()
 }
 
 
+u32 Mapgen::getBlockSeed(v3s16 p, int seed)
+{
+       return (u32)seed   +
+               p.Z * 38134234 +
+               p.Y * 42123    +
+               p.X * 23;
+}
+
+
+u32 Mapgen::getBlockSeed2(v3s16 p, int seed)
+{
+       u32 n = 1619 * p.X + 31337 * p.Y + 52591 * p.Z + 1013 * seed;
+       n = (n >> 13) ^ n;
+       return (n * (n * n * 60493 + 19990303) + 1376312589);
+}
+
+
 // Returns Y one under area minimum if not found
 s16 Mapgen::findGroundLevelFull(v2s16 p2d)
 {
@@ -137,6 +157,12 @@ s16 Mapgen::findGroundLevel(v2s16 p2d, s16 ymin, s16 ymax)
 }
 
 
+void Mapgen::initHeightMap(s16 *dest, size_t len)
+{
+       for (size_t i = 0; i < len; i++)
+               dest[i] = INVALID_HEIGHT;
+}
+
 void Mapgen::updateHeightmap(v3s16 nmin, v3s16 nmax)
 {
        if (!heightmap)
@@ -148,11 +174,13 @@ void Mapgen::updateHeightmap(v3s16 nmin, v3s16 nmax)
                for (s16 x = nmin.X; x <= nmax.X; x++, index++) {
                        s16 y = findGroundLevel(v2s16(x, z), nmin.Y, nmax.Y);
 
-                       // if the values found are out of range, trust the old heightmap
-                       if (y == nmax.Y && heightmap[index] > nmax.Y)
-                               continue;
-                       if (y == nmin.Y - 1 && heightmap[index] < nmin.Y)
-                               continue;
+                       if (heightmap[index] != INVALID_HEIGHT) {
+                               // if the values found are out of range, trust the old heightmap
+                               if (y == nmax.Y && heightmap[index] > nmax.Y)
+                                       continue;
+                               if (y == nmin.Y - 1 && heightmap[index] < nmin.Y)
+                                       continue;
+                       }
 
                        heightmap[index] = y;
                }
@@ -186,7 +214,7 @@ void Mapgen::updateLiquid(UniqueQueue<v3s16> *trans_liquid, v3s16 nmin, v3s16 nm
 }
 
 
-void Mapgen::setLighting(v3s16 nmin, v3s16 nmax, u8 light)
+void Mapgen::setLighting(u8 light, v3s16 nmin, v3s16 nmax)
 {
        ScopeProfiler sp(g_profiler, "EmergeThread: mapgen lighting update", SPT_AVG);
        VoxelArea a(nmin, nmax);
@@ -225,16 +253,43 @@ void Mapgen::lightSpread(VoxelArea &a, v3s16 p, u8 light)
 }
 
 
-void Mapgen::calcLighting(v3s16 nmin, v3s16 nmax)
+void Mapgen::calcLighting(v3s16 nmin, v3s16 nmax, v3s16 full_nmin, v3s16 full_nmax)
 {
-       VoxelArea a(nmin, nmax);
-       bool block_is_underground = (water_level >= nmax.Y);
+       ScopeProfiler sp(g_profiler, "EmergeThread: mapgen lighting update", SPT_AVG);
+       //TimeTaker t("updateLighting");
+
+       propagateSunlight(nmin, nmax);
+       spreadLight(full_nmin, full_nmax);
+
+       //printf("updateLighting: %dms\n", t.stop());
+}
+
 
+
+void Mapgen::calcLighting(v3s16 nmin, v3s16 nmax)
+{
        ScopeProfiler sp(g_profiler, "EmergeThread: mapgen lighting update", SPT_AVG);
        //TimeTaker t("updateLighting");
 
-       // first, send vertical rays of sunshine downward
+       propagateSunlight(
+               nmin - v3s16(1, 1, 1) * MAP_BLOCKSIZE,
+               nmax + v3s16(1, 0, 1) * MAP_BLOCKSIZE);
+
+       spreadLight(
+               nmin - v3s16(1, 1, 1) * MAP_BLOCKSIZE,
+               nmax + v3s16(1, 1, 1) * MAP_BLOCKSIZE);
+
+       //printf("updateLighting: %dms\n", t.stop());
+}
+
+
+void Mapgen::propagateSunlight(v3s16 nmin, v3s16 nmax)
+{
+       //TimeTaker t("propagateSunlight");
+       VoxelArea a(nmin, nmax);
+       bool block_is_underground = (water_level >= nmax.Y);
        v3s16 em = vm->m_area.getExtent();
+
        for (int z = a.MinEdge.Z; z <= a.MaxEdge.Z; z++) {
                for (int x = a.MinEdge.X; x <= a.MaxEdge.X; x++) {
                        // see if we can get a light value from the overtop
@@ -256,8 +311,16 @@ void Mapgen::calcLighting(v3s16 nmin, v3s16 nmax)
                        }
                }
        }
+       //printf("propagateSunlight: %dms\n", t.stop());
+}
+
+
+
+void Mapgen::spreadLight(v3s16 nmin, v3s16 nmax)
+{
+       //TimeTaker t("spreadLight");
+       VoxelArea a(nmin, nmax);
 
-       // now spread the sunlight and light up any sources
        for (int z = a.MinEdge.Z; z <= a.MaxEdge.Z; z++) {
                for (int y = a.MinEdge.Y; y <= a.MaxEdge.Y; y++) {
                        u32 i = vm->m_area.index(a.MinEdge.X, y, z);
@@ -273,21 +336,22 @@ void Mapgen::calcLighting(v3s16 nmin, v3s16 nmax)
 
                                u8 light = n.param1 & 0x0F;
                                if (light) {
-                                       lightSpread(a, v3s16(x,     y,     z + 1), light - 1);
-                                       lightSpread(a, v3s16(x,     y + 1, z    ), light - 1);
-                                       lightSpread(a, v3s16(x + 1, y,     z    ), light - 1);
-                                       lightSpread(a, v3s16(x,     y,     z - 1), light - 1);
-                                       lightSpread(a, v3s16(x,     y - 1, z    ), light - 1);
-                                       lightSpread(a, v3s16(x - 1, y,     z    ), light - 1);
+                                       lightSpread(a, v3s16(x,     y,     z + 1), light);
+                                       lightSpread(a, v3s16(x,     y + 1, z    ), light);
+                                       lightSpread(a, v3s16(x + 1, y,     z    ), light);
+                                       lightSpread(a, v3s16(x,     y,     z - 1), light);
+                                       lightSpread(a, v3s16(x,     y - 1, z    ), light);
+                                       lightSpread(a, v3s16(x - 1, y,     z    ), light);
                                }
                        }
                }
        }
 
-       //printf("updateLighting: %dms\n", t.stop());
+       //printf("spreadLight: %dms\n", t.stop());
 }
 
 
+
 void Mapgen::calcLightingOld(v3s16 nmin, v3s16 nmax)
 {
        enum LightBank banks[2] = {LIGHTBANK_DAY, LIGHTBANK_NIGHT};
@@ -316,6 +380,7 @@ void Mapgen::calcLightingOld(v3s16 nmin, v3s16 nmax)
 
 GenerateNotifier::GenerateNotifier()
 {
+       m_notify_on = 0;
 }
 
 
@@ -362,9 +427,8 @@ void GenerateNotifier::getEvents(
        std::map<std::string, std::vector<v3s16> > &event_map,
        bool peek_events)
 {
-       std::list<GenNotifyEvent>::iterator it;
-
-       for (it = m_notify_events.begin(); it != m_notify_events.end(); ++it) {
+       for (std::vector<GenNotifyEvent>::iterator it = m_notify_events.begin();
+                       it != m_notify_events.end(); ++it) {
                GenNotifyEvent &gn = *it;
                std::string name = (gn.type == GENNOTIFY_DECORATION) ?
                        "decoration#"+ itos(gn.id) :
@@ -381,6 +445,12 @@ void GenerateNotifier::getEvents(
 ///////////////////////////////////////////////////////////////////////////////
 
 
+GenElementManager::GenElementManager(IGameDef *gamedef)
+{
+       m_ndef = gamedef->getNodeDefManager();
+}
+
+
 GenElementManager::~GenElementManager()
 {
        for (size_t i = 0; i != m_elements.size(); i++)