"or" -> "||" in content_mapblock.cpp

[dragonfireclient.git] / src / voxel.h

diff --git a/src/voxel.h b/src/voxel.h
index 89333159c2b71f66536a2a5a82e53580662388ea..291b51e036fd95c2cbabf67cef30ba0f74c746f3 100644 (file)
--- a/src/voxel.h
+++ b/src/voxel.h
@@ -25,12 +25,18 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "debug.h"
 #include "mapnode.h"
 
+class INodeDefManager;
+
 // For VC++
 #undef min
 #undef max
 
 /*
-       A fast voxel manipulator class
+       A fast voxel manipulator class.
+
+       In normal operation, it fetches more map when it is requested.
+       It can also be used so that all allowed area is fetched at the
+       start, using ManualMapVoxelManipulator.
 
        Not thread-safe.
 */
@@ -152,6 +158,10 @@ class VoxelArea
                        p.Z >= MinEdge.Z && p.Z <= MaxEdge.Z
                );
        }
+       bool contains(s32 i) const
+       {
+               return (i >= 0 && i < getVolume());
+       }
        bool operator==(const VoxelArea &other) const
        {
                return (MinEdge == other.MinEdge
@@ -310,16 +320,12 @@ class VoxelArea
 // Checked as being inexistent in source
 #define VOXELFLAG_INEXISTENT (1<<1)
 // Algorithm-dependent
-// flowWater: "visited"
-#define VOXELFLAG_CHECKED (1<<2)
+#define VOXELFLAG_CHECKED1 (1<<2)
 // Algorithm-dependent
-// getWaterPressure: "visited"
 #define VOXELFLAG_CHECKED2 (1<<3)
 // Algorithm-dependent
-// spreadWaterPressure: "visited"
 #define VOXELFLAG_CHECKED3 (1<<4)
 // Algorithm-dependent
-// water: "pressure check route node"
 #define VOXELFLAG_CHECKED4 (1<<5)
 
 enum VoxelPrintMode
@@ -358,11 +364,47 @@ class VoxelManipulator /*: public NodeContainer*/
 
                if(m_flags[m_area.index(p)] & VOXELFLAG_INEXISTENT)
                {
-                       dstream<<"EXCEPT: VoxelManipulator::getNode(): "
+                       /*dstream<<"EXCEPT: VoxelManipulator::getNode(): "
                                        <<"p=("<<p.X<<","<<p.Y<<","<<p.Z<<")"
                                        <<", index="<<m_area.index(p)
                                        <<", flags="<<(int)m_flags[m_area.index(p)]
-                                       <<" is inexistent"<<std::endl;
+                                       <<" is inexistent"<<std::endl;*/
+                       throw InvalidPositionException
+                       ("VoxelManipulator: getNode: inexistent");
+               }
+
+               return m_data[m_area.index(p)];
+       }
+       MapNode getNodeNoEx(v3s16 p)
+       {
+               emerge(p);
+
+               if(m_flags[m_area.index(p)] & VOXELFLAG_INEXISTENT)
+               {
+                       return MapNode(CONTENT_IGNORE);
+               }
+
+               return m_data[m_area.index(p)];
+       }
+       MapNode getNodeNoExNoEmerge(v3s16 p)
+       {
+               if(m_area.contains(p) == false)
+                       return MapNode(CONTENT_IGNORE);
+               if(m_flags[m_area.index(p)] & VOXELFLAG_INEXISTENT)
+                       return MapNode(CONTENT_IGNORE);
+               return m_data[m_area.index(p)];
+       }
+       MapNode & getNodeRef(v3s16 p)
+       {
+               emerge(p);
+
+               if(m_flags[m_area.index(p)] & VOXELFLAG_INEXISTENT)
+               {
+                       /*dstream<<"EXCEPT: VoxelManipulator::getNode(): "
+                                       <<"p=("<<p.X<<","<<p.Y<<","<<p.Z<<")"
+                                       <<", index="<<m_area.index(p)
+                                       <<", flags="<<(int)m_flags[m_area.index(p)]
+                                       <<" is inexistent"<<std::endl;*/
                        throw InvalidPositionException
                        ("VoxelManipulator: getNode: inexistent");
                }
@@ -401,6 +443,33 @@ class VoxelManipulator /*: public NodeContainer*/
                
                return m_data[m_area.index(p)];
        }*/
+       
+       /*
+               Set stuff if available without an emerge.
+               Return false if failed.
+               This is convenient but slower than playing around directly
+               with the m_data table with indices.
+       */
+       bool setNodeNoEmerge(v3s16 p, MapNode n)
+       {
+               if(m_area.contains(p) == false)
+                       return false;
+               m_data[m_area.index(p)] = n;
+               return true;
+       }
+       bool setNodeNoEmerge(s32 i, MapNode n)
+       {
+               if(m_area.contains(i) == false)
+                       return false;
+               m_data[i] = n;
+               return true;
+       }
+       /*bool setContentNoEmerge(v3s16 p, u8 c)
+       {
+               if(isValidPosition(p) == false)
+                       return false;
+               m_data[m_area.index(p)].d = c;
+       }*/
 
        /*
                Control
@@ -408,7 +477,8 @@ class VoxelManipulator /*: public NodeContainer*/
 
        virtual void clear();
 
-       void print(std::ostream &o, VoxelPrintMode mode=VOXELPRINT_MATERIAL);
+       void print(std::ostream &o, INodeDefManager *nodemgr,
+                       VoxelPrintMode mode=VOXELPRINT_MATERIAL);
        
        void addArea(VoxelArea area);
 
@@ -430,14 +500,14 @@ class VoxelManipulator /*: public NodeContainer*/
        void clearFlag(u8 flag);
        
        void unspreadLight(enum LightBank bank, v3s16 p, u8 oldlight,
-                       core::map<v3s16, bool> & light_sources);
+                       core::map<v3s16, bool> & light_sources, INodeDefManager *nodemgr);
        void unspreadLight(enum LightBank bank,
                        core::map<v3s16, u8> & from_nodes,
-                       core::map<v3s16, bool> & light_sources);
+                       core::map<v3s16, bool> & light_sources, INodeDefManager *nodemgr);
        
-       void spreadLight(enum LightBank bank, v3s16 p);
+       void spreadLight(enum LightBank bank, v3s16 p, INodeDefManager *nodemgr);
        void spreadLight(enum LightBank bank,
-                       core::map<v3s16, bool> & from_nodes);
+                       core::map<v3s16, bool> & from_nodes, INodeDefManager *nodemgr);
        
        /*
                Virtual functions
@@ -496,7 +566,7 @@ class VoxelManipulator /*: public NodeContainer*/
        /*
                Some settings
        */
-       bool m_disable_water_climb;
+       //bool m_disable_water_climb;
 
 private:
 };