Wuzzy
/
BlockColor-Engine
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix special tile backspace culling

This commit is contained in:
kwolekr 2014-10-03 11:20:29 -04:00
parent b9cb196d49
commit 173beeee65
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/nodedef.cpp
View File

@ -394,8 +394,8 @@ private:
void addNameIdMapping(content_t i, std::string name); void addNameIdMapping(content_t i, std::string name);
#ifndef SERVER #ifndef SERVER
void fillTileAttribs(ITextureSource *tsrc, TileSpec *tile, TileDef *tiledef, void fillTileAttribs(ITextureSource *tsrc, TileSpec *tile, TileDef *tiledef,
u32 shader_id, bool use_normal_texture, u8 alpha, u8 material_type, u32 shader_id, bool use_normal_texture, bool backface_culling,
bool backface_culling); u8 alpha, u8 material_type);
#endif #endif
// Features indexed by id // Features indexed by id
@ -801,13 +801,14 @@ void CNodeDefManager::updateTextures(ITextureSource *tsrc, IShaderSource *shdsrc
// Tiles (fill in f->tiles[]) // Tiles (fill in f->tiles[])
for (u16 j = 0; j < 6; j++) { for (u16 j = 0; j < 6; j++) {
fillTileAttribs(tsrc, &f->tiles[j], &tiledef[j], tile_shader[j], fillTileAttribs(tsrc, &f->tiles[j], &tiledef[j], tile_shader[j],
use_normal_texture, f->alpha, material_type, f->backface_culling); use_normal_texture, f->backface_culling, f->alpha, material_type);
} }
// Special tiles (fill in f->special_tiles[]) // Special tiles (fill in f->special_tiles[])
for (u16 j = 0; j < CF_SPECIAL_COUNT; j++) { for (u16 j = 0; j < CF_SPECIAL_COUNT; j++) {
fillTileAttribs(tsrc, &f->special_tiles[j], &f->tiledef_special[j], fillTileAttribs(tsrc, &f->special_tiles[j], &f->tiledef_special[j],
tile_shader[j], use_normal_texture, f->alpha, material_type, f->backface_culling); tile_shader[j], use_normal_texture,
f->tiledef_special[j].backface_culling, f->alpha, material_type);
} }
} }
#endif #endif
@ -817,7 +818,7 @@ void CNodeDefManager::updateTextures(ITextureSource *tsrc, IShaderSource *shdsrc
#ifndef SERVER #ifndef SERVER
void CNodeDefManager::fillTileAttribs(ITextureSource *tsrc, TileSpec *tile, void CNodeDefManager::fillTileAttribs(ITextureSource *tsrc, TileSpec *tile,
TileDef *tiledef, u32 shader_id, bool use_normal_texture, TileDef *tiledef, u32 shader_id, bool use_normal_texture,
u8 alpha, u8 material_type, bool backface_culling) bool backface_culling, u8 alpha, u8 material_type)
{ {
tile->shader_id = shader_id; tile->shader_id = shader_id;
tile->texture = tsrc->getTexture(tiledef->name, &tile->texture_id); tile->texture = tsrc->getTexture(tiledef->name, &tile->texture_id);