day/night working client side

[dragonfireclient.git] / src / mapblock.h

diff --git a/src/mapblock.h b/src/mapblock.h
index f725aa1f542c4d264274f411d8713dc961a9dc0b..2743d8397c9609ee3a1da839808d637d25215770 100644 (file)
--- a/src/mapblock.h
+++ b/src/mapblock.h
@@ -46,10 +46,27 @@ enum{
 
 struct FastFace
 {
-       u16 tile;
+       TileSpec tile;
        video::S3DVertex vertices[4]; // Precalculated vertices
 };
 
+enum NodeModType
+{
+       NODEMOD_NONE,
+       NODEMOD_CHANGECONTENT, //param is content id
+       NODEMOD_CRACK // param is crack progression
+};
+
+struct NodeMod
+{
+       NodeMod()
+       {
+               type = NODEMOD_NONE;
+       }
+       enum NodeModType type;
+       u16 param;
+};
+
 enum
 {
        NODECONTAINER_ID_MAPBLOCK,
@@ -72,50 +89,12 @@ class MapBlock : public NodeContainer
 {
 public:
 
-       /*
-               This used by Server's block creation stuff for not sending
-               blocks that are waiting a lighting update.
-
-               If true, the block needs some work by the one who set this
-               to true.
-
-               While true, nobody else should touch the block.
-       */
-       //bool is_incomplete;
-       
+       //scene::SMesh *mesh[DAYNIGHT_CACHE_COUNT];
        scene::SMesh *mesh;
        JMutex mesh_mutex;
 
-       MapBlock(NodeContainer *parent, v3s16 pos, bool dummy=false):
-                       m_parent(parent),
-                       m_pos(pos),
-                       changed(true),
-                       is_underground(false),
-                       m_objects(this)
-                       //is_incomplete(false)
-       {
-               data = NULL;
-               if(dummy == false)
-                       reallocate();
-               mesh_mutex.Init();
-               mesh = NULL;
-       }
-
-       ~MapBlock()
-       {
-               {
-                       JMutexAutoLock lock(mesh_mutex);
-                       
-                       if(mesh != NULL)
-                       {
-                               mesh->drop();
-                               mesh = NULL;
-                       }
-               }
-
-               if(data)
-                       delete[] data;
-       }
+       MapBlock(NodeContainer *parent, v3s16 pos, bool dummy=false);
+       ~MapBlock();
        
        virtual u16 nodeContainerId() const
        {
@@ -153,6 +132,16 @@ class MapBlock : public NodeContainer
                changed = true;
        }
 
+       void setMeshExpired(bool expired)
+       {
+               m_mesh_expired = expired;
+       }
+       
+       bool getMeshExpired()
+       {
+               return m_mesh_expired;
+       }
+
        v3s16 getPos()
        {
                return m_pos;
@@ -274,6 +263,7 @@ class MapBlock : public NodeContainer
        bool isValidPositionParent(v3s16 p);
        MapNode getNodeParent(v3s16 p);
        void setNodeParent(v3s16 p, MapNode & n);
+       MapNode getNodeParentNoEx(v3s16 p);
 
        void drawbox(s16 x0, s16 y0, s16 z0, s16 w, s16 h, s16 d, MapNode node)
        {
@@ -283,25 +273,44 @@ class MapBlock : public NodeContainer
                                        setNode(x0+x, y0+y, z0+z, node);
        }
 
-       static FastFace * makeFastFace(u16 tile, u8 light, v3f p,
-                       v3f dir, v3f scale, v3f posRelative_f);
+       static void makeFastFace(TileSpec tile, u8 light, v3f p,
+                       v3s16 dir, v3f scale, v3f posRelative_f,
+                       core::array<FastFace> &dest);
+       
+       u8 getFaceLight(u32 daynight_ratio, MapNode n, MapNode n2,
+                       v3s16 face_dir);
        
-       u8 getFaceLight(v3s16 p, v3s16 face_dir);
+       u8 getFaceLight(u32 daynight_ratio, v3s16 p, v3s16 face_dir)
+       {
+               return getFaceLight(daynight_ratio,
+                               getNodeParentNoEx(p),
+                               getNodeParentNoEx(p + face_dir),
+                               face_dir);
+       }
        
-       u8 getNodeTile(v3s16 p);
+       TileSpec getNodeTile(MapNode mn, v3s16 p, v3s16 face_dir);
+       u8 getNodeContent(v3s16 p, MapNode mn);
 
        /*
                startpos:
                translate_dir: unit vector with only one of x, y or z
                face_dir: unit vector with only one of x, y or z
        */
-       void updateFastFaceRow(v3s16 startpos,
+       void updateFastFaceRow(
+                       u32 daynight_ratio,
+                       v3f posRelative_f,
+                       v3s16 startpos,
                        u16 length,
                        v3s16 translate_dir,
+                       v3f translate_dir_f,
                        v3s16 face_dir,
-                       core::list<FastFace*> &dest);
+                       v3f face_dir_f,
+                       core::array<FastFace> &dest);
 
-       void updateMesh();
+       void updateMesh(u32 daynight_ratio);
+       /*void updateMesh(s32 daynight_i);
+       // Updates all DAYNIGHT_CACHE_COUNT meshes
+       void updateMeshes(s32 first_i=0);*/
 
        bool propagateSunlight(core::map<v3s16, bool> & light_sources);
        
@@ -379,6 +388,39 @@ class MapBlock : public NodeContainer
        {
                return m_objects.getCount();
        }
+       
+       /*
+               Methods for setting temporary modifications to nodes for
+               drawing
+       */
+       void setTempMod(v3s16 p, NodeMod mod)
+       {
+               m_temp_mods[p] = mod;
+       }
+       void clearTempMod(v3s16 p)
+       {
+               if(m_temp_mods.find(p))
+                       m_temp_mods.remove(p);
+       }
+       void clearTempMods()
+       {
+               m_temp_mods.clear();
+       }
+
+       /*
+               Day-night lighting difference
+               
+               These methods don't care about neighboring blocks.
+               It means that to know if a block really doesn't need a mesh
+               update between day and night, the neighboring blocks have
+               to be taken into account.
+       */
+       void updateDayNightDiff();
+
+       bool dayNightDiffed()
+       {
+               return m_day_night_differs;
+       }
 
        /*
                Serialization
@@ -428,9 +470,17 @@ class MapBlock : public NodeContainer
                At least /has been/ used. 8)
        */
        bool is_underground;
+
+       bool m_mesh_expired;
+       
+       // Whether day and night lighting differs
+       bool m_day_night_differs;
        
        MapBlockObjectList m_objects;
        
+       // Temporary modifications to nodes
+       // These are only used when drawing
+       core::map<v3s16, NodeMod> m_temp_mods;
 };
 
 inline bool blockpos_over_limit(v3s16 p)