Jakieś działające gówno

Ale nie strzela chujek

CMakeLists.txt

@@ -25,7 +25,12 @@ add_executable(LotoStatek main.cpp
         headers/Rocket.h
         sources/Rocket.cpp
         headers/Size.h
-        headers/Position.h)
+        headers/Position.h
+        headers/ObjectItem.hpp
+        sources/ObjectItem.cpp
+        sources/Enemy.cpp
+        headers/Enemy.h
+)
 
 if(WIN32)
     set(SFML_ROOT "${CMAKE_SOURCE_DIR}/lib/SFML")
@@ -40,9 +45,9 @@ if(WIN32)
         target_link_libraries(LotoStatek ${SFML_LIBRARIES})
     endif()
 elseif(APPLE)
-    find_package(lib/SFML 2.6.2 COMPONENTS graphics window system REQUIRED)
+    find_package(SFML 2.6.2 COMPONENTS graphics window system REQUIRED)
     target_link_libraries(LotoStatek sfml-graphics sfml-window sfml-audio sfml-system)
 elseif(LINUX)
-    find_package(lib/SFML 2.6.2 COMPONENTS graphics window system REQUIRED)
+    find_package(SFML 2.6.2 COMPONENTS graphics window system REQUIRED)
     target_link_libraries(LotoStatek sfml-graphics sfml-window sfml-audio sfml-system)
 endif()

headers/Enemy.h

@@ -0,0 +1,25 @@
+#ifndef ENEMY_H
+#define ENEMY_H
+
+#include "Actor.h"
+#include "SFML/System/Clock.hpp"
+
+class Enemy : public Actor {
+public:
+    Enemy(int x, int y, std::string path);
+
+    void shoot() override;
+    void move(float deltaX, float deltaY) override;
+    void moveLeft() override;
+    void moveRight() override;
+    void moveUp() override;
+    void moveDown() override;
+    bool isAlive() const;
+    void takeDamage();
+
+private:
+    sf::Clock shootClock;
+    bool alive = true;
+};
+
+#endif // ENEMY_H

headers/Meteor.h

@@ -4,22 +4,12 @@
 #include "SFML/Graphics/Texture.hpp"
 #include "SFML/Graphics/Sprite.hpp"
 #include "Position.h"
+#include "ObjectItem.hpp"
 
-class Meteor {
+class Meteor : public ObjectItem {
 public:
     Meteor(float x, float y, sf::Texture &texture);
-    sf::Sprite &getSprite();
-    bool getStatus();
     void update();
-//    ~Meteor();
-private:
-    sf::Texture meteorTexture;
-    sf::Sprite meteorSprite;
-    Position meteorPosition;
-    float meteorRotationSpeed;
-    float meteorSpeed;
-    bool outOfBounds;
-    static unsigned int counter;
 };
 
 

headers/ObjectItem.hpp

@@ -0,0 +1,24 @@
+#ifndef LOTOSTATEK_OBJECTITEM_HPP
+#define LOTOSTATEK_OBJECTITEM_HPP
+
+#include "SFML/Graphics/Sprite.hpp"
+#include "Position.h"
+#include "SFML/Graphics/Texture.hpp"
+
+class ObjectItem {
+public:
+    ObjectItem(float x, float y, sf::Texture &texture);
+    sf::Sprite &getSprite();
+    bool getStatus();
+    virtual void update() = 0;
+protected:
+    sf::Texture texture;
+    sf::Sprite sprite;
+    Position position;
+    float rotationSpeed;
+    float movingSpeed;
+    bool outOfBounds;
+    static unsigned int counter;
+};
+
+#endif //LOTOSTATEK_OBJECTITEM_HPP

headers/Plansza.h

@@ -2,6 +2,7 @@
 #define PLANSZA_H
 
 #include "Meteor.h"
+#include "Enemy.h"
 #include "RandomNumberGenerator.h"
 #include "SFML/System/Clock.hpp"
 #include "SFML/Graphics/RenderWindow.hpp"
@@ -18,9 +19,12 @@ public:
     Plansza(unsigned int windowHeight,unsigned int windowWidth, sf::RenderWindow *mainWindow);
     Size getSize();
     std::vector<Meteor> &getMeteors();
+
+
     void spawn_meteor();
     void update_meteors();
     void update();
+    void spawn_enemy();
 private:
     Size size;
     Background background;
@@ -29,6 +33,9 @@ private:
     sf::Texture meteorTexture1;
     sf::Texture meteorTexture2;
     sf::Clock spawnClock;
+    sf::Clock shooterSpawnClock;
+    std::vector<Enemy> enemies;
+    sf::Clock enemySpawnClock;
     std::vector<Meteor> meteors;
     sf::RenderWindow *window;
 };

sources/Enemy.cpp

@@ -0,0 +1,36 @@
+#include "../headers/Enemy.h"
+#include "../headers/Bullet.h"
+
+Enemy::Enemy(int x, int y, std::string path) : Actor(x, y, path) {
+    hp = 1; // Przeciwnik ma 1 punkt życia
+    firerate = 1000; // Strzela co 1 sekundę
+    moving_speed = 2.0f; // Prędkość ruchu przeciwnika
+}
+
+void Enemy::shoot() {
+    if (shootClock.getElapsedTime().asMilliseconds() >= firerate) {
+        bullets.emplace_back(position.x, position.y + 20, bulletTextureLeft); // Strzał w dół
+        shootClock.restart();
+    }
+}
+
+void Enemy::move(float deltaX, float deltaY) {
+    actorSprite.move(deltaX, deltaY);
+    position.x += static_cast<int>(deltaX);
+    position.y += static_cast<int>(deltaY);
+}
+
+void Enemy::moveLeft() { move(-moving_speed, 0.0f); }
+void Enemy::moveRight() { move(moving_speed, 0.0f); }
+void Enemy::moveUp() { move(0.0f, -moving_speed); }
+void Enemy::moveDown() { move(0.0f, moving_speed); }
+
+bool Enemy::isAlive() const {
+    return alive;
+}
+
+void Enemy::takeDamage() {
+    if (--hp <= 0) {
+        alive = false;
+    }
+}

sources/Meteor.cpp

@@ -1,40 +1,29 @@
-#include <iostream>
 #include "../headers/Meteor.h"
 
-Meteor::Meteor(float x, float y, sf::Texture &texture) {
+Meteor::Meteor(float x, float y, sf::Texture &texture) : ObjectItem(x, y, texture) {
     outOfBounds = false;
-    meteorTexture = texture;
-    meteorSprite.setTexture(texture);
-    meteorSprite.setOrigin(meteorSprite.getLocalBounds().width / 2, meteorSprite.getLocalBounds().height / 2); // wycentrowanie sprite
-    meteorSprite.setPosition(x, y);
-    meteorSpeed = 5.0f;
-    meteorSprite.scale(0.05f, 0.05f);
-    meteorPosition.x = x;
-    meteorPosition.y = y;
-    meteorRotationSpeed = static_cast<float>(rand() % 2 + 1) * (rand() % 2 == 0 ? 1 : -1);
+    texture = texture;
+    sprite.setTexture(texture);
+    sprite.setOrigin(sprite.getLocalBounds().width / 2, sprite.getLocalBounds().height / 2); // wycentrowanie sprite
+    sprite.setPosition(x, y);
+    movingSpeed = 5.0f;
+    sprite.scale(0.05f, 0.05f);
+    position.x = x;
+    position.y = y;
+    rotationSpeed = static_cast<float>(rand() % 2 + 1) * (rand() % 2 == 0 ? 1 : -1);
 }
 
-sf::Sprite &Meteor::getSprite() {
-    return meteorSprite;
-}
+
 
 void Meteor::update() {
-    meteorSprite.move(0.0f, meteorSpeed); // przesunięcie sprajta
-    meteorPosition.y += int(meteorSpeed); // przesunięcie pozycji
-    meteorSprite.rotate(meteorRotationSpeed); // obracanie tym meteorkiem pięknym
-    if(meteorPosition.y > 900) {
+    sprite.move(0.0f, movingSpeed); // przesunięcie sprajta
+    position.y += int(movingSpeed); // przesunięcie pozycji
+    sprite.rotate(rotationSpeed); // obracanie tym meteorkiem pięknym
+    if(position.y > 900) {
         outOfBounds = true; // jeżeli wyszedł poza granice ekranu ustaw tą zmienną
     }
-//    std::cout << "x: " << meteorSprite.getPosition().x << std::endl;
-//    std::cout << "y: " << meteorSprite.getPosition().y << std::endl;
 }
 
-bool Meteor::getStatus() {
-    return outOfBounds;
-}
-
-unsigned int Meteor::counter = 0;
-
 // było użyte do testowania czy meteoryt jest kasowany
 //Meteor::~Meteor() {
 //    Meteor::counter++;

sources/ObjectItem.cpp

@@ -0,0 +1,17 @@
+#include "../headers/ObjectItem.hpp"
+
+ObjectItem::ObjectItem(float x, float y, sf::Texture &texture) {
+    Position position_;
+    position_.x = x;
+    position_.y = y;
+    position = position_;
+    this->texture = texture;
+}
+
+bool ObjectItem::getStatus() {
+    return outOfBounds;
+}
+
+sf::Sprite &ObjectItem::getSprite() {
+    return sprite;
+}

sources/Plansza.cpp

@@ -1,6 +1,7 @@
 #include <random>
 #include <iostream>
 #include "../headers/Plansza.h"
+#include "../headers/ObjectItem.hpp"
 
 Plansza::Plansza(unsigned int windowHeight, unsigned int windowWidth, sf::RenderWindow *mainWindow)
 : background("../assets/img/background/background.png", 2.0f),
@@ -66,7 +67,7 @@ void Plansza::update() {
 
         // generowanie nowego meteoru
         spawn_meteor();
-
+        spawn_enemy();
 
         // utrzymanie meteorów i pocisków w ruchu
         for (auto& meteor : getMeteors()) {
@@ -156,6 +157,41 @@ void Plansza::update() {
                 ++meteorIt;
             }
         }
+    // Ruch i renderowanie przeciwników
+    for (auto it = enemies.begin(); it != enemies.end();) {
+        it->moveDown(); // Przeciwnicy poruszają się w dół
+        it->shoot();
+
+        // Rysowanie przeciwników
+        window->draw(it->getSprite());
+
+        // Usunięcie martwych przeciwników
+        if (!it->isAlive()) {
+            it = enemies.erase(it);
+        } else {
+            ++it;
+        }
+    }
+
+    // Kolizje między pociskami gracza a przeciwnikami
+    for (auto enemyIt = enemies.begin(); enemyIt != enemies.end();) {
+        bool hit = false;
+        for (auto bulletIt = ship.getBullets().begin(); bulletIt != ship.getBullets().end();) {
+            if (enemyIt->getSprite().getGlobalBounds().intersects(bulletIt->getSprite().getGlobalBounds())) {
+                bulletIt = ship.getBullets().erase(bulletIt);
+                enemyIt->takeDamage();
+                hit = true;
+                break;
+            } else {
+                ++bulletIt;
+            }
+        }
+        if (hit && !enemyIt->isAlive()) {
+            enemyIt = enemies.erase(enemyIt);
+        } else {
+            ++enemyIt;
+        }
+    }
 }
 
 // Meteor-related niżej
@@ -182,6 +218,14 @@ void Plansza::update_meteors() {
     }
 }
 
+void Plansza::spawn_enemy() {
+    if (enemySpawnClock.getElapsedTime().asSeconds() >= 10) { // Spawn co 10 sekund
+        int spawnX = RandomNumberGenerator::getRandomNumber(50, size.width - 50);
+        enemies.emplace_back(spawnX, -50, "../assets/img/enemy/enemy.png");
+        enemySpawnClock.restart();
+    }
+}
+
 Size Plansza::getSize() {
     return size;
 }