X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fnodedef.cpp;h=93751c70e3160e3355e7042ec3f47ee2c3ebea08;hb=e66bb9b864ad8e917f20879d5a4a31fc744c766c;hp=466531efa8fa07a03fdaa14d1288d7001f90b0b5;hpb=23837e43525e332ea140b58e0f5d1e2b89f1149f;p=minetest.git diff --git a/src/nodedef.cpp b/src/nodedef.cpp index 466531efa..93751c70e 100644 --- a/src/nodedef.cpp +++ b/src/nodedef.cpp @@ -1,6 +1,6 @@ /* -Minetest-c55 -Copyright (C) 2010 celeron55, Perttu Ahola +Minetest +Copyright (C) 2013 celeron55, Perttu Ahola This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -27,7 +27,9 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "log.h" #include "settings.h" #include "nameidmapping.h" +#include "util/numeric.h" #include "util/serialize.h" +//#include "profiler.h" // For TimeTaker /* NodeBox @@ -44,12 +46,17 @@ void NodeBox::reset() wall_side = aabb3f(-BS/2, -BS/2, -BS/2, -BS/2+BS/16., BS/2, BS/2); } -void NodeBox::serialize(std::ostream &os) const +void NodeBox::serialize(std::ostream &os, u16 protocol_version) const { - writeU8(os, 1); // version - writeU8(os, type); + int version = protocol_version >= 21 ? 2 : 1; + writeU8(os, version); - if(type == NODEBOX_FIXED) + if (version == 1 && type == NODEBOX_LEVELED) + writeU8(os, NODEBOX_FIXED); + else + writeU8(os, type); + + if(type == NODEBOX_FIXED || type == NODEBOX_LEVELED) { writeU16(os, fixed.size()); for(std::vector::const_iterator @@ -74,14 +81,14 @@ void NodeBox::serialize(std::ostream &os) const void NodeBox::deSerialize(std::istream &is) { int version = readU8(is); - if(version != 1) + if(version < 1 || version > 2) throw SerializationError("unsupported NodeBox version"); reset(); type = (enum NodeBoxType)readU8(is); - if(type == NODEBOX_FIXED) + if(type == NODEBOX_FIXED || type == NODEBOX_LEVELED) { u16 fixed_count = readU16(is); while(fixed_count--) @@ -106,27 +113,32 @@ void NodeBox::deSerialize(std::istream &is) /* TileDef */ - -void TileDef::serialize(std::ostream &os) const + +void TileDef::serialize(std::ostream &os, u16 protocol_version) const { - writeU8(os, 0); // version + if(protocol_version >= 17) + writeU8(os, 1); + else + writeU8(os, 0); os<= 17) + writeU8(os, backface_culling); } void TileDef::deSerialize(std::istream &is) { int version = readU8(is); - if(version != 0) - throw SerializationError("unsupported TileDef version"); name = deSerializeString(is); animation.type = (TileAnimationType)readU8(is); animation.aspect_w = readU16(is); animation.aspect_h = readU16(is); animation.length = readF1000(is); + if(version >= 1) + backface_culling = readU8(is); } /* @@ -173,7 +185,7 @@ void ContentFeatures::reset() has_after_destruct = false; /* Actual data - + NOTE: Most of this is always overridden by the default values given in builtin.lua */ @@ -183,9 +195,9 @@ void ContentFeatures::reset() groups["dig_immediate"] = 2; drawtype = NDT_NORMAL; visual_scale = 1.0; - for(u32 i=0; i<6; i++) + for(u32 i = 0; i < 6; i++) tiledef[i] = TileDef(); - for(u16 j=0; jset(i, get(i)); - } + *mgr = *this; return mgr; } virtual const ContentFeatures& get(content_t c) const { - assert(c <= MAX_CONTENT); - return m_content_features[c]; + if(c < m_content_features.size()) + return m_content_features[c]; + else + return m_content_features[CONTENT_UNKNOWN]; } virtual const ContentFeatures& get(const MapNode &n) const { @@ -432,6 +476,7 @@ class CNodeDefManager: public IWritableNodeDefManager virtual void getIds(const std::string &name, std::set &result) const { + //TimeTaker t("getIds", NULL, PRECISION_MICRO); if(name.substr(0,6) != "group:"){ content_t id = CONTENT_IGNORE; if(getId(name, id)) @@ -439,61 +484,93 @@ class CNodeDefManager: public IWritableNodeDefManager return; } std::string group = name.substr(6); - for(u16 id=0; id<=MAX_CONTENT; id++) - { - const ContentFeatures &f = m_content_features[id]; - if(f.name == "") // Quickly discard undefined nodes - continue; - if(itemgroup_get(f.groups, group) != 0) - result.insert(id); + + std::map::const_iterator + i = m_group_to_items.find(group); + if (i == m_group_to_items.end()) + return; + + const GroupItems &items = i->second; + for (GroupItems::const_iterator j = items.begin(); + j != items.end(); ++j) { + if ((*j).second != 0) + result.insert((*j).first); } + //printf("getIds: %dus\n", t.stop()); } virtual const ContentFeatures& get(const std::string &name) const { - content_t id = CONTENT_IGNORE; + content_t id = CONTENT_UNKNOWN; getId(name, id); return get(id); } - // IWritableNodeDefManager - virtual void set(content_t c, const ContentFeatures &def) + // returns CONTENT_IGNORE if no free ID found + content_t allocateId() { - verbosestream<<"registerNode: registering content id \""<= m_next_id; // overflow? + ++id){ + while(id >= m_content_features.size()){ + m_content_features.push_back(ContentFeatures()); + } + const ContentFeatures &f = m_content_features[id]; + if(f.name == ""){ + m_next_id = id + 1; + return id; + } } - m_content_features[c] = def; - if(def.name != "") - addNameIdMapping(c, def.name); + // If we arrive here, an overflow occurred in id. + // That means no ID was found + return CONTENT_IGNORE; } + // IWritableNodeDefManager virtual content_t set(const std::string &name, const ContentFeatures &def) { + assert(name != ""); assert(name == def.name); - u16 id = CONTENT_IGNORE; + + // Don't allow redefining ignore (but allow air and unknown) + if(name == "ignore"){ + infostream<<"NodeDefManager: WARNING: Ignoring " + <<"CONTENT_IGNORE redefinition"<first; + + std::map::iterator + j = m_group_to_items.find(group_name); + if (j == m_group_to_items.end()) { + m_group_to_items[group_name].push_back( + std::make_pair(id, i->second)); + } else { + GroupItems &items = j->second; + items.push_back(std::make_pair(id, i->second)); + } } - set(id, def); return id; } virtual content_t allocateDummy(const std::string &name) @@ -520,7 +597,8 @@ class CNodeDefManager: public IWritableNodeDefManager } } } - virtual void updateTextures(ITextureSource *tsrc) + virtual void updateTextures(ITextureSource *tsrc, + IShaderSource *shdsrc) { #ifndef SERVER infostream<<"CNodeDefManager::updateTextures(): Updating " @@ -529,20 +607,29 @@ class CNodeDefManager: public IWritableNodeDefManager bool new_style_water = g_settings->getBool("new_style_water"); bool new_style_leaves = g_settings->getBool("new_style_leaves"); bool opaque_water = g_settings->getBool("opaque_water"); - - for(u16 i=0; i<=MAX_CONTENT; i++) + 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"); + + for(u32 i=0; itiledef[j]; if(tiledef[j].name == "") - tiledef[j].name = "unknown_block.png"; + tiledef[j].name = "unknown_node.png"; } + bool is_liquid = false; + bool is_water_surface = false; + + u8 material_type; + material_type = (f->alpha == 255) ? TILE_MATERIAL_BASIC : TILE_MATERIAL_ALPHA; + switch(f->drawtype){ default: case NDT_NORMAL: @@ -561,17 +648,23 @@ class CNodeDefManager: public IWritableNodeDefManager f->solidness = 1; f->backface_culling = false; } + 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_ALLFACES: f->solidness = 0; f->visual_solidness = 1; @@ -588,10 +681,17 @@ class CNodeDefManager: public IWritableNodeDefManager tiledef[i].name += std::string("^[noalpha"); } } + if (f->waving == 1) + material_type = TILE_MATERIAL_WAVING_LEAVES; + break; + case NDT_PLANTLIKE: + f->solidness = 0; + f->backface_culling = false; + if (f->waving == 1) + material_type = TILE_MATERIAL_WAVING_PLANTS; break; case NDT_TORCHLIKE: case NDT_SIGNLIKE: - case NDT_PLANTLIKE: case NDT_FENCELIKE: case NDT_RAILLIKE: case NDT_NODEBOX: @@ -599,16 +699,33 @@ class CNodeDefManager: public IWritableNodeDefManager 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++){ + for(u16 j = 0; j < 6; j++){ + // Shader + f->tiles[j].shader_id = tile_shader[j]; // Texture - f->tiles[j].texture = tsrc->getTexture(tiledef[j].name); + f->tiles[j].texture = tsrc->getTexture( + tiledef[j].name, + &f->tiles[j].texture_id); + // Normal texture + if (enable_shaders && (enable_bumpmapping || enable_parallax_occlusion)) + f->tiles[j].normal_texture = tsrc->getNormalTexture(tiledef[j].name); // Alpha f->tiles[j].alpha = f->alpha; - if(f->alpha == 255) - f->tiles[j].material_type = MATERIAL_ALPHA_SIMPLE; - else - f->tiles[j].material_type = MATERIAL_ALPHA_VERTEX; + // Material type + f->tiles[j].material_type = material_type; // Material flags f->tiles[j].material_flags = 0; if(f->backface_culling) @@ -616,43 +733,50 @@ class CNodeDefManager: public IWritableNodeDefManager if(tiledef[j].animation.type == TAT_VERTICAL_FRAMES) f->tiles[j].material_flags |= MATERIAL_FLAG_ANIMATION_VERTICAL_FRAMES; // Animation parameters - if(f->tiles[j].material_flags & - MATERIAL_FLAG_ANIMATION_VERTICAL_FRAMES) - { - // Get raw texture size to determine frame count by + int frame_count = 1; + if(f->tiles[j].material_flags & MATERIAL_FLAG_ANIMATION_VERTICAL_FRAMES) { + // Get texture size to determine frame count by // aspect ratio - video::ITexture *t = tsrc->getTextureRaw(tiledef[j].name); - v2u32 size = t->getOriginalSize(); + v2u32 size = f->tiles[j].texture->getOriginalSize(); int frame_height = (float)size.X / (float)tiledef[j].animation.aspect_w * (float)tiledef[j].animation.aspect_h; - int frame_count = size.Y / frame_height; + frame_count = size.Y / frame_height; int frame_length_ms = 1000.0 * tiledef[j].animation.length / frame_count; f->tiles[j].animation_frame_count = frame_count; f->tiles[j].animation_frame_length_ms = frame_length_ms; - - // If there are no frames for an animation, switch - // animation off (so that having specified an animation - // for something but not using it in the texture pack - // gives no overhead) - if(frame_count == 1){ - f->tiles[j].material_flags &= - ~MATERIAL_FLAG_ANIMATION_VERTICAL_FRAMES; + } + if(frame_count == 1) { + f->tiles[j].material_flags &= ~MATERIAL_FLAG_ANIMATION_VERTICAL_FRAMES; + } else { + std::ostringstream os(std::ios::binary); + for (int i = 0; i < frame_count; i++) { + FrameSpec frame; + os.str(""); + os<getTexture(os.str(), &frame.texture_id); + if (f->tiles[j].normal_texture) + frame.normal_texture = tsrc->getNormalTexture(os.str()); + f->tiles[j].frames[i]=frame; } } } // Special tiles (fill in f->special_tiles[]) for(u16 j=0; jspecial_tiles[j].shader_id = tile_shader[j]; // Texture - f->special_tiles[j].texture = - tsrc->getTexture(f->tiledef_special[j].name); + f->special_tiles[j].texture = tsrc->getTexture( + f->tiledef_special[j].name, + &f->special_tiles[j].texture_id); + // Normal texture + if (enable_shaders && (enable_bumpmapping || enable_parallax_occlusion)) + f->special_tiles[j].normal_texture = tsrc->getNormalTexture(f->tiledef_special[j].name); // Alpha f->special_tiles[j].alpha = f->alpha; - if(f->alpha == 255) - f->special_tiles[j].material_type = MATERIAL_ALPHA_SIMPLE; - else - f->special_tiles[j].material_type = MATERIAL_ALPHA_VERTEX; + // Material type + f->special_tiles[j].material_type = material_type; // Material flags f->special_tiles[j].material_flags = 0; if(f->tiledef_special[j].backface_culling) @@ -660,43 +784,47 @@ class CNodeDefManager: public IWritableNodeDefManager if(f->tiledef_special[j].animation.type == TAT_VERTICAL_FRAMES) f->special_tiles[j].material_flags |= MATERIAL_FLAG_ANIMATION_VERTICAL_FRAMES; // Animation parameters - if(f->special_tiles[j].material_flags & - MATERIAL_FLAG_ANIMATION_VERTICAL_FRAMES) - { - // Get raw texture size to determine frame count by + int frame_count = 1; + if(f->special_tiles[j].material_flags & MATERIAL_FLAG_ANIMATION_VERTICAL_FRAMES) { + // Get texture size to determine frame count by // aspect ratio - video::ITexture *t = tsrc->getTextureRaw(f->tiledef_special[j].name); - v2u32 size = t->getOriginalSize(); + v2u32 size = f->special_tiles[j].texture->getOriginalSize(); int frame_height = (float)size.X / (float)f->tiledef_special[j].animation.aspect_w * (float)f->tiledef_special[j].animation.aspect_h; - int frame_count = size.Y / frame_height; + frame_count = size.Y / frame_height; int frame_length_ms = 1000.0 * f->tiledef_special[j].animation.length / frame_count; f->special_tiles[j].animation_frame_count = frame_count; f->special_tiles[j].animation_frame_length_ms = frame_length_ms; - - // If there are no frames for an animation, switch - // animation off (so that having specified an animation - // for something but not using it in the texture pack - // gives no overhead) - if(frame_count == 1){ - f->special_tiles[j].material_flags &= - ~MATERIAL_FLAG_ANIMATION_VERTICAL_FRAMES; + } + if(frame_count == 1) { + f->special_tiles[j].material_flags &= ~MATERIAL_FLAG_ANIMATION_VERTICAL_FRAMES; + } else { + std::ostringstream os(std::ios::binary); + for (int i = 0; i < frame_count; i++) { + FrameSpec frame; + os.str(""); + os<tiledef_special[j].name<<"^[verticalframe:"<getTexture(os.str(), &frame.texture_id); + if (f->special_tiles[j].normal_texture) + frame.normal_texture = tsrc->getNormalTexture(os.str()); + f->special_tiles[j].frames[i]=frame; } } } } #endif } - void serialize(std::ostream &os) + void serialize(std::ostream &os, u16 protocol_version) { writeU8(os, 1); // version u16 count = 0; std::ostringstream os2(std::ios::binary); - for(u16 i=0; i<=MAX_CONTENT; i++) + for(u32 i = 0; i < m_content_features.size(); i++) { - if(i == CONTENT_IGNORE || i == CONTENT_AIR) + if(i == CONTENT_IGNORE || i == CONTENT_AIR + || i == CONTENT_UNKNOWN) continue; ContentFeatures *f = &m_content_features[i]; if(f->name == "") @@ -705,8 +833,10 @@ class CNodeDefManager: public IWritableNodeDefManager // Wrap it in a string to allow different lengths without // strict version incompatibilities std::ostringstream wrapper_os(std::ios::binary); - f->serialize(wrapper_os); + f->serialize(wrapper_os, protocol_version); os2< count); // must not overflow count++; } writeU16(os, count); @@ -720,24 +850,43 @@ class CNodeDefManager: public IWritableNodeDefManager throw SerializationError("unsupported NodeDefinitionManager version"); u16 count = readU16(is); std::istringstream is2(deSerializeLongString(is), std::ios::binary); - for(u16 n=0; n MAX_CONTENT){ - errorstream<<"ContentFeatures::deSerialize(): " - <<"Too large content id: "<deSerialize(wrapper_is); - verbosestream<<"deserialized "<name<name != "") - addNameIdMapping(i, f->name); + f.deSerialize(wrapper_is); + + // Check error conditions + if(i == CONTENT_IGNORE || i == CONTENT_AIR + || i == CONTENT_UNKNOWN){ + infostream<<"NodeDefManager::deSerialize(): WARNING: " + <<"not changing builtin node "<= m_content_features.size()) + m_content_features.resize((u32)(i) + 1); + m_content_features[i] = f; + addNameIdMapping(i, f.name); + verbosestream<<"deserialized "< m_content_features; // A mapping for fast converting back and forth between names and ids NameIdMapping m_name_id_mapping; // Like m_name_id_mapping, but only from names to ids, and includes // item aliases too. Updated by updateAliases() // Note: Not serialized. std::map 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 m_group_to_items; + // Next possibly free id + content_t m_next_id; }; IWritableNodeDefManager* createNodeDefManager() @@ -762,3 +917,224 @@ IWritableNodeDefManager* createNodeDefManager() return new CNodeDefManager(); } +/* + Serialization of old ContentFeatures formats +*/ + +void ContentFeatures::serializeOld(std::ostream &os, u16 protocol_version) +{ + if(protocol_version == 13) + { + writeU8(os, 5); // version + os<first); + writeS16(os, i->second); + } + writeU8(os, drawtype); + writeF1000(os, visual_scale); + writeU8(os, 6); + for(u32 i = 0; i < 6; i++) + tiledef[i].serialize(os, protocol_version); + //CF_SPECIAL_COUNT = 2 before cf ver. 7 and protocol ver. 24 + writeU8(os, 2); + for(u32 i = 0; i < 2; i++){ + tiledef_special[i].serialize(os, protocol_version); + } + writeU8(os, alpha); + writeU8(os, post_effect_color.getAlpha()); + writeU8(os, post_effect_color.getRed()); + writeU8(os, post_effect_color.getGreen()); + writeU8(os, post_effect_color.getBlue()); + writeU8(os, param_type); + writeU8(os, param_type_2); + writeU8(os, is_ground_content); + writeU8(os, light_propagates); + writeU8(os, sunlight_propagates); + writeU8(os, walkable); + writeU8(os, pointable); + writeU8(os, diggable); + writeU8(os, climbable); + writeU8(os, buildable_to); + os< 13 && protocol_version < 24) { + writeU8(os, 6); // version + os<first); + writeS16(os, i->second); + } + writeU8(os, drawtype); + writeF1000(os, visual_scale); + writeU8(os, 6); + for(u32 i = 0; i < 6; i++) + tiledef[i].serialize(os, protocol_version); + //CF_SPECIAL_COUNT = 2 before cf ver. 7 and protocol ver. 24 + writeU8(os, 2); + for(u32 i = 0; i < 2; i++){ + tiledef_special[i].serialize(os, protocol_version); + } + writeU8(os, alpha); + writeU8(os, post_effect_color.getAlpha()); + writeU8(os, post_effect_color.getRed()); + writeU8(os, post_effect_color.getGreen()); + writeU8(os, post_effect_color.getBlue()); + writeU8(os, param_type); + writeU8(os, param_type_2); + writeU8(os, is_ground_content); + writeU8(os, light_propagates); + writeU8(os, sunlight_propagates); + writeU8(os, walkable); + writeU8(os, pointable); + writeU8(os, diggable); + writeU8(os, climbable); + writeU8(os, buildable_to); + os<