Commit

Array-Minesweeper/Array-Minesweeper.vcxproj

@@ -133,6 +133,16 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="source\Gameplay\Board\BoardController.cpp" />
+    <ClCompile Include="source\Gameplay\Board\BoardService.cpp" />
+    <ClCompile Include="source\Gameplay\Board\BoardView.cpp" />
+    <ClCompile Include="source\Gameplay\Cell\CellController.cpp" />
+    <ClCompile Include="source\Gameplay\Cell\CellModel.cpp" />
+    <ClCompile Include="source\Gameplay\Cell\CellView.cpp" />
+    <ClCompile Include="source\Gameplay\GameplayController.cpp" />
+    <ClCompile Include="source\Gameplay\GameplayService.cpp" />
+    <ClCompile Include="source\Time\TimeService.cpp" />
+    <ClCompile Include="source\UI\Gameplay\GameplayUIController.cpp" />
     <ClCompile Include="source\UI\Instructions\InstructionsScreenUIController.cpp" />
     <ClCompile Include="main.cpp" />
     <ClCompile Include="source\Event\EventService.cpp" />
@@ -153,10 +163,20 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="header\Event\EventService.h" />
+    <ClInclude Include="header\Gameplay\Board\BoardController.h" />
+    <ClInclude Include="header\Gameplay\Board\BoardService.h" />
+    <ClInclude Include="header\Gameplay\Board\BoardView.h" />
+    <ClInclude Include="header\Gameplay\Cell\CellController.h" />
+    <ClInclude Include="header\Gameplay\Cell\CellModel.h" />
+    <ClInclude Include="header\Gameplay\Cell\CellView.h" />
+    <ClInclude Include="header\Gameplay\GameplayController.h" />
+    <ClInclude Include="header\Gameplay\GameplayService.h" />
     <ClInclude Include="header\Main\GameService.h" />
     <ClInclude Include="header\Global\Config.h" />
     <ClInclude Include="header\Graphics\GraphicService.h" />
+    <ClInclude Include="header\Time\TimeService.h" />
     <ClInclude Include="header\UI\Credits\CreditsScreenUIController.h" />
+    <ClInclude Include="header\UI\Gameplay\GameplayUIController.h" />
     <ClInclude Include="header\UI\Interface\IUIController.h" />
     <ClInclude Include="header\UI\MainMenu\MainMenuUIController.h" />
     <ClInclude Include="header\Global\ServiceLocator.h" />

Array-Minesweeper/SFML/include/SFML/Config.hpp

@@ -31,7 +31,7 @@
 ////////////////////////////////////////////////////////////
 #define SFML_VERSION_MAJOR 2
 #define SFML_VERSION_MINOR 6
-#define SFML_VERSION_PATCH 0
+#define SFML_VERSION_PATCH 1
 
 
 ////////////////////////////////////////////////////////////

Array-Minesweeper/SFML/lib/cmake/SFML/SFMLConfig.cmake

@@ -144,5 +144,5 @@ if (NOT SFML_FOUND)
 endif()
 
 if (SFML_FOUND AND NOT SFML_FIND_QUIETLY)
-    message(STATUS "Found SFML 2.6.0 in ${CMAKE_CURRENT_LIST_DIR}")
+    message(STATUS "Found SFML 2.6.1 in ${CMAKE_CURRENT_LIST_DIR}")
 endif()

Array-Minesweeper/SFML/lib/cmake/SFML/SFMLConfigVersion.cmake

@@ -9,19 +9,19 @@
 # The variable CVF_VERSION must be set before calling configure_file().
 
 
-set(PACKAGE_VERSION "2.6.0")
+set(PACKAGE_VERSION "2.6.1")
 
 if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
   set(PACKAGE_VERSION_COMPATIBLE FALSE)
 else()
 
-  if("2.6.0" MATCHES "^([0-9]+)\\.")
+  if("2.6.1" MATCHES "^([0-9]+)\\.")
     set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
     if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
       string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
     endif()
   else()
-    set(CVF_VERSION_MAJOR "2.6.0")
+    set(CVF_VERSION_MAJOR "2.6.1")
   endif()
 
   if(PACKAGE_FIND_VERSION_RANGE)

Array-Minesweeper/SFML/lib/cmake/SFML/SFMLSharedTargets.cmake

@@ -7,7 +7,7 @@ if(CMAKE_VERSION VERSION_LESS "2.8.3")
    message(FATAL_ERROR "CMake >= 2.8.3 required")
 endif()
 cmake_policy(PUSH)
-cmake_policy(VERSION 2.8.3...3.24)
+cmake_policy(VERSION 2.8.3...3.25)
 #----------------------------------------------------------------
 # Generated CMake target import file.
 #----------------------------------------------------------------

Array-Minesweeper/SFML/lib/cmake/SFML/SFMLStaticTargets.cmake

@@ -7,7 +7,7 @@ if(CMAKE_VERSION VERSION_LESS "2.8.3")
    message(FATAL_ERROR "CMake >= 2.8.3 required")
 endif()
 cmake_policy(PUSH)
-cmake_policy(VERSION 2.8.3...3.24)
+cmake_policy(VERSION 2.8.3...3.25)
 #----------------------------------------------------------------
 # Generated CMake target import file.
 #----------------------------------------------------------------

Array-Minesweeper/header/Event/EventService.h

@@ -24,7 +24,7 @@ namespace Event
 		bool gameWindowWasClosed();
 		bool hasQuitGame();
 		bool isKeyboardEvent();
-		void updateButtonsState(ButtonState& button_state);
+		void updateButtonsState(ButtonState& button_state, sf::Mouse::Button button_type);
 
 	public:
 		EventService();

Array-Minesweeper/header/Gameplay/Board/BoardController.h

@@ -0,0 +1,84 @@
+#pragma once
+#include <sfml/Graphics.hpp>
+#include "../../header/Gameplay/Cell/CellController.h"
+#include "../../header/UI/UIElement/ButtonView.h"
+#include <random>
+
+namespace Gameplay
+{
+    namespace Board
+    {
+        class BoardView;
+
+        enum class BoardState
+        {
+            FIRST_CELL,     // The state when the player opens first cell.
+            PLAYING,        // The game is in progress.
+            COMPLETED,      // The game is over.
+        };
+
+        class BoardController
+        {
+        public:
+            static const int number_of_rows = 9;
+            static const int number_of_colums = 9;
+            static const int mines_count = 8;
+
+            BoardController();
+            ~BoardController();
+
+            void initialize();
+            void update();
+            void render();
+
+            void processCellInput(Cell::CellController* cell_controller, UI::UIElement::ButtonType button_type);
+            void reset();
+
+            BoardState getBoardState();
+            void setBoardState(BoardState state);
+
+            int getMinesCount();
+
+            void flagAllMines();
+            void openAllCells();
+            void showBoard();
+
+        private:
+            BoardView* board_view;
+            Cell::CellController* board[number_of_rows][number_of_colums];
+
+            // To generate random values.
+            std::default_random_engine random_engine;
+
+            // To give random seed to generator.
+            std::random_device random_device;
+
+            BoardState board_state;
+            int flagged_cells;
+
+            void createBoard();
+            void initializeCells();
+
+            void populateBoard(sf::Vector2i cell_position);
+            void populateMines(sf::Vector2i cell_position);
+            void populateCells();
+            int countMinesAround(sf::Vector2i cell_position);
+
+            void flagCell(sf::Vector2i cell_position);
+            void openCell(sf::Vector2i cell_position);
+            bool areAllCellOpen();
+
+            void processCellType(sf::Vector2i cell_position);
+            void processEmptyCell(sf::Vector2i cell_position);
+            void processMineCell(sf::Vector2i cell_position);
+
+            void openEmptyCells(sf::Vector2i cell_position);
+            bool isValidCellPosition(sf::Vector2i cell_position);
+
+
+            void resetBoard();
+            void deleteBoard();
+            void destroy();
+        };
+    }
+}

Array-Minesweeper/header/Gameplay/Board/BoardService.h

@@ -0,0 +1,39 @@
+#pragma once
+#include "../../header/Gameplay/Board/BoardController.h"
+#include "../../header/Gameplay/Cell/CellController.h"
+#include "../../header/UI/UIElement/ButtonView.h"
+
+
+namespace Gameplay
+{
+    enum class GameResult;
+
+    namespace Board
+    {
+        class BoardService
+        {
+        private:
+            Board::BoardController* board_controller;
+
+            void destroy();
+
+        public:
+            BoardService();
+            ~BoardService();
+            void initialize();
+            void update();
+            void render();
+
+            void processCellInput(Cell::CellController* cell_controller, UI::UIElement::ButtonType button_type);
+
+            BoardState getBoardState();
+            void setBoardState(BoardState state);
+            void resetBoard();
+
+            int getMinesCount();
+
+            void flagAllMines();
+            void showBoard();
+        };
+    }
+}

Array-Minesweeper/header/Gameplay/Board/BoardView.h

@@ -0,0 +1,41 @@
+#pragma once
+#include "../../header/UI/UIElement/ImageView.h"
+
+namespace Gameplay
+{
+    namespace Board
+    {
+        class BoardController;
+
+        class BoardView
+        {
+        private:
+
+            const float board_width_offset = 115.f;
+            const float board_height_offset = 329.f;
+
+            const float board_width = 866.f;
+            const float board_height = 1080.f;
+
+            const float background_alpha = 85.f;
+
+            BoardController* board_controller;
+            UI::UIElement::ImageView* board_image;
+            UI::UIElement::ImageView* background_image;
+
+            void initializeBackgroudImage();
+            void initializeBoardImage();
+
+        public:
+            BoardView(BoardController* controller);
+            ~BoardView();
+
+            void initialize();
+            void update();
+            void render();
+
+            float getCellWidth();
+            float getCellHeight();
+        };
+    }
+}

Array-Minesweeper/header/Gameplay/Cell/CellController.h

@@ -0,0 +1,45 @@
+#pragma once
+#include <sfml/Graphics.hpp>
+
+namespace Gameplay
+{
+    namespace Cell
+    {
+        class CellView;
+        class CellModel;
+        enum class CellState;
+        enum class CellType;
+
+        class CellController
+        {
+        private:
+            CellView* cell_view;
+            CellModel* cell_model;
+
+            void destroy();
+
+        public:
+            CellController(sf::Vector2i grid_position);
+            ~CellController();
+
+            void initialize(float cell_width, float cell_height);
+            void update();
+            void render();
+
+            void flagCell();
+            void openCell();
+
+            bool canOpenCell();
+            CellState getCellState();
+            void setCellState(CellState state);
+
+            CellType getCellType();
+            void setCellType(CellType type);
+
+            sf::Vector2i getCellPosition();
+            int getMinesAround();
+
+            void reset();
+        };
+    }
+}

Array-Minesweeper/header/Gameplay/Cell/CellModel.h

@@ -0,0 +1,57 @@
+#pragma once
+#include <sfml/Graphics.hpp>
+
+namespace Gameplay
+{
+    namespace Cell
+    {
+        enum class CellState
+        {
+            HIDDEN,
+            OPEN,
+            FLAGGED,
+        };
+
+        enum class CellType
+        {
+            EMPTY,
+            ONE,
+            TWO,
+            THREE,
+            FOUR,
+            FIVE,
+            SIX,
+            SEVEN,
+            EIGHT,
+            MINE,
+        };
+
+        class CellModel
+        {
+        private:
+            CellState cell_state;
+            CellType cell_type;
+
+            sf::Vector2i position;
+            int mines_around;
+
+        public:
+            CellModel(sf::Vector2i grid_position);
+            ~CellModel();
+
+            CellState getCellState();
+            void setCellState(CellState state);
+
+            CellType getCellType();
+            void setCellType(CellType type);
+
+            sf::Vector2i getCellPosition();
+            void setCellPosition(sf::Vector2i grid_position);
+
+            int getMinesAround();
+            void setMinesAround(int mine_count);
+
+            void reset();
+        };
+    }
+}