From d19332e515f41167bc4dab82b48d1a9e601b48d9 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 13 Nov 2022 08:20:43 +0100 Subject: draw: fix drawing empty tiles on unsorted mesh --- draw/floor.cpp | 3 +-- draw/wall.cpp | 6 +----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/draw/floor.cpp b/draw/floor.cpp index 635b8d8f..1a5c908e 100644 --- a/draw/floor.cpp +++ b/draw/floor.cpp @@ -39,8 +39,7 @@ void floor_mesh::draw(tile_shader& shader, chunk& c) }; for (std::size_t k = 0; k < TILE_COUNT; k++) - if (auto* atlas = c.ground_atlas_at(ids[k])) - do_draw(k, atlas); + do_draw(k, c.ground_atlas_at(ids[k])); do_draw(TILE_COUNT, nullptr); #ifdef FM_DEBUG_DRAW_COUNT diff --git a/draw/wall.cpp b/draw/wall.cpp index c65b19fc..35f83137 100644 --- a/draw/wall.cpp +++ b/draw/wall.cpp @@ -41,11 +41,7 @@ void wall_mesh::draw(tile_shader& shader, chunk& c) }; for (std::size_t k = 0; k < TILE_COUNT*2; k++) - { - const std::size_t i = ids[k]; - if (auto* atlas = c.wall_atlas_at(i)) - do_draw(k, atlas); - } + do_draw(k, c.wall_atlas_at(ids[k])); do_draw(TILE_COUNT*2, nullptr); #ifdef FM_DEBUG_DRAW_COUNT -- cgit v1.2.3