From 206868efc5eb8ffcc94c180a24720b3ed5b112d7 Mon Sep 17 00:00:00 2001 From: m Date: Sun, 23 Jul 2023 14:33:59 -0400 Subject: [PATCH 1/2] Working zoom --- src/engine/rendering/renderer.hpp | 1 + src/engine/rendering/sdl/sdlrenderer.cpp | 21 ++++++++++++++++----- src/engine/rendering/sdl/sdlrenderer.hpp | 3 ++- src/engine/utility/camera.cpp | 21 ++++++++++++++++++++- src/engine/utility/camera.hpp | 10 +++++++++- src/game/visualizer.cpp | 11 ++++++++--- 6 files changed, 56 insertions(+), 11 deletions(-) diff --git a/src/engine/rendering/renderer.hpp b/src/engine/rendering/renderer.hpp index 2325d1e..eab1501 100644 --- a/src/engine/rendering/renderer.hpp +++ b/src/engine/rendering/renderer.hpp @@ -62,6 +62,7 @@ public: virtual void draw_point(int x, int y, Color color) = 0; virtual void draw_text(std::optional details, std::string text,int x, int y)=0; virtual void draw_sprite(Sprite sprite, int x, int y)=0; + virtual void draw_sprite(Sprite sprite, int x, int y, float scale)=0; virtual TextRenderDetails get_default_text_render_details()=0; virtual ~Renderer() = default; diff --git a/src/engine/rendering/sdl/sdlrenderer.cpp b/src/engine/rendering/sdl/sdlrenderer.cpp index cf8c173..7f2dc5a 100644 --- a/src/engine/rendering/sdl/sdlrenderer.cpp +++ b/src/engine/rendering/sdl/sdlrenderer.cpp @@ -20,7 +20,7 @@ void SdlRenderer::draw_text(std::optional details, std::strin TextRenderDetails unpacked_details = details.value_or(this->renderer_params.default_font); std::shared_ptr font = this->font_manager->fetch_resource(SdlFontArgs(unpacked_details.size, unpacked_details.font_path)); std::shared_ptr texture = this->texture_manager->load_text_as_texture(text, font, unpacked_details.color); - render_texture(x, y, texture, nullptr); + render_texture(x, y, texture, nullptr, nullptr); } SdlRenderer::~SdlRenderer() { @@ -34,7 +34,7 @@ SdlRenderer::~SdlRenderer() { SDL_Quit(); } -void SdlRenderer::render_texture(int x, int y, const std::shared_ptr& texture, SDL_Rect *src) { +void SdlRenderer::render_texture(int x, int y, const std::shared_ptr& texture, SDL_Rect *src, SDL_Rect *dest) { int w, h; if(src == nullptr) { SDL_QueryTexture(texture.get(), nullptr, nullptr, &w, &h); @@ -43,11 +43,21 @@ void SdlRenderer::render_texture(int x, int y, const std::shared_ptrw; h = src->h; } - SDL_Rect rect = {x,y,w,h}; - SDL_RenderCopy(this->renderer.get(), texture.get(), src, &rect); + SDL_Rect destination_rect; + if(dest == nullptr) { + destination_rect = {x,y,w,h}; + } + else { + destination_rect = *dest; + } + SDL_RenderCopy(this->renderer.get(), texture.get(), src, &destination_rect); } void SdlRenderer::draw_sprite(Sprite sprite, int x, int y) { + this->draw_sprite(sprite, x, y, 1); +} + +void SdlRenderer::draw_sprite(Sprite sprite, int x, int y, float scale) { SpriteSheet *sprite_sheet = sprite.sprite_sheet; TextureManagerFetchArgs args = TextureManagerFetchArgs {sprite_sheet->path, sprite_sheet->color_key}; std::shared_ptr texture = this->texture_manager->fetch_resource(args); @@ -57,7 +67,8 @@ void SdlRenderer::draw_sprite(Sprite sprite, int x, int y) { int src_y = l*sprite_sheet->sprite_height; int src_x = (sprite_sheet->sprite_width * sprite.index) % w; auto source = SDL_Rect{src_x, src_y, sprite_sheet->sprite_width, sprite_sheet->sprite_height}; - render_texture(x, y, texture, &source); + auto dest = SDL_Rect {x, y, (int)std::ceil(sprite_sheet->sprite_width * scale), (int)std::ceil(sprite_sheet->sprite_height * scale)}; + render_texture(x, y, texture, &source, &dest); } SdlRenderer::SdlRenderer(RendererParams renderer_params) : renderer_params(std::move(renderer_params)) { diff --git a/src/engine/rendering/sdl/sdlrenderer.hpp b/src/engine/rendering/sdl/sdlrenderer.hpp index 065dc8d..3fda2f9 100644 --- a/src/engine/rendering/sdl/sdlrenderer.hpp +++ b/src/engine/rendering/sdl/sdlrenderer.hpp @@ -23,6 +23,7 @@ public: void flush() override; void draw_point(int x, int y, Color color) override; void draw_sprite(Sprite sprite, int x, int y) override; + void draw_sprite(Sprite sprite, int x, int y, float scale) override; TextRenderDetails get_default_text_render_details() override { return this->renderer_params.default_font; } @@ -32,7 +33,7 @@ private: std::shared_ptr renderer = nullptr; std::unique_ptr texture_manager = nullptr; std::unique_ptr font_manager = nullptr; - void render_texture(int x, int y, const std::shared_ptr& texture, SDL_Rect *src); + void render_texture(int x, int y, const std::shared_ptr& texture, SDL_Rect *src, SDL_Rect *dest); }; diff --git a/src/engine/utility/camera.cpp b/src/engine/utility/camera.cpp index 5824bcf..abf9251 100644 --- a/src/engine/utility/camera.cpp +++ b/src/engine/utility/camera.cpp @@ -25,7 +25,9 @@ void Camera::set_bounds(int max_x, int max_y) { this->cached_bounds = calculate_bounds(); } -Rectangle Camera::calculate_bounds() { +Rectangle Camera::calculate_bounds() const { + auto tiles_rendered_x = this->getTilesRenderedX(); + auto tiles_rendered_y = this->getTilesRenderedY(); 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); @@ -50,3 +52,20 @@ ranges::any_view Camera::get_range() { }); }) | ranges::views::join; } + +float Camera::getScale() const { + return scale; +} + +void Camera::setScale(float scale) { + this->scale = scale; + this->cached_bounds = calculate_bounds(); +} + +int Camera::getTilesRenderedX() const { + return (int)std::ceil(tiles_rendered_x / this->scale); +} + +int Camera::getTilesRenderedY() const { + return (int)std::ceil(tiles_rendered_y / this->scale); +} diff --git a/src/engine/utility/camera.hpp b/src/engine/utility/camera.hpp index 9e37712..8d66fa3 100644 --- a/src/engine/utility/camera.hpp +++ b/src/engine/utility/camera.hpp @@ -20,7 +20,15 @@ private: int max_x=0; int max_y=0; Rectangle cached_bounds=Rectangle(); - Rectangle calculate_bounds(); + Rectangle calculate_bounds() const; + float scale = 1; + [[nodiscard]] int getTilesRenderedX() const; + [[nodiscard]] int getTilesRenderedY() const; +public: + [[nodiscard]] float getScale() const; + + void setScale(float scale); + public: Rectangle get_bounds(); void move_camera(Point new_center); diff --git a/src/game/visualizer.cpp b/src/game/visualizer.cpp index 3ea130b..e2fd3fb 100644 --- a/src/game/visualizer.cpp +++ b/src/game/visualizer.cpp @@ -16,6 +16,8 @@ bool Visualizer::update(InputResult input) { case KEY_LEFT: x -= 1; break; case KEY_UP: y -= 1; break; case KEY_DOWN: y += 1; break; + case KEY_KP_PLUS: this->camera.setScale(this->camera.getScale() * 2); break; + case KEY_KP_MINUS: this->camera.setScale(this->camera.getScale() / 2); break; default: break; } if(input.keycode >= InputProcessorKeycode::KEY_1 && input.keycode <= InputProcessorKeycode::KEY_9) { @@ -36,6 +38,9 @@ bool Visualizer::update(InputResult input) { void Visualizer::render(Renderer *renderer) { SpriteSheet tiles = SpriteSheet{"sprites/map1.bmp", tile_width, tile_height}; SpriteSheet characters = SpriteSheet{"sprites/character.bmp", tile_width, tile_height, COLOR_BLACK}; + float scale = this->camera.getScale(); + int scaled_tile_width = (int)std::ceil(tile_width * scale); + int scaled_tile_height = (int)std::ceil(tile_height * scale); auto grass = Sprite{&tiles, 0}; auto wall = Sprite{&tiles, 497}; auto character = Sprite{&characters, this->sprite_index}; @@ -43,13 +48,13 @@ void Visualizer::render(Renderer *renderer) { auto wp = camera.camera_coords_to_screen_coords(p); int wx = wp.x, wy = wp.y; if(this->tile_map.get_tile(p.x, p.y) == floor_char) { - renderer->draw_sprite(grass, wx*tile_width, wy*tile_height); + renderer->draw_sprite(grass, wx*scaled_tile_width, wy*scaled_tile_height, scale); } else { - renderer->draw_sprite(wall, wx*tile_width, wy*tile_height); + renderer->draw_sprite(wall, wx*scaled_tile_width, wy*scaled_tile_height, scale); } if(p.x == x && p.y == y) { - renderer->draw_sprite(character, wx*tile_width, wy*tile_height); + renderer->draw_sprite(character, wx*scaled_tile_width, wy*scaled_tile_height, scale); } } -- 2.49.1 From ddfa3c1dc9b656698367b29d6071adcbc45267bb Mon Sep 17 00:00:00 2001 From: m Date: Sun, 23 Jul 2023 14:39:16 -0400 Subject: [PATCH 2/2] Zoom fully working and code cleaned up, scaling x and y now done in game rather than rendering, closes #19 --- src/engine/utility/camera.cpp | 12 ++++++------ src/engine/utility/camera.hpp | 8 ++++---- src/game/tilemap.cpp | 1 - src/game/visualizer.cpp | 8 +++++--- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/engine/utility/camera.cpp b/src/engine/utility/camera.cpp index abf9251..6e96d51 100644 --- a/src/engine/utility/camera.cpp +++ b/src/engine/utility/camera.cpp @@ -26,8 +26,8 @@ void Camera::set_bounds(int max_x, int max_y) { } Rectangle Camera::calculate_bounds() const { - auto tiles_rendered_x = this->getTilesRenderedX(); - auto tiles_rendered_y = this->getTilesRenderedY(); + auto tiles_rendered_x = this->get_tiles_rendered_x(); + auto tiles_rendered_y = this->get_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); @@ -53,19 +53,19 @@ ranges::any_view Camera::get_range() { }) | ranges::views::join; } -float Camera::getScale() const { +float Camera::get_scale() const { return scale; } -void Camera::setScale(float scale) { +void Camera::set_scale(float scale) { this->scale = scale; this->cached_bounds = calculate_bounds(); } -int Camera::getTilesRenderedX() const { +int Camera::get_tiles_rendered_x() const { return (int)std::ceil(tiles_rendered_x / this->scale); } -int Camera::getTilesRenderedY() const { +int Camera::get_tiles_rendered_y() const { return (int)std::ceil(tiles_rendered_y / this->scale); } diff --git a/src/engine/utility/camera.hpp b/src/engine/utility/camera.hpp index 8d66fa3..94ee300 100644 --- a/src/engine/utility/camera.hpp +++ b/src/engine/utility/camera.hpp @@ -22,12 +22,12 @@ private: Rectangle cached_bounds=Rectangle(); Rectangle calculate_bounds() const; float scale = 1; - [[nodiscard]] int getTilesRenderedX() const; - [[nodiscard]] int getTilesRenderedY() const; + [[nodiscard]] int get_tiles_rendered_x() const; + [[nodiscard]] int get_tiles_rendered_y() const; public: - [[nodiscard]] float getScale() const; + [[nodiscard]] float get_scale() const; - void setScale(float scale); + void set_scale(float scale); public: Rectangle get_bounds(); diff --git a/src/game/tilemap.cpp b/src/game/tilemap.cpp index 7518584..7be2a73 100644 --- a/src/game/tilemap.cpp +++ b/src/game/tilemap.cpp @@ -31,7 +31,6 @@ void TileMap::fill(bool wall) { draw_floor(p.x, p.y); } } - } bool TileMap::is_wall(int x, int y) { diff --git a/src/game/visualizer.cpp b/src/game/visualizer.cpp index 4994127..c661f59 100644 --- a/src/game/visualizer.cpp +++ b/src/game/visualizer.cpp @@ -16,8 +16,10 @@ bool Visualizer::update(InputResult input) { case KEY_LEFT: x -= 1; break; case KEY_UP: y -= 1; break; case KEY_DOWN: y += 1; break; - case KEY_KP_PLUS: this->camera.setScale(this->camera.getScale() * 2); break; - case KEY_KP_MINUS: this->camera.setScale(this->camera.getScale() / 2); break; + case KEY_KP_PLUS: + this->camera.set_scale(this->camera.get_scale() * 2); break; + case KEY_KP_MINUS: + this->camera.set_scale(this->camera.get_scale() / 2); break; default: break; } if(input.keycode >= InputProcessorKeycode::KEY_1 && input.keycode <= InputProcessorKeycode::KEY_9) { @@ -38,7 +40,7 @@ bool Visualizer::update(InputResult input) { void Visualizer::render(Renderer *renderer) { SpriteSheet tiles = SpriteSheet{"sprites/map1.bmp", tile_width, tile_height}; SpriteSheet characters = SpriteSheet{"sprites/character.bmp", tile_width, tile_height, COLOR_BLACK}; - float scale = this->camera.getScale(); + float scale = this->camera.get_scale(); int scaled_tile_width = (int)std::ceil(tile_width * scale); int scaled_tile_height = (int)std::ceil(tile_height * scale); auto grass = Sprite{&tiles, 0}; -- 2.49.1