From 7204fc84110b43bee15c5f5d037e4cc30786add1 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 17 Oct 2022 20:13:06 +0200 Subject: a --- src/camera-offset.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src') 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 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() -- cgit v1.2.3