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

[Added] The ability to fire bullets to the player

Browse Source
This commit is contained in:
Ninjaws
2024-12-13 22:04:33 +01:00
parent 88e0b7cb05
commit 55792bb954
7 changed files with 266 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/entities/Bullet.h
+83
View File
@@ -0,0 +1,83 @@
#ifndef BULLET_H
#define BULLET_H
#include "raylib.h"
#include <cmath>
#include "entities/TextureWrapper.h"
#include "entities/Vector2i.h"
#include "services/MapService.h"
#include <iostream>
class Bullet
{
public:
Bullet() {}
Bullet(Vector2 pos, float direction)
{
this->position = pos;
this->direction = direction;
std::cout << direction << std::endl;
}
// ~Bullet() {}
void logic()
{
move();
hasCollided = false;
envCollision();
objCollision();
// // detectCollision();
}
void draw()
{
DrawCircle(position.x, position.y, size, color);
}
bool getHasCollided()
{
return this->hasCollided;
}
protected:
Color color = RED;
private:
// TextureWrapper object;
Vector2 position;
float direction;
float velocity = 15.0f;
int size = 7;
bool hasCollided = false;
void move()
{
// float directionInRadians = this->direction * M_PI / 180.0f;
position.x += velocity * cos(direction);
position.y += velocity * sin(direction);
}
void envCollision()
{
if (position.y < 0 || position.y > GetScreenHeight())
{
hasCollided = true;
return;
}
const int tileSize = MapService::getInstance().getMap().getTileSize();
Vector2i tilePos = Vector2i((int)this->position.x / tileSize, (int)this->position.y / tileSize);
if (MapService::getInstance().getMap().getColMap()[tilePos.y][tilePos.x] == 1)
{
hasCollided = true;
return;
}
}
virtual void objCollision() = 0;
// void handleCollision() {
// }
};
#endif
include/entities/EBullet.h
+20
View File
@@ -0,0 +1,20 @@
// #ifndef EBULLET_H
// #define EBULLET_H
// #include "Bullet.h"
// #include <iostream>
// class EBullet : public Bullet {
// public:
// EBullet() {}
// ~EBullet() {}
// void detectCollision() override {
// std::cout << "Enemy bullets" << std::endl;
// }
// private:
// };
// #endif
include/entities/Game.h
+19 -6
View File
@@ -10,14 +10,15 @@
#include "services/GameService.h"
#include "entities/Player.h"
#include "entities/Text.h"
#include "entities/Bullet.h"
#include "entities/PBullet.h"
class Game
{
public:
Game()
{
GameService::getInstance().setGameOver(false);
GameService::getInstance().setPaused(false);
GameService::getInstance().resetGame();
TextureWrapper wrapper1 = TextureWrapper(AssetService::getInstance().getBackground(EBackground::GAME1), {GetScreenWidth() * 2.0f, (float)GetScreenHeight()}, {0, 0});
wrapper1.setSourceRect({0, 0, wrapper1.getSize().x, wrapper1.getSize().y});
@@ -42,10 +43,8 @@ public:
camera.zoom = 1.0f;
// this->camera = camera;
GameService::getInstance().setCamera(camera);
this->player = Player();
this->player.setPosition({200, 350});
this->crosshair = TextureWrapper(AssetService::getInstance().getSprite(ESprite::CROSSHAIR), {15, 15}, {0, 0}, {0, 0, 15, 15});
initPauseScreen();
@@ -81,7 +80,9 @@ public:
AudioService::getInstance().pauseMusic();
return;
}
// this->camera.offset.x -= 1.5;
GameService::getInstance().bulletLogic();
this->player.logic();
if (this->player.getTexture().getPosition().x > (StateService::getInstance().getScreenSize().x / 2.0f))
{
@@ -95,6 +96,13 @@ public:
BeginMode2D(GameService::getInstance().getCamera());
this->background.draw();
// std::vector<PBullet> pbs = GameService::getInstance().getPlayerBullets();
// for (int i = 0; i < GameService::getInstance().getPlayerBullets().size(); i++)
// {
// GameService::getInstance().getPlayerBullets()[i].draw();
// }
GameService::getInstance().drawBullets();
this->map.draw();
this->player.draw();
@@ -126,12 +134,13 @@ private:
std::vector<Text> gameOverScreenButtons;
int hoveredGameOverScreenButton = 0;
// std::vector<PBullet> playerBullets;
// bool isPaused = false;
// bool isGameOver = false;
// std::vector<Enemy> enemies
// std::vector<Create> crates
// std::vector<PBullet> playerBullets
// std::vector<EBullet> enemyBullets
// std::vector<Jelly> jellies
// std::vector<Ammo> ammo
@@ -241,6 +250,10 @@ private:
}
}
void shootLogic()
{
}
void drawPaused()
{
// 100, 100, 255, 60
include/entities/PBullet.h
+23
View File
@@ -0,0 +1,23 @@
#ifndef PBULLET_H
#define PBULLET_H
#include "entities/Bullet.h"
#include <iostream>
class PBullet : public Bullet {
public:
PBullet() {}
PBullet(Vector2 pos, float angle) : Bullet(pos, angle) {
this->color = YELLOW;
}
private:
void objCollision() override {
}
};
#endif
include/entities/Player.h
+49
View File
@@ -10,6 +10,7 @@
#include "entities/TextureWrapper.h"
#include "enums/ECorner.h"
#include "entities/Vector2i.h"
#include "entities/PBullet.h"
class Player
{
@@ -22,6 +23,8 @@ public:
spriteAnimation = {0, 0};
this->gunRight = TextureWrapper(AssetService::getInstance().getSprite(ESprite::PLAYER_GUN_RIGHT), {58, 29}, {0, 0});
this->gunLeft = TextureWrapper(AssetService::getInstance().getSprite(ESprite::PLAYER_GUN_LEFT), {58, 29}, {0, 0});
this->ammo = max_ammo;
this->prevShot = GetTime();
}
~Player()
{
@@ -30,6 +33,7 @@ public:
void logic()
{
rotateGun();
shoot();
movement();
outofboundsCheck();
}
@@ -75,6 +79,11 @@ private:
bool groundCollision; // Keeps track of whether or not the player has collided with the ground
bool crateTopCollision; // Whether the player is standing on top of a crate
int ammo;
int max_ammo = 100;
float firingRate= 0.2f; // Delay in seconds
double prevShot; // The last time the player fired a bullet
void applyGravity()
{
if (!groundCollision)
@@ -320,6 +329,46 @@ private:
WHITE);
}
}
void shoot()
{
if (InputService::getInstance().isMouseButtonDown(MOUSE_BUTTON_LEFT) && GetTime() - prevShot > firingRate && groundCollision)
{
prevShot = GetTime();
if (ammo == 0) {
// Play empty gun sound
return;
}
// Play shooting sound
ammo--;
Vector2 bulletStartLocation = {this->texture.getPosition().x + 10, this->texture.getPosition().y + 10};
Vector2 mouseWorldPos = GameService::getInstance().getMouseWorldPos();
if (spriteAnimation.y == Left)
{
bulletStartLocation.y = this->texture.getPosition().y + 10;
bulletStartLocation.x = this->texture.getPosition().x - 5;
}
if (spriteAnimation.y == Right)
{
bulletStartLocation.y = this->texture.getPosition().y + 10;
bulletStartLocation.x = this->texture.getPosition().x + 37;
}
if (mouseWorldPos.x > this->texture.getPosition().x + (this->gunLeft.getSize().x) && spriteAnimation.y == Right ||
mouseWorldPos.x + (this->gunLeft.getSize().x / 2) < this->texture.getPosition().x && spriteAnimation.y == Left)
{
// PlayGunSound();
// currentAmmo--;
// .push_back(bulletStartLocation);
float angleShot = atan2(mouseWorldPos.y - bulletStartLocation.y,
mouseWorldPos.x - bulletStartLocation.x);
GameService::getInstance().addPlayerBullet(PBullet(bulletStartLocation, angleShot));
// bulletDirections.push_back(angleShot);
}
}
}
};
#endif
include/services/GameService.h
+57
View File
@@ -3,6 +3,9 @@
#include "services/Service.h"
#include "entities/Game.h"
#include "entities/PBullet.h"
#include <vector>
#include <list>
class GameService : public Service<GameService>
{
@@ -52,10 +55,64 @@ public:
// return this->game;
// }
void addPlayerBullet(PBullet bullet)
{
this->playerBullets.push_back(bullet);
}
// std::list<PBullet>& getPlayerBullets() {
// return this->playerBullets;
// }
// void removeCollidedBullets()
// {
// for (auto it = playerBullets.begin(); it != playerBullets.end(); /* no increment here */)
// {
// if (it->getHasCollided())
// {
// it = playerBullets.erase(it); // Remove element and get the next valid iterator
// }
// else
// {
// ++it; // Only increment if no removal happens
// }
// }
// }
void bulletLogic()
{
for (auto it = this->playerBullets.begin(); it != this->playerBullets.end();)
{
it->logic();
if (it->getHasCollided())
it = this->playerBullets.erase(it);
else
++it;
}
}
void drawBullets()
{
for (auto it = this->playerBullets.begin(); it != this->playerBullets.end();)
{
it->draw();
++it;
}
}
void resetGame()
{
paused = false;
gameOver = false;
// playerBullets.clear();
}
private:
bool paused = false;
bool gameOver = false;
Camera2D camera;
std::list<PBullet> playerBullets;
};
#endif
include/services/InputService.h
+12
View File
@@ -57,10 +57,15 @@ public:
for (auto button : watchedMouseButtons)
{
mouseButtonsPressed[button] = false;
mouseButtonsDown[button] = false;
if (IsMouseButtonPressed(button))
{
mouseButtonsPressed[button] = true;
}
if (IsMouseButtonDown(button))
{
mouseButtonsDown[button] = true;
}
}
}
@@ -78,22 +83,29 @@ public:
return mouseButtonsPressed[button];
}
bool isMouseButtonDown(MouseButton button) {
return mouseButtonsDown[button];
}
private:
std::unordered_set<KeyboardKey> watchedKeys;
std::unordered_map<KeyboardKey, bool> keysPressed;
std::unordered_map<KeyboardKey, bool> keysDown;
std::unordered_set<MouseButton> watchedMouseButtons;
std::unordered_map<MouseButton, bool> mouseButtonsPressed;
std::unordered_map<MouseButton, bool> mouseButtonsDown;
void setMouseButtonsToWatch(std::vector<MouseButton> mouseButtonsToWatch)
{
this->watchedMouseButtons.clear();
this->mouseButtonsPressed.clear();
this->mouseButtonsDown.clear();
for (int i = 0; i < mouseButtonsToWatch.size(); i++)
{
this->watchedMouseButtons.insert(mouseButtonsToWatch[i]);
this->mouseButtonsPressed[mouseButtonsToWatch[i]] = false;
this->mouseButtonsDown[mouseButtonsToWatch[i]] = false;
}
}
};