diff options
| -rw-r--r-- | src/content_mapblock.cpp | 4 | ||||
| -rw-r--r-- | src/nodedef.cpp | 53 | ||||
| -rw-r--r-- | src/nodedef.h | 8 |
3 files changed, 8 insertions, 57 deletions
diff --git a/src/content_mapblock.cpp b/src/content_mapblock.cpp index e0a9b60f9..368e6c611 100644 --- a/src/content_mapblock.cpp +++ b/src/content_mapblock.cpp @@ -234,6 +234,10 @@ void mapblock_mesh_generate_special(MeshMakeData *data, MapNode n = data->m_vmanip.getNodeNoEx(blockpos_nodes+p); + // Only solidness=0 stuff is drawn here + if(nodedef->get(n).solidness != 0) + continue; + /* Add torches to mesh */ diff --git a/src/nodedef.cpp b/src/nodedef.cpp index 6fa410cc2..045615fbb 100644 --- a/src/nodedef.cpp +++ b/src/nodedef.cpp @@ -37,59 +37,6 @@ ContentFeatures::~ContentFeatures() #endif } -#if 0 -void ContentFeatures::setTexture(ITextureSource *tsrc, - u16 i, std::string name, u8 alpha) -{ - used_texturenames.insert(name); - - if(tsrc) - { - tiles[i].texture = tsrc->getTexture(name); - } - - if(alpha != 255) - { - tiles[i].alpha = alpha; - tiles[i].material_type = MATERIAL_ALPHA_VERTEX; - } - - if(inventory_texture == NULL) - setInventoryTexture(name, tsrc); -} - -void ContentFeatures::setInventoryTexture(std::string imgname, - ITextureSource *tsrc) -{ - if(tsrc == NULL) - return; - - imgname += "^[forcesingle"; - - inventory_texture = tsrc->getTextureRaw(imgname); -} - -void ContentFeatures::setInventoryTextureCube(std::string top, - std::string left, std::string right, ITextureSource *tsrc) -{ - if(tsrc == NULL) - return; - - str_replace_char(top, '^', '&'); - str_replace_char(left, '^', '&'); - str_replace_char(right, '^', '&'); - - std::string imgname_full; - imgname_full += "[inventorycube{"; - imgname_full += top; - imgname_full += "{"; - imgname_full += left; - imgname_full += "{"; - imgname_full += right; - inventory_texture = tsrc->getTextureRaw(imgname_full); -} -#endif - void ContentFeatures::setTexture(u16 i, std::string name) { used_texturenames.insert(name); diff --git a/src/nodedef.h b/src/nodedef.h index f5662967b..e70295616 100644 --- a/src/nodedef.h +++ b/src/nodedef.h @@ -137,6 +137,8 @@ struct ContentFeatures MaterialSpec mspec_special[CF_SPECIAL_COUNT]; u8 alpha; bool backface_culling; + u8 solidness; // Used when choosing which face is drawn + u8 visual_solidness; // When solidness=0, this tells how it looks like // List of all block textures that have been used (value is dummy) // Used for texture atlas making. @@ -149,8 +151,6 @@ struct ContentFeatures bool is_ground_content; bool light_propagates; bool sunlight_propagates; - u8 solidness; // Used when choosing which face is drawn - u8 visual_solidness; // When solidness=0, this tells how it looks like // This is used for collision detection. // Also for general solidness queries. bool walkable; @@ -226,13 +226,13 @@ struct ContentFeatures tname_inventory = ""; alpha = 255; backface_culling = true; + solidness = 2; + visual_solidness = 0; used_texturenames.clear(); param_type = CPT_NONE; is_ground_content = false; light_propagates = false; sunlight_propagates = false; - solidness = 2; - visual_solidness = 0; walkable = true; pointable = true; diggable = true; |