luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-13 08:35:20 +02:00
Code Activity

framework for modifying textures

Browse Source
This commit is contained in:
Perttu Ahola
2010-12-20 22:03:49 +02:00
parent 6350c5d7a6
commit 123e8fdf53
19 changed files with 425 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/mapblock.cpp
View File

@@ -646,7 +646,9 @@ void MapBlock::updateMesh(u32 daynight_ratio)
if(f.tile.feature == TILEFEAT_NONE)
{
collector.append(g_tile_materials[f.tile.id], f.vertices, 4,
/*collector.append(g_tile_materials[f.tile.id], f.vertices, 4,
indices, 6);*/
collector.append(tile_material_get(f.tile.id), f.vertices, 4,
indices, 6);
}
else
@@ -748,16 +750,21 @@ void MapBlock::updateMesh(u32 daynight_ratio)
= video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
if(dir == v3s16(0,-1,0))
buf->getMaterial().setTexture(0,
g_texturecache.get("torch_on_floor"));
g_irrlicht->getTexture("../data/torch_on_floor.png"));
//g_texturecache.get("torch_on_floor"));
else if(dir == v3s16(0,1,0))
buf->getMaterial().setTexture(0,
g_texturecache.get("torch_on_ceiling"));
g_irrlicht->getTexture("../data/torch_on_ceiling.png"));
//g_texturecache.get("torch_on_ceiling"));
// For backwards compatibility
else if(dir == v3s16(0,0,0))
buf->getMaterial().setTexture(0,
g_texturecache.get("torch_on_floor"));
g_irrlicht->getTexture("../data/torch_on_floor.png"));
//g_texturecache.get("torch_on_floor"));
else
buf->getMaterial().setTexture(0, g_texturecache.get("torch"));
buf->getMaterial().setTexture(0,
g_irrlicht->getTexture("../data/torch.png"));
//buf->getMaterial().setTexture(0, g_texturecache.get("torch"));
// Add to mesh
mesh_new->addMeshBuffer(buf);