diff options
Diffstat (limited to 'draw')
| -rw-r--r-- | draw/anim.cpp | 2 | ||||
| -rw-r--r-- | draw/anim.hpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/draw/anim.cpp b/draw/anim.cpp index 5f52f680..e83bf5e5 100644 --- a/draw/anim.cpp +++ b/draw/anim.cpp @@ -28,7 +28,7 @@ std::array<UnsignedShort, 6> anim_mesh::make_index_array() } void anim_mesh::add_clickable(tile_shader& shader, const Vector2i& win_size, - entity* s_, const chunk::topo_sort_data& data, + object* s_, const chunk::topo_sort_data& data, std::vector<clickable>& list) { const auto& s = *s_; diff --git a/draw/anim.hpp b/draw/anim.hpp index ebee14be..5951e11b 100644 --- a/draw/anim.hpp +++ b/draw/anim.hpp @@ -20,7 +20,7 @@ struct tile_shader; struct anim_atlas; struct chunk; struct clickable; -struct entity; +struct object; struct anim_mesh final { @@ -30,7 +30,7 @@ struct anim_mesh final void draw(tile_shader& shader, anim_atlas& atlas, rotation r, size_t frame, const Vector3& pos, float depth); void draw(tile_shader& shader, anim_atlas& atlas, rotation r, size_t frame, local_coords xy, Vector2b offset, float dpeth); static void add_clickable(tile_shader& shader, const Vector2i& win_size, - entity* s_, const chunk::topo_sort_data& data, + object* s_, const chunk::topo_sort_data& data, std::vector<clickable>& list); private: @@ -43,7 +43,7 @@ private: }; using quad_data = std::array<vertex_data, 4>; - Array<chunk::entity_draw_order> _draw_array; + Array<chunk::object_draw_order> _draw_array; Array<std::array<uint16_t, 6>> _draw_indexes; Array<std::array<chunk::vertex, 4>> _draw_vertexes; |