summaryrefslogtreecommitdiffhomepage
path: root/draw
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2023-03-26 18:19:46 +0200
committerStanislaw Halik <sthalik@misaki.pl>2023-03-26 18:28:37 +0200
commit05dee8a02773141cbe6cbfb1c0557018210ced05 (patch)
tree25e1e9fd68a05912c146ccc45ceb07c3d6f99ae4 /draw
parent50273c040e605b6dbee3389c0c2adce2b8d85701 (diff)
a
Diffstat (limited to 'draw')
-rw-r--r--draw/anim.cpp1
-rw-r--r--draw/anim.hpp2
-rw-r--r--draw/floor.cpp1
3 files changed, 3 insertions, 1 deletions
diff --git a/draw/anim.cpp b/draw/anim.cpp
index 84afbfe3..1c333ca1 100644
--- a/draw/anim.cpp
+++ b/draw/anim.cpp
@@ -3,6 +3,7 @@
#include "chunk.hpp"
#include "shaders/tile.hpp"
#include "main/clickable.hpp"
+#include "chunk-scenery.hpp"
#include <Corrade/Containers/Optional.h>
#include <Magnum/GL/MeshView.h>
#include <Magnum/GL/Texture.h>
diff --git a/draw/anim.hpp b/draw/anim.hpp
index 9f279b38..8df5aebe 100644
--- a/draw/anim.hpp
+++ b/draw/anim.hpp
@@ -41,7 +41,7 @@ private:
};
using quad_data = std::array<vertex_data, 4>;
- Array<typename chunk::draw_entity> _draw_array;
+ Array<chunk::draw_entity> _draw_array;
GL::Mesh _mesh;
GL::Buffer _vertex_buffer{quad_data{}, Magnum::GL::BufferUsage::DynamicDraw},
_index_buffer{make_index_array()};
diff --git a/draw/floor.cpp b/draw/floor.cpp
index 6c5e1266..74d4a54d 100644
--- a/draw/floor.cpp
+++ b/draw/floor.cpp
@@ -3,6 +3,7 @@
#include "tile.hpp"
#include "chunk.hpp"
#include "tile-atlas.hpp"
+#include "compat/assert.hpp"
#include <Magnum/GL/MeshView.h>
namespace floormat {