]> git.lizzy.rs Git - minetest.git/blobdiff - src/nodedef.cpp
Add particle animation, glow
[minetest.git] / src / nodedef.cpp
index edd02d9f37bbc1f8bcd319ebfde85b37cbfd504e..a4af26e87ade414818d20e3f14dd7127fa3092cb 100644 (file)
@@ -23,6 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef SERVER
 #include "client/tile.h"
 #include "mesh.h"
+#include "client.h"
 #include <IMeshManipulator.h>
 #endif
 #include "log.h"
@@ -188,17 +189,16 @@ void NodeBox::deSerialize(std::istream &is)
 
 void TileDef::serialize(std::ostream &os, u16 protocol_version) const
 {
-       if (protocol_version >= 26)
+       if (protocol_version >= 29)
+               writeU8(os, 3);
+       else if (protocol_version >= 26)
                writeU8(os, 2);
        else if (protocol_version >= 17)
                writeU8(os, 1);
        else
                writeU8(os, 0);
        os<<serializeString(name);
-       writeU8(os, animation.type);
-       writeU16(os, animation.aspect_w);
-       writeU16(os, animation.aspect_h);
-       writeF1000(os, animation.length);
+       animation.serialize(os, protocol_version);
        if (protocol_version >= 17)
                writeU8(os, backface_culling);
        if (protocol_version >= 26) {
@@ -211,10 +211,7 @@ void TileDef::deSerialize(std::istream &is, const u8 contenfeatures_version, con
 {
        int version = readU8(is);
        name = deSerializeString(is);
-       animation.type = (TileAnimationType)readU8(is);
-       animation.aspect_w = readU16(is);
-       animation.aspect_h = readU16(is);
-       animation.length = readF1000(is);
+       animation.deSerialize(is, version >= 3 ? 29 : 26);
        if (version >= 1)
                backface_culling = readU8(is);
        if (version >= 2) {
@@ -247,6 +244,28 @@ static void deSerializeSimpleSoundSpec(SimpleSoundSpec &ss, std::istream &is)
        ss.gain = readF1000(is);
 }
 
+void TextureSettings::readSettings()
+{
+       connected_glass                = g_settings->getBool("connected_glass");
+       opaque_water                   = g_settings->getBool("opaque_water");
+       bool enable_shaders            = g_settings->getBool("enable_shaders");
+       bool enable_bumpmapping        = g_settings->getBool("enable_bumpmapping");
+       bool enable_parallax_occlusion = g_settings->getBool("enable_parallax_occlusion");
+       enable_mesh_cache              = g_settings->getBool("enable_mesh_cache");
+       enable_minimap                 = g_settings->getBool("enable_minimap");
+       std::string leaves_style_str   = g_settings->get("leaves_style");
+
+       use_normal_texture = enable_shaders &&
+               (enable_bumpmapping || enable_parallax_occlusion);
+       if (leaves_style_str == "fancy") {
+               leaves_style = LEAVES_FANCY;
+       } else if (leaves_style_str == "simple") {
+               leaves_style = LEAVES_SIMPLE;
+       } else {
+               leaves_style = LEAVES_OPAQUE;
+       }
+}
+
 /*
        ContentFeatures
 */
@@ -365,7 +384,10 @@ void ContentFeatures::serialize(std::ostream &os, u16 protocol_version) const
        writeU8(os, post_effect_color.getGreen());
        writeU8(os, post_effect_color.getBlue());
        writeU8(os, param_type);
-       writeU8(os, param_type_2);
+       if ((protocol_version < 28) && (param_type_2 == CPT2_MESHOPTIONS))
+               writeU8(os, CPT2_NONE);
+       else
+               writeU8(os, param_type_2);
        writeU8(os, is_ground_content);
        writeU8(os, light_propagates);
        writeU8(os, sunlight_propagates);
@@ -457,6 +479,7 @@ void ContentFeatures::deSerialize(std::istream &is)
        liquid_viscosity = readU8(is);
        liquid_renewable = readU8(is);
        light_source = readU8(is);
+       light_source = MYMIN(light_source, LIGHT_MAX);
        damage_per_second = readU32(is);
        node_box.deSerialize(is);
        selection_box.deSerialize(is);
@@ -479,12 +502,257 @@ void ContentFeatures::deSerialize(std::istream &is)
        collision_box.deSerialize(is);
        floodable = readU8(is);
        u16 connects_to_size = readU16(is);
+       connects_to_ids.clear();
        for (u16 i = 0; i < connects_to_size; i++)
                connects_to_ids.insert(readU16(is));
        connect_sides = readU8(is);
        }catch(SerializationError &e) {};
 }
 
+#ifndef SERVER
+void ContentFeatures::fillTileAttribs(ITextureSource *tsrc, TileSpec *tile,
+               TileDef *tiledef, u32 shader_id, bool use_normal_texture,
+               bool backface_culling, u8 alpha, u8 material_type)
+{
+       tile->shader_id     = shader_id;
+       tile->texture       = tsrc->getTextureForMesh(tiledef->name, &tile->texture_id);
+       tile->alpha         = alpha;
+       tile->material_type = material_type;
+
+       // Normal texture and shader flags texture
+       if (use_normal_texture) {
+               tile->normal_texture = tsrc->getNormalTexture(tiledef->name);
+       }
+       tile->flags_texture = tsrc->getShaderFlagsTexture(tile->normal_texture ? true : false);
+
+       // Material flags
+       tile->material_flags = 0;
+       if (backface_culling)
+               tile->material_flags |= MATERIAL_FLAG_BACKFACE_CULLING;
+       if (tiledef->animation.type != TAT_NONE)
+               tile->material_flags |= MATERIAL_FLAG_ANIMATION;
+       if (tiledef->tileable_horizontal)
+               tile->material_flags |= MATERIAL_FLAG_TILEABLE_HORIZONTAL;
+       if (tiledef->tileable_vertical)
+               tile->material_flags |= MATERIAL_FLAG_TILEABLE_VERTICAL;
+
+       // Animation parameters
+       int frame_count = 1;
+       if (tile->material_flags & MATERIAL_FLAG_ANIMATION) {
+               int frame_length_ms;
+               tiledef->animation.determineParams(tile->texture->getOriginalSize(),
+                               &frame_count, &frame_length_ms, NULL);
+               tile->animation_frame_count = frame_count;
+               tile->animation_frame_length_ms = frame_length_ms;
+       }
+
+       if (frame_count == 1) {
+               tile->material_flags &= ~MATERIAL_FLAG_ANIMATION;
+       } else {
+               std::ostringstream os(std::ios::binary);
+               tile->frames.resize(frame_count);
+
+               for (int i = 0; i < frame_count; i++) {
+
+                       FrameSpec frame;
+
+                       os.str("");
+                       os << tiledef->name;
+                       tiledef->animation.getTextureModifer(os,
+                                       tile->texture->getOriginalSize(), i);
+
+                       frame.texture = tsrc->getTextureForMesh(os.str(), &frame.texture_id);
+                       if (tile->normal_texture)
+                               frame.normal_texture = tsrc->getNormalTexture(os.str());
+                       frame.flags_texture = tile->flags_texture;
+                       tile->frames[i] = frame;
+               }
+       }
+}
+#endif
+
+#ifndef SERVER
+void ContentFeatures::updateTextures(ITextureSource *tsrc, IShaderSource *shdsrc,
+       scene::IMeshManipulator *meshmanip, Client *client, const TextureSettings &tsettings)
+{
+       // minimap pixel color - the average color of a texture
+       if (tsettings.enable_minimap && tiledef[0].name != "")
+               minimap_color = tsrc->getTextureAverageColor(tiledef[0].name);
+
+       // Figure out the actual tiles to use
+       TileDef tdef[6];
+       for (u32 j = 0; j < 6; j++) {
+               tdef[j] = tiledef[j];
+               if (tdef[j].name == "")
+                       tdef[j].name = "unknown_node.png";
+       }
+
+       bool is_liquid = false;
+       bool is_water_surface = false;
+
+       u8 material_type = (alpha == 255) ?
+               TILE_MATERIAL_BASIC : TILE_MATERIAL_ALPHA;
+
+       switch (drawtype) {
+       default:
+       case NDT_NORMAL:
+               solidness = 2;
+               break;
+       case NDT_AIRLIKE:
+               solidness = 0;
+               break;
+       case NDT_LIQUID:
+               assert(liquid_type == LIQUID_SOURCE);
+               if (tsettings.opaque_water)
+                       alpha = 255;
+               solidness = 1;
+               is_liquid = true;
+               break;
+       case NDT_FLOWINGLIQUID:
+               assert(liquid_type == LIQUID_FLOWING);
+               solidness = 0;
+               if (tsettings.opaque_water)
+                       alpha = 255;
+               is_liquid = true;
+               break;
+       case NDT_GLASSLIKE:
+               solidness = 0;
+               visual_solidness = 1;
+               break;
+       case NDT_GLASSLIKE_FRAMED:
+               solidness = 0;
+               visual_solidness = 1;
+               break;
+       case NDT_GLASSLIKE_FRAMED_OPTIONAL:
+               solidness = 0;
+               visual_solidness = 1;
+               drawtype = tsettings.connected_glass ? NDT_GLASSLIKE_FRAMED : NDT_GLASSLIKE;
+               break;
+       case NDT_ALLFACES:
+               solidness = 0;
+               visual_solidness = 1;
+               break;
+       case NDT_ALLFACES_OPTIONAL:
+               if (tsettings.leaves_style == LEAVES_FANCY) {
+                       drawtype = NDT_ALLFACES;
+                       solidness = 0;
+                       visual_solidness = 1;
+               } else if (tsettings.leaves_style == LEAVES_SIMPLE) {
+                       for (u32 j = 0; j < 6; j++) {
+                               if (tiledef_special[j].name != "")
+                                       tdef[j].name = tiledef_special[j].name;
+                       }
+                       drawtype = NDT_GLASSLIKE;
+                       solidness = 0;
+                       visual_solidness = 1;
+               } else {
+                       drawtype = NDT_NORMAL;
+                       solidness = 2;
+                       for (u32 i = 0; i < 6; i++)
+                               tdef[i].name += std::string("^[noalpha");
+               }
+               if (waving == 1)
+                       material_type = TILE_MATERIAL_WAVING_LEAVES;
+               break;
+       case NDT_PLANTLIKE:
+               solidness = 0;
+               if (waving == 1)
+                       material_type = TILE_MATERIAL_WAVING_PLANTS;
+               break;
+       case NDT_FIRELIKE:
+               solidness = 0;
+               break;
+       case NDT_MESH:
+               solidness = 0;
+               break;
+       case NDT_TORCHLIKE:
+       case NDT_SIGNLIKE:
+       case NDT_FENCELIKE:
+       case NDT_RAILLIKE:
+       case NDT_NODEBOX:
+               solidness = 0;
+               break;
+       }
+
+       if (is_liquid) {
+               material_type = (alpha == 255) ?
+                       TILE_MATERIAL_LIQUID_OPAQUE : TILE_MATERIAL_LIQUID_TRANSPARENT;
+               if (name == "default:water_source")
+                       is_water_surface = true;
+       }
+
+       u32 tile_shader[6];
+       for (u16 j = 0; j < 6; j++) {
+               tile_shader[j] = shdsrc->getShader("nodes_shader",
+                       material_type, drawtype);
+       }
+
+       if (is_water_surface) {
+               tile_shader[0] = shdsrc->getShader("water_surface_shader",
+                       material_type, drawtype);
+       }
+
+       // Tiles (fill in f->tiles[])
+       for (u16 j = 0; j < 6; j++) {
+               fillTileAttribs(tsrc, &tiles[j], &tdef[j], tile_shader[j],
+                       tsettings.use_normal_texture,
+                       tiledef[j].backface_culling, alpha, material_type);
+       }
+
+       // Special tiles (fill in f->special_tiles[])
+       for (u16 j = 0; j < CF_SPECIAL_COUNT; j++) {
+               fillTileAttribs(tsrc, &special_tiles[j], &tiledef_special[j],
+                       tile_shader[j], tsettings.use_normal_texture,
+                       tiledef_special[j].backface_culling, alpha, material_type);
+       }
+
+       if ((drawtype == NDT_MESH) && (mesh != "")) {
+               // Meshnode drawtype
+               // Read the mesh and apply scale
+               mesh_ptr[0] = client->getMesh(mesh);
+               if (mesh_ptr[0]){
+                       v3f scale = v3f(1.0, 1.0, 1.0) * BS * visual_scale;
+                       scaleMesh(mesh_ptr[0], scale);
+                       recalculateBoundingBox(mesh_ptr[0]);
+                       meshmanip->recalculateNormals(mesh_ptr[0], true, false);
+               }
+       } else if ((drawtype == NDT_NODEBOX) &&
+                       ((node_box.type == NODEBOX_REGULAR) ||
+                       (node_box.type == NODEBOX_FIXED)) &&
+                       (!node_box.fixed.empty())) {
+               //Convert regular nodebox nodes to meshnodes
+               //Change the drawtype and apply scale
+               drawtype = NDT_MESH;
+               mesh_ptr[0] = convertNodeboxesToMesh(node_box.fixed);
+               v3f scale = v3f(1.0, 1.0, 1.0) * visual_scale;
+               scaleMesh(mesh_ptr[0], scale);
+               recalculateBoundingBox(mesh_ptr[0]);
+               meshmanip->recalculateNormals(mesh_ptr[0], true, false);
+       }
+
+       //Cache 6dfacedir and wallmounted rotated clones of meshes
+       if (tsettings.enable_mesh_cache && mesh_ptr[0] && (param_type_2 == CPT2_FACEDIR)) {
+               for (u16 j = 1; j < 24; j++) {
+                       mesh_ptr[j] = cloneMesh(mesh_ptr[0]);
+                       rotateMeshBy6dFacedir(mesh_ptr[j], j);
+                       recalculateBoundingBox(mesh_ptr[j]);
+                       meshmanip->recalculateNormals(mesh_ptr[j], true, false);
+               }
+       } else if (tsettings.enable_mesh_cache && mesh_ptr[0] && (param_type_2 == CPT2_WALLMOUNTED)) {
+               static const u8 wm_to_6d[6] = {20, 0, 16+1, 12+3, 8, 4+2};
+               for (u16 j = 1; j < 6; j++) {
+                       mesh_ptr[j] = cloneMesh(mesh_ptr[0]);
+                       rotateMeshBy6dFacedir(mesh_ptr[j], wm_to_6d[j]);
+                       recalculateBoundingBox(mesh_ptr[j]);
+                       meshmanip->recalculateNormals(mesh_ptr[j], true, false);
+               }
+               rotateMeshBy6dFacedir(mesh_ptr[0], wm_to_6d[0]);
+               recalculateBoundingBox(mesh_ptr[0]);
+               meshmanip->recalculateNormals(mesh_ptr[0], true, false);
+       }
+}
+#endif
+
 /*
        CNodeDefManager
 */
@@ -504,6 +772,7 @@ class CNodeDefManager: public IWritableNodeDefManager {
        content_t allocateId();
        virtual content_t set(const std::string &name, const ContentFeatures &def);
        virtual content_t allocateDummy(const std::string &name);
+       virtual void removeNode(const std::string &name);
        virtual void updateAliases(IItemDefManager *idef);
        virtual void applyTextureOverrides(const std::string &override_filepath);
        virtual void updateTextures(IGameDef *gamedef,
@@ -521,14 +790,18 @@ class CNodeDefManager: public IWritableNodeDefManager {
        virtual void resetNodeResolveState();
        virtual void mapNodeboxConnections();
        virtual bool nodeboxConnects(MapNode from, MapNode to, u8 connect_face);
+       virtual core::aabbox3d<s16> getSelectionBoxIntUnion() const
+       {
+               return m_selection_box_int_union;
+       }
 
 private:
        void addNameIdMapping(content_t i, std::string name);
-#ifndef SERVER
-       void fillTileAttribs(ITextureSource *tsrc, TileSpec *tile, TileDef *tiledef,
-               u32 shader_id, bool use_normal_texture, bool backface_culling,
-               u8 alpha, u8 material_type);
-#endif
+       /*!
+        * Recalculates m_selection_box_int_union based on
+        * m_selection_box_union.
+        */
+       void fixSelectionBoxIntUnion();
 
        // Features indexed by id
        std::vector<ContentFeatures> m_content_features;
@@ -540,12 +813,12 @@ class CNodeDefManager: public IWritableNodeDefManager {
        // item aliases too. Updated by updateAliases()
        // Note: Not serialized.
 
-       std::map<std::string, content_t> m_name_id_mapping_with_aliases;
+       UNORDERED_MAP<std::string, content_t> m_name_id_mapping_with_aliases;
 
        // A mapping from groups to a list of content_ts (and their levels)
        // that belong to it.  Necessary for a direct lookup in getIds().
        // Note: Not serialized.
-       std::map<std::string, GroupItems> m_group_to_items;
+       UNORDERED_MAP<std::string, GroupItems> m_group_to_items;
 
        // Next possibly free id
        content_t m_next_id;
@@ -555,6 +828,14 @@ class CNodeDefManager: public IWritableNodeDefManager {
 
        // True when all nodes have been registered
        bool m_node_registration_complete;
+
+       //! The union of all nodes' selection boxes.
+       aabb3f m_selection_box_union;
+       /*!
+        * The smallest box in node coordinates that
+        * contains all nodes' selection boxes.
+        */
+       core::aabbox3d<s16> m_selection_box_int_union;
 };
 
 
@@ -585,6 +866,8 @@ void CNodeDefManager::clear()
        m_name_id_mapping_with_aliases.clear();
        m_group_to_items.clear();
        m_next_id = 0;
+       m_selection_box_union.reset(0,0,0);
+       m_selection_box_int_union.reset(0,0,0);
 
        resetNodeResolveState();
 
@@ -668,7 +951,7 @@ inline const ContentFeatures& CNodeDefManager::get(const MapNode &n) const
 
 bool CNodeDefManager::getId(const std::string &name, content_t &result) const
 {
-       std::map<std::string, content_t>::const_iterator
+       UNORDERED_MAP<std::string, content_t>::const_iterator
                i = m_name_id_mapping_with_aliases.find(name);
        if(i == m_name_id_mapping_with_aliases.end())
                return false;
@@ -698,7 +981,7 @@ bool CNodeDefManager::getIds(const std::string &name,
        }
        std::string group = name.substr(6);
 
-       std::map<std::string, GroupItems>::const_iterator
+       UNORDERED_MAP<std::string, GroupItems>::const_iterator
                i = m_group_to_items.find(group);
        if (i == m_group_to_items.end())
                return true;
@@ -743,6 +1026,123 @@ content_t CNodeDefManager::allocateId()
 }
 
 
+/*!
+ * Returns the smallest box that contains all boxes
+ * in the vector. Box_union is expanded.
+ * @param[in]      boxes     the vector containing the boxes
+ * @param[in, out] box_union the union of the arguments
+ */
+void boxVectorUnion(const std::vector<aabb3f> &boxes, aabb3f *box_union)
+{
+       for (std::vector<aabb3f>::const_iterator it = boxes.begin();
+                       it != boxes.end(); ++it) {
+               box_union->addInternalBox(*it);
+       }
+}
+
+
+/*!
+ * Returns a box that contains the nodebox in every case.
+ * The argument node_union is expanded.
+ * @param[in]      nodebox  the nodebox to be measured
+ * @param[in]      features  used to decide whether the nodebox
+ * can be rotated
+ * @param[in, out] box_union the union of the arguments
+ */
+void getNodeBoxUnion(const NodeBox &nodebox, const ContentFeatures &features,
+       aabb3f *box_union)
+{
+       switch(nodebox.type) {
+               case NODEBOX_FIXED:
+               case NODEBOX_LEVELED: {
+                       // Raw union
+                       aabb3f half_processed(0, 0, 0, 0, 0, 0);
+                       boxVectorUnion(nodebox.fixed, &half_processed);
+                       // Set leveled boxes to maximal
+                       if (nodebox.type == NODEBOX_LEVELED) {
+                               half_processed.MaxEdge.Y = +BS / 2;
+                       }
+                       if (features.param_type_2 == CPT2_FACEDIR) {
+                               // Get maximal coordinate
+                               f32 coords[] = {
+                                       fabsf(half_processed.MinEdge.X),
+                                       fabsf(half_processed.MinEdge.Y),
+                                       fabsf(half_processed.MinEdge.Z),
+                                       fabsf(half_processed.MaxEdge.X),
+                                       fabsf(half_processed.MaxEdge.Y),
+                                       fabsf(half_processed.MaxEdge.Z) };
+                               f32 max = 0;
+                               for (int i = 0; i < 6; i++) {
+                                       if (max < coords[i]) {
+                                               max = coords[i];
+                                       }
+                               }
+                               // Add the union of all possible rotated boxes
+                               box_union->addInternalPoint(-max, -max, -max);
+                               box_union->addInternalPoint(+max, +max, +max);
+                       } else {
+                               box_union->addInternalBox(half_processed);
+                       }
+                       break;
+               }
+               case NODEBOX_WALLMOUNTED: {
+                       // Add fix boxes
+                       box_union->addInternalBox(nodebox.wall_top);
+                       box_union->addInternalBox(nodebox.wall_bottom);
+                       // Find maximal coordinate in the X-Z plane
+                       f32 coords[] = {
+                               fabsf(nodebox.wall_side.MinEdge.X),
+                               fabsf(nodebox.wall_side.MinEdge.Z),
+                               fabsf(nodebox.wall_side.MaxEdge.X),
+                               fabsf(nodebox.wall_side.MaxEdge.Z) };
+                       f32 max = 0;
+                       for (int i = 0; i < 4; i++) {
+                               if (max < coords[i]) {
+                                       max = coords[i];
+                               }
+                       }
+                       // Add the union of all possible rotated boxes
+                       box_union->addInternalPoint(-max, nodebox.wall_side.MinEdge.Y, -max);
+                       box_union->addInternalPoint(max, nodebox.wall_side.MaxEdge.Y, max);
+                       break;
+               }
+               case NODEBOX_CONNECTED: {
+                       // Add all possible connected boxes
+                       boxVectorUnion(nodebox.fixed,          box_union);
+                       boxVectorUnion(nodebox.connect_top,    box_union);
+                       boxVectorUnion(nodebox.connect_bottom, box_union);
+                       boxVectorUnion(nodebox.connect_front,  box_union);
+                       boxVectorUnion(nodebox.connect_left,   box_union);
+                       boxVectorUnion(nodebox.connect_back,   box_union);
+                       boxVectorUnion(nodebox.connect_right,  box_union);
+                       break;
+               }
+               default: {
+                       // NODEBOX_REGULAR
+                       box_union->addInternalPoint(-BS / 2, -BS / 2, -BS / 2);
+                       box_union->addInternalPoint(+BS / 2, +BS / 2, +BS / 2);
+               }
+       }
+}
+
+
+inline void CNodeDefManager::fixSelectionBoxIntUnion()
+{
+       m_selection_box_int_union.MinEdge.X = floorf(
+               m_selection_box_union.MinEdge.X / BS + 0.5f);
+       m_selection_box_int_union.MinEdge.Y = floorf(
+               m_selection_box_union.MinEdge.Y / BS + 0.5f);
+       m_selection_box_int_union.MinEdge.Z = floorf(
+               m_selection_box_union.MinEdge.Z / BS + 0.5f);
+       m_selection_box_int_union.MaxEdge.X = ceilf(
+               m_selection_box_union.MaxEdge.X / BS - 0.5f);
+       m_selection_box_int_union.MaxEdge.Y = ceilf(
+               m_selection_box_union.MaxEdge.Y / BS - 0.5f);
+       m_selection_box_int_union.MaxEdge.Z = ceilf(
+               m_selection_box_union.MaxEdge.Z / BS - 0.5f);
+}
+
+
 // IWritableNodeDefManager
 content_t CNodeDefManager::set(const std::string &name, const ContentFeatures &def)
 {
@@ -773,6 +1173,8 @@ content_t CNodeDefManager::set(const std::string &name, const ContentFeatures &d
        verbosestream << "NodeDefManager: registering content id \"" << id
                << "\": name=\"" << def.name << "\""<<std::endl;
 
+       getNodeBoxUnion(def.selection_box, def, &m_selection_box_union);
+       fixSelectionBoxIntUnion();
        // Add this content to the list of all groups it belongs to
        // FIXME: This should remove a node from groups it no longer
        // belongs to when a node is re-registered
@@ -780,7 +1182,7 @@ content_t CNodeDefManager::set(const std::string &name, const ContentFeatures &d
                i != def.groups.end(); ++i) {
                std::string group_name = i->first;
 
-               std::map<std::string, GroupItems>::iterator
+               UNORDERED_MAP<std::string, GroupItems>::iterator
                        j = m_group_to_items.find(group_name);
                if (j == m_group_to_items.end()) {
                        m_group_to_items[group_name].push_back(
@@ -803,6 +1205,40 @@ content_t CNodeDefManager::allocateDummy(const std::string &name)
 }
 
 
+void CNodeDefManager::removeNode(const std::string &name)
+{
+       // Pre-condition
+       assert(name != "");
+
+       // Erase name from name ID mapping
+       content_t id = CONTENT_IGNORE;
+       if (m_name_id_mapping.getId(name, id)) {
+               m_name_id_mapping.eraseName(name);
+               m_name_id_mapping_with_aliases.erase(name);
+       }
+
+       // Erase node content from all groups it belongs to
+       for (UNORDERED_MAP<std::string, GroupItems>::iterator iter_groups =
+                       m_group_to_items.begin();
+                       iter_groups != m_group_to_items.end();) {
+               GroupItems &items = iter_groups->second;
+               for (GroupItems::iterator iter_groupitems = items.begin();
+                               iter_groupitems != items.end();) {
+                       if (iter_groupitems->first == id)
+                               items.erase(iter_groupitems++);
+                       else
+                               iter_groupitems++;
+               }
+
+               // Check if group is empty
+               if (items.size() == 0)
+                       m_group_to_items.erase(iter_groups++);
+               else
+                       iter_groups++;
+       }
+}
+
+
 void CNodeDefManager::updateAliases(IItemDefManager *idef)
 {
        std::set<std::string> all = idef->getAll();
@@ -840,13 +1276,8 @@ void CNodeDefManager::applyTextureOverrides(const std::string &override_filepath
                }
 
                content_t id;
-               if (!getId(splitted[0], id)) {
-                       errorstream << override_filepath
-                               << ":" << line_c << " Could not apply texture override \""
-                               << line << "\": Unknown node \""
-                               << splitted[0] << "\"" << std::endl;
-                       continue;
-               }
+               if (!getId(splitted[0], id))
+                       continue; // Ignore unknown node
 
                ContentFeatures &nodedef = m_content_features[id];
 
@@ -885,275 +1316,24 @@ void CNodeDefManager::updateTextures(IGameDef *gamedef,
 #ifndef SERVER
        infostream << "CNodeDefManager::updateTextures(): Updating "
                "textures in node definitions" << std::endl;
-       ITextureSource *tsrc = gamedef->tsrc();
-       IShaderSource *shdsrc = gamedef->getShaderSource();
-       scene::ISceneManager* smgr = gamedef->getSceneManager();
-       scene::IMeshManipulator* meshmanip = smgr->getMeshManipulator();
-
-       bool connected_glass           = g_settings->getBool("connected_glass");
-       bool opaque_water              = g_settings->getBool("opaque_water");
-       bool enable_shaders            = g_settings->getBool("enable_shaders");
-       bool enable_bumpmapping        = g_settings->getBool("enable_bumpmapping");
-       bool enable_parallax_occlusion = g_settings->getBool("enable_parallax_occlusion");
-       bool enable_mesh_cache         = g_settings->getBool("enable_mesh_cache");
-       bool enable_minimap            = g_settings->getBool("enable_minimap");
-       std::string leaves_style       = g_settings->get("leaves_style");
 
-       bool use_normal_texture = enable_shaders &&
-               (enable_bumpmapping || enable_parallax_occlusion);
+       Client *client = (Client *)gamedef;
+       ITextureSource *tsrc = client->tsrc();
+       IShaderSource *shdsrc = client->getShaderSource();
+       scene::ISceneManager* smgr = client->getSceneManager();
+       scene::IMeshManipulator* meshmanip = smgr->getMeshManipulator();
+       TextureSettings tsettings;
+       tsettings.readSettings();
 
        u32 size = m_content_features.size();
 
        for (u32 i = 0; i < size; i++) {
-               ContentFeatures *f = &m_content_features[i];
-
-               // minimap pixel color - the average color of a texture
-               if (enable_minimap && f->tiledef[0].name != "")
-                       f->minimap_color = tsrc->getTextureAverageColor(f->tiledef[0].name);
-
-               // Figure out the actual tiles to use
-               TileDef tiledef[6];
-               for (u32 j = 0; j < 6; j++) {
-                       tiledef[j] = f->tiledef[j];
-                       if (tiledef[j].name == "")
-                               tiledef[j].name = "unknown_node.png";
-               }
-
-               bool is_liquid = false;
-               bool is_water_surface = false;
-
-               u8 material_type = (f->alpha == 255) ?
-                       TILE_MATERIAL_BASIC : TILE_MATERIAL_ALPHA;
-
-               switch (f->drawtype) {
-               default:
-               case NDT_NORMAL:
-                       f->solidness = 2;
-                       break;
-               case NDT_AIRLIKE:
-                       f->solidness = 0;
-                       break;
-               case NDT_LIQUID:
-                       assert(f->liquid_type == LIQUID_SOURCE);
-                       if (opaque_water)
-                               f->alpha = 255;
-                       f->solidness = 1;
-                       is_liquid = true;
-                       break;
-               case NDT_FLOWINGLIQUID:
-                       assert(f->liquid_type == LIQUID_FLOWING);
-                       f->solidness = 0;
-                       if (opaque_water)
-                               f->alpha = 255;
-                       is_liquid = true;
-                       break;
-               case NDT_GLASSLIKE:
-                       f->solidness = 0;
-                       f->visual_solidness = 1;
-                       break;
-               case NDT_GLASSLIKE_FRAMED:
-                       f->solidness = 0;
-                       f->visual_solidness = 1;
-                       break;
-               case NDT_GLASSLIKE_FRAMED_OPTIONAL:
-                       f->solidness = 0;
-                       f->visual_solidness = 1;
-                       f->drawtype = connected_glass ? NDT_GLASSLIKE_FRAMED : NDT_GLASSLIKE;
-                       break;
-               case NDT_ALLFACES:
-                       f->solidness = 0;
-                       f->visual_solidness = 1;
-                       break;
-               case NDT_ALLFACES_OPTIONAL:
-                       if (leaves_style == "fancy") {
-                               f->drawtype = NDT_ALLFACES;
-                               f->solidness = 0;
-                               f->visual_solidness = 1;
-                       } else if (leaves_style == "simple") {
-                               for (u32 j = 0; j < 6; j++) {
-                                       if (f->tiledef_special[j].name != "")
-                                               tiledef[j].name = f->tiledef_special[j].name;
-                               }
-                               f->drawtype = NDT_GLASSLIKE;
-                               f->solidness = 0;
-                               f->visual_solidness = 1;
-                       } else {
-                               f->drawtype = NDT_NORMAL;
-                               f->solidness = 2;
-                               for (u32 i = 0; i < 6; i++)
-                                       tiledef[i].name += std::string("^[noalpha");
-                       }
-                       if (f->waving == 1)
-                               material_type = TILE_MATERIAL_WAVING_LEAVES;
-                       break;
-               case NDT_PLANTLIKE:
-                       f->solidness = 0;
-                       if (f->waving == 1)
-                               material_type = TILE_MATERIAL_WAVING_PLANTS;
-                       break;
-               case NDT_FIRELIKE:
-                       f->solidness = 0;
-                       break;
-               case NDT_MESH:
-                       f->solidness = 0;
-                       break;
-               case NDT_TORCHLIKE:
-               case NDT_SIGNLIKE:
-               case NDT_FENCELIKE:
-               case NDT_RAILLIKE:
-               case NDT_NODEBOX:
-                       f->solidness = 0;
-                       break;
-               }
-
-               if (is_liquid) {
-                       material_type = (f->alpha == 255) ?
-                               TILE_MATERIAL_LIQUID_OPAQUE : TILE_MATERIAL_LIQUID_TRANSPARENT;
-                       if (f->name == "default:water_source")
-                               is_water_surface = true;
-               }
-
-               u32 tile_shader[6];
-               for (u16 j = 0; j < 6; j++) {
-                       tile_shader[j] = shdsrc->getShader("nodes_shader",
-                               material_type, f->drawtype);
-               }
-
-               if (is_water_surface) {
-                       tile_shader[0] = shdsrc->getShader("water_surface_shader",
-                               material_type, f->drawtype);
-               }
-
-               // Tiles (fill in f->tiles[])
-               for (u16 j = 0; j < 6; j++) {
-                       fillTileAttribs(tsrc, &f->tiles[j], &tiledef[j], tile_shader[j],
-                               use_normal_texture, f->tiledef[j].backface_culling, f->alpha, material_type);
-               }
-
-               // Special tiles (fill in f->special_tiles[])
-               for (u16 j = 0; j < CF_SPECIAL_COUNT; j++) {
-                       fillTileAttribs(tsrc, &f->special_tiles[j], &f->tiledef_special[j],
-                               tile_shader[j], use_normal_texture,
-                               f->tiledef_special[j].backface_culling, f->alpha, material_type);
-               }
-
-               if ((f->drawtype == NDT_MESH) && (f->mesh != "")) {
-                       // Meshnode drawtype
-                       // Read the mesh and apply scale
-                       f->mesh_ptr[0] = gamedef->getMesh(f->mesh);
-                       if (f->mesh_ptr[0]){
-                               v3f scale = v3f(1.0, 1.0, 1.0) * BS * f->visual_scale;
-                               scaleMesh(f->mesh_ptr[0], scale);
-                               recalculateBoundingBox(f->mesh_ptr[0]);
-                               meshmanip->recalculateNormals(f->mesh_ptr[0], true, false);
-                       }
-               } else if ((f->drawtype == NDT_NODEBOX) &&
-                               ((f->node_box.type == NODEBOX_REGULAR) ||
-                               (f->node_box.type == NODEBOX_FIXED)) &&
-                               (!f->node_box.fixed.empty())) {
-                       //Convert regular nodebox nodes to meshnodes
-                       //Change the drawtype and apply scale
-                       f->drawtype = NDT_MESH;
-                       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]);
-                       meshmanip->recalculateNormals(f->mesh_ptr[0], true, false);
-               }
-
-               //Cache 6dfacedir and wallmounted rotated clones of meshes
-               if (enable_mesh_cache && f->mesh_ptr[0] && (f->param_type_2 == CPT2_FACEDIR)) {
-                       for (u16 j = 1; j < 24; j++) {
-                               f->mesh_ptr[j] = cloneMesh(f->mesh_ptr[0]);
-                               rotateMeshBy6dFacedir(f->mesh_ptr[j], j);
-                               recalculateBoundingBox(f->mesh_ptr[j]);
-                               meshmanip->recalculateNormals(f->mesh_ptr[j], true, false);
-                       }
-               } else if (enable_mesh_cache && f->mesh_ptr[0] && (f->param_type_2 == CPT2_WALLMOUNTED)) {
-                       static const u8 wm_to_6d[6] = {20, 0, 16+1, 12+3, 8, 4+2};
-                       for (u16 j = 1; j < 6; j++) {
-                               f->mesh_ptr[j] = cloneMesh(f->mesh_ptr[0]);
-                               rotateMeshBy6dFacedir(f->mesh_ptr[j], wm_to_6d[j]);
-                               recalculateBoundingBox(f->mesh_ptr[j]);
-                               meshmanip->recalculateNormals(f->mesh_ptr[j], true, false);
-                       }
-                       rotateMeshBy6dFacedir(f->mesh_ptr[0], wm_to_6d[0]);
-                       recalculateBoundingBox(f->mesh_ptr[0]);
-                       meshmanip->recalculateNormals(f->mesh_ptr[0], true, false);
-               }
-
+               m_content_features[i].updateTextures(tsrc, shdsrc, meshmanip, client, tsettings);
                progress_callback(progress_callback_args, i, size);
        }
 #endif
 }
 
-
-#ifndef SERVER
-void CNodeDefManager::fillTileAttribs(ITextureSource *tsrc, TileSpec *tile,
-               TileDef *tiledef, u32 shader_id, bool use_normal_texture,
-               bool backface_culling, u8 alpha, u8 material_type)
-{
-       tile->shader_id     = shader_id;
-       tile->texture       = tsrc->getTextureForMesh(tiledef->name, &tile->texture_id);
-       tile->alpha         = alpha;
-       tile->material_type = material_type;
-
-       // Normal texture and shader flags texture
-       if (use_normal_texture) {
-               tile->normal_texture = tsrc->getNormalTexture(tiledef->name);
-       }
-       tile->flags_texture = tsrc->getShaderFlagsTexture(tile->normal_texture ? true : false);
-
-       // Material flags
-       tile->material_flags = 0;
-       if (backface_culling)
-               tile->material_flags |= MATERIAL_FLAG_BACKFACE_CULLING;
-       if (tiledef->animation.type == TAT_VERTICAL_FRAMES)
-               tile->material_flags |= MATERIAL_FLAG_ANIMATION_VERTICAL_FRAMES;
-       if (tiledef->tileable_horizontal)
-               tile->material_flags |= MATERIAL_FLAG_TILEABLE_HORIZONTAL;
-       if (tiledef->tileable_vertical)
-               tile->material_flags |= MATERIAL_FLAG_TILEABLE_VERTICAL;
-
-       // Animation parameters
-       int frame_count = 1;
-       if (tile->material_flags & MATERIAL_FLAG_ANIMATION_VERTICAL_FRAMES) {
-               // Get texture size to determine frame count by aspect ratio
-               v2u32 size = tile->texture->getOriginalSize();
-               int frame_height = (float)size.X /
-                               (float)tiledef->animation.aspect_w *
-                               (float)tiledef->animation.aspect_h;
-               frame_count = size.Y / frame_height;
-               int frame_length_ms = 1000.0 * tiledef->animation.length / frame_count;
-               tile->animation_frame_count = frame_count;
-               tile->animation_frame_length_ms = frame_length_ms;
-       }
-
-       if (frame_count == 1) {
-               tile->material_flags &= ~MATERIAL_FLAG_ANIMATION_VERTICAL_FRAMES;
-       } else {
-               std::ostringstream os(std::ios::binary);
-               tile->frames.resize(frame_count);
-
-               for (int i = 0; i < frame_count; i++) {
-
-                       FrameSpec frame;
-
-                       os.str("");
-                       os << tiledef->name << "^[verticalframe:"
-                               << frame_count << ":" << i;
-
-                       frame.texture = tsrc->getTextureForMesh(os.str(), &frame.texture_id);
-                       if (tile->normal_texture)
-                               frame.normal_texture = tsrc->getNormalTexture(os.str());
-                       frame.flags_texture = tile->flags_texture;
-                       tile->frames[i] = frame;
-               }
-       }
-}
-#endif
-
-
 void CNodeDefManager::serialize(std::ostream &os, u16 protocol_version) const
 {
        writeU8(os, 1); // version
@@ -1226,6 +1406,9 @@ void CNodeDefManager::deSerialize(std::istream &is)
                m_content_features[i] = f;
                addNameIdMapping(i, f.name);
                verbosestream << "deserialized " << f.name << std::endl;
+
+               getNodeBoxUnion(f.selection_box, f, &m_selection_box_union);
+               fixSelectionBoxIntUnion();
        }
 }
 
@@ -1396,6 +1579,7 @@ void ContentFeatures::deSerializeOld(std::istream &is, int version)
                liquid_alternative_source = deSerializeString(is);
                liquid_viscosity = readU8(is);
                light_source = readU8(is);
+               light_source = MYMIN(light_source, LIGHT_MAX);
                damage_per_second = readU32(is);
                node_box.deSerialize(is);
                selection_box.deSerialize(is);
@@ -1546,7 +1730,7 @@ bool CNodeDefManager::nodeboxConnects(MapNode from, MapNode to, u8 connect_face)
 
        const ContentFeatures &f2 = get(to);
 
-       if ((f2.drawtype == NDT_NODEBOX) && (f1.node_box.type == NODEBOX_CONNECTED))
+       if ((f2.drawtype == NDT_NODEBOX) && (f2.node_box.type == NODEBOX_CONNECTED))
                // ignores actually looking if back connection exists
                return (f2.connects_to_ids.find(from.param0) != f2.connects_to_ids.end());