From e141be92f0aa9e75d4191931205da073a209a505 Mon Sep 17 00:00:00 2001 From: Reimar Date: Tue, 28 Oct 2025 13:48:39 +0100 Subject: [PATCH] Implement shooting arrows --- Makefile | 1 + src/Arrow.cpp | 23 +++++++++++++++++++++++ src/Arrow.hpp | 27 +++++++++++++++++++++++++++ src/Game.cpp | 20 +++++++++++++++++++- src/Game.hpp | 5 ++++- src/Map.cpp | 12 ++++++------ src/Map.hpp | 7 ++++--- 7 files changed, 84 insertions(+), 11 deletions(-) create mode 100644 src/Arrow.cpp create mode 100644 src/Arrow.hpp diff --git a/Makefile b/Makefile index d90daba..22cb556 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,7 @@ OBJS= \ build/src/main.o \ build/src/Map.o \ build/src/Game.o \ + build/src/Arrow.o \ build/src/Player.o \ build/src/GameRenderer.o diff --git a/src/Arrow.cpp b/src/Arrow.cpp new file mode 100644 index 0000000..9151c38 --- /dev/null +++ b/src/Arrow.cpp @@ -0,0 +1,23 @@ +#include "Arrow.hpp" + +Arrow::Arrow(GameRenderer *renderer, const double x, const double y, const double angle) + : renderer(renderer), x(x), y(y), angle(angle) +{ + sprite = renderer->load_sprite("./assets/arrow.png", 22, 8); +} + +void Arrow::draw(const double player_x, const double player_y) const +{ + renderer->draw_sprite_rotated( + sprite, + (int)(x - sprite.width / 2 + renderer->screen_width / 2 - player_x), + (int)(y - sprite.height / 2 + renderer->screen_height / 2 - player_y), + angle * 180 / M_PI + ); +} + +void Arrow::update() +{ + x += std::cos(angle) * speed; + y += std::sin(angle) * speed; +} diff --git a/src/Arrow.hpp b/src/Arrow.hpp new file mode 100644 index 0000000..73d03b2 --- /dev/null +++ b/src/Arrow.hpp @@ -0,0 +1,27 @@ +#ifndef ARROW_HPP +#define ARROW_HPP + +#include "GameRenderer.hpp" +#include "Sprite.hpp" + +class Arrow +{ +private: + GameRenderer *renderer; + Sprite sprite; + + double x; + double y; + double angle; + + static constexpr int speed = 5; + +public: + Arrow(GameRenderer *renderer, double x, double y, double angle); + + void draw(double offset_x, double offset_y) const; + + void update(); +}; + +#endif diff --git a/src/Game.cpp b/src/Game.cpp index 4d339cd..700d146 100644 --- a/src/Game.cpp +++ b/src/Game.cpp @@ -1,12 +1,18 @@ #include #include -#include #include "GameRenderer.hpp" #include "Player.hpp" #include "Game.hpp" using namespace std::literals::chrono_literals; +Game::~Game() +{ + for (const Arrow *arrow : arrows) { + delete arrow; + } +} + void Game::update(std::stop_token stop_token) { while (!stop_token.stop_requested()) { @@ -14,6 +20,10 @@ void Game::update(std::stop_token stop_token) player.update(); + for (Arrow *arrow : arrows) { + arrow->update(); + } + renderer.redraw(); map.check_bounds(player.x, player.y); @@ -32,6 +42,10 @@ void Game::draw() map.draw(player.x, player.y); + for (const Arrow *arrow : arrows) { + arrow->draw(player.x, player.y); + } + player.draw(); renderer.flush(); @@ -87,6 +101,10 @@ void Game::run() } } + if (e.type == SDL_MOUSEBUTTONDOWN && e.button.button == 1) { + arrows.push_back(new Arrow(&renderer, player.x, player.y, player.angle)); + } + int mouse_x, mouse_y; SDL_GetMouseState(&mouse_x, &mouse_y); player.angle = std::atan2(mouse_y - renderer.screen_height / 2, mouse_x - renderer.screen_width / 2); diff --git a/src/Game.hpp b/src/Game.hpp index 1cb70d3..d4049c4 100644 --- a/src/Game.hpp +++ b/src/Game.hpp @@ -2,6 +2,8 @@ #define GAME_HPP #include +#include +#include "Arrow.hpp" #include "GameRenderer.hpp" #include "Player.hpp" #include "Map.hpp" @@ -12,6 +14,7 @@ private: GameRenderer renderer; Player player; Map map; + std::vector arrows; std::jthread update_thread; std::mutex game_mutex; @@ -21,7 +24,7 @@ private: public: Game() : renderer("Zombo Shooter", 800, 450), player(&renderer), map(&renderer, 40) {} - ~Game() = default; + ~Game(); void run(); diff --git a/src/Map.cpp b/src/Map.cpp index 9ab9265..4bc1b9e 100644 --- a/src/Map.cpp +++ b/src/Map.cpp @@ -5,8 +5,8 @@ Map::Map(GameRenderer *renderer, int tile_size) : renderer(renderer), tile_size(tile_size), tiles(renderer->screen_width / tile_size, std::vector(renderer->screen_height / tile_size, Tile::grass)), - tile_offset_x(-renderer->screen_width / tile_size / 2), - tile_offset_y(-renderer->screen_height / tile_size / 2) + tile_offset_x(-renderer->screen_width / tile_size / 2.0), + tile_offset_y(-renderer->screen_height / tile_size / 2.0) { grass_sprite = renderer->load_sprite("./assets/grass_tile.png", tile_size, tile_size); path_sprite = renderer->load_sprite("./assets/path_tile.png", tile_size, tile_size); @@ -69,13 +69,13 @@ void Map::check_bounds(const double player_x, const double player_y) } // Generate to the right - if (player_x > (int)(tile_offset_x * tile_size + tiles.size() * tile_size - renderer->screen_width / 2)) { + if (player_x > tile_offset_x * tile_size + tiles.size() * tile_size - renderer->screen_width / 2) { const std::vector new_tiles = generate_tiles(tiles.back()); tiles.push_back(new_tiles); } // Generate downwards - if (player_y > (int)(tile_offset_y * tile_size + tiles[0].size() * tile_size - renderer->screen_height / 2)) { + if (player_y > tile_offset_y * tile_size + tiles[0].size() * tile_size - renderer->screen_height / 2) { std::vector prev_tiles; for (unsigned int x = 0; x < tiles.size(); x++) { prev_tiles.push_back(tiles[x].back()); @@ -92,8 +92,8 @@ void Map::draw(const double player_x, const double player_y) const { for (unsigned int tile_x = 0; tile_x < tiles.size(); tile_x++) { for (unsigned int tile_y = 0; tile_y < tiles[tile_x].size(); tile_y++) { - int screen_x = tile_x * tile_size + tile_offset_x * tile_size + renderer->screen_width / 2 - (int)player_x; - int screen_y = tile_y * tile_size + tile_offset_y * tile_size + renderer->screen_height / 2 - (int)player_y; + int screen_x = (int)(tile_x * tile_size + tile_offset_x * tile_size + renderer->screen_width / 2.0 - player_x); + int screen_y = (int)(tile_y * tile_size + tile_offset_y * tile_size + renderer->screen_height / 2.0 - player_y); if ( screen_x < -tile_size || screen_y < -tile_size || diff --git a/src/Map.hpp b/src/Map.hpp index 48f7aa6..63a8f2f 100644 --- a/src/Map.hpp +++ b/src/Map.hpp @@ -10,10 +10,7 @@ class Map { private: GameRenderer *renderer; - int tile_size; std::vector> tiles; - int tile_offset_x; - int tile_offset_y; Sprite grass_sprite; Sprite path_sprite; @@ -21,6 +18,10 @@ private: [[nodiscard]] std::vector generate_tiles(const std::vector &prev_tiles) const; public: + double tile_offset_x; + double tile_offset_y; + int tile_size; + Map(GameRenderer *renderer, int tile_size); void draw(double player_x, double player_y) const;