#include "log.h"
#include "settings.h"
#include "nameidmapping.h"
+#include "util/numeric.h"
#include "util/serialize.h"
//#include "profiler.h" // For TimeTaker
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<aabb3f>::const_iterator
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--)
climbable = false;
buildable_to = false;
rightclickable = true;
+ leveled = 0;
liquid_type = LIQUID_NONE;
liquid_alternative_flowing = "";
liquid_alternative_source = "";
liquid_viscosity = 0;
liquid_renewable = true;
- drowning = true;
+ freezemelt = "";
+ liquid_range = LIQUID_LEVEL_MAX+1;
+ drowning = 0;
light_source = 0;
damage_per_second = 0;
node_box = NodeBox();
writeU8(os, liquid_renewable);
writeU8(os, light_source);
writeU32(os, damage_per_second);
- node_box.serialize(os);
- selection_box.serialize(os);
+ node_box.serialize(os, protocol_version);
+ selection_box.serialize(os, protocol_version);
writeU8(os, legacy_facedir_simple);
writeU8(os, legacy_wallmounted);
serializeSimpleSoundSpec(sound_footstep, os);
serializeSimpleSoundSpec(sound_dig, os);
serializeSimpleSoundSpec(sound_dug, os);
writeU8(os, rightclickable);
+ writeU8(os, drowning);
+ writeU8(os, leveled);
+ writeU8(os, liquid_range);
// Stuff below should be moved to correct place in a version that otherwise changes
// the protocol version
- writeU8(os, drowning);
}
void ContentFeatures::deSerialize(std::istream &is)
deSerializeSimpleSoundSpec(sound_dig, is);
deSerializeSimpleSoundSpec(sound_dug, is);
rightclickable = readU8(is);
+ drowning = readU8(is);
+ leveled = readU8(is);
+ liquid_range = readU8(is);
// If you add anything here, insert it primarily inside the try-catch
// block to not need to increase the version.
try{
// Stuff below should be moved to correct place in a version that
// otherwise changes the protocol version
- drowning = readU8(is);
}catch(SerializationError &e) {};
}
public:
void clear()
{
+ m_content_features.clear();
m_name_id_mapping.clear();
m_name_id_mapping_with_aliases.clear();
+ m_group_to_items.clear();
+ m_next_id = 0;
+
+ u32 initial_length = 0;
+ initial_length = MYMAX(initial_length, CONTENT_UNKNOWN + 1);
+ initial_length = MYMAX(initial_length, CONTENT_AIR + 1);
+ initial_length = MYMAX(initial_length, CONTENT_IGNORE + 1);
+ m_content_features.resize(initial_length);
- for(u16 i=0; i<=MAX_CONTENT; i++)
+ // Set CONTENT_UNKNOWN
{
- ContentFeatures &f = m_content_features[i];
- f.reset(); // Reset to defaults
+ ContentFeatures f;
+ f.name = "unknown";
+ // Insert directly into containers
+ content_t c = CONTENT_UNKNOWN;
+ m_content_features[c] = f;
+ addNameIdMapping(c, f.name);
}
// Set CONTENT_AIR
m_content_features[c] = f;
addNameIdMapping(c, f.name);
}
+
// Set CONTENT_IGNORE
{
ContentFeatures f;
addNameIdMapping(c, f.name);
}
}
- // CONTENT_IGNORE = not found
- content_t getFreeId()
- {
- for(u32 i=0; i<=0xffff; i++){
- const ContentFeatures &f = m_content_features[i];
- if(f.name == "")
- return i;
- }
- return CONTENT_IGNORE;
- }
CNodeDefManager()
{
clear();
virtual IWritableNodeDefManager* clone()
{
CNodeDefManager *mgr = new CNodeDefManager();
- for(u16 i=0; i<=MAX_CONTENT; i++)
- {
- mgr->set(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
{
}
std::string group = name.substr(6);
-#if 1 // Optimized version, takes less than 1 microsecond at -O1
std::map<std::string, GroupItems>::const_iterator
i = m_group_to_items.find(group);
if (i == m_group_to_items.end())
if ((*j).second != 0)
result.insert((*j).first);
}
-#else // Old version, takes about ~150-200us at -O1
- 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);
- }
-#endif
//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);
}
+ // returns CONTENT_IGNORE if no free ID found
+ content_t allocateId()
+ {
+ for(content_t id = m_next_id;
+ 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;
+ }
+ }
+ // If we arrive here, an overflow occurred in id.
+ // That means no ID was found
+ return CONTENT_IGNORE;
+ }
// IWritableNodeDefManager
- virtual void set(content_t c, const ContentFeatures &def)
+ virtual content_t set(const std::string &name,
+ const ContentFeatures &def)
{
- verbosestream<<"registerNode: registering content id \""<<c
- <<"\": name=\""<<def.name<<"\""<<std::endl;
- assert(c <= MAX_CONTENT);
- // Don't allow redefining CONTENT_IGNORE (but allow air)
- if(def.name == "ignore" || c == CONTENT_IGNORE){
- infostream<<"registerNode: WARNING: Ignoring "
+ assert(name != "");
+ assert(name == def.name);
+
+ // Don't allow redefining ignore (but allow air and unknown)
+ if(name == "ignore"){
+ infostream<<"NodeDefManager: WARNING: Ignoring "
<<"CONTENT_IGNORE redefinition"<<std::endl;
- return;
+ return CONTENT_IGNORE;
}
- // Check that the special contents are not redefined as different id
- // because it would mess up everything
- if((def.name == "ignore" && c != CONTENT_IGNORE) ||
- (def.name == "air" && c != CONTENT_AIR)){
- errorstream<<"registerNode: IGNORING ERROR: "
- <<"trying to register built-in type \""
- <<def.name<<"\" as different id"<<std::endl;
- return;
+
+ content_t id = CONTENT_IGNORE;
+ bool found = m_name_id_mapping.getId(name, id); // ignore aliases
+ if(!found){
+ // Get new id
+ id = allocateId();
+ if(id == CONTENT_IGNORE){
+ infostream<<"NodeDefManager: WARNING: Absolute "
+ <<"limit reached"<<std::endl;
+ return CONTENT_IGNORE;
+ }
+ assert(id != CONTENT_IGNORE);
+ addNameIdMapping(id, name);
}
- m_content_features[c] = def;
- if(def.name != "")
- addNameIdMapping(c, def.name);
+ m_content_features[id] = def;
+ verbosestream<<"NodeDefManager: registering content id \""<<id
+ <<"\": name=\""<<def.name<<"\""<<std::endl;
// 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
for (ItemGroupList::const_iterator i = def.groups.begin();
i != def.groups.end(); ++i) {
std::string group_name = i->first;
std::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(std::make_pair(c, i->second));
+ 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(c, i->second));
+ items.push_back(std::make_pair(id, i->second));
}
}
- }
- virtual content_t set(const std::string &name,
- const ContentFeatures &def)
- {
- assert(name == def.name);
- u16 id = CONTENT_IGNORE;
- bool found = m_name_id_mapping.getId(name, id); // ignore aliases
- if(!found){
- // Get some id
- id = getFreeId();
- if(id == CONTENT_IGNORE)
- return CONTENT_IGNORE;
- if(name != "")
- addNameIdMapping(id, name);
- }
- set(id, def);
return id;
}
virtual content_t allocateDummy(const std::string &name)
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++)
+ for(u32 i=0; i<m_content_features.size(); i++)
{
ContentFeatures *f = &m_content_features[i];
// Tiles (fill in f->tiles[])
for(u16 j=0; j<6; 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);
// Alpha
f->tiles[j].alpha = f->alpha;
// Material type
if(f->tiles[j].material_flags &
MATERIAL_FLAG_ANIMATION_VERTICAL_FRAMES)
{
- // Get raw texture size to determine frame count by
+ // 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;
// Special tiles (fill in f->special_tiles[])
for(u16 j=0; j<CF_SPECIAL_COUNT; 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);
// Alpha
f->special_tiles[j].alpha = f->alpha;
// Material type
if(f->special_tiles[j].material_flags &
MATERIAL_FLAG_ANIMATION_VERTICAL_FRAMES)
{
- // Get raw texture size to determine frame count by
+ // 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;
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 == "")
std::ostringstream wrapper_os(std::ios::binary);
f->serialize(wrapper_os, protocol_version);
os2<<serializeString(wrapper_os.str());
+
+ assert(count + 1 > count); // must not overflow
count++;
}
writeU16(os, count);
throw SerializationError("unsupported NodeDefinitionManager version");
u16 count = readU16(is);
std::istringstream is2(deSerializeLongString(is), std::ios::binary);
+ ContentFeatures f;
for(u16 n=0; n<count; n++){
u16 i = readU16(is2);
- if(i > MAX_CONTENT){
- errorstream<<"ContentFeatures::deSerialize(): "
- <<"Too large content id: "<<i<<std::endl;
- continue;
- }
- /*// Do not deserialize special types
- if(i == CONTENT_IGNORE || i == CONTENT_AIR)
- continue;*/
- ContentFeatures *f = &m_content_features[i];
+
// Read it from the string wrapper
std::string wrapper = deSerializeString(is2);
std::istringstream wrapper_is(wrapper, std::ios::binary);
- f->deSerialize(wrapper_is);
- verbosestream<<"deserialized "<<f->name<<std::endl;
- if(f->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 "<<i
+ <<std::endl;
+ continue;
+ }
+ if(f.name == ""){
+ infostream<<"NodeDefManager::deSerialize(): WARNING: "
+ <<"received empty name"<<std::endl;
+ continue;
+ }
+ u16 existing_id;
+ bool found = m_name_id_mapping.getId(f.name, existing_id); // ignore aliases
+ if(found && i != existing_id){
+ infostream<<"NodeDefManager::deSerialize(): WARNING: "
+ <<"already defined with different ID: "
+ <<f.name<<std::endl;
+ continue;
+ }
+
+ // All is ok, add node definition with the requested ID
+ if(i >= m_content_features.size())
+ m_content_features.resize((u32)(i) + 1);
+ m_content_features[i] = f;
+ addNameIdMapping(i, f.name);
+ verbosestream<<"deserialized "<<f.name<<std::endl;
}
}
private:
}
private:
// Features indexed by id
- ContentFeatures m_content_features[MAX_CONTENT+1];
+ std::vector<ContentFeatures> 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
// that belong to it. Necessary for a direct lookup in getIds().
// Note: Not serialized.
std::map<std::string, GroupItems> m_group_to_items;
+ // Next possibly free id
+ content_t m_next_id;
};
IWritableNodeDefManager* createNodeDefManager()
writeU8(os, liquid_viscosity);
writeU8(os, light_source);
writeU32(os, damage_per_second);
- node_box.serialize(os);
- selection_box.serialize(os);
+ node_box.serialize(os, protocol_version);
+ selection_box.serialize(os, protocol_version);
writeU8(os, legacy_facedir_simple);
writeU8(os, legacy_wallmounted);
serializeSimpleSoundSpec(sound_footstep, os);
projects / dragonfireclient.git / blobdiff