]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - src/mapblock.h
day/night working client side
[dragonfireclient.git] / src / mapblock.h
index 60f78b6ffb36103bf0f21a6ff0d861f028d6c3b9..2743d8397c9609ee3a1da839808d637d25215770 100644 (file)
@@ -1,5 +1,20 @@
 /*
-(c) 2010 Perttu Ahola <celeron55@gmail.com>
+Minetest-c55
+Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #ifndef MAPBLOCK_HEADER
@@ -15,6 +30,7 @@
 #include "serialization.h"
 #include "constants.h"
 #include "mapblockobject.h"
+#include "voxel.h"
 
 #define MAP_BLOCKSIZE 16
 
@@ -30,15 +46,34 @@ enum{
 
 struct FastFace
 {
-       u8 material;
+       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,
        NODECONTAINER_ID_MAPSECTOR,
-       NODECONTAINER_ID_MAP
+       NODECONTAINER_ID_MAP,
+       NODECONTAINER_ID_MAPBLOCKCACHE,
+       NODECONTAINER_ID_VOXELMANIPULATOR,
 };
 
 class NodeContainer
@@ -52,77 +87,14 @@ class NodeContainer
 
 class MapBlock : public NodeContainer
 {
-private:
-
-       NodeContainer *m_parent;
-       // Position in blocks on parent
-       v3s16 m_pos;
-       /*
-               If NULL, block is a dummy block.
-               Dummy blocks are used for caching not-found-on-disk blocks.
-       */
-       MapNode * data;
-       /*
-               - On the client, this is used for checking whether to
-                 recalculate the face cache. (Is it anymore?)
-               - On the server, this is used for telling whether the
-                 block has been changed from the one on disk.
-       */
-       bool changed;
-       /*
-               Used for some initial lighting stuff.
-               At least /has been/ used. 8)
-       */
-       bool is_underground;
-       
-       MapBlockObjectList m_objects;
-       
 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
        {
@@ -160,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;
@@ -245,6 +227,35 @@ class MapBlock : public NodeContainer
                setNode(p.X, p.Y, p.Z, n);
        }
 
+       /*
+               Non-checking variants of the above
+       */
+
+       MapNode getNodeNoCheck(s16 x, s16 y, s16 z)
+       {
+               if(data == NULL)
+                       throw InvalidPositionException();
+               return data[z*MAP_BLOCKSIZE*MAP_BLOCKSIZE + y*MAP_BLOCKSIZE + x];
+       }
+       
+       MapNode getNodeNoCheck(v3s16 p)
+       {
+               return getNodeNoCheck(p.X, p.Y, p.Z);
+       }
+       
+       void setNodeNoCheck(s16 x, s16 y, s16 z, MapNode & n)
+       {
+               if(data == NULL)
+                       throw InvalidPositionException();
+               data[z*MAP_BLOCKSIZE*MAP_BLOCKSIZE + y*MAP_BLOCKSIZE + x] = n;
+               setChangedFlag();
+       }
+       
+       void setNodeNoCheck(v3s16 p, MapNode & n)
+       {
+               setNodeNoCheck(p.X, p.Y, p.Z, n);
+       }
+
        /*
                These functions consult the parent container if the position
                is not valid on this MapBlock.
@@ -252,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)
        {
@@ -261,36 +273,53 @@ class MapBlock : public NodeContainer
                                        setNode(x0+x, y0+y, z0+z, node);
        }
 
-       static FastFace * makeFastFace(u8 material, 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(v3s16 p, v3s16 face_dir);
+       u8 getFaceLight(u32 daynight_ratio, MapNode n, MapNode n2,
+                       v3s16 face_dir);
        
-       /*
-               Gets node material from any place relative to block.
-               Returns MATERIAL_AIR if doesn't exist.
-       */
-       u8 getNodeMaterial(v3s16 p);
+       u8 getFaceLight(u32 daynight_ratio, v3s16 p, v3s16 face_dir)
+       {
+               return getFaceLight(daynight_ratio,
+                               getNodeParentNoEx(p),
+                               getNodeParentNoEx(p + face_dir),
+                               face_dir);
+       }
+       
+       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);
        
-       // Doesn't write version by itself
-       void serialize(std::ostream &os, u8 version);
+       // Copies data to VoxelManipulator to getPosRelative()
+       void copyTo(VoxelManipulator &dst);
 
-       void deSerialize(std::istream &is, u8 version);
+       /*
+               Object stuff
+       */
        
        void serializeObjects(std::ostream &os, u8 version)
        {
@@ -352,10 +381,55 @@ class MapBlock : public NodeContainer
                m_objects.getObjects(origin, max_d, dest);
        }
 
+       /*void getPseudoObjects(v3f origin, f32 max_d,
+                       core::array<DistanceSortedObject> &dest);*/
+
        s32 getObjectCount()
        {
                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
+       */
+       
+       // Doesn't write version by itself
+       void serialize(std::ostream &os, u8 version);
+
+       void deSerialize(std::istream &is, u8 version);
 
 private:
 
@@ -374,6 +448,39 @@ class MapBlock : public NodeContainer
        {
                return getNodeRef(p.X, p.Y, p.Z);
        }
+
+       
+       NodeContainer *m_parent;
+       // Position in blocks on parent
+       v3s16 m_pos;
+       /*
+               If NULL, block is a dummy block.
+               Dummy blocks are used for caching not-found-on-disk blocks.
+       */
+       MapNode * data;
+       /*
+               - On the client, this is used for checking whether to
+                 recalculate the face cache. (Is it anymore?)
+               - On the server, this is used for telling whether the
+                 block has been changed from the one on disk.
+       */
+       bool changed;
+       /*
+               Used for some initial lighting stuff.
+               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)