summaryrefslogtreecommitdiffhomepage
path: root/draw
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2023-12-10 23:35:48 +0100
committerStanislaw Halik <sthalik@misaki.pl>2023-12-10 23:35:48 +0100
commit9aba8139b728d3b25f5763ddc134b09e5a2e1948 (patch)
tree37f18eee33ba98b79c5980961a0f12fbc9017b51 /draw
parent4e46a8101b2063457ac0c56770e58cd0bedf52ea (diff)
w
Diffstat (limited to 'draw')
-rw-r--r--draw/wall.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/draw/wall.cpp b/draw/wall.cpp
index 0a0a0b5a..870cf9b9 100644
--- a/draw/wall.cpp
+++ b/draw/wall.cpp
@@ -1,9 +1,9 @@
#include "wall.hpp"
-#include "src/tile-atlas.hpp"
+#include "src/wall-atlas.hpp"
#include "shaders/shader.hpp"
#include "src/chunk.hpp"
-#include "src/tile-image.hpp"
-#include "src/anim-atlas.hpp"
+//#include "src/tile-image.hpp"
+//#include "src/anim-atlas.hpp"
#include <Magnum/GL/Texture.h>
#include <Magnum/GL/MeshView.h>
@@ -16,12 +16,12 @@ wall_mesh::wall_mesh() = default;
void wall_mesh::draw(tile_shader& shader, chunk& c)
{
const auto [mesh_, ids, size] = c.ensure_wall_mesh();
- struct { tile_atlas* atlas = nullptr; size_t pos = 0; } last;
+ struct { wall_atlas* atlas = nullptr; size_t pos = 0; } last;
GL::MeshView mesh{mesh_};
[[maybe_unused]] size_t draw_count = 0;
fm_debug_assert(size_t(mesh_.count()) == size*quad_index_count);
- const auto do_draw = [&](size_t i, tile_atlas* atlas, uint32_t max_index) {
+ const auto do_draw = [&](size_t i, wall_atlas* atlas, uint32_t max_index) {
if (atlas == last.atlas)
return;
if (auto len = i - last.pos; last.atlas && len > 0)