Dodano podstawowy licznik

# Conflicts:
#	main.cpp

CMakeLists.txt

@@ -25,7 +25,9 @@ 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)
 
 if(WIN32)
     set(SFML_ROOT "${CMAKE_SOURCE_DIR}/lib/SFML")
@@ -40,9 +42,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/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

@@ -21,6 +21,7 @@ public:
     void spawn_meteor();
     void update_meteors();
     void update();
+    void update_score();
 private:
     Size size;
     Background background;
@@ -29,8 +30,11 @@ private:
     sf::Texture meteorTexture1;
     sf::Texture meteorTexture2;
     sf::Clock spawnClock;
+    sf::Clock scoreClock;
     std::vector<Meteor> meteors;
     sf::RenderWindow *window;
+    sf::Font font;
+    unsigned int score = 0;
 };
 
 #endif //PLANSZA_H

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;
+    texture = texture;
-    meteorSprite.setTexture(texture);
+    sprite.setTexture(texture);
-    meteorSprite.setOrigin(meteorSprite.getLocalBounds().width / 2, meteorSprite.getLocalBounds().height / 2); // wycentrowanie sprite
+    sprite.setOrigin(sprite.getLocalBounds().width / 2, sprite.getLocalBounds().height / 2); // wycentrowanie sprite
-    meteorSprite.setPosition(x, y);
+    sprite.setPosition(x, y);
-    meteorSpeed = 5.0f;
+    movingSpeed = 5.0f;
-    meteorSprite.scale(0.05f, 0.05f);
+    sprite.scale(0.05f, 0.05f);
-    meteorPosition.x = x;
+    position.x = x;
-    meteorPosition.y = y;
+    position.y = y;
-    meteorRotationSpeed = static_cast<float>(rand() % 2 + 1) * (rand() % 2 == 0 ? 1 : -1);
+    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
+    sprite.move(0.0f, movingSpeed); // przesunięcie sprajta
-    meteorPosition.y += int(meteorSpeed); // przesunięcie pozycji
+    position.y += int(movingSpeed); // przesunięcie pozycji
-    meteorSprite.rotate(meteorRotationSpeed); // obracanie tym meteorkiem pięknym
+    sprite.rotate(rotationSpeed); // obracanie tym meteorkiem pięknym
-    if(meteorPosition.y > 900) {
+    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),
@@ -11,6 +12,13 @@ ship(static_cast<int>(mainWindow->getSize().x) / 2, static_cast<int>(mainWindow-
     size.height = static_cast<int>(windowHeight);
     size.width = static_cast<int>(windowWidth);
 
+    score = 0;
+
+    if (!font.loadFromFile("../assets/fonts/arial.ttf")) {
+        std::cerr << "Error loading font\n";
+        exit(-500);
+    }
+
     ship.setMovingSpeed(8);
     ship.setFirerate(200);
 
@@ -156,6 +164,7 @@ void Plansza::update() {
                 ++meteorIt;
             }
         }
+        update_score();
 }
 
 // Meteor-related niżej
@@ -190,5 +199,18 @@ std::vector<Meteor> &Plansza::getMeteors() {
     return meteors;
 }
 
+// TODO: naliczanie punktów za zabicie wrogów
+void Plansza::update_score() {
+    if (scoreClock.getElapsedTime().asMilliseconds() > 500) {
+        score++;
+        scoreClock.restart();
+    }
+
+    sf::Text text(std::to_string(score), font, 24);
+    text.setFillColor(sf::Color::White);
+    text.setPosition(25, 25);
+    window->draw(text);
+}
+