Готовлю новый релиз

Author: AsuRaHan

README.md

@@ -180,7 +180,7 @@ git push origin v1.0.0
 
 - **./system**: Настройка системы, OpenGL и пользовательского ввода:
   - `OpenGLInitializer.h`, `OpenGLInitializer.cpp` - Инициализация контекста OpenGL
-  - `GLFunctions.h`, `GLFunctions.cpp` - Загрузка функций OpenGL
+  - `GLFunctions.h`, `GLFunctions.cpp` - Загрузка функций OpenGL (урезанный GLAD)
   - `ShaderManager.h`, `ShaderManager.cpp` - Создание компиляция проверка шейдеров (GLSL) OpenGL
   - `SettingsManager.h`, `SettingsManager.cpp` - Сохранение и загрузка пользовательских настроек.
   - `InputHandler.h`, `InputHandler.cpp` - Обработчик пользовательского ввода (клавиатура мыш).

game/GPUAutomaton.cpp

@@ -190,8 +190,6 @@ void GPUAutomaton::Update() {
     glDispatchCompute((gridWidth + 31) / 32, (gridHeight + 31) / 32, 1);
     glMemoryBarrier(GL_SHADER_STORAGE_BARRIER_BIT);
 
-    //bufferIndex = (bufferIndex + 1) % 2;
-
     SwapBuffers();
 }
 //  Êàê ýòî ðàáîòàåò

game/GameController.cpp

@@ -1,14 +1,16 @@
 #include "GameController.h"
 
 GameController::GameController(int width, int height, float cellSize)
-    : grid(width, height), GameSimulation(grid), cellSize(cellSize), 
-    isRunning(false), showGrid(true), showUI(true),
+    : grid(width, height), 
+    gpuAutomaton(grid.getWidth(), grid.getHeight()),
+    cellSize(cellSize), 
+    isRunning(false), showGrid(true), showUI(true), isWorldToroidal(true),
     currentPatternRotator(0), isSelectionActive(false),
     rendererProvider(nullptr)
 {
     currentPattern = glider;
     std::srand(static_cast<unsigned int>(std::time(nullptr))); // Èíèöèàëèçàöèÿ ãåíåðàòîðà ñëó÷àéíûõ ÷èñåë
-
+    grid.SetGPUAutomaton(&gpuAutomaton);
 }
 
 void GameController::randomizeGrid() {
@@ -77,6 +79,12 @@ void GameController::PlacePattern(int startX, int startY) {
     }
 }
 
+void GameController::setWoldToroidal(bool wt)
+{
+    isWorldToroidal = wt;
+    gpuAutomaton.SetToroidal(isWorldToroidal);
+}
+
 void GameController::randomizeGrid(float density) {
     if (isRunning) return;
     // Ãåíåðàòîð ñëó÷àéíûõ ÷èñåë
@@ -113,7 +121,7 @@ void GameController::update(float deltaTime) {
     if (isRunning) {
         //frameTimeAccumulator += deltaTime;
         //if (frameTimeAccumulator >= simulationSpeed) {
-            GameSimulation.nextGeneration();
+        gpuAutomaton.Update();
         //    frameTimeAccumulator -= simulationSpeed;
         //}
     }
@@ -129,7 +137,7 @@ void GameController::stopSimulation() {
 
 void GameController::stepSimulation() {
     if (isRunning) return;
-    GameSimulation.nextGeneration();
+    gpuAutomaton.Update();
 }
 
 bool GameController::isSimulationRunning() const {
@@ -162,7 +170,7 @@ bool GameController::getCellState(int x, int y) const {
 
 void GameController::SetCellInstanceProvider(IRendererProvider* provider) {
     rendererProvider = provider;
-    GameSimulation.SetCellProvider(provider); // Ïåðåäàåì ïðîâàéäåðà â GameOfLife
+    //GameSimulation.SetCellProvider(provider); // Ïåðåäàåì ïðîâàéäåðà â GameOfLife
 }
 
 void GameController::setFieldSize(int newWidth, int newHeight) {
@@ -172,30 +180,8 @@ void GameController::setFieldSize(int newWidth, int newHeight) {
     }
     if (newWidth <= 0 || newHeight <= 0) return; // Ïðîâåðêà íà ïîëîæèòåëüíûé ðàçìåð
 
-    // Ñîçäàåì íîâóþ ñåòêó ñ íîâûìè ðàçìåðàìè
-    Grid newGrid(newWidth, newHeight);
-
-    // Êîïèðóåì ñòàðûå äàííûå â íîâóþ ñåòêó, ãäå ýòî âîçìîæíî
-    for (int y = 0; y < grid.getHeight(); ++y) {
-        if (y >= newHeight) break; // Âûõîäèì èç öèêëà, åñëè ïðåâûøàåì íîâóþ âûñîòó
-        for (int x = 0; x < grid.getWidth(); ++x) {
-            if (x >= newWidth) break; // Âûõîäèì èç öèêëà, åñëè ïðåâûøàåì íîâóþ øèðèíó
-
-            bool currentState = grid.getCellState(x, y);
-            newGrid.setCellState(x, y, currentState);
-            if (currentState) {
-                newGrid.setCellColor(x, y, 0.1f, 0.4f, 0.1f);
-            }
-            else {
-                newGrid.setCellColor(x, y, 0.0f, 0.0f, 0.0f);
-            }
-        }
-    }
-    // Îáíîâëÿåì òåêóùóþ ñåòêó
-    grid = std::move(newGrid);
-
-    // Îáíîâëÿåì ññûëêó íà ñåòêó â GameOfLife
-    GameSimulation.updateGridReference(grid);
+    grid.setSize(newWidth, newHeight);
+    gpuAutomaton.SetNewGridSize(newWidth, newHeight);
     // Ïåðåä ïåðåñòðîéêîé áóôåðîâ, óâåäîìëÿåì ðåíäåð î íåîáõîäèìîñòè îáíîâëåíèé
     rendererProvider->RebuildGameField();
 }

game/GameController.h

@@ -2,10 +2,13 @@
 #ifndef GAMECONTROLLER_H_
 #define GAMECONTROLLER_H_
 
-#include "GameSimulation.h"
+//#include "GameSimulation.h"
+
 #include "Grid.h"
+#include "GPUAutomaton.h"
 #include "GameStateManager.h"
 #include "PatternManager.h"
+#include "../rendering/IRendererProvider.h"
 
 #include <random> // Äëÿ ãåíåðàöèè ñëó÷àéíûõ ÷èñåë
 #include <string>
@@ -21,11 +24,13 @@ using Pattern = std::vector<std::vector<bool>>;
 class GameController {
 private:
     Grid grid;
-    GameSimulation GameSimulation;
+    //GameSimulation GameSimulation;
+    GPUAutomaton gpuAutomaton; // ÷ëåí êëàññà äëÿ âû÷èñëåíèé íà GPU
     float cellSize; // Ðàçìåð êàæäîé êëåòêè â ïèêñåëÿõ
     bool isRunning; // Ôëàã, ïîêàçûâàåò, çàïóùåíà ëè ñèìóëÿöèÿ
     bool showGrid;
     bool showUI;
+    bool isWorldToroidal;
     float simulationSpeed = 0.01f; // Çíà÷åíèå 1.0f ìîæåò ñîîòâåòñòâîâàòü îäíîé ñåêóíäå ðåàëüíîãî âðåìåíè
     float frameTimeAccumulator = 0.0f;
 
@@ -132,8 +137,8 @@ class GameController {
 
     void PlacePattern(int startX, int startY);
 
-    void setWoldToroidal(bool wt) { GameSimulation.setWoldToroidal( wt); };
-    bool getWoldToroidal() const { return GameSimulation.getWoldToroidal(); };
+    void setWoldToroidal(bool wt);
+    bool getWoldToroidal() const { return isWorldToroidal; };
 
     void setSimulationSpeed(float speed);
 
@@ -147,7 +152,7 @@ class GameController {
 
     void SetCellInstanceProvider(IRendererProvider* provider);
 
-    GPUAutomaton& getGPUAutomaton() { return GameSimulation.getGPUAutomaton(); }
+    GPUAutomaton& getGPUAutomaton() { return gpuAutomaton; }
 
     // Íîâûé ìåòîä äëÿ çàãðóçêè ñïèñêà ïàòòåðíîâ
     void loadPatternList(const std::string& patternFolder = "patterns");

game/GameSimulation.cpp

@@ -37,4 +37,10 @@ int Grid::getWidth() const {
 
 int Grid::getHeight() const {
     return height;
-}
+}
+
+void Grid::setSize(int w, int h)
+{
+    width = w;
+    height = h;
+}

game/GameSimulation.h

@@ -16,6 +16,9 @@ class Grid {
     void setCellState(int x, int y, bool alive);
     bool getCellState(int x, int y) const;
     int getWidth() const;
+    void setWidth(int w) { width = w; };
     int getHeight() const;
+    void setHeight(int h) { height = h; };
+    void setSize(int w, int h);
 };
 #endif // GRID_H_

game/Grid.cpp

@@ -156,7 +156,6 @@
     <ClCompile Include="external\imgui\imgui_tables.cpp" />
     <ClCompile Include="external\imgui\imgui_widgets.cpp" />
     <ClCompile Include="game\GameController.cpp" />
-    <ClCompile Include="game\GameSimulation.cpp" />
     <ClCompile Include="game\GameStateManager.cpp" />
     <ClCompile Include="game\GPUAutomaton.cpp" />
     <ClCompile Include="game\Grid.cpp" />
@@ -185,7 +184,6 @@
     <ClInclude Include="external\imgui\imgui.h" />
     <ClInclude Include="external\imgui\imgui_internal.h" />
     <ClInclude Include="game\GameController.h" />
-    <ClInclude Include="game\GameSimulation.h" />
     <ClInclude Include="game\GameStateManager.h" />
     <ClInclude Include="game\GPUAutomaton.h" />
     <ClInclude Include="game\Grid.h" />

game/Grid.h

@@ -4,9 +4,6 @@
     <ClCompile Include="game\GameController.cpp">
       <Filter>game</Filter>
     </ClCompile>
-    <ClCompile Include="game\GameSimulation.cpp">
-      <Filter>game</Filter>
-    </ClCompile>
     <ClCompile Include="rendering\Camera.cpp">
       <Filter>rendering</Filter>
     </ClCompile>
@@ -91,12 +88,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="game\GameController.h">
-      <Filter>game</Filter>
-    </ClInclude>
-    <ClInclude Include="game\GameSimulation.h">
-      <Filter>game</Filter>
-    </ClInclude>
     <ClInclude Include="rendering\Camera.h">
       <Filter>rendering</Filter>
     </ClInclude>
@@ -181,6 +172,9 @@
     <ClInclude Include="system\OpenGLDebug.h">
       <Filter>system</Filter>
     </ClInclude>
+    <ClInclude Include="game\GameController.h">
+      <Filter>game</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="game">