]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - src/mapnode.cpp
Overlays for wield and inventory images (#6107)
[dragonfireclient.git] / src / mapnode.cpp
index 5efebf3d8b10f809a70721bbf2b2e27513dbb022..9b6a39e1bd2f23d996ac975ff94c99d9bb65912c 100644 (file)
@@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mapnode.h"
 #include "porting.h"
 #include "nodedef.h"
+#include "map.h"
 #include "content_mapnode.h" // For mapnode_translate_*_internal
 #include "serialization.h" // For ser_ver_supported
 #include "util/serialize.h"
@@ -54,6 +55,15 @@ MapNode::MapNode(INodeDefManager *ndef, const std::string &name,
        param2 = a_param2;
 }
 
+void MapNode::getColor(const ContentFeatures &f, video::SColor *color) const
+{
+       if (f.palette) {
+               *color = (*f.palette)[param2];
+               return;
+       }
+       *color = f.color;
+}
+
 void MapNode::setLight(enum LightBank bank, u8 a_light, const ContentFeatures &f)
 {
        // If node doesn't contain light data, ignore this
@@ -145,7 +155,8 @@ bool MapNode::getLightBanks(u8 &lightday, u8 &lightnight, INodeDefManager *nodem
 u8 MapNode::getFaceDir(INodeDefManager *nodemgr) const
 {
        const ContentFeatures &f = nodemgr->get(*this);
-       if(f.param_type_2 == CPT2_FACEDIR)
+       if (f.param_type_2 == CPT2_FACEDIR ||
+                       f.param_type_2 == CPT2_COLORED_FACEDIR)
                return (getParam2() & 0x1F) % 24;
        return 0;
 }
@@ -153,7 +164,8 @@ u8 MapNode::getFaceDir(INodeDefManager *nodemgr) const
 u8 MapNode::getWallMounted(INodeDefManager *nodemgr) const
 {
        const ContentFeatures &f = nodemgr->get(*this);
-       if(f.param_type_2 == CPT2_WALLMOUNTED)
+       if (f.param_type_2 == CPT2_WALLMOUNTED ||
+                       f.param_type_2 == CPT2_COLORED_WALLMOUNTED)
                return getParam2() & 0x07;
        return 0;
 }
@@ -175,7 +187,7 @@ void MapNode::rotateAlongYAxis(INodeDefManager *nodemgr, Rotation rot)
 {
        ContentParamType2 cpt2 = nodemgr->get(*this).param_type_2;
 
-       if (cpt2 == CPT2_FACEDIR) {
+       if (cpt2 == CPT2_FACEDIR || cpt2 == CPT2_COLORED_FACEDIR) {
                static const u8 rotate_facedir[24 * 4] = {
                        // Table value = rotated facedir
                        // Columns: 0, 90, 180, 270 degrees rotation around vertical axis
@@ -215,7 +227,8 @@ void MapNode::rotateAlongYAxis(INodeDefManager *nodemgr, Rotation rot)
                u8 index = facedir * 4 + rot;
                param2 &= ~31;
                param2 |= rotate_facedir[index];
-       } else if (cpt2 == CPT2_WALLMOUNTED) {
+       } else if (cpt2 == CPT2_WALLMOUNTED ||
+                       cpt2 == CPT2_COLORED_WALLMOUNTED) {
                u8 wmountface = (param2 & 7);
                if (wmountface <= 1)
                        return;
@@ -236,18 +249,12 @@ void transformNodeBox(const MapNode &n, const NodeBox &nodebox,
                int facedir = n.getFaceDir(nodemgr);
                u8 axisdir = facedir>>2;
                facedir&=0x03;
-               for(std::vector<aabb3f>::const_iterator
-                               i = fixed.begin();
-                               i != fixed.end(); ++i)
-               {
-                       aabb3f box = *i;
-
+               for (aabb3f box : fixed) {
                        if (nodebox.type == NODEBOX_LEVELED) {
                                box.MaxEdge.Y = -BS/2 + BS*((float)1/LEVELED_MAX) * n.getLevel(nodemgr);
                        }
 
-                       switch (axisdir)
-                       {
+                       switch (axisdir) {
                        case 0:
                                if(facedir == 1)
                                {
@@ -390,16 +397,15 @@ void transformNodeBox(const MapNode &n, const NodeBox &nodebox,
                                nodebox.wall_side.MaxEdge
                        };
 
-                       for(s32 i=0; i<2; i++)
-                       {
+                       for (v3f &vertex : vertices) {
                                if(dir == v3s16(-1,0,0))
-                                       vertices[i].rotateXZBy(0);
+                                       vertex.rotateXZBy(0);
                                if(dir == v3s16(1,0,0))
-                                       vertices[i].rotateXZBy(180);
+                                       vertex.rotateXZBy(180);
                                if(dir == v3s16(0,0,-1))
-                                       vertices[i].rotateXZBy(90);
+                                       vertex.rotateXZBy(90);
                                if(dir == v3s16(0,0,1))
-                                       vertices[i].rotateXZBy(-90);
+                                       vertex.rotateXZBy(-90);
                        }
 
                        aabb3f box = aabb3f(vertices[0]);
@@ -425,12 +431,11 @@ void transformNodeBox(const MapNode &n, const NodeBox &nodebox,
                        boxes_size += nodebox.connect_right.size();
                boxes.reserve(boxes_size);
 
-#define BOXESPUSHBACK(c) do { \
+#define BOXESPUSHBACK(c) \
                for (std::vector<aabb3f>::const_iterator \
                                it = (c).begin(); \
                                it != (c).end(); ++it) \
-                       (boxes).push_back(*it); \
-               } while (0)
+                       (boxes).push_back(*it);
 
                BOXESPUSHBACK(nodebox.fixed);
 
@@ -449,10 +454,55 @@ void transformNodeBox(const MapNode &n, const NodeBox &nodebox,
        }
        else // NODEBOX_REGULAR
        {
-               boxes.push_back(aabb3f(-BS/2,-BS/2,-BS/2,BS/2,BS/2,BS/2));
+               boxes.emplace_back(-BS/2,-BS/2,-BS/2,BS/2,BS/2,BS/2);
        }
 }
 
+static inline void getNeighborConnectingFace(
+       const v3s16 &p, INodeDefManager *nodedef,
+       Map *map, MapNode n, u8 bitmask, u8 *neighbors)
+{
+       MapNode n2 = map->getNodeNoEx(p);
+       if (nodedef->nodeboxConnects(n, n2, bitmask))
+               *neighbors |= bitmask;
+}
+
+u8 MapNode::getNeighbors(v3s16 p, Map *map)
+{
+       INodeDefManager *nodedef=map->getNodeDefManager();
+       u8 neighbors = 0;
+       const ContentFeatures &f = nodedef->get(*this);
+       // locate possible neighboring nodes to connect to
+       if (f.drawtype == NDT_NODEBOX && f.node_box.type == NODEBOX_CONNECTED) {
+               v3s16 p2 = p;
+
+               p2.Y++;
+               getNeighborConnectingFace(p2, nodedef, map, *this, 1, &neighbors);
+
+               p2 = p;
+               p2.Y--;
+               getNeighborConnectingFace(p2, nodedef, map, *this, 2, &neighbors);
+
+               p2 = p;
+               p2.Z--;
+               getNeighborConnectingFace(p2, nodedef, map, *this, 4, &neighbors);
+
+               p2 = p;
+               p2.X--;
+               getNeighborConnectingFace(p2, nodedef, map, *this, 8, &neighbors);
+
+               p2 = p;
+               p2.Z++;
+               getNeighborConnectingFace(p2, nodedef, map, *this, 16, &neighbors);
+
+               p2 = p;
+               p2.X++;
+               getNeighborConnectingFace(p2, nodedef, map, *this, 32, &neighbors);
+       }
+
+       return neighbors;
+}
+
 void MapNode::getNodeBoxes(INodeDefManager *nodemgr, std::vector<aabb3f> *boxes, u8 neighbors)
 {
        const ContentFeatures &f = nodemgr->get(*this);
@@ -547,14 +597,16 @@ u32 MapNode::serializedLength(u8 version)
        if(!ser_ver_supported(version))
                throw VersionMismatchException("ERROR: MapNode format not supported");
 
-       if(version == 0)
+       if (version == 0)
                return 1;
-       else if(version <= 9)
+
+       if (version <= 9)
                return 2;
-       else if(version <= 23)
+
+       if (version <= 23)
                return 3;
-       else
-               return 4;
+
+       return 4;
 }
 void MapNode::serialize(u8 *dest, u8 version)
 {
@@ -600,7 +652,7 @@ void MapNode::serializeBulk(std::ostream &os, int version,
                const MapNode *nodes, u32 nodecount,
                u8 content_width, u8 params_width, bool compressed)
 {
-       if(!ser_ver_supported(version))
+       if (!ser_ver_supported(version))
                throw VersionMismatchException("ERROR: MapNode format not supported");
 
        sanity_check(content_width == 2);
@@ -608,38 +660,33 @@ void MapNode::serializeBulk(std::ostream &os, int version,
 
        // 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)
+       if (version < 24)
                throw SerializationError("MapNode::serializeBulk: serialization to "
                                "version < 24 not possible");
 
-       SharedBuffer<u8> databuf(nodecount * (content_width + params_width));
-
-       // Serialize content
-       for(u32 i=0; i<nodecount; i++)
-               writeU16(&databuf[i*2], nodes[i].param0);
+       size_t databuf_size = nodecount * (content_width + params_width);
+       u8 *databuf = new u8[databuf_size];
 
-       // Serialize param1
        u32 start1 = content_width * nodecount;
-       for(u32 i=0; i<nodecount; i++)
-               writeU8(&databuf[start1 + i], nodes[i].param1);
-
-       // Serialize param2
        u32 start2 = (content_width + 1) * nodecount;
-       for(u32 i=0; i<nodecount; i++)
+
+       // Serialize content
+       for (u32 i = 0; i < nodecount; i++) {
+               writeU16(&databuf[i * 2], nodes[i].param0);
+               writeU8(&databuf[start1 + i], nodes[i].param1);
                writeU8(&databuf[start2 + i], nodes[i].param2);
+       }
 
        /*
                Compress data to output stream
        */
 
-       if(compressed)
-       {
-               compressZlib(databuf, os);
-       }
+       if (compressed)
+               compressZlib(databuf, databuf_size, os);
        else
-       {
-               os.write((const char*) &databuf[0], databuf.getSize());
-       }
+               os.write((const char*) &databuf[0], databuf_size);
+
+       delete [] databuf;
 }
 
 // Deserialize bulk node data
@@ -716,7 +763,7 @@ void MapNode::deSerializeBulk(std::istream &is, int version,
 /*
        Legacy serialization
 */
-void MapNode::deSerialize_pre22(u8 *source, u8 version)
+void MapNode::deSerialize_pre22(const u8 *source, u8 version)
 {
        if(version <= 1)
        {