Ninjaws/WebJelly-Rescue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Added] Crates, Hud for bullets and health

Browse Source
This commit is contained in:
Ninjaws
2024-12-15 00:12:16 +01:00
parent 55792bb954
commit de958b02e6
17 changed files with 448 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/entities/Game.h
+66 -5
View File
@@ -8,6 +8,7 @@
#include "services/MapService.h"
#include "services/InputService.h"
#include "services/GameService.h"
#include "services/CollectableService.h"
#include "entities/Player.h"
#include "entities/Text.h"
#include "entities/Bullet.h"
@@ -47,6 +48,8 @@ public:
this->player.setPosition({200, 350});
this->crosshair = TextureWrapper(AssetService::getInstance().getSprite(ESprite::CROSSHAIR), {15, 15}, {0, 0}, {0, 0, 15, 15});
CollectableService::getInstance().initCollectables();
initPauseScreen();
initGameOverScreen();
@@ -80,8 +83,9 @@ public:
AudioService::getInstance().pauseMusic();
return;
}
GameService::getInstance().bulletLogic();
CollectableService::getInstance().collectableLogic();
this->player.logic();
if (this->player.getTexture().getPosition().x > (StateService::getInstance().getScreenSize().x / 2.0f))
@@ -104,6 +108,7 @@ public:
// }
GameService::getInstance().drawBullets();
this->map.draw();
CollectableService::getInstance().drawCollectables();
this->player.draw();
EndMode2D();
@@ -116,6 +121,7 @@ public:
{
drawGameOver();
}
drawHud();
drawCrosshair();
EndDrawing();
}
@@ -250,10 +256,6 @@ private:
}
}
void shootLogic()
{
}
void drawPaused()
{
// 100, 100, 255, 60
@@ -290,6 +292,65 @@ private:
// 0,
// WHITE);
}
void drawHud()
{
drawHudHealth();
drawHudBullets();
}
void drawHudBullets()
{
Vector2i pixel_pos = Vector2i(5, 40);
Texture2D ammoSprite = AssetService::getInstance().getSprite(ESprite::HUD_AMMO);
Vector2i display_pos;
for (int i = 0; i < this->player.getAmmo(); i++)
{
if (i <= 49)
{
display_pos = Vector2i(pixel_pos.x + ammoSprite.width * i, pixel_pos.y);
}
if (i > 49 && i <= 99)
{
display_pos = Vector2i(pixel_pos.x + ammoSprite.width * (i - (50)), pixel_pos.y + ammoSprite.height);
}
else if (i > 99 && i <= 149)
{
display_pos = Vector2i(pixel_pos.x + ammoSprite.width * (i - (100)), pixel_pos.y + ammoSprite.height * 2);
}
else if (i > 149 && i <= 199)
{
display_pos = Vector2i(pixel_pos.x + ammoSprite.width * (i - (150)), pixel_pos.y + ammoSprite.height * 3);
}
else if (i > 199 && i <= 249)
{
display_pos = Vector2i(pixel_pos.x + ammoSprite.width * (i - (200)), pixel_pos.y + ammoSprite.height * 4);
}
DrawTexture(ammoSprite, display_pos.x, display_pos.y, WHITE);
}
}
void drawHudHealth()
{
Vector2i pixel_pos = Vector2i(5, 5);
Texture2D noHealthSprite = AssetService::getInstance().getSprite(ESprite::HUD_HEART_EMPTY);
Texture2D healthSprite = AssetService::getInstance().getSprite(ESprite::HUD_HEART);
// sVector2f coord_pos = GetWindow().mapPixelToCoords(pixel_pos);
for (int i = 0; i < this->player.getMaxHealth(); i++)
{
Vector2i pos = Vector2i(pixel_pos.x + noHealthSprite.width * i, pixel_pos.y);
// noHealthSprite[i].setPosition(coord_pos.x + noHealthTexture.getSize().x * i, coord_pos.y);
DrawTexture(noHealthSprite, pos.x, pos.y, WHITE);
}
for (int i = 0; i < this->player.getHealth(); i++)
{
// healthSprite[i].setPosition(coord_pos.x + healthTexture.getSize().x * i, coord_pos.y);
// DrawTexture(ammoSprite, display_pos.x, display_pos.y, WHITE);
Vector2i pos = Vector2i(pixel_pos.x + healthSprite.width * i, pixel_pos.y);
// noHealthSprite[i].setPosition(coord_pos.x + noHealthTexture.getSize().x * i, coord_pos.y);
DrawTexture(healthSprite, pos.x, pos.y, WHITE);
}
}
};
#endif