forked from Mirrorlandia_minetest/minetest
Clean more
This commit is contained in:
parent
ff34955a0d
commit
89e7bacd99
@ -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
|
||||
*/
|
||||
|
@ -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);
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user