Improve glass
[oweals/minetest.git] / src / nodedef.cpp
index 74d825362e51093a9cbd3c2c4e6d9f16e7a16b85..c86a3aefcb8528071f6158a47a8a6aa4b942f86b 100644 (file)
@@ -25,54 +25,237 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "tile.h"
 #endif
 #include "log.h"
+#include "settings.h"
+
+void NodeBox::serialize(std::ostream &os)
+{
+       writeU8(os, 0); // version
+       writeU8(os, type);
+       writeV3F1000(os, fixed.MinEdge);
+       writeV3F1000(os, fixed.MaxEdge);
+       writeV3F1000(os, wall_top.MinEdge);
+       writeV3F1000(os, wall_top.MaxEdge);
+       writeV3F1000(os, wall_bottom.MinEdge);
+       writeV3F1000(os, wall_bottom.MaxEdge);
+       writeV3F1000(os, wall_side.MinEdge);
+       writeV3F1000(os, wall_side.MaxEdge);
+}
+
+void NodeBox::deSerialize(std::istream &is)
+{
+       int version = readU8(is);
+       if(version != 0)
+               throw SerializationError("unsupported NodeBox version");
+       type = (enum NodeBoxType)readU8(is);
+       fixed.MinEdge = readV3F1000(is);
+       fixed.MaxEdge = readV3F1000(is);
+       wall_top.MinEdge = readV3F1000(is);
+       wall_top.MaxEdge = readV3F1000(is);
+       wall_bottom.MinEdge = readV3F1000(is);
+       wall_bottom.MaxEdge = readV3F1000(is);
+       wall_side.MinEdge = readV3F1000(is);
+       wall_side.MaxEdge = readV3F1000(is);
+}
+
+void MaterialSpec::serialize(std::ostream &os)
+{
+       os<<serializeString(tname);
+       writeU8(os, backface_culling);
+}
+
+void MaterialSpec::deSerialize(std::istream &is)
+{
+       tname = deSerializeString(is);
+       backface_culling = readU8(is);
+}
+
+ContentFeatures::ContentFeatures()
+{
+       reset();
+}
 
 ContentFeatures::~ContentFeatures()
 {
        delete initial_metadata;
 #ifndef SERVER
-       delete special_material;
-       delete special_atlas;
+       for(u16 j=0; j<CF_SPECIAL_COUNT; j++){
+               delete special_materials[j];
+               delete special_aps[j];
+       }
 #endif
 }
 
-#ifndef SERVER
-void ContentFeatures::setTexture(ITextureSource *tsrc,
-               u16 i, std::string name, u8 alpha)
+void ContentFeatures::reset()
 {
-       used_texturenames.insert(name);
+       /*
+               Cached stuff
+       */
+#ifndef SERVER
+       inventory_texture = NULL;
        
-       if(tsrc)
-       {
-               tiles[i].texture = tsrc->getTexture(name);
+       for(u16 j=0; j<CF_SPECIAL_COUNT; j++){
+               special_materials[j] = NULL;
+               special_aps[j] = NULL;
        }
-       
-       if(alpha != 255)
-       {
-               tiles[i].alpha = alpha;
-               tiles[i].material_type = MATERIAL_ALPHA_VERTEX;
+       solidness = 2;
+       visual_solidness = 0;
+       backface_culling = true;
+#endif
+       used_texturenames.clear();
+       modified = true; // NodeDefManager explicitly sets to false
+       /*
+               Actual data
+       */
+       drawtype = NDT_NORMAL;
+       visual_scale = 1.0;
+       for(u32 i=0; i<6; i++)
+               tname_tiles[i] = "";
+       for(u16 j=0; j<CF_SPECIAL_COUNT; j++)
+               mspec_special[j] = MaterialSpec();
+       tname_inventory = "";
+       alpha = 255;
+       post_effect_color = video::SColor(0, 0, 0, 0);
+       param_type = CPT_NONE;
+       is_ground_content = false;
+       light_propagates = false;
+       sunlight_propagates = false;
+       walkable = true;
+       pointable = true;
+       diggable = true;
+       climbable = false;
+       buildable_to = false;
+       wall_mounted = false;
+       air_equivalent = false;
+       often_contains_mineral = false;
+       dug_item = "";
+       initial_metadata = NULL;
+       liquid_type = LIQUID_NONE;
+       liquid_alternative_flowing = CONTENT_IGNORE;
+       liquid_alternative_source = CONTENT_IGNORE;
+       liquid_viscosity = 0;
+       light_source = 0;
+       damage_per_second = 0;
+       selection_box = NodeBox();
+       material = MaterialProperties();
+}
+
+void ContentFeatures::serialize(std::ostream &os)
+{
+       writeU8(os, 0); // version
+       writeU8(os, drawtype);
+       writeF1000(os, visual_scale);
+       writeU8(os, 6);
+       for(u32 i=0; i<6; i++)
+               os<<serializeString(tname_tiles[i]);
+       os<<serializeString(tname_inventory);
+       writeU8(os, CF_SPECIAL_COUNT);
+       for(u32 i=0; i<CF_SPECIAL_COUNT; i++){
+               mspec_special[i].serialize(os);
+       }
+       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, 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);
+       writeU8(os, wall_mounted);
+       writeU8(os, air_equivalent);
+       writeU8(os, often_contains_mineral);
+       os<<serializeString(dug_item);
+       os<<serializeString(extra_dug_item);
+       writeS32(os, extra_dug_item_rarity);
+       if(initial_metadata){
+               writeU8(os, true);
+               initial_metadata->serialize(os);
+       } else {
+               writeU8(os, false);
+       }
+       writeU8(os, liquid_type);
+       writeU16(os, liquid_alternative_flowing);
+       writeU16(os, liquid_alternative_source);
+       writeU8(os, liquid_viscosity);
+       writeU8(os, light_source);
+       writeU32(os, damage_per_second);
+       selection_box.serialize(os);
+       material.serialize(os);
+}
+
+void ContentFeatures::deSerialize(std::istream &is, IGameDef *gamedef)
+{
+       int version = readU8(is);
+       if(version != 0)
+               throw SerializationError("unsupported ContentFeatures version");
+       drawtype = (enum NodeDrawType)readU8(is);
+       visual_scale = readF1000(is);
+       if(readU8(is) != 6)
+               throw SerializationError("unsupported tile count");
+       for(u32 i=0; i<6; i++)
+               tname_tiles[i] = deSerializeString(is);
+       tname_inventory = deSerializeString(is);
+       if(readU8(is) != CF_SPECIAL_COUNT)
+               throw SerializationError("unsupported CF_SPECIAL_COUNT");
+       for(u32 i=0; i<CF_SPECIAL_COUNT; i++){
+               mspec_special[i].deSerialize(is);
        }
+       alpha = readU8(is);
+       post_effect_color.setAlpha(readU8(is));
+       post_effect_color.setRed(readU8(is));
+       post_effect_color.setGreen(readU8(is));
+       post_effect_color.setBlue(readU8(is));
+       param_type = (enum ContentParamType)readU8(is);
+       is_ground_content = readU8(is);
+       light_propagates = readU8(is);
+       sunlight_propagates = readU8(is);
+       walkable = readU8(is);
+       pointable = readU8(is);
+       diggable = readU8(is);
+       climbable = readU8(is);
+       buildable_to = readU8(is);
+       wall_mounted = readU8(is);
+       air_equivalent = readU8(is);
+       often_contains_mineral = readU8(is);
+       dug_item = deSerializeString(is);
+       extra_dug_item = deSerializeString(is);
+       extra_dug_item_rarity = readS32(is);
+       if(readU8(is)){
+               initial_metadata = NodeMetadata::deSerialize(is, gamedef);
+       } else {
+               initial_metadata = NULL;
+       }
+       liquid_type = (enum LiquidType)readU8(is);
+       liquid_alternative_flowing = readU16(is);
+       liquid_alternative_source = readU16(is);
+       liquid_viscosity = readU8(is);
+       light_source = readU8(is);
+       damage_per_second = readU32(is);
+       selection_box.deSerialize(is);
+       material.deSerialize(is);
+}
 
-       if(inventory_texture == NULL)
-               setInventoryTexture(name, tsrc);
+void ContentFeatures::setTexture(u16 i, std::string name)
+{
+       used_texturenames.insert(name);
+       tname_tiles[i] = name;
+       if(tname_inventory == "")
+               tname_inventory = name;
 }
 
-void ContentFeatures::setInventoryTexture(std::string imgname,
-               ITextureSource *tsrc)
+void ContentFeatures::setInventoryTexture(std::string imgname)
 {
-       if(tsrc == NULL)
-               return;
-       
-       imgname += "^[forcesingle";
-       
-       inventory_texture = tsrc->getTextureRaw(imgname);
+       tname_inventory = imgname + "^[forcesingle";
 }
 
 void ContentFeatures::setInventoryTextureCube(std::string top,
-               std::string left, std::string right, ITextureSource *tsrc)
+               std::string left, std::string right)
 {
-       if(tsrc == NULL)
-               return;
-       
        str_replace_char(top, '^', '&');
        str_replace_char(left, '^', '&');
        str_replace_char(right, '^', '&');
@@ -84,59 +267,41 @@ void ContentFeatures::setInventoryTextureCube(std::string top,
        imgname_full += left;
        imgname_full += "{";
        imgname_full += right;
-       inventory_texture = tsrc->getTextureRaw(imgname_full);
+       tname_inventory = imgname_full;
 }
-#endif
 
 class CNodeDefManager: public IWritableNodeDefManager
 {
 public:
-       CNodeDefManager(ITextureSource *tsrc)
+       void clear()
        {
-#ifndef SERVER
-               /*
-                       Set initial material type to same in all tiles, so that the
-                       same material can be used in more stuff.
-                       This is set according to the leaves because they are the only
-                       differing material to which all materials can be changed to
-                       get this optimization.
-               */
-               u8 initial_material_type = MATERIAL_ALPHA_SIMPLE;
-               /*if(new_style_leaves)
-                       initial_material_type = MATERIAL_ALPHA_SIMPLE;
-               else
-                       initial_material_type = MATERIAL_ALPHA_NONE;*/
                for(u16 i=0; i<=MAX_CONTENT; i++)
                {
                        ContentFeatures *f = &m_content_features[i];
-                       // Re-initialize
-                       f->reset();
-
-                       for(u16 j=0; j<6; j++)
-                               f->tiles[j].material_type = initial_material_type;
-               }
-#endif
-               /*
-                       Initially set every block to be shown as an unknown block.
-                       Don't touch CONTENT_IGNORE or CONTENT_AIR.
-               */
-               for(u16 i=0; i<=MAX_CONTENT; i++)
-               {
-                       if(i == CONTENT_IGNORE || i == CONTENT_AIR)
+                       f->reset(); // Reset to defaults
+                       f->modified = false; // Not changed from default
+                       if(i == CONTENT_IGNORE || i == CONTENT_AIR){
+                               f->drawtype = NDT_AIRLIKE;
                                continue;
-                       ContentFeatures *f = &m_content_features[i];
-                       f->setAllTextures(tsrc, "unknown_block.png");
-                       f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
+                       }
+                       f->setAllTextures("unknown_block.png");
+                       //f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
                }
+#ifndef SERVER
                // Make CONTENT_IGNORE to not block the view when occlusion culling
                m_content_features[CONTENT_IGNORE].solidness = 0;
+#endif
+       }
+       CNodeDefManager()
+       {
+               clear();
        }
        virtual ~CNodeDefManager()
        {
        }
        virtual IWritableNodeDefManager* clone()
        {
-               CNodeDefManager *mgr = new CNodeDefManager(NULL);
+               CNodeDefManager *mgr = new CNodeDefManager();
                for(u16 i=0; i<=MAX_CONTENT; i++)
                {
                        mgr->set(i, get(i));
@@ -162,14 +327,167 @@ public:
        virtual ContentFeatures* getModifiable(content_t c)
        {
                assert(c <= MAX_CONTENT);
+               m_content_features[c].modified = true; // Assume it is modified
                return &m_content_features[c];
        }
+       virtual void updateTextures(ITextureSource *tsrc)
+       {
+#ifndef SERVER
+               infostream<<"CNodeDefManager::updateTextures(): Updating "
+                               <<"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");
+               bool opaque_water = g_settings->getBool("opaque_water");
+               
+               for(u16 i=0; i<=MAX_CONTENT; i++)
+               {
+                       ContentFeatures *f = &m_content_features[i];
+
+                       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;
+                               if(new_style_water){
+                                       f->solidness = 0;
+                               } else {
+                                       f->solidness = 1;
+                                       if(f->alpha == 255)
+                                               f->solidness = 2;
+                               }
+                               break;
+                       case NDT_FLOWINGLIQUID:
+                               assert(f->liquid_type == LIQUID_FLOWING);
+                               f->solidness = 0;
+                               if(opaque_water)
+                                       f->alpha = 255;
+                               break;
+                       case NDT_GLASSLIKE:
+                               f->solidness = 0;
+                               f->visual_solidness = 1;
+                               break;
+                       case NDT_ALLFACES:
+                               f->solidness = 0;
+                               f->visual_solidness = 1;
+                               break;
+                       case NDT_ALLFACES_OPTIONAL:
+                               if(new_style_leaves){
+                                       f->drawtype = NDT_ALLFACES;
+                                       f->solidness = 0;
+                                       f->visual_solidness = 1;
+                               } else {
+                                       f->drawtype = NDT_NORMAL;
+                                       f->solidness = 1;
+                                       for(u32 i=0; i<6; i++){
+                                               f->tname_tiles[i] = std::string("[noalpha:")
+                                                               + f->tname_tiles[i];
+                                       }
+                               }
+                               break;
+                       case NDT_TORCHLIKE:
+                       case NDT_SIGNLIKE:
+                       case NDT_PLANTLIKE:
+                       case NDT_FENCELIKE:
+                       case NDT_RAILLIKE:
+                               f->solidness = 0;
+                               break;
+                       }
+
+                       // Inventory texture
+                       if(f->tname_inventory != "")
+                               f->inventory_texture = tsrc->getTextureRaw(f->tname_inventory);
+                       else
+                               f->inventory_texture = NULL;
+                       // Tile textures
+                       for(u16 j=0; j<6; j++){
+                               if(f->tname_tiles[j] == "")
+                                       continue;
+                               f->tiles[j].texture = tsrc->getTexture(f->tname_tiles[j]);
+                               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;
+                               if(f->backface_culling)
+                                       f->tiles[j].material_flags |= MATERIAL_FLAG_BACKFACE_CULLING;
+                               else
+                                       f->tiles[j].material_flags &= ~MATERIAL_FLAG_BACKFACE_CULLING;
+                       }
+                       // Special textures
+                       for(u16 j=0; j<CF_SPECIAL_COUNT; j++){
+                               // Remove all stuff
+                               if(f->special_aps[j]){
+                                       delete f->special_aps[j];
+                                       f->special_aps[j] = NULL;
+                               }
+                               if(f->special_materials[j]){
+                                       delete f->special_materials[j];
+                                       f->special_materials[j] = NULL;
+                               }
+                               // Skip if should not exist
+                               if(f->mspec_special[j].tname == "")
+                                       continue;
+                               // Create all stuff
+                               f->special_aps[j] = new AtlasPointer(
+                                               tsrc->getTexture(f->mspec_special[j].tname));
+                               f->special_materials[j] = new video::SMaterial;
+                               f->special_materials[j]->setFlag(video::EMF_LIGHTING, false);
+                               f->special_materials[j]->setFlag(video::EMF_BACK_FACE_CULLING,
+                                               f->mspec_special[j].backface_culling);
+                               f->special_materials[j]->setFlag(video::EMF_BILINEAR_FILTER, false);
+                               f->special_materials[j]->setFlag(video::EMF_FOG_ENABLE, true);
+                               f->special_materials[j]->setTexture(0, f->special_aps[j]->atlas);
+                       }
+               }
+#endif
+       }
+       void serialize(std::ostream &os)
+       {
+               u16 count = 0;
+               std::ostringstream tmp_os(std::ios::binary);
+               for(u16 i=0; i<=MAX_CONTENT; i++)
+               {
+                       ContentFeatures *f = &m_content_features[i];
+                       if(!f->modified)
+                               continue;
+                       writeU16(tmp_os, i);
+                       f->serialize(tmp_os);
+                       count++;
+               }
+               writeU16(os, count);
+               os<<serializeLongString(tmp_os.str());
+       }
+       void deSerialize(std::istream &is, IGameDef *gamedef)
+       {
+               clear();
+               u16 count = readU16(is);
+               std::istringstream tmp_is(deSerializeLongString(is), std::ios::binary);
+               for(u16 n=0; n<count; n++){
+                       u16 i = readU16(tmp_is);
+                       if(i > MAX_CONTENT){
+                               errorstream<<"ContentFeatures::deSerialize(): "
+                                               <<"Too large content id: "<<i<<std::endl;
+                               continue;
+                       }
+                       ContentFeatures *f = &m_content_features[i];
+                       f->deSerialize(tmp_is, gamedef);
+                       f->modified = true;
+               }
+       }
 private:
        ContentFeatures m_content_features[MAX_CONTENT+1];
 };
 
-IWritableNodeDefManager* createNodeDefManager(ITextureSource *tsrc)
+IWritableNodeDefManager* createNodeDefManager()
 {
-       return new CNodeDefManager(tsrc);
+       return new CNodeDefManager();
 }