a

3 files changed, 6 insertions, 5 deletions

diff --git a/draw/anim.cpp b/draw/anim.cpp
index 0e913d08..1a02ad93 100644
--- a/draw/anim.cpp
+++ b/draw/anim.cpp
@@ -23,12 +23,12 @@ std::array<UnsignedShort, 6> anim_mesh::make_index_array()
     }};
 }
 
-void anim_mesh::draw(tile_shader& shader, const anim_atlas& atlas, const anim_frame& frame, local_coords xy)
+void anim_mesh::draw(tile_shader& shader, const anim_atlas& atlas, rotation r, std::size_t frame, local_coords xy)
 {
     const auto center = Vector3(xy.x, xy.y, 0.f) * TILE_SIZE;
-    const auto pos = atlas.frame_quad(center, frame);
+    const auto pos = atlas.frame_quad(center, r, frame);
     _positions_buffer.setSubData(0, pos);
-    const auto texcoords = atlas.texcoords_for_frame(frame);
+    const auto texcoords = atlas.texcoords_for_frame(r, frame);
     _vertex_buffer.setSubData(0, texcoords);
     shader.draw(_mesh);
 }
diff --git a/draw/anim.hpp b/draw/anim.hpp
index 85c73bcb..04fd92c8 100644
--- a/draw/anim.hpp
+++ b/draw/anim.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "local-coords.hpp"
+#include "scenery.hpp"
 #include <array>
 #include <Corrade/Containers/ArrayViewStl.h>
 #include <Magnum/Magnum.h>
@@ -20,7 +21,7 @@ using anim_frame = Serialize::anim_frame;
 struct anim_mesh final
 {
     anim_mesh();
-    void draw(tile_shader& shader, const anim_atlas& atlas, const anim_frame& frame, local_coords pos);
+    void draw(tile_shader& shader, const anim_atlas& atlas, rotation r, std::size_t frame, local_coords xy);
 
 private:
     struct vertex_data final { Vector2 texcoords; };
diff --git a/draw/wall.cpp b/draw/wall.cpp
index 353925f6..9bcfe9d4 100644
--- a/draw/wall.cpp
+++ b/draw/wall.cpp
@@ -79,7 +79,7 @@ void wall_mesh::draw(tile_shader& shader, chunk& c)
               f = 0;
           frame.frame = (scenery::frame_t)std::min(f, a.atlas->info().nframes - 1);
 #endif
-          _anim_mesh.draw(shader, *a.atlas, a.atlas->frame(a.frame.r, frame.frame), local_coords{idx});
+          _anim_mesh.draw(shader, *a.atlas, a.frame.r, frame.frame, local_coords{idx});
         }
     }
 }