hamx/LotoStatek
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merge branch 'refactor'

Browse Source
This commit is contained in:
Andrii Solianyk
2025-01-06 11:51:33 +01:00
parent 3e2d37cf72 6b45443c75
commit 236ddd828d
21 changed files with 185 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
headers/Actor.h
View File

@@ -11,8 +11,7 @@
class Actor { class Actor {
public: public:
Actor(int x, int y, const sf::Texture& texture); Actor(int x, int y, const sf::Texture& texture);
virtual ~Actor() = default;
sf::Sprite& getSprite(); sf::Sprite& getSprite();
unsigned int getHP(); unsigned int getHP();

2
headers/AdvancedEnemy.h
View File

@@ -3,8 +3,6 @@
#include "Enemy.h" #include "Enemy.h"
#include <cmath>
enum class DirectionA { enum class DirectionA {
Up, Up,
Down, Down,

19
headers/Beam.h
View File

@@ -2,27 +2,16 @@
#define LOTOSTATEK_BEAM_H #define LOTOSTATEK_BEAM_H
#include <SFML/Graphics.hpp> #include <SFML/Graphics.hpp>
#include "Position.h"
class Beam { class Beam {
public: public:
Beam(float x, float y, float width, float height, const sf::Color& color); Beam() = default;
Beam(int x, int y, const sf::Texture &texture);
void draw(sf::RenderWindow &window);
void update();
void render(sf::RenderWindow& window);
sf::FloatRect getBounds() const;
bool isVisible() const;
void setVisible(bool visible);
sf::Sprite getSprite();
void setRotation(float angle);
private: private:
sf::RectangleShape beamShape;
bool visible;
sf::Texture beamTexture;
sf::Sprite beamSprite; sf::Sprite beamSprite;
}; };

3
headers/Bullet.h
View File

@@ -2,14 +2,11 @@
#define LOTOSTATEK_BULLET_H #define LOTOSTATEK_BULLET_H
#include "Projectile.h" #include "Projectile.h"
#include "SFML/Graphics/Texture.hpp"
class Bullet : public Projectile { class Bullet : public Projectile {
public: public:
Bullet(float x, float y, sf::Texture &texture) : Projectile(x,y, texture) {}; Bullet(float x, float y, sf::Texture &texture) : Projectile(x,y, texture) {};
void update() override; void update() override;
private:
float directionY;
}; };

3
headers/Heart.hpp
View File

@@ -2,13 +2,12 @@
#define LOTOSTATEK_HEART_HPP #define LOTOSTATEK_HEART_HPP
#include "SFML/Graphics/Texture.hpp" #include "SFML/Graphics/Texture.hpp"
#include "SFML/Graphics/Sprite.hpp"
#include "ObjectItem.hpp" #include "ObjectItem.hpp"
class Heart : public ObjectItem { class Heart : public ObjectItem {
public: public:
Heart(float x, float y, sf::Texture &texture); Heart(float x, float y, sf::Texture &texture);
void update(); void update() override;
}; };
#endif //LOTOSTATEK_HEART_HPP #endif //LOTOSTATEK_HEART_HPP

2
headers/Meteor.h
View File

@@ -8,7 +8,7 @@
class Meteor : public ObjectItem { class Meteor : public ObjectItem {
public: public:
Meteor(float x, float y, sf::Texture &texture); Meteor(float x, float y, sf::Texture &texture_);
void update(); void update();
}; };

2
headers/ObjectItem.hpp
View File

@@ -12,7 +12,7 @@ public:
bool getStatus(); bool getStatus();
virtual void update() = 0; virtual void update() = 0;
protected: protected:
sf::Texture texture; sf::Texture texture_;
sf::Sprite sprite; sf::Sprite sprite;
Position position; Position position;
float rotationSpeed; float rotationSpeed;

10
headers/Position.h
View File

@@ -6,4 +6,14 @@ struct Position {
int y; int y;
}; };
struct PositionU {
unsigned int x;
unsigned int y;
};
struct PositionF {
float x;
float y;
};
#endif //LOTOSTATEK_POSITION_H #endif //LOTOSTATEK_POSITION_H

39
headers/Wiazkowiec.h
View File

@@ -13,42 +13,47 @@ enum class DirectionW {
class Wiazkowiec : public Actor { class Wiazkowiec : public Actor {
public: public:
Wiazkowiec(int x, int y, const sf::Texture& texture); Wiazkowiec(int x, int y, const sf::Texture& texture, sf::RenderWindow *window);
void shoot() override;
void move(float deltaX, float deltaY) override; void move(float deltaX, float deltaY) override;
void moveLeft() override; void moveLeft() override;
void moveRight() override; void moveRight() override;
void moveUp() override; void moveUp() override;
void moveDown() override; void moveDown() override;
void takeDamage();
void setRandomDirection(); void setRandomDirection();
void checkIfBeamShootOutOfBounds();
void update(); void update();
void shoot() override;
void render(sf::RenderWindow &window); void render(sf::RenderWindow &window);
bool isAlive() const; bool isAlive() const;
void takeDamage();
void updateDirection();
bool isShooting() const; bool isShooting() const;
const Beam& getBeam() const;
void setPlanszaHeight(float height, float width);
void setMapBounds(float width, float height);
void setPlanszaHeight(int height, int width);
Beam* getBeam() const;
private: private:
float planszaHeight = 800.f;
float planszaWidth = 600.f;
sf::Clock shootClock;
sf::Texture WiazkaTexture; sf::Texture WiazkaTexture;
float movementSpeed = 2.0f; sf::Texture beamTexture;
bool alive = true; sf::Clock shootClock;
DirectionW direction = DirectionW::Down;
Beam beam; // Wiązka
bool shooting = false;
sf::Clock shootingClock; sf::Clock shootingClock;
float beamDuration = 1.0f; DirectionW direction = DirectionW::Down;
Beam *beam; // wskaźnik na wiązkę
sf::RenderWindow *window_ptr;
void spawnBeam(); // Tworzy wiązkę void spawnBeam(); // Tworzy wiązkę
int planszaHeight = 800;
int planszaWidth = 600;
float beamDuration = 1.0f;
float movementSpeed = 2.0f;
bool shooting = false;
bool alive = true;
}; };
#endif //WIAZKOWIEC_H #endif //WIAZKOWIEC_H

1
sources/AdvancedEnemy.cpp
View File

@@ -3,7 +3,6 @@
#include "../headers/Plansza.h" #include "../headers/Plansza.h"
AdvancedEnemy::AdvancedEnemy(int x, int y, const sf::Texture& texture, const sf::Texture& bulletTexture) : Actor(x, y, texture) { AdvancedEnemy::AdvancedEnemy(int x, int y, const sf::Texture& texture, const sf::Texture& bulletTexture) : Actor(x, y, texture) {
actorSprite.setTexture(texture);
enemyBulletTexture = bulletTexture; enemyBulletTexture = bulletTexture;
hp = 2; // 2 punkty życia hp = 2; // 2 punkty życia
firerate = 2000; // Strzela co 2 firerate = 2000; // Strzela co 2

45
sources/Beam.cpp
View File

@@ -2,50 +2,21 @@
#include <iostream> #include <iostream>
Beam::Beam(float x, float y, float width, float height, const sf::Color& color) Beam::Beam(int x, int y, const sf::Texture& texture) {
: visible(false) { beamSprite.setOrigin(beamSprite.getLocalBounds().width/2, beamSprite.getLocalBounds().height/2);
beamShape.setPosition(x, y); if (texture.getSize().x > 0 && texture.getSize().y > 0) {
beamShape.setSize({width, height});
beamShape.setFillColor(color);
if (!beamTexture.loadFromFile("../assets/img/wiazka/wiazka.png")) {
std::cerr << "Błąd! Nie można załadować tekstury wiazka.png" << std::endl;
}
beamSprite.setTexture(beamTexture);
if (beamTexture.getSize().x > 0 && beamTexture.getSize().y > 0) {
float scaleX = width / beamTexture.getSize().x;
float scaleY = height / beamTexture.getSize().y;
beamSprite.setScale(scaleX, scaleY);
beamSprite.setPosition(x, y); beamSprite.setPosition(x, y);
} else { } else {
std::cerr << "Błąd: Tekstura wiązki nie została poprawnie załadowana." << std::endl; std::cerr << "Błąd: Tekstura wiązki nie została poprawnie załadowana." << std::endl;
} }
beamSprite.setTexture(texture);
} }
void Beam::draw(sf::RenderWindow& window) { sf::Sprite Beam::getSprite() {
return beamSprite;
window.draw(beamSprite);
} }
void Beam::update() { void Beam::setRotation(float angle) {
} beamSprite.setRotation(angle);
void Beam::render(sf::RenderWindow& window) {
window.draw(beamSprite);
}
sf::FloatRect Beam::getBounds() const {
return beamShape.getGlobalBounds();
}
bool Beam::isVisible() const {
return visible;
}
void Beam::setVisible(bool visible) {
this->visible = visible;
} }

1
sources/Bomber.cpp
View File

@@ -4,7 +4,6 @@
#include <random> #include <random>
Bomber::Bomber(int x, int y, const sf::Texture& texture, const sf::Texture& bulletTexture) : Actor(x, y, texture) { Bomber::Bomber(int x, int y, const sf::Texture& texture, const sf::Texture& bulletTexture) : Actor(x, y, texture) {
actorSprite.setTexture(texture);
BombaTexture = bulletTexture; BombaTexture = bulletTexture;
hp = 2; // 2 punkty życia hp = 2; // 2 punkty życia
firerate = 10000; // Strzela co 10 firerate = 10000; // Strzela co 10

3
sources/Bullet.cpp
View File

@@ -1,8 +1,5 @@
#include "../headers/Bullet.h" #include "../headers/Bullet.h"
#include <iostream>
#include <ostream>
void Bullet::update() { void Bullet::update() {
//std::cout << "Start update: speed = " << speed << ", position.y = " << position.y << std::endl; //std::cout << "Start update: speed = " << speed << ", position.y = " << position.y << std::endl;
sprite.move(0.0f, speed); sprite.move(0.0f, speed);

1
sources/Enemy.cpp
View File

@@ -3,7 +3,6 @@
#include "../headers/Plansza.h" #include "../headers/Plansza.h"
Enemy::Enemy(int x, int y, const sf::Texture& texture) : Actor(x, y, texture) { Enemy::Enemy(int x, int y, const sf::Texture& texture) : Actor(x, y, texture) {
actorSprite.setTexture(texture);
hp = 1; // Przeciwnik ma 1 punkt życia hp = 1; // Przeciwnik ma 1 punkt życia
firerate = 2000; // Strzela co 2 firerate = 2000; // Strzela co 2
moving_speed = 2.0f; // Prędkość moving_speed = 2.0f; // Prędkość

1
sources/Kamikadze.cpp
View File

@@ -7,7 +7,6 @@
Kamikadze::Kamikadze(int x, int y, const sf::Texture& texture) : Actor(x, y, texture) { Kamikadze::Kamikadze(int x, int y, const sf::Texture& texture) : Actor(x, y, texture) {
actorSprite.setTexture(texture);
hp = 3; // 3 punkty życia hp = 3; // 3 punkty życia
moving_speed = 2.0f; // Prędkość moving_speed = 2.0f; // Prędkość
} }

2
sources/Meteor.cpp
View File

@@ -2,7 +2,7 @@
Meteor::Meteor(float x, float y, sf::Texture &texture) : ObjectItem(x, y, texture) { Meteor::Meteor(float x, float y, sf::Texture &texture) : ObjectItem(x, y, texture) {
outOfBounds = false; outOfBounds = false;
texture = texture; texture_ = texture;
sprite.setTexture(texture); sprite.setTexture(texture);
sprite.setOrigin(sprite.getLocalBounds().width / 2, sprite.getLocalBounds().height / 2); // wycentrowanie sprite sprite.setOrigin(sprite.getLocalBounds().width / 2, sprite.getLocalBounds().height / 2); // wycentrowanie sprite
sprite.setPosition(x, y); sprite.setPosition(x, y);

8
sources/ObjectItem.cpp
View File

@@ -1,11 +1,11 @@
#include "../headers/ObjectItem.hpp" #include "../headers/ObjectItem.hpp"
ObjectItem::ObjectItem(float x, float y, sf::Texture &texture) { ObjectItem::ObjectItem(float x, float y, sf::Texture &texture) {
Position position_; Position position_ = {0,0};
position_.x = x; position_.x = static_cast<int>(x);
position_.y = y; position_.y = static_cast<int>(y);
position = position_; position = position_;
this->texture = texture; this->texture_ = texture;
} }
bool ObjectItem::getStatus() { bool ObjectItem::getStatus() {

65
sources/Plansza.cpp
View File

@@ -111,13 +111,13 @@ void Plansza::update() {
ship->update(); // migotanie statku ship->update(); // migotanie statku
update_score(); // naliczanie punktów update_score(); // naliczanie punktów
// Sprawnowanie wszystkich rodzajów wrogów // Sprawnowanie wszystkich rodzajów wrogów
spawn_meteor(); // spawn_meteor();
spawn_hearts(); // spawn_hearts();
spawn_enemy(); // spawn_enemy();
spawn_advanced_enemy(); // spawn_advanced_enemy();
spawn_wiazkowiec(); spawn_wiazkowiec();
spawn_bomber(); // spawn_bomber();
spawn_kamikadze(); // spawn_kamikadze();
// utrzymanie meteorów i pocisków w ruchu // utrzymanie meteorów i pocisków w ruchu
for (auto &meteor: meteors) { for (auto &meteor: meteors) {
@@ -140,7 +140,7 @@ void Plansza::update() {
window->draw(rocket.getSprite()); window->draw(rocket.getSprite());
} }
// Sprawdzenie czy meteory i pociski są poza granicami ekranu // Sprawdzenie, czy meteory i pociski są poza granicami ekranu
update_meteors(); update_meteors();
update_hearts(); update_hearts();
ship->updateBullets(); ship->updateBullets();
@@ -406,7 +406,7 @@ void Plansza::update() {
if (playerBulletIt->getSprite().getGlobalBounds().intersects(it->getSprite().getGlobalBounds())) { if (playerBulletIt->getSprite().getGlobalBounds().intersects(it->getSprite().getGlobalBounds())) {
// Usuń pocisk Bombera i pocisk gracza // Usuń pocisk Bombera i pocisk gracza
it = bomberEnemy.getBullets().erase(it); it = bomberEnemy.getBullets().erase(it);
playerBulletIt = ship->getBullets().erase(playerBulletIt); ship->getBullets().erase(playerBulletIt);
bulletDestroyed = true; bulletDestroyed = true;
break; break;
} else { } else {
@@ -420,7 +420,7 @@ void Plansza::update() {
if (rocketIt->getSprite().getGlobalBounds().intersects(it->getSprite().getGlobalBounds())) { if (rocketIt->getSprite().getGlobalBounds().intersects(it->getSprite().getGlobalBounds())) {
// Usuń pocisk Bombera i rakietę gracza // Usuń pocisk Bombera i rakietę gracza
it = bomberEnemy.getBullets().erase(it); it = bomberEnemy.getBullets().erase(it);
rocketIt = ship->getRockets().erase(rocketIt); ship->getRockets().erase(rocketIt);
bulletDestroyed = true; bulletDestroyed = true;
break; break;
} else { } else {
@@ -445,14 +445,13 @@ void Plansza::update() {
for (auto &wiazkowiec: WEnemies) { for (auto &wiazkowiec: WEnemies) {
wiazkowiec.update(); wiazkowiec.update();
if (wiazkowiec.isShooting() && wiazkowiec.getBeam().isVisible()) { if (wiazkowiec.isShooting()) {
if (ship->getSprite().getGlobalBounds().intersects(wiazkowiec.getBeam().getBounds())) { if (ship->getSprite().getGlobalBounds().intersects(wiazkowiec.getBeam()->getSprite().getGlobalBounds())) {
ship->takeDamage(); // Gracz otrzymuje obrażenia ship->takeDamage(); // Gracz otrzymuje obrażenia
} }
} }
window->draw(wiazkowiec.getSprite()); window->draw(wiazkowiec.getSprite());
wiazkowiec.render(*window);
} }
// TODO: naprawić to co średnio działa // TODO: naprawić to co średnio działa
@@ -474,7 +473,7 @@ void Plansza::update() {
bool hit = false; bool hit = false;
for (auto bulletIt = ship->getBullets().begin(); bulletIt != ship->getBullets().end();) { for (auto bulletIt = ship->getBullets().begin(); bulletIt != ship->getBullets().end();) {
if (enemyIt->getSprite().getGlobalBounds().intersects(bulletIt->getSprite().getGlobalBounds())) { if (enemyIt->getSprite().getGlobalBounds().intersects(bulletIt->getSprite().getGlobalBounds())) {
bulletIt = ship->getBullets().erase(bulletIt); ship->getBullets().erase(bulletIt);
enemyIt->takeDamage(); enemyIt->takeDamage();
hit = true; hit = true;
break; break;
@@ -493,7 +492,7 @@ void Plansza::update() {
bool hit = false; bool hit = false;
for (auto bulletIt = ship->getBullets().begin(); bulletIt != ship->getBullets().end();) { for (auto bulletIt = ship->getBullets().begin(); bulletIt != ship->getBullets().end();) {
if (advancedIt->getSprite().getGlobalBounds().intersects(bulletIt->getSprite().getGlobalBounds())) { if (advancedIt->getSprite().getGlobalBounds().intersects(bulletIt->getSprite().getGlobalBounds())) {
bulletIt = ship->getBullets().erase(bulletIt); ship->getBullets().erase(bulletIt);
advancedIt->takeDamage(); advancedIt->takeDamage();
hit = true; hit = true;
break; break;
@@ -512,7 +511,7 @@ void Plansza::update() {
bool hit = false; bool hit = false;
for (auto bulletIt = ship->getBullets().begin(); bulletIt != ship->getBullets().end();) { for (auto bulletIt = ship->getBullets().begin(); bulletIt != ship->getBullets().end();) {
if (bomberIt->getSprite().getGlobalBounds().intersects(bulletIt->getSprite().getGlobalBounds())) { if (bomberIt->getSprite().getGlobalBounds().intersects(bulletIt->getSprite().getGlobalBounds())) {
bulletIt = ship->getBullets().erase(bulletIt); ship->getBullets().erase(bulletIt);
bomberIt->takeDamage(); bomberIt->takeDamage();
hit = true; hit = true;
break; break;
@@ -531,7 +530,7 @@ void Plansza::update() {
bool hit = false; bool hit = false;
for (auto bulletIt = ship->getBullets().begin(); bulletIt != ship->getBullets().end();) { for (auto bulletIt = ship->getBullets().begin(); bulletIt != ship->getBullets().end();) {
if (kamikadzeIt->getSprite().getGlobalBounds().intersects(bulletIt->getSprite().getGlobalBounds())) { if (kamikadzeIt->getSprite().getGlobalBounds().intersects(bulletIt->getSprite().getGlobalBounds())) {
bulletIt = ship->getBullets().erase(bulletIt); ship->getBullets().erase(bulletIt);
kamikadzeIt->takeDamage(); kamikadzeIt->takeDamage();
hit = true; hit = true;
break; break;
@@ -550,7 +549,7 @@ void Plansza::update() {
bool hit = false; bool hit = false;
for (auto bulletIt = ship->getBullets().begin(); bulletIt != ship->getBullets().end();) { for (auto bulletIt = ship->getBullets().begin(); bulletIt != ship->getBullets().end();) {
if (wiazkowiecIt->getSprite().getGlobalBounds().intersects(bulletIt->getSprite().getGlobalBounds())) { if (wiazkowiecIt->getSprite().getGlobalBounds().intersects(bulletIt->getSprite().getGlobalBounds())) {
bulletIt = ship->getBullets().erase(bulletIt); ship->getBullets().erase(bulletIt);
wiazkowiecIt->takeDamage(); wiazkowiecIt->takeDamage();
hit = true; hit = true;
break; break;
@@ -572,7 +571,7 @@ void Plansza::update() {
bool hit = false; bool hit = false;
for (auto rocketIt = ship->getRockets().begin(); rocketIt != ship->getRockets().end();) { for (auto rocketIt = ship->getRockets().begin(); rocketIt != ship->getRockets().end();) {
if (enemyIt->getSprite().getGlobalBounds().intersects(rocketIt->getSprite().getGlobalBounds())) { if (enemyIt->getSprite().getGlobalBounds().intersects(rocketIt->getSprite().getGlobalBounds())) {
rocketIt = ship->getRockets().erase(rocketIt); ship->getRockets().erase(rocketIt);
enemyIt->takeDamage(); enemyIt->takeDamage();
hit = true; hit = true;
break; break;
@@ -591,7 +590,7 @@ void Plansza::update() {
bool hit = false; bool hit = false;
for (auto rocketIt = ship->getRockets().begin(); rocketIt != ship->getRockets().end();) { for (auto rocketIt = ship->getRockets().begin(); rocketIt != ship->getRockets().end();) {
if (advancedIt->getSprite().getGlobalBounds().intersects(rocketIt->getSprite().getGlobalBounds())) { if (advancedIt->getSprite().getGlobalBounds().intersects(rocketIt->getSprite().getGlobalBounds())) {
rocketIt = ship->getRockets().erase(rocketIt); ship->getRockets().erase(rocketIt);
advancedIt->takeDamage(); advancedIt->takeDamage();
hit = true; hit = true;
break; break;
@@ -610,7 +609,7 @@ void Plansza::update() {
bool hit = false; bool hit = false;
for (auto rocketIt = ship->getRockets().begin(); rocketIt != ship->getRockets().end();) { for (auto rocketIt = ship->getRockets().begin(); rocketIt != ship->getRockets().end();) {
if (bomberIt->getSprite().getGlobalBounds().intersects(rocketIt->getSprite().getGlobalBounds())) { if (bomberIt->getSprite().getGlobalBounds().intersects(rocketIt->getSprite().getGlobalBounds())) {
rocketIt = ship->getRockets().erase(rocketIt); ship->getRockets().erase(rocketIt);
bomberIt->takeDamage(); bomberIt->takeDamage();
hit = true; hit = true;
break; break;
@@ -629,7 +628,7 @@ void Plansza::update() {
bool hit = false; bool hit = false;
for (auto rocketIt = ship->getRockets().begin(); rocketIt != ship->getRockets().end();) { for (auto rocketIt = ship->getRockets().begin(); rocketIt != ship->getRockets().end();) {
if (kamikadzeIt->getSprite().getGlobalBounds().intersects(rocketIt->getSprite().getGlobalBounds())) { if (kamikadzeIt->getSprite().getGlobalBounds().intersects(rocketIt->getSprite().getGlobalBounds())) {
rocketIt = ship->getRockets().erase(rocketIt); ship->getRockets().erase(rocketIt);
kamikadzeIt->takeDamage(); kamikadzeIt->takeDamage();
hit = true; hit = true;
break; break;
@@ -648,7 +647,7 @@ void Plansza::update() {
bool hit = false; bool hit = false;
for (auto rocketIt = ship->getRockets().begin(); rocketIt != ship->getRockets().end();) { for (auto rocketIt = ship->getRockets().begin(); rocketIt != ship->getRockets().end();) {
if (wiazkowiecIt->getSprite().getGlobalBounds().intersects(rocketIt->getSprite().getGlobalBounds())) { if (wiazkowiecIt->getSprite().getGlobalBounds().intersects(rocketIt->getSprite().getGlobalBounds())) {
rocketIt = ship->getRockets().erase(rocketIt); ship->getRockets().erase(rocketIt);
wiazkowiecIt->takeDamage(); wiazkowiecIt->takeDamage();
hit = true; hit = true;
break; break;
@@ -687,6 +686,8 @@ void Plansza::update() {
heartStats[1].setTexture(heartTexture); heartStats[1].setTexture(heartTexture);
heartStats[2].setTexture(heartTexture); heartStats[2].setTexture(heartTexture);
break; break;
default:
break;
} }
@@ -698,7 +699,7 @@ void Plansza::update() {
void Plansza::update_meteors() { void Plansza::update_meteors() {
// usuwanie meteorów które wyleciały poza ekran // usuwanie meteorów, które wyleciały poza ekran
for (auto &meteor: meteors) { for (auto &meteor: meteors) {
if (meteor.getStatus()) { if (meteor.getStatus()) {
meteors.erase(meteors.begin()); meteors.erase(meteors.begin());
@@ -775,19 +776,21 @@ void Plansza::spawn_kamikadze() {
} }
void Plansza::spawn_wiazkowiec() { void Plansza::spawn_wiazkowiec() {
if (WiazkowiecSpawnClock.getElapsedTime().asSeconds() >= 50) { // Spawn co 10 sekund if (WiazkowiecSpawnClock.getElapsedTime().asSeconds() >= 5) { // Spawn co 10 sekund
int spawnX = RandomNumberGenerator::getRandomNumber(50, size.width - 50); if (WEnemies.size() < 1) {
Wiazkowiec wiazkowiec(spawnX, -50, WiazkowiecTexture); int spawnX = RandomNumberGenerator::getRandomNumber(50, size.width - 50);
wiazkowiec.setPlanszaHeight(size.height, size.width); // Przekazanie wysokości i szerokosci okna Wiazkowiec wiazkowiec(spawnX, -50, WiazkowiecTexture, window);
WEnemies.push_back(wiazkowiec); wiazkowiec.setPlanszaHeight(size.height, size.width); // Przekazanie wysokości i szerokosci okna
std::cout << "Spawned Wiazkowiec Enemy at X: " << spawnX << std::endl; WEnemies.push_back(wiazkowiec);
WiazkowiecSpawnClock.restart(); std::cout << "Spawned Wiazkowiec Enemy at X: " << spawnX << std::endl;
WiazkowiecSpawnClock.restart();
}
} }
} }
void Plansza::update_hearts() { void Plansza::update_hearts() {
// usuwanie serduszek które wyleciały poza ekran // usuwanie serduszek, które wyleciały poza ekran
for (auto& heart : hearts) { for (auto& heart : hearts) {
if(heart.getStatus()) { if(heart.getStatus()) {
hearts.erase(hearts.begin()); hearts.erase(hearts.begin());

13
sources/Player.cpp
View File

@@ -1,10 +1,7 @@
#include <utility>
#include "../headers/Player.h" #include "../headers/Player.h"
#include <iostream> #include <iostream>
#include <SFML/Graphics/Font.hpp> #include <SFML/Graphics/Font.hpp>
#include <SFML/Graphics/RenderWindow.hpp>
#include <SFML/Graphics/Text.hpp> #include <SFML/Graphics/Text.hpp>
#include "../headers/Plansza.h" #include "../headers/Plansza.h"
@@ -24,8 +21,14 @@ Player* Player::getInstance(int x, int y, const sf::Texture& texture) {
} }
void Player::loadTexture() { void Player::loadTexture() {
bulletTexture.loadFromFile("../assets/img/bullets/bullet_pink.png"); try {
rocketTexture.loadFromFile("../assets/img/rockets/Rocket_111.png"); bulletTexture.loadFromFile("../assets/img/bullets/bullet_pink.png");
rocketTexture.loadFromFile("../assets/img/rockets/Rocket_111.png");
} catch (std::exception &e) {
std::cerr << "Failed to load textures: " << e.what() << std::endl;
exit(-500);
}
damageDealClock.restart(); damageDealClock.restart();
originalColor = actorSprite.getColor(); originalColor = actorSprite.getColor();
} }

2
sources/Rocket.cpp
View File

@@ -2,7 +2,7 @@
void Rocket::update() { void Rocket::update() {
sprite.move(0.0f, speed); sprite.move(0.0f, speed);
position.y += int(speed); position.y += static_cast<int>(speed);
if(position.y < -100) { if(position.y < -100) {
outOfBounds = true; outOfBounds = true;
} }

155
sources/Wiazkowiec.cpp
View File

@@ -1,56 +1,60 @@
#include "../headers/Wiazkowiec.h" #include "../headers/Wiazkowiec.h"
#include "../headers/Plansza.h"
#include "../headers/RandomNumberGenerator.h"
#include <iostream> #include <iostream>
#include <random>
#include "../headers/Plansza.h"
Wiazkowiec::Wiazkowiec(int x, int y, const sf::Texture& texture) : Actor(x, y, texture), beam(0, 0, 50.f, 50.f, sf::Color::Red) { Wiazkowiec::Wiazkowiec(int x, int y, const sf::Texture &texture, sf::RenderWindow *window) : Actor(x, y, texture),
actorSprite.setTexture(texture); beam(nullptr)
{
window_ptr = window;
try {
beamTexture.loadFromFile("../assets/img/wiazka/laser.png");
} catch (std::exception &e) {
std::cerr << "Failed to load textures: " << e.what() << std::endl;
exit(-500);
}
hp = 2; // 2 punkty życia hp = 2; // 2 punkty życia
firerate = 5000; // Strzela co 10 firerate = 5000; // Strzela co 10
moving_speed = 5.0f; // Prędkość moving_speed = 5.0f; // Prędkość
} }
void Wiazkowiec::setPlanszaHeight(float height, float width) { void Wiazkowiec::setPlanszaHeight(int height, int width) {
planszaHeight = height; planszaHeight = height;
planszaWidth = width; planszaWidth = width;
} }
void Wiazkowiec::spawnBeam() { void Wiazkowiec::spawnBeam() {
float beamX = position.x; int beamX = actorSprite.getPosition().x;
float beamY = position.y; int beamY = actorSprite.getPosition().y;
float beamWidth = 50.f;
float beamHeight = 0.f;
switch (direction) { switch (direction) {
case DirectionW::Up: case DirectionW::Up: {
beamHeight = position.y; beam = new Beam(beamX, beamY, beamTexture);
beamY -= beamHeight; beam->setRotation(180);
beam = Beam(beamX, beamY, beamWidth, beamHeight, sf::Color::Red); break;
break; }
case DirectionW::Down: case DirectionW::Down: {
beamHeight = planszaHeight - position.y; beam = new Beam(beamX, beamY, beamTexture);
beam = Beam(beamX, beamY, beamWidth, beamHeight, sf::Color::Red); break;
break; }
case DirectionW::Left: case DirectionW::Left: {
beamHeight = 50.f; beam = new Beam(beamX, beamY, beamTexture);
beamWidth = position.x; beam->setRotation(90);
beamX -= beamWidth; break;
beamY = position.y + (actorSprite.getGlobalBounds().height / 2) - 25.f; }
beam = Beam(beamX, beamY, beamWidth, beamHeight, sf::Color::Red); case DirectionW::Right: {
break; beam = new Beam(beamX, beamY, beamTexture);
case DirectionW::Right: beam->setRotation(270);
beamHeight = 50.f; break;
beamWidth = 800 - position.x; }
beamY = position.y + (actorSprite.getGlobalBounds().height / 2) - 25.f; default:
beam = Beam(beamX, beamY, beamWidth, beamHeight, sf::Color::Red); break;
break;
} }
beam = Beam(beamX, beamY, beamWidth, beamHeight, sf::Color::Red);
beam.setVisible(true);
shooting = true; shooting = true;
shootingClock.restart(); shootingClock.restart();
} }
@@ -59,31 +63,53 @@ void Wiazkowiec::spawnBeam() {
void Wiazkowiec::shoot() { void Wiazkowiec::shoot() {
if (!shooting) { if (!shooting) {
spawnBeam(); spawnBeam();
std::cout << "Wiazkowiec shot a beam!" << std::endl; }
switch (direction) {
case DirectionW::Up: {
std::cout << "Direction is up" << std::endl;
break;
}
case DirectionW::Down: {
std::cout << "Direction is down" << std::endl;
break;
}
case DirectionW::Left: {
std::cout << "Direction is left" << std::endl;
break;
}
case DirectionW::Right: {
std::cout << "Direction is right" << std::endl;
break;
}
default:
break;
} }
} }
void Wiazkowiec::setRandomDirection() { void Wiazkowiec::setRandomDirection() {
// Losowanie kierunku: 0 = Up, 1 = Down, 2 = Left, 3 = Right // Losowanie kierunku: 0 = Up, 1 = Down, 2 = Left, 3 = Right
int directionIndex = std::rand() % 4;
switch (directionIndex) { int whatNumber = rand() % 4;
switch (whatNumber) {
case 0: case 0:
direction = DirectionW::Up; direction = DirectionW::Up;
break; break;
case 1: case 1:
direction = DirectionW::Down; direction = DirectionW::Down;
break; break;
case 2: case 2:
direction = DirectionW::Left; direction = DirectionW::Left;
break; break;
case 3: case 3:
direction = DirectionW::Right; direction = DirectionW::Right;
break; break;
default:
break;
} }
} }
void Wiazkowiec::updateDirection() { void Wiazkowiec::checkIfBeamShootOutOfBounds() {
auto spriteBounds = actorSprite.getGlobalBounds(); // Pobierz rozmiar i pozycję sprite'a auto spriteBounds = actorSprite.getGlobalBounds(); // Pobierz rozmiar i pozycję sprite'a
// Kontrola górnej i dolnej krawędzi // Kontrola górnej i dolnej krawędzi
@@ -106,17 +132,17 @@ void Wiazkowiec::move(float deltaX, float deltaY) {
auto spriteBounds = actorSprite.getGlobalBounds(); // Rozmiar i pozycja sprite'a auto spriteBounds = actorSprite.getGlobalBounds(); // Rozmiar i pozycja sprite'a
// Zapobiegaj wyjściu poza poziome granice // Zapobiegaj wyjściu poza poziome granice
if (position.x + deltaX < 0) { if (static_cast<float>(position.x) + deltaX < 0) {
deltaX = -position.x; deltaX = static_cast<float>(-position.x);
} else if (position.x + spriteBounds.width + deltaX > planszaWidth) { } else if (static_cast<float>(position.x) + spriteBounds.width + deltaX > static_cast<float>(planszaWidth)) {
deltaX = planszaWidth - (position.x + spriteBounds.width); deltaX = static_cast<float>(planszaWidth) - (static_cast<float>(position.x) + spriteBounds.width);
} }
// Zapobiegaj wyjściu poza pionowe granice // Zapobiegaj wyjściu poza pionowe granice
if (position.y + deltaY < 0) { if (static_cast<float>(position.y) + deltaY < 0) {
deltaY = -position.y; deltaY = static_cast<float>(-position.y);
} else if (position.y + spriteBounds.height + deltaY > planszaHeight) { } else if (static_cast<float>(position.y) + spriteBounds.height + deltaY > static_cast<float>(planszaHeight)) {
deltaY = planszaHeight - (position.y + spriteBounds.height); deltaY = static_cast<float>(planszaHeight) - (static_cast<float>(position.y) + spriteBounds.height);
} }
actorSprite.move(deltaX, deltaY); actorSprite.move(deltaX, deltaY);
@@ -133,42 +159,39 @@ void Wiazkowiec::update() {
if (shooting) { if (shooting) {
// Kontrola zakończenia strzału // Kontrola zakończenia strzału
if (shootingClock.getElapsedTime().asSeconds() >= beamDuration) { if (shootingClock.getElapsedTime().asSeconds() >= beamDuration) {
beam.setVisible(false);
shooting = false; shooting = false;
delete beam;
beam = nullptr;
setRandomDirection(); // Zmień kierunek po strzale setRandomDirection(); // Zmień kierunek po strzale
} else {
window_ptr->draw(beam->getSprite());
} }
} else { } else {
updateDirection(); checkIfBeamShootOutOfBounds();
switch (direction) { switch (direction) {
case DirectionW::Up: case DirectionW::Up:
moveUp(); moveUp();
break; break;
case DirectionW::Down: case DirectionW::Down:
moveDown(); moveDown();
break; break;
case DirectionW::Left: case DirectionW::Left:
moveLeft(); moveLeft();
break; break;
case DirectionW::Right: case DirectionW::Right:
moveRight(); moveRight();
break; break;
} }
if (shootClock.getElapsedTime().asSeconds() >= 3.0f) { // Co 3 sekundy if (shootClock.getElapsedTime().asSeconds() >= 3.0f) {
// Co 3 sekundy
shoot(); shoot();
shootClock.restart(); shootClock.restart();
} }
} }
} }
// Ustawianie widoczności wiązki podczas renderowania
void Wiazkowiec::render(sf::RenderWindow& window) {
if (beam.isVisible()) {
beam.render(window);
}
}
bool Wiazkowiec::isAlive() const { bool Wiazkowiec::isAlive() const {
return alive; return alive;
} }
@@ -184,6 +207,6 @@ bool Wiazkowiec::isShooting() const {
return shooting; return shooting;
} }
const Beam& Wiazkowiec::getBeam() const { Beam* Wiazkowiec::getBeam() const {
return beam; return beam;
} }