Remove ClientMap::m_camera_mutex

[minetest.git] / src / nodedef.cpp

diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index 0bcc00e47bab3c5565d7dbb2bccdee4f364c5e68..c60958ba5a52a255e9ab896d7716780ba45ef020 100644 (file)
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -139,7 +139,7 @@ void TileDef::serialize(std::ostream &os, u16 protocol_version) const
        }
 }
 
-void TileDef::deSerialize(std::istream &is)
+void TileDef::deSerialize(std::istream &is, bool culling_ignore)
 {
        int version = readU8(is);
        name = deSerializeString(is);
@@ -153,6 +153,11 @@ void TileDef::deSerialize(std::istream &is)
                tileable_horizontal = readU8(is);
                tileable_vertical = readU8(is);
        }
+       // when connecting to old servers - do not use
+       // provided values here since culling needs to be
+       // disabled by default for these drawtypes
+       if (culling_ignore)
+               backface_culling = false;
 }
 
 
@@ -339,15 +344,22 @@ void ContentFeatures::deSerialize(std::istream &is)
                groups[name] = value;
        }
        drawtype = (enum NodeDrawType)readU8(is);
+
+       bool ignore_culling = ((version <= 26) &&
+                       ((drawtype == NDT_MESH) ||
+                        (drawtype == NDT_PLANTLIKE) ||
+                        (drawtype == NDT_FIRELIKE) ||
+                        (drawtype == NDT_LIQUID)));
+
        visual_scale = readF1000(is);
        if(readU8(is) != 6)
                throw SerializationError("unsupported tile count");
        for(u32 i = 0; i < 6; i++)
-               tiledef[i].deSerialize(is);
+               tiledef[i].deSerialize(is, ignore_culling);
        if(readU8(is) != CF_SPECIAL_COUNT)
                throw SerializationError("unsupported CF_SPECIAL_COUNT");
        for(u32 i = 0; i < CF_SPECIAL_COUNT; i++)
-               tiledef_special[i].deSerialize(is);
+               tiledef_special[i].deSerialize(is, ignore_culling);
        alpha = readU8(is);
        post_effect_color.setAlpha(readU8(is));
        post_effect_color.setRed(readU8(is));
@@ -960,7 +972,7 @@ void CNodeDefManager::updateTextures(IGameDef *gamedef,
                        //Convert regular nodebox nodes to meshnodes
                        //Change the drawtype and apply scale
                        f->drawtype = NDT_MESH;
-                       f->mesh_ptr[0] = convertNodeboxNodeToMesh(f);
+                       f->mesh_ptr[0] = convertNodeboxesToMesh(f->node_box.fixed);
                        v3f scale = v3f(1.0, 1.0, 1.0) * f->visual_scale;
                        scaleMesh(f->mesh_ptr[0], scale);
                        recalculateBoundingBox(f->mesh_ptr[0]);
@@ -1258,7 +1270,6 @@ void ContentFeatures::serializeOld(std::ostream &os, u16 protocol_version) const
                        "Unsupported version requested");
 }
 
-
 void ContentFeatures::deSerializeOld(std::istream &is, int version)
 {
        if (version == 5) // In PROTOCOL_VERSION 13
@@ -1272,15 +1283,22 @@ void ContentFeatures::deSerializeOld(std::istream &is, int version)
                        groups[name] = value;
                }
                drawtype = (enum NodeDrawType)readU8(is);
+
+               bool ignore_culling = ((version <= 26) &&
+                               ((drawtype == NDT_MESH) ||
+                               (drawtype == NDT_PLANTLIKE) ||
+                               (drawtype == NDT_FIRELIKE) ||
+                               (drawtype == NDT_LIQUID)));
+
                visual_scale = readF1000(is);
                if (readU8(is) != 6)
                        throw SerializationError("unsupported tile count");
                for (u32 i = 0; i < 6; i++)
-                       tiledef[i].deSerialize(is);
+                       tiledef[i].deSerialize(is, ignore_culling);
                if (readU8(is) != CF_SPECIAL_COUNT)
                        throw SerializationError("unsupported CF_SPECIAL_COUNT");
                for (u32 i = 0; i < CF_SPECIAL_COUNT; i++)
-                       tiledef_special[i].deSerialize(is);
+                       tiledef_special[i].deSerialize(is, ignore_culling);
                alpha = readU8(is);
                post_effect_color.setAlpha(readU8(is));
                post_effect_color.setRed(readU8(is));
@@ -1324,12 +1342,12 @@ void ContentFeatures::deSerializeOld(std::istream &is, int version)
                if (readU8(is) != 6)
                        throw SerializationError("unsupported tile count");
                for (u32 i = 0; i < 6; i++)
-                       tiledef[i].deSerialize(is);
+                       tiledef[i].deSerialize(is, drawtype);
                // CF_SPECIAL_COUNT in version 6 = 2
                if (readU8(is) != 2)
                        throw SerializationError("unsupported CF_SPECIAL_COUNT");
                for (u32 i = 0; i < 2; i++)
-                       tiledef_special[i].deSerialize(is);
+                       tiledef_special[i].deSerialize(is, drawtype);
                alpha = readU8(is);
                post_effect_color.setAlpha(readU8(is));
                post_effect_color.setRed(readU8(is));