Merge pull request #503 from RealBadAngel/master

[minetest.git] / src / voxel.h

diff --git a/src/voxel.h b/src/voxel.h
index 483b4d2a0f5654559e0ef2e6ce9fffc71c7b5c7b..c2a5efb4b7de6b1289c490e92d32ca59ef2062bc 100644 (file)
--- a/src/voxel.h
+++ b/src/voxel.h
@@ -21,6 +21,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define VOXEL_HEADER
 
 #include "irrlichttypes.h"
+#include "irr_v3d.h"
+#include <irrList.h>
 #include <iostream>
 #include "debug.h"
 #include "mapnode.h"
@@ -70,7 +72,7 @@ class VoxelArea
                MaxEdge(p)
        {
        }
-       
+
        /*
                Modifying methods
        */
@@ -104,14 +106,14 @@ class VoxelArea
                if(p.Y > MaxEdge.Y) MaxEdge.Y = p.Y;
                if(p.Z > MaxEdge.Z) MaxEdge.Z = p.Z;
        }
-       
+
        // Pad with d nodes
        void pad(v3s16 d)
        {
                MinEdge -= d;
                MaxEdge += d;
        }
-       
+
        /*void operator+=(v3s16 off)
        {
                MinEdge += off;
@@ -200,7 +202,7 @@ class VoxelArea
                }
 
                assert(contains(a));
-               
+
                // Take back area, XY inclusive
                {
                        v3s16 min(MinEdge.X, MinEdge.Y, a.MaxEdge.Z+1);
@@ -256,7 +258,7 @@ class VoxelArea
                }
 
        }
-       
+
        /*
                Translates position from virtual coordinates to array index
        */
@@ -272,7 +274,7 @@ class VoxelArea
        {
                return index(p.X, p.Y, p.Z);
        }
-       
+
        // Translate index in the X coordinate
        void add_x(const v3s16 &extent, u32 &i, s16 a)
        {
@@ -341,7 +343,7 @@ class VoxelManipulator /*: public NodeContainer*/
 public:
        VoxelManipulator();
        virtual ~VoxelManipulator();
-       
+
        /*
                Virtuals from NodeContainer
        */
@@ -428,7 +430,7 @@ class VoxelManipulator /*: public NodeContainer*/
        void setNode(v3s16 p, const MapNode &n)
        {
                emerge(p);
-               
+
                m_data[m_area.index(p)] = n;
                m_flags[m_area.index(p)] &= ~VOXELFLAG_INEXISTENT;
                m_flags[m_area.index(p)] &= ~VOXELFLAG_NOT_LOADED;
@@ -455,10 +457,10 @@ class VoxelManipulator /*: public NodeContainer*/
                //dstream<<"operator[] p=("<<p.X<<","<<p.Y<<","<<p.Z<<")"<<std::endl;
                if(isValidPosition(p) == false)
                        emerge(VoxelArea(p));
-               
+
                return m_data[m_area.index(p)];
        }*/
-       
+
        /*
                Set stuff if available without an emerge.
                Return false if failed.
@@ -494,7 +496,7 @@ class VoxelManipulator /*: public NodeContainer*/
 
        void print(std::ostream &o, INodeDefManager *nodemgr,
                        VoxelPrintMode mode=VOXELPRINT_MATERIAL);
-       
+
        void addArea(VoxelArea area);
 
        /*
@@ -503,7 +505,7 @@ class VoxelManipulator /*: public NodeContainer*/
        */
        void copyFrom(MapNode *src, VoxelArea src_area,
                        v3s16 from_pos, v3s16 to_pos, v3s16 size);
-       
+
        // Copy data
        void copyTo(MapNode *dst, VoxelArea dst_area,
                        v3s16 dst_pos, v3s16 from_pos, v3s16 size);
@@ -521,15 +523,15 @@ class VoxelManipulator /*: public NodeContainer*/
        void unspreadLight(enum LightBank bank,
                        core::map<v3s16, u8> & from_nodes,
                        core::map<v3s16, bool> & light_sources, INodeDefManager *nodemgr);
-       
+
        void spreadLight(enum LightBank bank, v3s16 p, INodeDefManager *nodemgr);
        void spreadLight(enum LightBank bank,
                        core::map<v3s16, bool> & from_nodes, INodeDefManager *nodemgr);
-       
+
        /*
                Virtual functions
        */
-       
+
        /*
                Get the contents of the requested area from somewhere.
                Shall touch only nodes that have VOXELFLAG_NOT_LOADED
@@ -563,7 +565,7 @@ class VoxelManipulator /*: public NodeContainer*/
                MaxEdge is 1 higher than maximum allowed position
        */
        VoxelArea m_area;
-       
+
        /*
                NULL if data size is 0 (extent (0,0,0))
                Data is stored as [z*h*w + y*h + x]
@@ -574,7 +576,7 @@ class VoxelManipulator /*: public NodeContainer*/
                Flags of all nodes
        */
        u8 *m_flags;
-       
+
        //TODO: Use these or remove them
        //TODO: Would these make any speed improvement?
        //bool m_pressure_route_valid;