Mathias/ObstacleGame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Add hitbox system

Browse Source
This commit is contained in:
Mathias Wagner 2024-11-25 13:21:24 +01:00
parent 67426218fc
commit f9774c8145
2 changed files with 41 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Game.cpp
View File

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

8
Game.h
View File

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