Fixes for android

[minetest.git] / src / voxel.h

diff --git a/src/voxel.h b/src/voxel.h
index fa459444ff5a539b0b19eab57398e8a29b8cd301..53b6edbc7b9ab649fa2ef64044c60622d1c28bc8 100644 (file)
--- a/src/voxel.h
+++ b/src/voxel.h
@@ -80,7 +80,7 @@ class VoxelArea
                Modifying methods
        */
 
-       void addArea(VoxelArea &a)
+       void addArea(const VoxelArea &a)
        {
                if(getExtent() == v3s16(0,0,0))
                {
@@ -94,7 +94,7 @@ class VoxelArea
                if(a.MaxEdge.Y > MaxEdge.Y) MaxEdge.Y = a.MaxEdge.Y;
                if(a.MaxEdge.Z > MaxEdge.Z) MaxEdge.Z = a.MaxEdge.Z;
        }
-       void addPoint(v3s16 p)
+       void addPoint(const v3s16 &p)
        {
                if(getExtent() == v3s16(0,0,0))
                {
@@ -111,7 +111,7 @@ class VoxelArea
        }
 
        // Pad with d nodes
-       void pad(v3s16 d)
+       void pad(const v3s16 &d)
        {
                MinEdge -= d;
                MaxEdge += d;
@@ -320,10 +320,10 @@ class VoxelArea
        v3s16 MaxEdge;
 };
 
-// Hasn't been copied from source (emerged)
-#define VOXELFLAG_NOT_LOADED (1<<0)
-// Checked as being inexistent in source
-#define VOXELFLAG_INEXISTENT (1<<1)
+// unused 
+#define VOXELFLAG_UNUSED   (1<<0)
+// no data about that node
+#define VOXELFLAG_NO_DATA  (1<<1)
 // Algorithm-dependent
 #define VOXELFLAG_CHECKED1 (1<<2)
 // Algorithm-dependent
@@ -356,8 +356,8 @@ class VoxelManipulator /*: public NodeContainer*/
        }
        bool isValidPosition(v3s16 p)
        {
-               emerge(p);
-               return !(m_flags[m_area.index(p)] & VOXELFLAG_INEXISTENT);
+               addArea(p);
+               return !(m_flags[m_area.index(p)] & VOXELFLAG_NO_DATA);
        }*/
 
        /*
@@ -366,9 +366,10 @@ class VoxelManipulator /*: public NodeContainer*/
        */
        MapNode getNode(v3s16 p)
        {
-               emerge(p);
+               VoxelArea voxel_area(p);
+               addArea(voxel_area);
 
-               if(m_flags[m_area.index(p)] & VOXELFLAG_INEXISTENT)
+               if(m_flags[m_area.index(p)] & VOXELFLAG_NO_DATA)
                {
                        /*dstream<<"EXCEPT: VoxelManipulator::getNode(): "
                                        <<"p=("<<p.X<<","<<p.Y<<","<<p.Z<<")"
@@ -383,9 +384,10 @@ class VoxelManipulator /*: public NodeContainer*/
        }
        MapNode getNodeNoEx(v3s16 p)
        {
-               emerge(p);
+               VoxelArea voxel_area(p);
+               addArea(voxel_area);
 
-               if(m_flags[m_area.index(p)] & VOXELFLAG_INEXISTENT)
+               if(m_flags[m_area.index(p)] & VOXELFLAG_NO_DATA)
                {
                        return MapNode(CONTENT_IGNORE);
                }
@@ -396,12 +398,12 @@ class VoxelManipulator /*: public NodeContainer*/
        {
                if(m_area.contains(p) == false)
                        return MapNode(CONTENT_IGNORE);
-               if(m_flags[m_area.index(p)] & VOXELFLAG_INEXISTENT)
+               if(m_flags[m_area.index(p)] & VOXELFLAG_NO_DATA)
                        return MapNode(CONTENT_IGNORE);
                return m_data[m_area.index(p)];
        }
        // Stuff explodes if non-emerged area is touched with this.
-       // Emerge first, and check VOXELFLAG_INEXISTENT if appropriate.
+       // Emerge first, and check VOXELFLAG_NO_DATA if appropriate.
        MapNode & getNodeRefUnsafe(v3s16 p)
        {
                return m_data[m_area.index(p)];
@@ -413,12 +415,13 @@ class VoxelManipulator /*: public NodeContainer*/
        bool exists(v3s16 p)
        {
                return m_area.contains(p) &&
-                       !(getFlagsRefUnsafe(p) & VOXELFLAG_INEXISTENT);
+                       !(getFlagsRefUnsafe(p) & VOXELFLAG_NO_DATA);
        }
        MapNode & getNodeRef(v3s16 p)
        {
-               emerge(p);
-               if(getFlagsRefUnsafe(p) & VOXELFLAG_INEXISTENT)
+               VoxelArea voxel_area(p);
+               addArea(voxel_area);
+               if(getFlagsRefUnsafe(p) & VOXELFLAG_NO_DATA)
                {
                        /*dstream<<"EXCEPT: VoxelManipulator::getNode(): "
                                        <<"p=("<<p.X<<","<<p.Y<<","<<p.Z<<")"
@@ -432,11 +435,11 @@ class VoxelManipulator /*: public NodeContainer*/
        }
        void setNode(v3s16 p, const MapNode &n)
        {
-               emerge(p);
+               VoxelArea voxel_area(p);
+               addArea(voxel_area);
 
                m_data[m_area.index(p)] = n;
-               m_flags[m_area.index(p)] &= ~VOXELFLAG_INEXISTENT;
-               m_flags[m_area.index(p)] &= ~VOXELFLAG_NOT_LOADED;
+               m_flags[m_area.index(p)] &= ~VOXELFLAG_NO_DATA;
        }
        // TODO: Should be removed and replaced with setNode
        void setNodeNoRef(v3s16 p, const MapNode &n)
@@ -446,12 +449,12 @@ class VoxelManipulator /*: public NodeContainer*/
 
        /*void setExists(VoxelArea a)
        {
-               emerge(a);
+               addArea(a);
                for(s32 z=a.MinEdge.Z; z<=a.MaxEdge.Z; z++)
                for(s32 y=a.MinEdge.Y; y<=a.MaxEdge.Y; y++)
                for(s32 x=a.MinEdge.X; x<=a.MaxEdge.X; x++)
                {
-                       m_flags[m_area.index(x,y,z)] &= ~VOXELFLAG_INEXISTENT;
+                       m_flags[m_area.index(x,y,z)] &= ~VOXELFLAG_NO_DATA;
                }
        }*/
 
@@ -459,7 +462,7 @@ class VoxelManipulator /*: public NodeContainer*/
        {
                //dstream<<"operator[] p=("<<p.X<<","<<p.Y<<","<<p.Z<<")"<<std::endl;
                if(isValidPosition(p) == false)
-                       emerge(VoxelArea(p));
+                       addArea(VoxelArea(p));
 
                return m_data[m_area.index(p)];
        }*/
@@ -500,17 +503,17 @@ class VoxelManipulator /*: public NodeContainer*/
        void print(std::ostream &o, INodeDefManager *nodemgr,
                        VoxelPrintMode mode=VOXELPRINT_MATERIAL);
 
-       void addArea(VoxelArea area);
+       void addArea(const VoxelArea &area);
 
        /*
                Copy data and set flags to 0
                dst_area.getExtent() <= src_area.getExtent()
        */
-       void copyFrom(MapNode *src, VoxelArea src_area,
+       void copyFrom(MapNode *src, const VoxelArea& src_area,
                        v3s16 from_pos, v3s16 to_pos, v3s16 size);
 
        // Copy data
-       void copyTo(MapNode *dst, VoxelArea dst_area,
+       void copyTo(MapNode *dst, const VoxelArea& dst_area,
                        v3s16 dst_pos, v3s16 from_pos, v3s16 size);
 
        /*
@@ -535,29 +538,6 @@ class VoxelManipulator /*: public NodeContainer*/
                Virtual functions
        */
 
-       /*
-               Get the contents of the requested area from somewhere.
-               Shall touch only nodes that have VOXELFLAG_NOT_LOADED
-               Shall reset VOXELFLAG_NOT_LOADED
-
-               If not found from source, add with VOXELFLAG_INEXISTENT
-       */
-       virtual void emerge(VoxelArea a, s32 caller_id=-1)
-       {
-               //dstream<<"emerge p=("<<p.X<<","<<p.Y<<","<<p.Z<<")"<<std::endl;
-               addArea(a);
-               for(s32 z=a.MinEdge.Z; z<=a.MaxEdge.Z; z++)
-               for(s32 y=a.MinEdge.Y; y<=a.MaxEdge.Y; y++)
-               for(s32 x=a.MinEdge.X; x<=a.MaxEdge.X; x++)
-               {
-                       s32 i = m_area.index(x,y,z);
-                       // Don't touch nodes that have already been loaded
-                       if(!(m_flags[i] & VOXELFLAG_NOT_LOADED))
-                               continue;
-                       m_flags[i] = VOXELFLAG_INEXISTENT;
-               }
-       }
-
        /*
                Member variables
        */