From a328246a1e51e4cdc40d44a2dccedb753b78647d Mon Sep 17 00:00:00 2001 From: littlefoot Date: Sat, 11 Dec 2021 22:00:21 -0500 Subject: [PATCH] added support for smaller maps than the window --- src/game/camera.cpp | 4 ++-- src/game/visualizer.cpp | 7 ++----- src/game/visualizer.hpp | 8 ++++++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/game/camera.cpp b/src/game/camera.cpp index 8489441..0aeb6c3 100644 --- a/src/game/camera.cpp +++ b/src/game/camera.cpp @@ -5,8 +5,8 @@ #include "camera.hpp" Rectangle Camera::get_bounds() { - int minx = std::clamp(center.x-(tiles_rendered_x/2), 0, max_x - tiles_rendered_x); - int miny = std::clamp(center.y-(tiles_rendered_y/2), 0, max_y - tiles_rendered_y); + int minx = std::clamp(center.x-(tiles_rendered_x/2), 0, std::max(0,max_x - tiles_rendered_x)); + int miny = std::clamp(center.y-(tiles_rendered_y/2), 0, std::max(0,max_y - tiles_rendered_y)); int width = std::min(tiles_rendered_x, max_x-minx); int height = std::min(tiles_rendered_y, max_y-miny); return Rectangle{minx, miny, width, height}; diff --git a/src/game/visualizer.cpp b/src/game/visualizer.cpp index 1daf243..5492466 100644 --- a/src/game/visualizer.cpp +++ b/src/game/visualizer.cpp @@ -3,10 +3,7 @@ // #include "visualizer.hpp" -#define TILE_WIDTH 48 -#define TILE_HEIGHT 48 -#define WALL_CHAR '#' -#define FLOOR_CHAR '.' + bool Visualizer::update(InputResult input) { if(input.keycode == KEY_ESCAPE) { return true; @@ -46,7 +43,7 @@ void Visualizer::render(Renderer *renderer) { } } } - return; + return; // for breaking } void Visualizer::initialize(GameInitArgs args) { diff --git a/src/game/visualizer.hpp b/src/game/visualizer.hpp index 30d65d8..15433f5 100644 --- a/src/game/visualizer.hpp +++ b/src/game/visualizer.hpp @@ -8,8 +8,12 @@ #include #ifndef RLA_IIPP_VISUALIZER_HPP #define RLA_IIPP_VISUALIZER_HPP -#define MAP_SIZE_W 20 -#define MAP_SIZE_H 20 +#define MAP_SIZE_W 10 +#define MAP_SIZE_H 10 +#define TILE_WIDTH 48 +#define TILE_HEIGHT 48 +#define WALL_CHAR '#' +#define FLOOR_CHAR '.' class Visualizer : public Game { public: