Illuna-Minetest
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean more

master
Perttu Ahola 2011-11-15 15:46:52 +02:00
parent ff34955a0d
commit 89e7bacd99
3 changed files with 8 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/content_mapblock.cpp
View File

@ -234,6 +234,10 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
MapNode n = data->m_vmanip.getNodeNoEx(blockpos_nodes+p); 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 Add torches to mesh
*/ */

53
src/nodedef.cpp
View File

@ -37,59 +37,6 @@ ContentFeatures::~ContentFeatures()
#endif #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) void ContentFeatures::setTexture(u16 i, std::string name)
{ {
used_texturenames.insert(name); used_texturenames.insert(name);

8
src/nodedef.h
View File

@ -137,6 +137,8 @@ struct ContentFeatures
MaterialSpec mspec_special[CF_SPECIAL_COUNT]; MaterialSpec mspec_special[CF_SPECIAL_COUNT];
u8 alpha; u8 alpha;
bool backface_culling; 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) // List of all block textures that have been used (value is dummy)
// Used for texture atlas making. // Used for texture atlas making.
@ -149,8 +151,6 @@ struct ContentFeatures
bool is_ground_content; bool is_ground_content;
bool light_propagates; bool light_propagates;
bool sunlight_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. // This is used for collision detection.
// Also for general solidness queries. // Also for general solidness queries.
bool walkable; bool walkable;
@ -226,13 +226,13 @@ struct ContentFeatures
tname_inventory = ""; tname_inventory = "";
alpha = 255; alpha = 255;
backface_culling = true; backface_culling = true;
solidness = 2;
visual_solidness = 0;
used_texturenames.clear(); used_texturenames.clear();
param_type = CPT_NONE; param_type = CPT_NONE;
is_ground_content = false; is_ground_content = false;
light_propagates = false; light_propagates = false;
sunlight_propagates = false; sunlight_propagates = false;
solidness = 2;
visual_solidness = 0;
walkable = true; walkable = true;
pointable = true; pointable = true;
diggable = true; diggable = true;