1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00

Add no_texture.png as fallback for unspecified textures

This commit is contained in:
Wuzzy 2021-10-20 19:50:16 +00:00 committed by GitHub
parent c82ec8b210
commit 86b44ecd82
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 68 additions and 23 deletions

View file

@ -796,8 +796,10 @@ void ContentFeatures::updateTextures(ITextureSource *tsrc, IShaderSource *shdsrc
TileDef tdef[6];
for (u32 j = 0; j < 6; j++) {
tdef[j] = tiledef[j];
if (tdef[j].name.empty())
tdef[j].name = "unknown_node.png";
if (tdef[j].name.empty()) {
tdef[j].name = "no_texture.png";
tdef[j].backface_culling = false;
}
}
// also the overlay tiles
TileDef tdef_overlay[6];
@ -805,8 +807,13 @@ void ContentFeatures::updateTextures(ITextureSource *tsrc, IShaderSource *shdsrc
tdef_overlay[j] = tiledef_overlay[j];
// also the special tiles
TileDef tdef_spec[6];
for (u32 j = 0; j < CF_SPECIAL_COUNT; j++)
for (u32 j = 0; j < CF_SPECIAL_COUNT; j++) {
tdef_spec[j] = tiledef_special[j];
if (tdef_spec[j].name.empty()) {
tdef_spec[j].name = "no_texture.png";
tdef_spec[j].backface_culling = false;
}
}
bool is_liquid = false;
@ -1052,6 +1059,10 @@ void NodeDefManager::clear()
{
ContentFeatures f;
f.name = "unknown";
TileDef unknownTile;
unknownTile.name = "unknown_node.png";
for (int t = 0; t < 6; t++)
f.tiledef[t] = unknownTile;
// Insert directly into containers
content_t c = CONTENT_UNKNOWN;
m_content_features[c] = f;