Tema #2

CMakeLists.txt

@@ -108,7 +108,18 @@ endif()
 ###############################################################################
 
 # NOTE: update executable name in .github/workflows/cmake.yml:25 when changing name here
-add_executable(${PROJECT_NAME} main.cpp doodle_jump/game/Game.cpp doodle_jump/platform/Platform.cpp doodle_jump/player/Player.cpp doodle_jump/screen/GameScreen.cpp doodle_jump/screen/MainMenu.cpp doodle_jump/screen/PlayScreen.cpp doodle_jump/screen/GameOver.cpp doodle_jump/game_object/GameObject.cpp doodle_jump/powerups/Powerups.cpp)
+add_executable(${PROJECT_NAME} main.cpp 
+        doodle_jump/player/Player.cpp
+        doodle_jump/game/Game.cpp
+        doodle_jump/game_object/GameObject.cpp
+        doodle_jump/platform/Platform.cpp
+        doodle_jump/powerups/Powerups.cpp
+        doodle_jump/screen/GameOver.cpp
+        doodle_jump/screen/GameScreen.cpp
+        doodle_jump/screen/MainMenu.cpp
+        doodle_jump/screen/PlayScreen.cpp
+        doodle_jump/exceptions/Exceptions.cpp
+        )
 
 ###############################################################################
 
@@ -158,6 +169,5 @@ endif()
 # copy binaries to "bin" folder; these are uploaded as artifacts on each release
 # update name in .github/workflows/cmake.yml:29 when changing "bin" name here
 install(TARGETS ${PROJECT_NAME} DESTINATION bin)
-install(DIRECTORY assets fonts DESTINATION bin)
-# install(DIRECTORY some_dir1 some_dir2 DESTINATION bin)
+install(DIRECTORY Assets DESTINATION bin)
 # install(FILES some_file1.txt some_file2.md DESTINATION bin)

README.md

@@ -2,6 +2,10 @@
 
 #### In acest proiect voi recrea popularul joc mobil Doodle Jump folosind limbajul de programare C++ alaturi de libraria SFML pentru interfata grafica.
 
+## Known Issues
+
+- Peste scor ~30k playerul iese din ecran
+
 ### Tema 0
 
 - [x] Nume proiect (poate fi schimbat ulterior)
@@ -39,11 +43,11 @@
   - [x] smart pointers (recomandat, opțional)
   - [x] `dynamic_cast`/`std::dynamic_pointer_cast` pentru downcast cu sens
 - [x] suprascris cc/op= pentru copieri/atribuiri corecte, copy and swap
-- [ ] excepții
-  - [ ] ierarhie proprie cu baza `std::exception` sau derivată din `std::exception`; minim 2 clase pentru erori specifice
-  - [ ] utilizare cu sens: de exemplu, `throw` în constructor, `try`/`catch` în `main`
-- [ ] funcții și atribute `static`
-- [ ] STL
+- [x] excepții
+  - [x] ierarhie proprie cu baza `std::exception` sau derivată din `std::exception`; minim 2 clase pentru erori specifice
+  - [x] utilizare cu sens: de exemplu, `throw` în constructor, `try`/`catch` în `main`
+- [x] funcții și atribute `static`
+- [x] STL
 - [x] cât mai multe `const`
 - [ ] la sfârșit: commit separat cu adăugarea unei noi clase derivate fără a modifica restul codului, pe lângă cele 3 derivate deja adăugate
   - noua derivată nu poate fi una existentă care a fost ștearsă și adăugată din nou

doodle_jump/exceptions/Exceptions.cpp

@@ -0,0 +1,9 @@
+#include "Exceptions.h"
+
+const char* PlayerOutOfBoundException::what() const noexcept {
+    return "Player is out of bound";
+}
+
+const char* RandomException::what() const noexcept {
+    return "Random exception";
+}

doodle_jump/exceptions/Exceptions.h

@@ -0,0 +1,11 @@
+#include <iostream>
+
+class PlayerOutOfBoundException : public std::exception {
+public:
+    [[nodiscard]] const char* what() const noexcept override;
+};
+
+class RandomException : public std::exception {
+public:
+    [[nodiscard]] const char* what() const noexcept override;
+};

doodle_jump/game/Game.cpp

@@ -2,6 +2,7 @@
 #include "./../screen/MainMenu.h"
 #include "./../screen/PlayScreen.h"
 #include "./../screen/GameOver.h"
+#include "./../exceptions/Exceptions.h"
 #include <iostream>
 #include <memory>
 #include <string>
@@ -99,6 +100,7 @@ void Game::reset() {
 
 void Game::run() {
     std::cout << "Game run called\n";
+    Game::setDifficulty(1);
 
     while (window.isOpen()) {
         sf::Event e = sf::Event();
@@ -155,6 +157,10 @@ void Game::run() {
     }
 }
 
+void Game::setDifficulty(int difficulty) {
+    Game::difficulty = difficulty;
+}
+
 void Game::checkCollision() {
     // Get only lower part of player sprite
     sf::FloatRect lowerPlayerBounds = player.getSprite().getGlobalBounds();
@@ -264,6 +270,12 @@ void Game::play() {
         gameObject->moveSprite({0.0f, velocity.y});
         // player.moveSprite({0.0f, velocity.y});
     }
+
+    // Check if player is out of bounds
+    if (player.getSprite().getPosition().y < 0.0f) {
+        throw PlayerOutOfBoundException();
+    }
+
     player.moveSprite({velocity.x, 0.0f});
 
     window.clear(sf::Color::White);

doodle_jump/game/Game.h

@@ -17,6 +17,7 @@ class Game {
     float maxScore;
     sf::Text scoreText;
     Player player;
+    static int difficulty;
 
     sf::Sprite backgroundSprite[2] = { sf::Sprite(), sf::Sprite() };
     std::vector<sf::Texture> platformTextures = std::vector<sf::Texture>();
@@ -38,8 +39,8 @@ class Game {
     void changeScreen(ScreenType screenType);
     void play();
     void reset();
-    // void displayDebugInfo();
     void initTextures();
+    static void setDifficulty(int difficulty);
     sf::Texture& pickTexture(PlatformType platformType);
     sf::Texture& pickTexture(PowerupsType powerupsType);
     void displayScore();

main.cpp

@@ -4,6 +4,7 @@
 #include <time.h>
 
 #include "./doodle_jump/game/Game.h"
+#include "./doodle_jump/exceptions/Exceptions.h"
 
 #ifdef __linux__
 #include <X11/Xlib.h>
@@ -16,6 +17,12 @@ int main() {
 
     srand(time(NULL));
 
+    try {
+        throw RandomException();
+    } catch (const std::exception& e) {
+        std::cout << e.what() << '\n';
+    }
+
     Game game = Game();
     std::cout << game << '\n';