Light calculation: New bulk node lighting code

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

diff --git a/src/mapblock.cpp b/src/mapblock.cpp
index be16c3bb72f748061826812cca525b1ae9db6e8f..840cb9b3994a28da789db0f898433e8da1cc49dd 100644 (file)
--- a/src/mapblock.cpp
+++ b/src/mapblock.cpp
@@ -35,8 +35,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #endif
 #include "util/string.h"
 #include "util/serialize.h"
-
-#define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")"
+#include "util/basic_macros.h"
 
 static const char *modified_reason_strings[] = {
        "initial",
@@ -74,7 +73,7 @@ MapBlock::MapBlock(Map *parent, v3s16 pos, IGameDef *gamedef, bool dummy):
                m_modified(MOD_STATE_WRITE_NEEDED),
                m_modified_reason(MOD_REASON_INITIAL),
                is_underground(false),
-               m_lighting_expired(true),
+               m_lighting_complete(0xFFFF),
                m_day_night_differs(false),
                m_day_night_differs_expired(true),
                m_generated(false),
@@ -572,11 +571,12 @@ void MapBlock::serialize(std::ostream &os, u8 version, bool disk)
                flags |= 0x01;
        if(getDayNightDiff())
                flags |= 0x02;
-       if(m_lighting_expired)
-               flags |= 0x04;
        if(m_generated == false)
                flags |= 0x08;
        writeU8(os, flags);
+       if (version >= 27) {
+               writeU16(os, m_lighting_complete);
+       }
 
        /*
                Bulk node data
@@ -673,7 +673,11 @@ void MapBlock::deSerialize(std::istream &is, u8 version, bool disk)
        u8 flags = readU8(is);
        is_underground = (flags & 0x01) ? true : false;
        m_day_night_differs = (flags & 0x02) ? true : false;
-       m_lighting_expired = (flags & 0x04) ? true : false;
+       if (version < 27) {
+               m_lighting_complete = 0xFFFF;
+       } else {
+               m_lighting_complete = readU16(is);
+       }
        m_generated = (flags & 0x08) ? false : true;
 
        /*
@@ -784,7 +788,7 @@ void MapBlock::deSerialize_pre22(std::istream &is, u8 version, bool disk)
        // Initialize default flags
        is_underground = false;
        m_day_night_differs = false;
-       m_lighting_expired = false;
+       m_lighting_complete = 0xFFFF;
        m_generated = true;
 
        // Make a temporary buffer
@@ -796,12 +800,12 @@ void MapBlock::deSerialize_pre22(std::istream &is, u8 version, bool disk)
                char tmp;
                is.read(&tmp, 1);
                if (is.gcount() != 1)
-                       throw SerializationError(std::string(__FUNCTION_NAME)
+                       throw SerializationError(std::string(FUNCTION_NAME)
                                + ": not enough input data");
                is_underground = tmp;
                is.read((char *)*databuf_nodelist, nodecount * ser_length);
                if ((u32)is.gcount() != nodecount * ser_length)
-                       throw SerializationError(std::string(__FUNCTION_NAME)
+                       throw SerializationError(std::string(FUNCTION_NAME)
                                + ": not enough input data");
        } else if (version <= 10) {
                u8 t8;
@@ -814,7 +818,7 @@ void MapBlock::deSerialize_pre22(std::istream &is, u8 version, bool disk)
                        decompress(is, os, version);
                        std::string s = os.str();
                        if (s.size() != nodecount)
-                               throw SerializationError(std::string(__FUNCTION_NAME)
+                               throw SerializationError(std::string(FUNCTION_NAME)
                                        + ": not enough input data");
                        for (u32 i = 0; i < s.size(); i++) {
                                databuf_nodelist[i*ser_length] = s[i];
@@ -826,7 +830,7 @@ void MapBlock::deSerialize_pre22(std::istream &is, u8 version, bool disk)
                        decompress(is, os, version);
                        std::string s = os.str();
                        if (s.size() != nodecount)
-                               throw SerializationError(std::string(__FUNCTION_NAME)
+                               throw SerializationError(std::string(FUNCTION_NAME)
                                        + ": not enough input data");
                        for (u32 i = 0; i < s.size(); i++) {
                                databuf_nodelist[i*ser_length + 1] = s[i];
@@ -839,7 +843,7 @@ void MapBlock::deSerialize_pre22(std::istream &is, u8 version, bool disk)
                        decompress(is, os, version);
                        std::string s = os.str();
                        if (s.size() != nodecount)
-                               throw SerializationError(std::string(__FUNCTION_NAME)
+                               throw SerializationError(std::string(FUNCTION_NAME)
                                        + ": not enough input data");
                        for (u32 i = 0; i < s.size(); i++) {
                                databuf_nodelist[i*ser_length + 2] = s[i];
@@ -850,7 +854,6 @@ void MapBlock::deSerialize_pre22(std::istream &is, u8 version, bool disk)
                is.read((char*)&flags, 1);
                is_underground = (flags & 0x01) ? true : false;
                m_day_night_differs = (flags & 0x02) ? true : false;
-               m_lighting_expired = (flags & 0x04) ? true : false;
                if(version >= 18)
                        m_generated = (flags & 0x08) ? false : true;
 
@@ -859,7 +862,7 @@ void MapBlock::deSerialize_pre22(std::istream &is, u8 version, bool disk)
                decompress(is, os, version);
                std::string s = os.str();
                if (s.size() != nodecount * 3)
-                       throw SerializationError(std::string(__FUNCTION_NAME)
+                       throw SerializationError(std::string(FUNCTION_NAME)
                                + ": decompress resulted in size other than nodecount*3");
 
                // deserialize nodes from buffer
@@ -1028,10 +1031,7 @@ std::string analyze_block(MapBlock *block)
        else
                desc<<"is_ug [ ], ";
 
-       if(block->getLightingExpired())
-               desc<<"lighting_exp [X], ";
-       else
-               desc<<"lighting_exp [ ], ";
+       desc<<"lighting_complete: "<<block->getLightingComplete()<<", ";
 
        if(block->isDummy())
        {