diff options
Diffstat (limited to 'draw')
| -rw-r--r-- | draw/anim.cpp | 6 | ||||
| -rw-r--r-- | draw/anim.hpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/draw/anim.cpp b/draw/anim.cpp index c6632fa1..5c1f61a7 100644 --- a/draw/anim.cpp +++ b/draw/anim.cpp @@ -33,10 +33,10 @@ std::array<UnsignedShort, 6> anim_mesh::make_index_array() } void anim_mesh::add_clickable(tile_shader& shader, const Vector2i& win_size, - object* s_, const chunk::topo_sort_data& data, + object* sʹ, const chunk::topo_sort_data& data, Array<clickable>& list) { - const auto& s = *s_; + const auto& s = *sʹ; const auto& a = *s.atlas; const auto& g = a.group(s.r); const auto& f = a.frame(s.r, s.frame); @@ -49,7 +49,7 @@ void anim_mesh::add_clickable(tile_shader& shader, const Vector2i& win_size, .src = { f.offset, f.offset + f.size }, .dest = { offset, offset + Vector2i(f.size) }, .bitmask = a.bitmask(), - .e = s_, + .e = sʹ, .depth = s.ordinal() + (float)s.coord.z() * TILE_COUNT, .slope = data.slope, .bb_min = data.bb_min, .bb_max = data.bb_max, diff --git a/draw/anim.hpp b/draw/anim.hpp index a19af1e1..a9fd6011 100644 --- a/draw/anim.hpp +++ b/draw/anim.hpp @@ -30,7 +30,7 @@ struct anim_mesh 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, - object* s_, const chunk::topo_sort_data& data, + object* s, const chunk::topo_sort_data& data, Array<clickable>& list); private: |