]> git.lizzy.rs Git - minetest.git/blobdiff - src/mapnode.cpp
Formspec: Add container[] and container_end[] elements
[minetest.git] / src / mapnode.cpp
index bba845fcce95678dffae5f033d96d554a911d681..eba47446d99ac1e0b56a0a2ae03ed159ef98ff64 100644 (file)
@@ -20,14 +20,24 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "irrlichttypes_extrabloated.h"
 #include "mapnode.h"
 #include "porting.h"
-#include "main.h" // For g_settings
 #include "nodedef.h"
 #include "content_mapnode.h" // For mapnode_translate_*_internal
 #include "serialization.h" // For ser_ver_supported
 #include "util/serialize.h"
+#include "log.h"
+#include "util/numeric.h"
 #include <string>
 #include <sstream>
 
+static const Rotation wallmounted_to_rot[] = {
+       ROTATE_0, ROTATE_180, ROTATE_90, ROTATE_270
+};
+
+static const u8 rot_to_wallmounted[] = {
+       2, 4, 3, 5
+};
+
+
 /*
        MapNode
 */
@@ -60,26 +70,43 @@ void MapNode::setLight(enum LightBank bank, u8 a_light, INodeDefManager *nodemgr
                param1 |= (a_light & 0x0f)<<4;
        }
        else
-               assert(0);
+               assert("Invalid light bank" == NULL);
+}
+
+bool MapNode::isLightDayNightEq(INodeDefManager *nodemgr) const
+{
+       const ContentFeatures &f = nodemgr->get(*this);
+       bool isEqual;
+
+       if (f.param_type == CPT_LIGHT) {
+               u8 day   = MYMAX(f.light_source, param1 & 0x0f);
+               u8 night = MYMAX(f.light_source, (param1 >> 4) & 0x0f);
+               isEqual = day == night;
+       } else {
+               isEqual = true;
+       }
+
+       return isEqual;
 }
 
 u8 MapNode::getLight(enum LightBank bank, INodeDefManager *nodemgr) const
 {
        // Select the brightest of [light source, propagated light]
        const ContentFeatures &f = nodemgr->get(*this);
-       u8 light = 0;
+
+       u8 light;
        if(f.param_type == CPT_LIGHT)
-       {
-               if(bank == LIGHTBANK_DAY)
-                       light = param1 & 0x0f;
-               else if(bank == LIGHTBANK_NIGHT)
-                       light = (param1>>4)&0x0f;
-               else
-                       assert(0);
-       }
-       if(f.light_source > light)
-               light = f.light_source;
-       return light;
+               light = bank == LIGHTBANK_DAY ? param1 & 0x0f : (param1 >> 4) & 0x0f;
+       else
+               light = 0;
+
+       return MYMAX(f.light_source, light);
+}
+
+u8 MapNode::getLightNoChecks(enum LightBank bank, const ContentFeatures *f) const
+{
+       return MYMAX(f->light_source,
+                    bank == LIGHTBANK_DAY ? param1 & 0x0f : (param1 >> 4) & 0x0f);
 }
 
 bool MapNode::getLightBanks(u8 &lightday, u8 &lightnight, INodeDefManager *nodemgr) const
@@ -107,7 +134,7 @@ u8 MapNode::getFaceDir(INodeDefManager *nodemgr) const
 {
        const ContentFeatures &f = nodemgr->get(*this);
        if(f.param_type_2 == CPT2_FACEDIR)
-               return getParam2() & 0x1F;
+               return (getParam2() & 0x1F) % 24;
        return 0;
 }
 
@@ -132,21 +159,81 @@ v3s16 MapNode::getWallMountedDir(INodeDefManager *nodemgr) const
        }
 }
 
-static std::vector<aabb3f> transformNodeBox(const MapNode &n,
-               const NodeBox &nodebox, INodeDefManager *nodemgr)
+void MapNode::rotateAlongYAxis(INodeDefManager *nodemgr, Rotation rot)
 {
-       std::vector<aabb3f> boxes;
-       if(nodebox.type == NODEBOX_FIXED)
-       {
+       ContentParamType2 cpt2 = nodemgr->get(*this).param_type_2;
+
+       if (cpt2 == CPT2_FACEDIR) {
+               static const u8 rotate_facedir[24 * 4] = {
+                       // Table value = rotated facedir
+                       // Columns: 0, 90, 180, 270 degrees rotation around vertical axis
+                       // Rotation is anticlockwise as seen from above (+Y)
+
+                       0, 1, 2, 3,  // Initial facedir 0 to 3
+                       1, 2, 3, 0,
+                       2, 3, 0, 1,
+                       3, 0, 1, 2,
+
+                       4, 13, 10, 19,  // 4 to 7
+                       5, 14, 11, 16,
+                       6, 15, 8, 17,
+                       7, 12, 9, 18,
+
+                       8, 17, 6, 15,  // 8 to 11
+                       9, 18, 7, 12,
+                       10, 19, 4, 13,
+                       11, 16, 5, 14,
+
+                       12, 9, 18, 7,  // 12 to 15
+                       13, 10, 19, 4,
+                       14, 11, 16, 5,
+                       15, 8, 17, 6,
+
+                       16, 5, 14, 11,  // 16 to 19
+                       17, 6, 15, 8,
+                       18, 7, 12, 9,
+                       19, 4, 13, 10,
+
+                       20, 23, 22, 21,  // 20 to 23
+                       21, 20, 23, 22,
+                       22, 21, 20, 23,
+                       23, 22, 21, 20
+               };
+               u8 facedir = (param2 & 31) % 24;
+               u8 index = facedir * 4 + rot;
+               param2 &= ~31;
+               param2 |= rotate_facedir[index];
+       } else if (cpt2 == CPT2_WALLMOUNTED) {
+               u8 wmountface = (param2 & 7);
+               if (wmountface <= 1)
+                       return;
+
+               Rotation oldrot = wallmounted_to_rot[wmountface - 2];
+               param2 &= ~7;
+               param2 |= rot_to_wallmounted[(oldrot - rot) & 3];
+       }
+}
+
+void transformNodeBox(const MapNode &n, const NodeBox &nodebox,
+               INodeDefManager *nodemgr, std::vector<aabb3f> *p_boxes, u8 neighbors = 0)
+{
+       std::vector<aabb3f> &boxes = *p_boxes;
+
+       if (nodebox.type == NODEBOX_FIXED || nodebox.type == NODEBOX_LEVELED) {
                const std::vector<aabb3f> &fixed = nodebox.fixed;
                int facedir = n.getFaceDir(nodemgr);
                u8 axisdir = facedir>>2;
                facedir&=0x03;
                for(std::vector<aabb3f>::const_iterator
                                i = fixed.begin();
-                               i != fixed.end(); i++)
+                               i != fixed.end(); ++i)
                {
                        aabb3f box = *i;
+
+                       if (nodebox.type == NODEBOX_LEVELED) {
+                               box.MaxEdge.Y = -BS/2 + BS*((float)1/LEVELED_MAX) * n.getLevel(nodemgr);
+                       }
+
                        switch (axisdir)
                        {
                        case 0:
@@ -308,30 +395,146 @@ static std::vector<aabb3f> transformNodeBox(const MapNode &n,
                        boxes.push_back(box);
                }
        }
+       else if (nodebox.type == NODEBOX_CONNECTED)
+       {
+               size_t boxes_size = boxes.size();
+               boxes_size += nodebox.fixed.size();
+               if (neighbors & 1)
+                       boxes_size += nodebox.connect_top.size();
+               if (neighbors & 2)
+                       boxes_size += nodebox.connect_bottom.size();
+               if (neighbors & 4)
+                       boxes_size += nodebox.connect_front.size();
+               if (neighbors & 8)
+                       boxes_size += nodebox.connect_left.size();
+               if (neighbors & 16)
+                       boxes_size += nodebox.connect_back.size();
+               if (neighbors & 32)
+                       boxes_size += nodebox.connect_right.size();
+               boxes.reserve(boxes_size);
+
+#define BOXESPUSHBACK(c) do { \
+               for (std::vector<aabb3f>::const_iterator \
+                               it = (c).begin(); \
+                               it != (c).end(); ++it) \
+                       (boxes).push_back(*it); \
+               } while (0)
+
+               BOXESPUSHBACK(nodebox.fixed);
+
+               if (neighbors & 1)
+                       BOXESPUSHBACK(nodebox.connect_top);
+               if (neighbors & 2)
+                       BOXESPUSHBACK(nodebox.connect_bottom);
+               if (neighbors & 4)
+                       BOXESPUSHBACK(nodebox.connect_front);
+               if (neighbors & 8)
+                       BOXESPUSHBACK(nodebox.connect_left);
+               if (neighbors & 16)
+                       BOXESPUSHBACK(nodebox.connect_back);
+               if (neighbors & 32)
+                       BOXESPUSHBACK(nodebox.connect_right);
+       }
        else // NODEBOX_REGULAR
        {
                boxes.push_back(aabb3f(-BS/2,-BS/2,-BS/2,BS/2,BS/2,BS/2));
        }
-       return boxes;
 }
 
-std::vector<aabb3f> MapNode::getNodeBoxes(INodeDefManager *nodemgr) const
+void MapNode::getNodeBoxes(INodeDefManager *nodemgr, std::vector<aabb3f> *boxes, u8 neighbors)
+{
+       const ContentFeatures &f = nodemgr->get(*this);
+       transformNodeBox(*this, f.node_box, nodemgr, boxes, neighbors);
+}
+
+void MapNode::getCollisionBoxes(INodeDefManager *nodemgr, std::vector<aabb3f> *boxes, u8 neighbors)
+{
+       const ContentFeatures &f = nodemgr->get(*this);
+       if (f.collision_box.fixed.empty())
+               transformNodeBox(*this, f.node_box, nodemgr, boxes, neighbors);
+       else
+               transformNodeBox(*this, f.collision_box, nodemgr, boxes, neighbors);
+}
+
+void MapNode::getSelectionBoxes(INodeDefManager *nodemgr, std::vector<aabb3f> *boxes, u8 neighbors)
+{
+       const ContentFeatures &f = nodemgr->get(*this);
+       transformNodeBox(*this, f.selection_box, nodemgr, boxes, neighbors);
+}
+
+u8 MapNode::getMaxLevel(INodeDefManager *nodemgr) const
 {
        const ContentFeatures &f = nodemgr->get(*this);
-       return transformNodeBox(*this, f.node_box, nodemgr);
+       // todo: after update in all games leave only if (f.param_type_2 ==
+       if( f.liquid_type == LIQUID_FLOWING || f.param_type_2 == CPT2_FLOWINGLIQUID)
+               return LIQUID_LEVEL_MAX;
+       if(f.leveled || f.param_type_2 == CPT2_LEVELED)
+               return LEVELED_MAX;
+       return 0;
 }
 
-std::vector<aabb3f> MapNode::getSelectionBoxes(INodeDefManager *nodemgr) const
+u8 MapNode::getLevel(INodeDefManager *nodemgr) const
 {
        const ContentFeatures &f = nodemgr->get(*this);
-       return transformNodeBox(*this, f.selection_box, nodemgr);
+       // todo: after update in all games leave only if (f.param_type_2 ==
+       if(f.liquid_type == LIQUID_SOURCE)
+               return LIQUID_LEVEL_SOURCE;
+       if (f.param_type_2 == CPT2_FLOWINGLIQUID)
+               return getParam2() & LIQUID_LEVEL_MASK;
+       if(f.liquid_type == LIQUID_FLOWING) // can remove if all param_type_2 setted
+               return getParam2() & LIQUID_LEVEL_MASK;
+       if(f.leveled || f.param_type_2 == CPT2_LEVELED) {
+                u8 level = getParam2() & LEVELED_MASK;
+                if(level)
+                       return level;
+                if(f.leveled > LEVELED_MAX)
+                       return LEVELED_MAX;
+                return f.leveled; //default
+       }
+       return 0;
+}
+
+u8 MapNode::setLevel(INodeDefManager *nodemgr, s8 level)
+{
+       u8 rest = 0;
+       if (level < 1) {
+               setContent(CONTENT_AIR);
+               return 0;
+       }
+       const ContentFeatures &f = nodemgr->get(*this);
+       if (f.param_type_2 == CPT2_FLOWINGLIQUID
+               || f.liquid_type == LIQUID_FLOWING
+               || f.liquid_type == LIQUID_SOURCE) {
+               if (level >= LIQUID_LEVEL_SOURCE) {
+                       rest = level - LIQUID_LEVEL_SOURCE;
+                       setContent(nodemgr->getId(f.liquid_alternative_source));
+               } else {
+                       setContent(nodemgr->getId(f.liquid_alternative_flowing));
+                       setParam2(level & LIQUID_LEVEL_MASK);
+               }
+       } else if (f.leveled || f.param_type_2 == CPT2_LEVELED) {
+               if (level > LEVELED_MAX) {
+                       rest = level - LEVELED_MAX;
+                       level = LEVELED_MAX;
+               }
+               setParam2(level & LEVELED_MASK);
+       }
+       return rest;
+}
+
+u8 MapNode::addLevel(INodeDefManager *nodemgr, s8 add)
+{
+       s8 level = getLevel(nodemgr);
+       if (add == 0) level = 1;
+       level += add;
+       return setLevel(nodemgr, level);
 }
 
 u32 MapNode::serializedLength(u8 version)
 {
        if(!ser_ver_supported(version))
                throw VersionMismatchException("ERROR: MapNode format not supported");
-               
+
        if(version == 0)
                return 1;
        else if(version <= 9)
@@ -345,13 +548,13 @@ void MapNode::serialize(u8 *dest, u8 version)
 {
        if(!ser_ver_supported(version))
                throw VersionMismatchException("ERROR: MapNode format not supported");
-       
+
        // Can't do this anymore; we have 16-bit dynamically allocated node IDs
        // in memory; conversion just won't work in this direction.
        if(version < 24)
                throw SerializationError("MapNode::serialize: serialization to "
                                "version < 24 not possible");
-               
+
        writeU16(dest+0, param0);
        writeU8(dest+2, param1);
        writeU8(dest+3, param2);
@@ -360,7 +563,7 @@ void MapNode::deSerialize(u8 *source, u8 version)
 {
        if(!ser_ver_supported(version))
                throw VersionMismatchException("ERROR: MapNode format not supported");
-               
+
        if(version <= 21)
        {
                deSerialize_pre22(source, version);
@@ -371,8 +574,7 @@ void MapNode::deSerialize(u8 *source, u8 version)
                param0 = readU16(source+0);
                param1 = readU8(source+2);
                param2 = readU8(source+3);
-       }
-       else{
+       }else{
                param0 = readU8(source+0);
                param1 = readU8(source+1);
                param2 = readU8(source+2);
@@ -389,8 +591,8 @@ void MapNode::serializeBulk(std::ostream &os, int version,
        if(!ser_ver_supported(version))
                throw VersionMismatchException("ERROR: MapNode format not supported");
 
-       assert(content_width == 2);
-       assert(params_width == 2);
+       sanity_check(content_width == 2);
+       sanity_check(params_width == 2);
 
        // Can't do this anymore; we have 16-bit dynamically allocated node IDs
        // in memory; conversion just won't work in this direction.
@@ -436,9 +638,10 @@ void MapNode::deSerializeBulk(std::istream &is, int version,
        if(!ser_ver_supported(version))
                throw VersionMismatchException("ERROR: MapNode format not supported");
 
-       assert(version >= 22);
-       assert(content_width == 1 || content_width == 2);
-       assert(params_width == 2);
+       if (version < 22
+                       || (content_width != 1 && content_width != 2)
+                       || params_width != 2)
+               FATAL_ERROR("Deserialize bulk node data error");
 
        // Uncompress or read data
        u32 len = nodecount * (content_width + params_width);
@@ -523,7 +726,7 @@ void MapNode::deSerialize_pre22(u8 *source, u8 version)
                        param2 &= 0x0f;
                }
        }
-       
+
        // Convert special values from old version to new
        if(version <= 19)
        {