diff options
Diffstat (limited to 'draw/anim.hpp')
| -rw-r--r-- | draw/anim.hpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/draw/anim.hpp b/draw/anim.hpp index 4a3e4c40..b7d0a0cd 100644 --- a/draw/anim.hpp +++ b/draw/anim.hpp @@ -1,5 +1,6 @@ #pragma once #include "local-coords.hpp" +#include "rotation.hpp" #include <array> #include <Corrade/Containers/ArrayViewStl.h> #include <Magnum/Magnum.h> @@ -7,7 +8,6 @@ #include <Magnum/Math/Vector3.h> #include <Magnum/GL/Mesh.h> #include <Magnum/GL/Buffer.h> -#include "src/scenery.hpp" #include "main/clickable.hpp" //namespace floormat::Serialize { struct anim_frame; } @@ -18,7 +18,7 @@ struct tile_shader; struct anim_atlas; struct chunk; struct clickable; -struct scenery; +struct entity; struct anim_mesh final { @@ -27,9 +27,7 @@ struct anim_mesh final void draw(tile_shader& shader, chunk& c); void draw(tile_shader& shader, anim_atlas& atlas, rotation r, std::size_t frame, const Vector3& pos, float depth); void draw(tile_shader& shader, anim_atlas& atlas, rotation r, std::size_t frame, local_coords xy, Vector2b offset, float depth_offset); - static void add_clickable(tile_shader& shader, const Vector2i& win_size, - chunk_coords c, std::uint8_t i, const std::shared_ptr<anim_atlas>& atlas, scenery& s, - std::vector<clickable>& list); + static void add_clickable(tile_shader& shader, const Vector2i& win_size, const std::shared_ptr<entity>& s, std::vector<clickable>& list); private: struct vertex_data final { |