From eb182694163d3abd750418b9ade85e563c5287bb Mon Sep 17 00:00:00 2001 From: MihailRis Date: Wed, 22 Nov 2023 15:18:11 +0300 Subject: [PATCH] notfound texture --- res/textures/blocks/notfound.png | Bin 0 -> 6820 bytes src/definitions.cpp | 1 - src/frontend/ContentGfxCache.cpp | 3 +++ 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 res/textures/blocks/notfound.png diff --git a/res/textures/blocks/notfound.png b/res/textures/blocks/notfound.png new file mode 100644 index 0000000000000000000000000000000000000000..d1e2db57c9639b41738e0a820f74dee4fa50505d GIT binary patch literal 6820 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 PgAypiB121p=Vt#03)h5L literal 0 HcmV?d00001 diff --git a/src/definitions.cpp b/src/definitions.cpp index 3b810ea8..ee7023c1 100644 --- a/src/definitions.cpp +++ b/src/definitions.cpp @@ -8,7 +8,6 @@ // All in-game definitions (blocks, items, etc..) void setup_definitions(ContentBuilder* builder) { - // TODO: automatic atlas generation instead of using texture indices Block* block = new Block("core:air", "air"); block->drawGroup = 1; block->lightPassing = true; diff --git a/src/frontend/ContentGfxCache.cpp b/src/frontend/ContentGfxCache.cpp index 2cf1affe..3e425510 100644 --- a/src/frontend/ContentGfxCache.cpp +++ b/src/frontend/ContentGfxCache.cpp @@ -20,6 +20,9 @@ ContentGfxCache::ContentGfxCache(const Content* content, Assets* assets) { string tex = def->textureFaces[side]; if (atlas->has(tex)) { sideregions[i * 6 + side] = atlas->get(tex); + } else { + if (atlas->has("notfound")) + sideregions[i * 6 + side] = atlas->get("notfound"); } } }