Skip to content

Commit 86b44ec

Browse files
Wuzzy2Wuzzy2
authoredOct 20, 2021
Add no_texture.png as fallback for unspecified textures
·
5.11.05.5.0
1 parent c82ec8b commit 86b44ec

File tree

11 files changed

+68
-23
lines changed

11 files changed

+68
-23
lines changed
 

‎doc/texture_packs.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,10 @@ by texture packs. All existing fallback textures can be found in the directory
9090
* `minimap_mask_square.png`: mask used for the square minimap
9191
* `minimap_overlay_round.png`: overlay texture for the round minimap
9292
* `minimap_overlay_square.png`: overlay texture for the square minimap
93-
* `no_texture_airlike.png`: fallback inventory image for airlike nodes
9493
* `object_marker_red.png`: texture for players on the minimap
9594
* `player_marker.png`: texture for the own player on the square minimap
95+
* `no_texture_airlike.png`: fallback inventory image for airlike nodes
96+
* `no_texture.png`: fallback image for unspecified textures
9697

9798
* `player.png`: front texture of the 2D upright sprite player
9899
* `player_back.png`: back texture of the 2D upright sprite player

‎games/devtest/mods/broken/init.lua

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
-- Register stuff with empty definitions to test if Minetest fallback options
2+
-- for these things work properly.
3+
4+
-- The itemstrings are deliberately kept descriptive to keep them easy to
5+
-- recognize.
6+
7+
minetest.register_node("broken:node_with_empty_definition", {})
8+
minetest.register_tool("broken:tool_with_empty_definition", {})
9+
minetest.register_craftitem("broken:craftitem_with_empty_definition", {})
10+
11+
minetest.register_entity("broken:entity_with_empty_definition", {})

‎games/devtest/mods/broken/mod.conf

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
name = broken
2+
description = Register items and an entity with empty definitions to test fallback

‎src/client/content_cao.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,7 @@ void GenericCAO::addToScene(ITextureSource *tsrc, scene::ISceneManager *smgr)
647647
m_matrixnode, v2f(1, 1), v3f(0,0,0), -1);
648648
m_spritenode->grab();
649649
m_spritenode->setMaterialTexture(0,
650-
tsrc->getTextureForMesh("unknown_node.png"));
650+
tsrc->getTextureForMesh("no_texture.png"));
651651

652652
setSceneNodeMaterial(m_spritenode);
653653

@@ -1288,7 +1288,7 @@ void GenericCAO::updateTextures(std::string mod)
12881288

12891289
if (m_spritenode) {
12901290
if (m_prop.visual == "sprite") {
1291-
std::string texturestring = "unknown_node.png";
1291+
std::string texturestring = "no_texture.png";
12921292
if (!m_prop.textures.empty())
12931293
texturestring = m_prop.textures[0];
12941294
texturestring += mod;
@@ -1367,7 +1367,7 @@ void GenericCAO::updateTextures(std::string mod)
13671367
{
13681368
for (u32 i = 0; i < 6; ++i)
13691369
{
1370-
std::string texturestring = "unknown_node.png";
1370+
std::string texturestring = "no_texture.png";
13711371
if(m_prop.textures.size() > i)
13721372
texturestring = m_prop.textures[i];
13731373
texturestring += mod;
@@ -1400,7 +1400,7 @@ void GenericCAO::updateTextures(std::string mod)
14001400
} else if (m_prop.visual == "upright_sprite") {
14011401
scene::IMesh *mesh = m_meshnode->getMesh();
14021402
{
1403-
std::string tname = "unknown_object.png";
1403+
std::string tname = "no_texture.png";
14041404
if (!m_prop.textures.empty())
14051405
tname = m_prop.textures[0];
14061406
tname += mod;
@@ -1422,7 +1422,7 @@ void GenericCAO::updateTextures(std::string mod)
14221422
buf->getMaterial().setFlag(video::EMF_ANISOTROPIC_FILTER, use_anisotropic_filter);
14231423
}
14241424
{
1425-
std::string tname = "unknown_object.png";
1425+
std::string tname = "no_texture.png";
14261426
if (m_prop.textures.size() >= 2)
14271427
tname = m_prop.textures[1];
14281428
else if (!m_prop.textures.empty())

‎src/client/game.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -3331,9 +3331,8 @@ void Game::handlePointingAtNode(const PointedThing &pointed,
33313331
} else {
33323332
MapNode n = map.getNode(nodepos);
33333333

3334-
if (nodedef_manager->get(n).tiledef[0].name == "unknown_node.png") {
3335-
m_game_ui->setInfoText(L"Unknown node: " +
3336-
utf8_to_wide(nodedef_manager->get(n).name));
3334+
if (nodedef_manager->get(n).name == "unknown") {
3335+
m_game_ui->setInfoText(L"Unknown node");
33373336
}
33383337
}
33393338

‎src/client/hud.cpp

+18-7
Original file line numberDiff line numberDiff line change
@@ -1007,11 +1007,15 @@ void drawItemStack(
10071007

10081008
bool draw_overlay = false;
10091009

1010+
bool has_mesh = false;
1011+
ItemMesh *imesh;
1012+
10101013
// Render as mesh if animated or no inventory image
10111014
if ((enable_animations && rotation_kind < IT_ROT_NONE) || def.inventory_image.empty()) {
1012-
ItemMesh *imesh = client->idef()->getWieldMesh(def.name, client);
1013-
if (!imesh || !imesh->mesh)
1014-
return;
1015+
imesh = client->idef()->getWieldMesh(def.name, client);
1016+
has_mesh = imesh && imesh->mesh;
1017+
}
1018+
if (has_mesh) {
10151019
scene::IMesh *mesh = imesh->mesh;
10161020
driver->clearBuffers(video::ECBF_DEPTH);
10171021
s32 delta = 0;
@@ -1103,10 +1107,17 @@ void drawItemStack(
11031107
draw_overlay = def.type == ITEM_NODE && def.inventory_image.empty();
11041108
} else { // Otherwise just draw as 2D
11051109
video::ITexture *texture = client->idef()->getInventoryTexture(def.name, client);
1106-
if (!texture)
1107-
return;
1108-
video::SColor color =
1109-
client->idef()->getItemstackColor(item, client);
1110+
video::SColor color;
1111+
if (texture) {
1112+
color = client->idef()->getItemstackColor(item, client);
1113+
} else {
1114+
color = video::SColor(255, 255, 255, 255);
1115+
ITextureSource *tsrc = client->getTextureSource();
1116+
texture = tsrc->getTexture("no_texture.png");
1117+
if (!texture)
1118+
return;
1119+
}
1120+
11101121
const video::SColor colors[] = { color, color, color, color };
11111122

11121123
draw2DImageFilterScaled(driver, texture, rect,

‎src/client/wieldmesh.cpp

+8-3
Original file line numberDiff line numberDiff line change
@@ -458,9 +458,14 @@ void WieldMeshSceneNode::setItem(const ItemStack &item, Client *client, bool che
458458
material.setFlag(video::EMF_TRILINEAR_FILTER, m_trilinear_filter);
459459
}
460460
return;
461-
} else if (!def.inventory_image.empty()) {
462-
setExtruded(def.inventory_image, def.inventory_overlay, def.wield_scale,
463-
tsrc, 1);
461+
} else {
462+
if (!def.inventory_image.empty()) {
463+
setExtruded(def.inventory_image, def.inventory_overlay, def.wield_scale,
464+
tsrc, 1);
465+
} else {
466+
setExtruded("no_texture.png", "", def.wield_scale, tsrc, 1);
467+
}
468+
464469
m_colors.emplace_back();
465470
// overlay is white, if present
466471
m_colors.emplace_back(true, video::SColor(0xFFFFFFFF));

‎src/nodedef.cpp

+14-3
Original file line numberDiff line numberDiff line change
@@ -796,17 +796,24 @@ void ContentFeatures::updateTextures(ITextureSource *tsrc, IShaderSource *shdsrc
796796
TileDef tdef[6];
797797
for (u32 j = 0; j < 6; j++) {
798798
tdef[j] = tiledef[j];
799-
if (tdef[j].name.empty())
800-
tdef[j].name = "unknown_node.png";
799+
if (tdef[j].name.empty()) {
800+
tdef[j].name = "no_texture.png";
801+
tdef[j].backface_culling = false;
802+
}
801803
}
802804
// also the overlay tiles
803805
TileDef tdef_overlay[6];
804806
for (u32 j = 0; j < 6; j++)
805807
tdef_overlay[j] = tiledef_overlay[j];
806808
// also the special tiles
807809
TileDef tdef_spec[6];
808-
for (u32 j = 0; j < CF_SPECIAL_COUNT; j++)
810+
for (u32 j = 0; j < CF_SPECIAL_COUNT; j++) {
809811
tdef_spec[j] = tiledef_special[j];
812+
if (tdef_spec[j].name.empty()) {
813+
tdef_spec[j].name = "no_texture.png";
814+
tdef_spec[j].backface_culling = false;
815+
}
816+
}
810817

811818
bool is_liquid = false;
812819

@@ -1052,6 +1059,10 @@ void NodeDefManager::clear()
10521059
{
10531060
ContentFeatures f;
10541061
f.name = "unknown";
1062+
TileDef unknownTile;
1063+
unknownTile.name = "unknown_node.png";
1064+
for (int t = 0; t < 6; t++)
1065+
f.tiledef[t] = unknownTile;
10551066
// Insert directly into containers
10561067
content_t c = CONTENT_UNKNOWN;
10571068
m_content_features[c] = f;

‎src/object_properties.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ static const video::SColor NULL_BGCOLOR{0, 1, 1, 1};
2828

2929
ObjectProperties::ObjectProperties()
3030
{
31-
textures.emplace_back("unknown_object.png");
31+
textures.emplace_back("no_texture.png");
3232
colors.emplace_back(255,255,255,255);
3333
}
3434

‎src/server/luaentity_sao.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,12 @@ void LuaEntitySAO::addedToEnvironment(u32 dtime_s)
108108
m_env->getScriptIface()->
109109
luaentity_Activate(m_id, m_init_state, dtime_s);
110110
} else {
111+
// It's an unknown object
112+
// Use entitystring as infotext for debugging
111113
m_prop.infotext = m_init_name;
114+
// Set unknown object texture
115+
m_prop.textures.clear();
116+
m_prop.textures.emplace_back("unknown_object.png");
112117
}
113118
}
114119

‎textures/base/pack/no_texture.png

281 Bytes
Loading

0 commit comments

Comments
 (0)
Please sign in to comment.