diff options
| -rw-r--r-- | src/camera-offset.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/camera-offset.cpp b/src/camera-offset.cpp index 2595d1d8..3087cf13 100644 --- a/src/camera-offset.cpp +++ b/src/camera-offset.cpp @@ -1,6 +1,7 @@ #include "camera-offset.hpp" #include "tile-defs.hpp" #include "shaders/tile-shader.hpp" +#include "compat/assert.hpp" #include <Magnum/Math/Vector2.h> namespace floormat { @@ -11,10 +12,11 @@ with_shifted_camera_offset::with_shifted_camera_offset(tile_shader& shader, shor _shader{shader}, _offset{shader.camera_offset()} { - const auto offset = tile_shader::project({float(x)*TILE_MAX_DIM*TILE_SIZE[0], - float(y)*TILE_MAX_DIM*TILE_SIZE[1], - 0}); - _shader.set_camera_offset(_offset + offset); + const auto offset = _offset + tile_shader::project({float(x)*TILE_MAX_DIM*TILE_SIZE[0], + float(y)*TILE_MAX_DIM*TILE_SIZE[1], + 0}); + _shader.set_camera_offset(offset); + ASSERT(std::abs(offset[0]) < 1 << 24 && std::abs(offset[1]) < 1 << 24); } with_shifted_camera_offset::~with_shifted_camera_offset() |