BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Clean up nodedef.cpp

Browse Source
This commit is contained in:
kwolekr 2014-10-03 03:16:43 -04:00
parent 5baf379f40
commit 01ce57ade5
1 changed files with 583 additions and 561 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

398
src/nodedef.cpp
View File

@ -370,10 +370,67 @@ void ContentFeatures::deSerialize(std::istream &is)
CNodeDefManager
*/
class CNodeDefManager: public IWritableNodeDefManager
{
class CNodeDefManager: public IWritableNodeDefManager {
public:
void clear()
CNodeDefManager();
virtual ~CNodeDefManager();
void clear();
virtual IWritableNodeDefManager *clone();
virtual const ContentFeatures& get(content_t c) const;
virtual const ContentFeatures& get(const MapNode &n) const;
virtual bool getId(const std::string &name, content_t &result) const;
virtual content_t getId(const std::string &name) const;
virtual void getIds(const std::string &name, std::set<content_t> &result) const;
virtual const ContentFeatures& get(const std::string &name) const;
content_t allocateId();
virtual content_t set(const std::string &name, const ContentFeatures &def);
virtual content_t allocateDummy(const std::string &name);
virtual void updateAliases(IItemDefManager *idef);
virtual void updateTextures(ITextureSource *tsrc, IShaderSource *shdsrc);
void serialize(std::ostream &os, u16 protocol_version);
void deSerialize(std::istream &is);
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, u8 alpha, u8 material_type);
#endif
// Features indexed by id
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
// item aliases too. Updated by updateAliases()
// Note: Not serialized.
std::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;
// Next possibly free id
content_t m_next_id;
};
CNodeDefManager::CNodeDefManager()
{
clear();
}
CNodeDefManager::~CNodeDefManager()
{
}
void CNodeDefManager::clear()
{
m_content_features.clear();
m_name_id_mapping.clear();
@ -435,31 +492,32 @@ public:
addNameIdMapping(c, f.name);
}
}
CNodeDefManager()
{
clear();
}
virtual ~CNodeDefManager()
{
}
virtual IWritableNodeDefManager* clone()
IWritableNodeDefManager *CNodeDefManager::clone()
{
CNodeDefManager *mgr = new CNodeDefManager();
*mgr = *this;
return mgr;
}
virtual const ContentFeatures& get(content_t c) const
const ContentFeatures& CNodeDefManager::get(content_t c) const
{
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
const ContentFeatures& CNodeDefManager::get(const MapNode &n) const
{
return get(n.getContent());
}
virtual bool getId(const std::string &name, content_t &result) const
bool CNodeDefManager::getId(const std::string &name, content_t &result) const
{
std::map<std::string, content_t>::const_iterator
i = m_name_id_mapping_with_aliases.find(name);
@ -468,13 +526,17 @@ public:
result = i->second;
return true;
}
virtual content_t getId(const std::string &name) const
content_t CNodeDefManager::getId(const std::string &name) const
{
content_t id = CONTENT_IGNORE;
getId(name, id);
return id;
}
virtual void getIds(const std::string &name, std::set<content_t> &result)
void CNodeDefManager::getIds(const std::string &name, std::set<content_t> &result)
const
{
//TimeTaker t("getIds", NULL, PRECISION_MICRO);
@ -499,14 +561,18 @@ public:
}
//printf("getIds: %dus\n", t.stop());
}
virtual const ContentFeatures& get(const std::string &name) const
const ContentFeatures& CNodeDefManager::get(const std::string &name) const
{
content_t id = CONTENT_UNKNOWN;
getId(name, id);
return get(id);
}
// returns CONTENT_IGNORE if no free ID found
content_t allocateId()
content_t CNodeDefManager::allocateId()
{
for (content_t id = m_next_id;
id >= m_next_id; // overflow?
@ -524,9 +590,10 @@ public:
// That means no ID was found
return CONTENT_IGNORE;
}
// IWritableNodeDefManager
virtual content_t set(const std::string &name,
const ContentFeatures &def)
content_t CNodeDefManager::set(const std::string &name, const ContentFeatures &def)
{
assert(name != "");
assert(name == def.name);
@ -534,18 +601,17 @@ public:
// Don't allow redefining ignore (but allow air and unknown)
if (name == "ignore") {
infostream << "NodeDefManager: WARNING: Ignoring "
<<"CONTENT_IGNORE redefinition"<<std::endl;
"CONTENT_IGNORE redefinition"<<std::endl;
return CONTENT_IGNORE;
}
content_t id = CONTENT_IGNORE;
bool found = m_name_id_mapping.getId(name, id); // ignore aliases
if(!found){
if (!m_name_id_mapping.getId(name, id)) { // ignore aliases
// Get new id
id = allocateId();
if (id == CONTENT_IGNORE) {
infostream << "NodeDefManager: WARNING: Absolute "
<<"limit reached"<<std::endl;
"limit reached" << std::endl;
return CONTENT_IGNORE;
}
assert(id != CONTENT_IGNORE);
@ -574,36 +640,39 @@ public:
}
return id;
}
virtual content_t allocateDummy(const std::string &name)
content_t CNodeDefManager::allocateDummy(const std::string &name)
{
assert(name != "");
ContentFeatures f;
f.name = name;
return set(name, f);
}
virtual void updateAliases(IItemDefManager *idef)
void CNodeDefManager::updateAliases(IItemDefManager *idef)
{
std::set<std::string> all = idef->getAll();
m_name_id_mapping_with_aliases.clear();
for (std::set<std::string>::iterator
i = all.begin(); i != all.end(); i++)
{
i = all.begin(); i != all.end(); i++) {
std::string name = *i;
std::string convert_to = idef->getAlias(name);
content_t id;
if(m_name_id_mapping.getId(convert_to, id))
{
if (m_name_id_mapping.getId(convert_to, id)) {
m_name_id_mapping_with_aliases.insert(
std::make_pair(name, id));
}
}
}
virtual void updateTextures(ITextureSource *tsrc,
IShaderSource *shdsrc)
void CNodeDefManager::updateTextures(ITextureSource *tsrc, IShaderSource *shdsrc)
{
#ifndef SERVER
infostream << "CNodeDefManager::updateTextures(): Updating "
<<"textures in node definitions"<<std::endl;
"textures in node definitions" << std::endl;
bool new_style_water = g_settings->getBool("new_style_water");
bool new_style_leaves = g_settings->getBool("new_style_leaves");
@ -613,14 +682,15 @@ public:
bool enable_bumpmapping = g_settings->getBool("enable_bumpmapping");
bool enable_parallax_occlusion = g_settings->getBool("enable_parallax_occlusion");
for(u32 i=0; i<m_content_features.size(); i++)
{
bool use_normal_texture = enable_shaders &&
(enable_bumpmapping || enable_parallax_occlusion);
for (u32 i = 0; i < m_content_features.size(); i++) {
ContentFeatures *f = &m_content_features[i];
// Figure out the actual tiles to use
TileDef tiledef[6];
for(u32 j = 0; j < 6; j++)
{
for (u32 j = 0; j < 6; j++) {
tiledef[j] = f->tiledef[j];
if (tiledef[j].name == "")
tiledef[j].name = "unknown_node.png";
@ -629,8 +699,8 @@ public:
bool is_liquid = false;
bool is_water_surface = false;
u8 material_type;
material_type = (f->alpha == 255) ? TILE_MATERIAL_BASIC : TILE_MATERIAL_ALPHA;
u8 material_type = (f->alpha == 255) ?
TILE_MATERIAL_BASIC : TILE_MATERIAL_ALPHA;
switch (f->drawtype) {
default:
@ -670,11 +740,7 @@ public:
case NDT_GLASSLIKE_FRAMED_OPTIONAL:
f->solidness = 0;
f->visual_solidness = 1;
if (connected_glass) {
f->drawtype = NDT_GLASSLIKE_FRAMED;
} else {
f->drawtype = NDT_GLASSLIKE;
}
f->drawtype = connected_glass ? NDT_GLASSLIKE_FRAMED : NDT_GLASSLIKE;
break;
case NDT_ALLFACES:
f->solidness = 0;
@ -688,10 +754,9 @@ public:
} else {
f->drawtype = NDT_NORMAL;
f->solidness = 2;
for(u32 i=0; i<6; i++){
for (u32 i = 0; i < 6; i++)
tiledef[i].name += std::string("^[noalpha");
}
}
if (f->waving == 1)
material_type = TILE_MATERIAL_WAVING_LEAVES;
break;
@ -713,129 +778,101 @@ public:
}
if (is_liquid) {
material_type = (f->alpha == 255) ? TILE_MATERIAL_LIQUID_OPAQUE : TILE_MATERIAL_LIQUID_TRANSPARENT;
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);
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++) {
// Shader
f->tiles[j].shader_id = tile_shader[j];
// Texture
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;
// Material type
f->tiles[j].material_type = material_type;
// Material flags
f->tiles[j].material_flags = 0;
if(f->backface_culling)
f->tiles[j].material_flags |= MATERIAL_FLAG_BACKFACE_CULLING;
if(tiledef[j].animation.type == TAT_VERTICAL_FRAMES)
f->tiles[j].material_flags |= MATERIAL_FLAG_ANIMATION_VERTICAL_FRAMES;
// Animation parameters
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
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;
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(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<<tiledef[j].name<<"^[verticalframe:"<<frame_count<<":"<<i;
frame.texture = tsrc->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;
}
}
fillTileAttribs(tsrc, &f->tiles[j], &tiledef[j], tile_shader[j],
use_normal_texture, f->alpha, material_type);
}
// Special tiles (fill in f->special_tiles[])
for (u16 j = 0; j < CF_SPECIAL_COUNT; j++) {
// Shader
f->special_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_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;
// 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)
f->special_tiles[j].material_flags |= MATERIAL_FLAG_BACKFACE_CULLING;
if(f->tiledef_special[j].animation.type == TAT_VERTICAL_FRAMES)
f->special_tiles[j].material_flags |= MATERIAL_FLAG_ANIMATION_VERTICAL_FRAMES;
// Animation parameters
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
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;
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(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<<f->tiledef_special[j].name<<"^[verticalframe:"<<frame_count<<":"<<i;
frame.texture = tsrc->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;
}
}
fillTileAttribs(tsrc, &f->special_tiles[j], &f->tiledef_special[j],
tile_shader[j], use_normal_texture, f->alpha, material_type);
}
}
#endif
}
void serialize(std::ostream &os, u16 protocol_version)
#ifndef SERVER
void CNodeDefManager::fillTileAttribs(ITextureSource *tsrc, TileSpec *tile,
TileDef *tiledef, u32 shader_id, bool use_normal_texture,
u8 alpha, u8 material_type)
{
tile->shader_id = shader_id;
tile->texture = tsrc->getTexture(tiledef->name, &tile->texture_id);
tile->alpha = alpha;
tile->material_type = material_type;
// Normal texture
if (use_normal_texture)
tile->normal_texture = tsrc->getNormalTexture(tiledef->name);
// Material flags
tile->material_flags = 0;
if (tiledef->backface_culling)
tile->material_flags |= MATERIAL_FLAG_BACKFACE_CULLING;
if (tiledef->animation.type == TAT_VERTICAL_FRAMES)
tile->material_flags |= MATERIAL_FLAG_ANIMATION_VERTICAL_FRAMES;
// 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);
for (int i = 0; i < frame_count; i++) {
FrameSpec frame;
os.str("");
os << tiledef->name << "^[verticalframe:"
<< frame_count << ":" << i;
frame.texture = tsrc->getTexture(os.str(), &frame.texture_id);
if (tile->normal_texture)
frame.normal_texture = tsrc->getNormalTexture(os.str());
tile->frames[i] = frame;
}
}
}
#endif
void CNodeDefManager::serialize(std::ostream &os, u16 protocol_version)
{
writeU8(os, 1); // version
u16 count = 0;
std::ostringstream os2(std::ios::binary);
for(u32 i = 0; i < m_content_features.size(); i++)
{
for (u32 i = 0; i < m_content_features.size(); i++) {
if (i == CONTENT_IGNORE || i == CONTENT_AIR
|| i == CONTENT_UNKNOWN)
continue;
@ -855,7 +892,9 @@ public:
writeU16(os, count);
os << serializeLongString(os2.str());
}
void deSerialize(std::istream &is)
void CNodeDefManager::deSerialize(std::istream &is)
{
clear();
int version = readU8(is);
@ -873,24 +912,22 @@ public:
f.deSerialize(wrapper_is);
// Check error conditions
if(i == CONTENT_IGNORE || i == CONTENT_AIR
|| i == CONTENT_UNKNOWN){
if (i == CONTENT_IGNORE || i == CONTENT_AIR || i == CONTENT_UNKNOWN) {
infostream << "NodeDefManager::deSerialize(): WARNING: "
<<"not changing builtin node "<<i
<<std::endl;
"not changing builtin node " << i << std::endl;
continue;
}
if (f.name == "") {
infostream << "NodeDefManager::deSerialize(): WARNING: "
<<"received empty name"<<std::endl;
"received empty name" << std::endl;
continue;
}
// Ignore aliases
u16 existing_id;
bool found = m_name_id_mapping.getId(f.name, existing_id); // ignore aliases
if(found && i != existing_id){
if (m_name_id_mapping.getId(f.name, existing_id) && i != existing_id) {
infostream << "NodeDefManager::deSerialize(): WARNING: "
<<"already defined with different ID: "
<<f.name<<std::endl;
"already defined with different ID: " << f.name << std::endl;
continue;
}
@ -902,38 +939,22 @@ public:
verbosestream << "deserialized " << f.name << std::endl;
}
}
private:
void addNameIdMapping(content_t i, std::string name)
void CNodeDefManager::addNameIdMapping(content_t i, std::string name)
{
m_name_id_mapping.set(i, name);
m_name_id_mapping_with_aliases.insert(std::make_pair(name, i));
}
private:
// Features indexed by id
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
// item aliases too. Updated by updateAliases()
// Note: Not serialized.
std::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;
// Next possibly free id
content_t m_next_id;
};
IWritableNodeDefManager *createNodeDefManager()
{
return new CNodeDefManager();
}
/*
Serialization of old ContentFeatures formats
*/
//// Serialization of old ContentFeatures formats
void ContentFeatures::serializeOld(std::ostream &os, u16 protocol_version)
{
if (protocol_version == 13)
@ -953,9 +974,8 @@ void ContentFeatures::serializeOld(std::ostream &os, u16 protocol_version)
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++){
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());
@ -1002,9 +1022,8 @@ void ContentFeatures::serializeOld(std::ostream &os, u16 protocol_version)
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++){
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());
@ -1040,9 +1059,11 @@ void ContentFeatures::serializeOld(std::ostream &os, u16 protocol_version)
writeU8(os, leveled);
writeU8(os, liquid_range);
} else
throw SerializationError("ContentFeatures::serialize(): Unsupported version requested");
throw SerializationError("ContentFeatures::serialize(): "
"Unsupported version requested");
}
void ContentFeatures::deSerializeOld(std::istream &is, int version)
{
if (version == 5) // In PROTOCOL_VERSION 13
@ -1148,6 +1169,7 @@ void ContentFeatures::deSerializeOld(std::istream &is, int version)
drowning = readU8(is);
leveled = readU8(is);
liquid_range = readU8(is);
} else
} else {
throw SerializationError("unsupported ContentFeatures version");
}
}