Mapnode: Add rotateAlongYAxisFull supporting 24 facedirs

[oweals/minetest.git] / src / mapnode.cpp

diff --git a/src/mapnode.cpp b/src/mapnode.cpp
index 388071a17ad7d1c69321190990df71460b263831..64c0ea03f3d1d4cba6c913a368fa22ef74a312e1 100644 (file)
--- a/src/mapnode.cpp
+++ b/src/mapnode.cpp
@@ -20,7 +20,6 @@ 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
@@ -71,7 +70,7 @@ 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
@@ -104,7 +103,7 @@ u8 MapNode::getLight(enum LightBank bank, INodeDefManager *nodemgr) const
        return MYMAX(f.light_source, light);
 }
 
-u8 MapNode::getLightNoChecks(enum LightBank bank, const ContentFeatures *f)
+u8 MapNode::getLightNoChecks(enum LightBank bank, const ContentFeatures *f) const
 {
        return MYMAX(f->light_source,
                     bank == LIGHTBANK_DAY ? param1 & 0x0f : (param1 >> 4) & 0x0f);
@@ -160,10 +159,14 @@ v3s16 MapNode::getWallMountedDir(INodeDefManager *nodemgr) const
        }
 }
 
-void MapNode::rotateAlongYAxis(INodeDefManager *nodemgr, Rotation rot) {
+void MapNode::rotateAlongYAxis(INodeDefManager *nodemgr, Rotation rot)
+{
        ContentParamType2 cpt2 = nodemgr->get(*this).param_type_2;
 
        if (cpt2 == CPT2_FACEDIR) {
+               if (param2 >= 4)
+                       return;
+
                u8 newrot = param2 & 3;
                param2 &= ~3;
                param2 |= (newrot + rot) & 3;
@@ -178,6 +181,59 @@ void MapNode::rotateAlongYAxis(INodeDefManager *nodemgr, Rotation rot) {
        }
 }
 
+void MapNode::rotateAlongYAxisFull(INodeDefManager *nodemgr, Rotation rot)
+{
+       ContentParamType2 cpt2 = nodemgr->get(*this).param_type_2;
+
+       if (cpt2 == CPT2_FACEDIR) {
+               static const u16 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
+               };
+               u16 index = param2 * 4 + rot;
+               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];
+       }
+}
+
 static std::vector<aabb3f> transformNodeBox(const MapNode &n,
                const NodeBox &nodebox, INodeDefManager *nodemgr)
 {
@@ -190,7 +246,7 @@ static std::vector<aabb3f> transformNodeBox(const MapNode &n,
                facedir&=0x03;
                for(std::vector<aabb3f>::const_iterator
                                i = fixed.begin();
-                               i != fixed.end(); i++)
+                               i != fixed.end(); ++i)
                {
                        aabb3f box = *i;
 
@@ -516,8 +572,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.
@@ -563,9 +619,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);