merge: Merge pull request #45 from G-Epitech/nibbler

Nibbler

.gitignore

@@ -19,4 +19,4 @@ lib
 *.gcno
 *.gcda
 *.o
-*.txt
+scores.txt

assets/nibbler/apple.ascii

@@ -0,0 +1 @@
+O

assets/nibbler/head.ascii

@@ -0,0 +1 @@
+@@@@

assets/nibbler/levels/1.ascii

@@ -0,0 +1,19 @@
+###################
+#  *   *   *   *  #
+# ### # ### # ### #
+#*# #*#     #*# #*#
+# ### # # # # ### #
+#     #*# #*#     #
+# ##### # # ##### #
+#*# *         * #*#
+# # #####*##### # #
+#   *         *   #
+# ##### ### ##### #
+#  *    ###    *  #
+# ### # ### # ### #
+# # # #  *  # # # #
+#*###*#*###*#*###*#
+#     # ### #     #
+#*##### ### #####*#
+#                 #
+###################

assets/nibbler/levels/2.ascii

@@ -0,0 +1,19 @@
+###################
+#*    #*  #   # * #
+# # # # # # # # # #
+#  *#    *  # * # #
+# #### # # ## ##  #
+#  # * # # ## ## ##
+#*   # # *    #   #
+# #### * #### * # #
+#   ### ##   #### #
+# #   *  * #  *   #
+# ## # ## ## ## ###
+#**# # # * #   *  #
+## # #   # ## ### #
+#   *## ##    *   #
+# ##### ## ## # ###
+# *  *  # * #    *#
+# ##### # # ## ## #
+# *             * #
+###################

assets/nibbler/tail.ascii

@@ -0,0 +1,3 @@
+║═
+~~~~
+╝╚╗╔

assets/nibbler/wall.ascii

@@ -0,0 +1 @@
+#

core/src/Core.cpp

@@ -55,16 +55,43 @@ void Core::_initGame()
         if (this->_gameProviders.empty())
             throw ArcadeError("No game provider available");
         this->_gameProvider = this->_getGameProvider(0);
-        std::cout << "No game provider selected, using default provider" << std::endl;
+        std::cerr << "No game provider selected, using default provider" << std::endl;
     }
-    this->_game = this->_gameProvider->createInstance();
-    this->_sceneStage = RESUME;
+    try {
+        this->_game = this->_gameProvider->createInstance();
+        this->_sceneStage = RESUME;
+    } catch (std::exception &e) {
+        std::cerr << e.what() << std::endl;
+        this->_sceneStage = MENU;
+    }
+}
+
+void Core::_initSecureWindow()
+{
+    IWindow::WindowInitProps windowInitProps {
+        Vector2u(20, 20),
+        IWindow::WINDOWED,
+        60,
+        "Secured Window",
+        ""
+    };
+
+    this->_handleWindowClose();
+    if (!this->_graphicsProvider) {
+        if (this->_graphicsProviders.empty())
+            throw ArcadeError("No graphic provider available");
+        this->_graphicsProvider = this->_getGraphicsProvider(0);
+        std::cerr << "No graphic provider selected, using default provider" << std::endl;
+    }
+    this->_window = this->_graphicsProvider->createWindow(windowInitProps);
 }
 
 void Core::_initWindow()
 {
     if (!this->_game)
         this->_initGame();
+    if (!this->_game)
+        return this->_initSecureWindow();
     auto gameManifest = this->_game->getManifest();
     IWindow::WindowInitProps windowInitProps {
         this->_game->getSize(),
@@ -79,7 +106,7 @@ void Core::_initWindow()
         if (this->_graphicsProviders.empty())
             throw ArcadeError("No graphic provider available");
         this->_graphicsProvider = this->_getGraphicsProvider(0);
-        std::cout << "No graphic provider selected, using default provider" << std::endl;
+        std::cerr << "No graphic provider selected, using default provider" << std::endl;
     }
     this->_window = this->_graphicsProvider->createWindow(windowInitProps);
     this->_sceneStage = PLAY;
@@ -285,7 +312,7 @@ void Core::_preventWindowEvents(std::vector<events::EventPtr> events)
 void Core::_changeGraphicProvider(const unsigned char &index)
 {
     if (index > this->_graphicsProviders.size() - 1) {
-        std::cout << "Invalid graphic provider index" << std::endl;
+        std::cerr << "Invalid graphic provider index" << std::endl;
         return;
     }
     auto newProvider = this->_getGraphicsProvider(index);
@@ -298,7 +325,7 @@ void Core::_changeGraphicProvider(const unsigned char &index)
 void Core::_changeGameProvider(const unsigned char &index)
 {
     if (index > this->_gameProviders.size() - 1) {
-        std::cout << "Invalid game provider index" << std::endl;
+        std::cerr << "Invalid game provider index" << std::endl;
         return;
     }
     auto newProvider = this->_getGameProvider(index);
@@ -393,6 +420,7 @@ void Core::_handleWindowClose()
         this->_stopAllGraphicsSounds();
         this->_window->close();
         this->_menu.updateScore(this->_game);
+        this->_sceneStage = MENU;
     }
 }
 
@@ -549,7 +577,7 @@ void Core::run()
         return;
     this->_initGame();
     this->_initWindow();
-    while (this->_window->isOpen()) {
+    while (this->_sceneStage != EXIT) {
         auto currentTime = std::chrono::high_resolution_clock::now();
         auto deltaTime = std::chrono::duration_cast<std::chrono::milliseconds>(currentTime - previousTime);
         previousTime = currentTime;
@@ -559,15 +587,15 @@ void Core::run()
             this->_menu.run();
             previousTime = std::chrono::high_resolution_clock::now();
         }
-        if (this->_sceneStage == EXIT)
-            return;
         if (this->_sceneStage == NEWGAME)
             this->_initGame();
         if (this->_sceneStage == RESUME)
             this->_initWindow();
-        this->_game->compute(deltaTime);
-        this->_gameEntities = this->_game->getEntities();
-        this->_handleEvents();
-        this->_renderEntities();
+        if (this->_sceneStage == PLAY) {
+            this->_game->compute(deltaTime);
+            this->_gameEntities = this->_game->getEntities();
+            this->_handleEvents();
+            this->_renderEntities();
+        }
     }
 }

core/src/Core.hpp

@@ -64,6 +64,12 @@ class Core {
          */
         void _initWindow();
 
+        /**
+         * @brief Initialize the secure window
+         * 
+         */
+        void _initSecureWindow();
+
         /**
          * @brief Initialize the game
          * 

core/src/menu/Menu.cpp

@@ -692,10 +692,11 @@ void Menu::_writeScore()
 
 void Menu::updateScore(std::shared_ptr<IGame> game)
 {
+    if (!game)
+        return;
     this->_score.game = game->getManifest().name;
     this->_score.score = game->getScore();
 
-    std::cout << "Player Score: " << this->_score.score << std::endl;
     for (auto &score : this->_scores) {
         auto playerName = this->_score.player.empty() ? "Guest" : this->_score.player;
         auto scoreName = score.player.empty() ? "Guest" : score.player;

games/CMakeLists.txt

@@ -1 +1,2 @@
 add_subdirectory(snake)
+add_subdirectory(nibbler)

games/nibbler/CMakeLists.txt

@@ -0,0 +1,24 @@
+project(nibbler)
+add_library(${PROJECT_NAME} SHARED
+        export.cpp
+        src/NibblerGameProvider.cpp
+        src/NibblerGame.cpp
+        src/entities/nibbler/Nibbler.cpp
+        src/entities/nibbler/Nibbler.hpp
+        src/entities/nibbler/TailEntity.cpp
+        src/entities/nibbler/TailEntity.hpp
+        src/entities/nibbler/HeadEntity.cpp
+        src/entities/nibbler/HeadEntity.hpp
+        src/entities/nibbler/components/HeadKeyboardComponent.cpp
+        src/entities/nibbler/components/HeadKeyboardComponent.hpp
+        src/entities/wall/WallEntity.cpp
+        src/entities/wall/WallEntity.hpp
+        src/entities/background/BackgroundEntity.cpp
+        src/entities/background/BackgroundEntity.hpp
+        src/entities/apple/AppleEntity.cpp
+        src/entities/apple/AppleEntity.hpp
+)
+add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../common PRIVATE)
+target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_LIST_DIR}/src)
+target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_LIST_DIR}/../..)
+target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_LIST_DIR}/..)

games/nibbler/export.cpp

@@ -0,0 +1,22 @@
+/*
+** EPITECH PROJECT, 2024
+** arcade-shared
+** File description:
+** export
+*/
+
+#include "NibblerGameProvider.hpp"
+#include "shared/types/Libraries.hpp"
+
+using namespace shared::games;
+using namespace shared::types;
+
+extern "C" {
+LibraryType SHARED_LIBRARY_TYPE_GETTER_NAME(void) {
+    return LibraryType::GAME;
+}
+
+IGameProvider *SHARED_GAME_PROVIDER_GETTER_NAME(void) {
+    return new arcade::games::nibbler::NibblerGameProvider();
+}
+}