Add hitbox system

.gitea/workflows/release.yml

@@ -1,52 +0,0 @@
-name: Build and Release
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Set up CMake
-        uses: jwlawson/actions-setup-cmake@v1
-        with:
-          cmake-version: '3.16.x'
-          github-api-token: ${{ secrets.GH_TOKEN }}
-
-      - name: Install dependencies
-        run: |
-          apt-get update
-          apt-get install -y libsdl2-dev libsdl2-image-dev libsdl2-ttf-dev
-
-      - name: Configure CMake
-        run: cmake -S . -B build
-
-      - name: Build
-        run: cmake --build build --config Release
-
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITEA_TOKEN }}
-        with:
-          tag_name: v${{ github.run_number }}
-          release_name: "Release v${{ github.run_number }}"
-          draft: false
-          prerelease: false
-
-      - name: Upload executable
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITEA_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./build/Obstacle
-          asset_name: Obstacle
-          asset_content_type: application/octet-stream

Game.cpp

@@ -34,7 +34,12 @@ for (int i = 0; i < opponents.size(); i++) {
             opponents.erase(opponents.begin() + i);
         }
         if (player.x < o.x + 80 && player.x + 80 > o.x && player.y < o.y + 96 && player.y + 96 > o.y) {
-            player.health--;
+            if (player.health > 0) {
+                player.health--;
+            } else {
+                // TODO: Game over sccreen
+            }
+
             opponents.erase(opponents.begin() + i);
         }
     }
@@ -42,11 +47,7 @@ for (int i = 0; i < opponents.size(); i++) {
 
 void Game::renderHUD(SDL_Renderer *renderer, SDL_Texture *heart) {
     SDL_SetRenderDrawColor(renderer, 0, 0, 0, SDL_ALPHA_OPAQUE);
-    SDL_Rect bgRect;
-    bgRect.x = 0;
-    bgRect.y = 0;
-    bgRect.w = 30 * 3 + 15;
-    bgRect.h = 40;
+    SDL_Rect bgRect = {0, 0, 30 * 3 + 15, 40};
     SDL_RenderFillRect(renderer, &bgRect);
 
     for (int i = 0; i < this->player.health; i++) {
@@ -54,8 +55,14 @@ void Game::renderHUD(SDL_Renderer *renderer, SDL_Texture *heart) {
     }
 }
 
-void Game::renderPlayer(SDL_Renderer *renderer, SDL_Texture *player, Player p) {
-    drawTexture(renderer, player, p.x, p.y, 80, 96);
+void Game::renderPlayer(SDL_Renderer *renderer, SDL_Texture *playerTexture, Player p) {
+    drawTexture(renderer, playerTexture, p.x, p.y, 80, 96);
+
+    if (showHitboxes) {
+        SDL_SetRenderDrawColor(renderer, 255, 0, 0, SDL_ALPHA_OPAQUE);
+        SDL_Rect hitbox = {p.x, p.y, 80, 96};
+        SDL_RenderDrawRect(renderer, &hitbox);
+    }
 }
 
 void Game::createOpponent() {
@@ -92,9 +99,14 @@ void Game::createOpponent() {
     opponents.push_back(o);
 }
 
+void Game::renderOpponent(SDL_Renderer *renderer, SDL_Texture *opponentTexture, Opponent o) {
+    drawTexture(renderer, opponentTexture, o.x, o.y, 80, 96);
 
-void Game::renderOpponent(SDL_Renderer *renderer, SDL_Texture *opponent, Player p) {
-    drawTexture(renderer, opponent, p.x, p.y, 80, 96);
+    if (showHitboxes) {
+        SDL_SetRenderDrawColor(renderer, 255, 0, 0, SDL_ALPHA_OPAQUE);
+        SDL_Rect hitbox = {o.x, o.y, 80, 96};
+        SDL_RenderDrawRect(renderer, &hitbox);
+    }
 }
 
 void Game::render(SDL_Renderer *renderer, SDL_Texture *bg) {
@@ -104,25 +116,24 @@ void Game::render(SDL_Renderer *renderer, SDL_Texture *bg) {
 
     drawTexture(renderer, bg, 0, 0, WINDOW_WIDTH, WINDOW_HEIGHT);
 
-    SDL_Texture *player = IMG_LoadTexture(renderer, "./res/player.png");
-    renderPlayer(renderer, player, this->player);
-
-    SDL_Texture *opponent = IMG_LoadTexture(renderer, "./res/opponent.png");
+    SDL_Texture *playerTexture = IMG_LoadTexture(renderer, "./res/player.png");
+    renderPlayer(renderer, playerTexture, this->player);
 
+    SDL_Texture *opponentTexture = IMG_LoadTexture(renderer, "./res/opponent.png");
     for (Opponent o: this->opponents) {
-        renderOpponent(renderer, opponent, o);
+        renderOpponent(renderer, opponentTexture, o);
     }
 
     SDL_Texture *heart = IMG_LoadTexture(renderer, "./res/heart.png");
     renderHUD(renderer, heart);
 
     TTF_Init();
-    TTF_Font *font = TTF_OpenFont("./res/Arial.ttf", 24);
+    TTF_Font *font = TTF_OpenFont("./res/font.ttf", 24);
 
-    drawText(renderer, font, "Time: " + std::to_string(timeMultiplier), 30 * 3 + 15 + 10, 10, 100, 30);
+    drawText(renderer, font, "h: " + std::to_string(player.health), 30 * 3 + 15 + 10, 10);
 
-    SDL_DestroyTexture(player);
-    SDL_DestroyTexture(opponent);
+    SDL_DestroyTexture(playerTexture);
+    SDL_DestroyTexture(opponentTexture);
     SDL_DestroyTexture(heart);
 
     SDL_RenderPresent(renderer);
@@ -158,6 +169,9 @@ void Game::run() {
                     case SDLK_d:
                         keys[3] = isPressed;
                         break;
+                    case SDLK_h:
+                        if (isPressed) showHitboxes = !showHitboxes;
+                        break;
                 }
             }
         }
@@ -169,14 +183,12 @@ void Game::run() {
 
         checkCollision();
 
-        if (rand() % 50 == 0) createOpponent();
+        if (rand() % 100 == 0) createOpponent();
 
-        for (int i = 0; i < opponents.size(); i++) {
-            opponents[i].move(timeMultiplier);
+        for (Opponent &o: opponents) {
+            o.move(10);
         }
 
-        timeMultiplier= (int) (time(nullptr) - startTime) / 10 + 1;
-
         render(renderer, background);
         SDL_Delay(16);
     }

Game.h

@@ -11,7 +11,7 @@ class Player {
 public:
     int x = 40;
     int y = 40;
-    int health = 3;
+    int unsigned health = 3;
 
     void moveX(int dx);
     void moveY(int dy);
@@ -28,16 +28,18 @@ public:
 class Game {
     Player player;
     std::vector<Opponent> opponents;
-    int timeMultiplier = 1;
+    bool showHitboxes = false;
 
     void renderPlayer(SDL_Renderer *renderer, SDL_Texture *player, Player p);
-    void renderOpponent(SDL_Renderer *renderer, SDL_Texture *opponent, Player p);
 public:
+
     void createOpponent();
     void checkCollision();
     void renderHUD(SDL_Renderer *renderer, SDL_Texture *heart);
     void render(SDL_Renderer *renderer, SDL_Texture *bg);
     void run();
+
+    void renderOpponent(SDL_Renderer *renderer, SDL_Texture *opponentTexture, Opponent o);
 };
 
 

Helper.cpp

@@ -14,7 +14,7 @@ void drawTexture(SDL_Renderer *renderer, SDL_Texture *texture, int x, int y, int
     SDL_RenderCopy(renderer, texture, &src, &dist);
 }
 
-void drawText(SDL_Renderer *renderer, TTF_Font *font, const std::string text, int x, int y, int w, int h) {
+void drawText(SDL_Renderer *renderer, TTF_Font *font, const std::string text, int x, int y) {
     SDL_Surface *surface = TTF_RenderText_Solid(font, text.c_str(), {255, 255, 255});
     SDL_Texture *texture = SDL_CreateTextureFromSurface(renderer, surface);
 
@@ -26,8 +26,8 @@ void drawText(SDL_Renderer *renderer, TTF_Font *font, const std::string text, in
     SDL_Rect dist;
     dist.x = x;
     dist.y = y;
-    dist.w = w;
-    dist.h = h;
+
+    TTF_SizeText(font, text.c_str(), &dist.w, &dist.h);
 
     SDL_RenderCopy(renderer, texture, &src, &dist);
 

Helper.h

@@ -5,6 +5,6 @@
 #include <string>
 
 void drawTexture(SDL_Renderer *renderer, SDL_Texture *texture, int x, int y, int w, int h);
-void drawText(SDL_Renderer *renderer, TTF_Font *font, const std::string text, int x, int y, int w, int h);
+void drawText(SDL_Renderer *renderer, TTF_Font *font, const std::string text, int x, int y);
 
 #endif