Minor refactoring

CMakeLists.txt

@@ -413,45 +413,45 @@ set_target_properties(libzip_external_lib PROPERTIES
 # Основной проект space-game001
 # ===========================================
 add_executable(space-game001
-    main.cpp
-    Game.cpp
-    Game.h
-    Environment.cpp
-    Environment.h
-    Renderer.cpp
-    Renderer.h
-    ShaderManager.cpp
-    ShaderManager.h
-    TextureManager.cpp
-    TextureManager.h
-    TextModel.cpp
-    TextModel.h
-    AudioPlayerAsync.cpp
-    AudioPlayerAsync.h
-    BoneAnimatedModel.cpp
-    BoneAnimatedModel.h
-    ZLMath.cpp
-    ZLMath.h
-    OpenGlExtensions.cpp
-    OpenGlExtensions.h
-    Utils.cpp
-    Utils.h
-    SparkEmitter.cpp
-    SparkEmitter.h
-	PlanetObject.cpp
-	PlanetObject.h
-	PlanetData.cpp
-	PlanetData.h
-	Perlin.cpp
-	Perlin.h
-	StoneObject.cpp
-	StoneObject.h
-	FrameBuffer.cpp
-	FrameBuffer.h
-    UiManager.cpp
-    UiManager.h
-    Projectile.h
-    Projectile.cpp
+    src/main.cpp
+    src/Game.cpp
+    src/Game.h
+    src/Environment.cpp
+    src/Environment.h
+    src/render/Renderer.cpp
+    src/render/Renderer.h
+    src/render/ShaderManager.cpp
+    src/render/ShaderManager.h
+    src/render/TextureManager.cpp
+    src/render/TextureManager.h
+    src/TextModel.cpp
+    src/TextModel.h
+    src/AudioPlayerAsync.cpp
+    src/AudioPlayerAsync.h
+    src/BoneAnimatedModel.cpp
+    src/BoneAnimatedModel.h
+    src/utils/ZLMath.cpp
+    src/utils/ZLMath.h
+    src/render/OpenGlExtensions.cpp
+    src/render/OpenGlExtensions.h
+    src/utils/Utils.cpp
+    src/utils/Utils.h
+    src/SparkEmitter.cpp
+    src/SparkEmitter.h
+	src/planet/PlanetObject.cpp
+	src/planet/PlanetObject.h
+	src/planet/PlanetData.cpp
+	src/planet/PlanetData.h
+	src/utils/Perlin.cpp
+	src/utils/Perlin.h
+	src/planet/StoneObject.cpp
+	src/planet/StoneObject.h
+	src/render/FrameBuffer.cpp
+	src/render/FrameBuffer.h
+    src/UiManager.cpp
+    src/UiManager.h
+    src/Projectile.h
+    src/Projectile.cpp
 )
 
 # Установка проекта по умолчанию для Visual Studio
@@ -459,12 +459,8 @@ set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT s
 
 # include-пути проекта
 target_include_directories(space-game001 PRIVATE
-    "${CMAKE_CURRENT_SOURCE_DIR}"
-    #"${CMAKE_CURRENT_SOURCE_DIR}/gl"
-    #"${CMAKE_CURRENT_SOURCE_DIR}/cmakeaudioplayer/include"
-    #"${SDL2_INSTALL_DIR}/include"
-    #"${SDL2_INSTALL_DIR}/include/SDL2"
-    #"${LIBZIP_INSTALL_DIR}-Release/include" # Добавил include-путь для libzip
+    "${CMAKE_CURRENT_SOURCE_DIR}/src"
+	"${CMAKE_CURRENT_SOURCE_DIR}/external"
 )
 
 set_target_properties(space-game001 PROPERTIES

src/AnimatedModel.h

@@ -1,8 +1,8 @@
 #pragma once
 
 
-#include "Renderer.h"
-#include "TextureManager.h"
+#include "render/Renderer.h"
+#include "render/TextureManager.h"
 
 namespace ZL
 {

src/BoneAnimatedModel.h

@@ -1,6 +1,6 @@
 #pragma once
-#include "ZLMath.h"
-#include "Renderer.h"
+#include "utils/ZLMath.h"
+#include "render/Renderer.h"
 #include <unordered_map>
 
 

src/Environment.cpp

@@ -1,6 +1,6 @@
 #include "Environment.h"
 
-#include "Utils.h"
+#include "utils/Utils.h"
 #include <GL/gl.h>
 
 namespace ZL {

src/Environment.h

@@ -1,9 +1,9 @@
 #pragma once
-#include "ZLMath.h"
+#include "utils/ZLMath.h"
 #ifdef __linux__
 #include <SDL2/SDL.h>
 #endif
-#include "OpenGlExtensions.h"
+#include "render/OpenGlExtensions.h"
 
 namespace ZL {
 

src/Game.cpp

@@ -1,12 +1,11 @@
 #include "Game.h"
 #include "AnimatedModel.h"
 #include "BoneAnimatedModel.h"
-#include "Utils.h"
-#include "OpenGlExtensions.h"
+#include "utils/Utils.h"
+#include "render/OpenGlExtensions.h"
 #include <iostream>
-#include "TextureManager.h"
+#include "render/TextureManager.h"
 #include "TextModel.h"
-#include "StoneObject.h"
 #include <random>
 #include <cmath>
 

src/Game.h

@@ -1,11 +1,10 @@
 #pragma once
 
-#include "OpenGlExtensions.h"
-#include "Renderer.h"
+#include "render/Renderer.h"
 #include "Environment.h"
-#include "TextureManager.h"
+#include "render/TextureManager.h"
 #include "SparkEmitter.h"
-#include "PlanetObject.h"
+#include "planet/PlanetObject.h"
 #include "UiManager.h"
 #include "Projectile.h"
 

src/Projectile.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "ZLMath.h"
-#include "Renderer.h"
-#include "TextureManager.h"
+#include "utils/ZLMath.h"
+#include "render/Renderer.h"
+#include "render/TextureManager.h"
 #include <memory>
 
 namespace ZL {

src/SparkEmitter.cpp

@@ -1,7 +1,7 @@
 #include "SparkEmitter.h"
 #include <random>
 #include <cmath>
-#include "OpenGlExtensions.h"
+//#include "renderer/OpenGlExtensions.h"
 #include <fstream>
 #include "external/nlohmann/json.hpp"
 #include <iostream>

src/SparkEmitter.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "ZLMath.h"
-#include "Renderer.h"
-#include "TextureManager.h"
+#include "utils/ZLMath.h"
+#include "render/Renderer.h"
+#include "render/TextureManager.h"
 #include <vector>
 #include <chrono>
 #include <string>

src/TextModel.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "ZLMath.h"
-#include "Renderer.h"
+#include "utils/ZLMath.h"
+#include "render/Renderer.h"
 #include <unordered_map>
 
 

src/UiManager.cpp

@@ -1,5 +1,5 @@
 #include "UiManager.h"
-#include "Utils.h"
+#include "utils/Utils.h"
 #include <fstream>
 #include <iostream>
 #include <algorithm>

src/UiManager.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Renderer.h"
-#include "TextureManager.h"
+#include "render/Renderer.h"
+#include "render/TextureManager.h"
 #include "Environment.h"
 #include "external/nlohmann/json.hpp"
 #include <string>

src/planet/PlanetData.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "ZLMath.h"
-#include "Perlin.h"
-#include "Renderer.h" // Äëÿ VertexDataStruct
+#include "utils/ZLMath.h"
+#include "utils/Perlin.h"
+#include "render/Renderer.h"
 #include <vector>
 #include <array>
 #include <string>

src/planet/PlanetObject.cpp

@@ -1,7 +1,7 @@
 #include "PlanetObject.h"
 #include <random>
 #include <cmath>
-#include "OpenGlExtensions.h"
+#include "render/OpenGlExtensions.h"
 #include "Environment.h"
 #include "StoneObject.h"
 

src/planet/PlanetObject.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "ZLMath.h"
-#include "Renderer.h"
-#include "TextureManager.h"
+#include "utils/ZLMath.h"
+#include "render/Renderer.h"
+#include "render/TextureManager.h"
 #include <vector>
 #include <chrono>
 #include <iostream>
@@ -13,10 +13,10 @@
 #include <algorithm>
 #include <map>
 #include <set>
-#include "Perlin.h"
+#include "utils/Perlin.h"
 #include "PlanetData.h"
 #include "StoneObject.h"
-#include "FrameBuffer.h"
+#include "render/FrameBuffer.h"
 
 namespace ZL {
 

src/planet/StoneObject.cpp

@@ -1,10 +1,10 @@
 #include "StoneObject.h"
 
-#include "Utils.h"
+#include "utils/Utils.h"
 #include <GL/gl.h>
 #include <random>
 #include <cmath>
-#include "Renderer.h"
+#include "render/Renderer.h"
 #include "PlanetData.h"
 
 namespace ZL {

src/planet/StoneObject.h

@@ -1,6 +1,6 @@
 #pragma once
-#include "ZLMath.h"
-#include "Renderer.h"
+#include "utils/ZLMath.h"
+#include "render/Renderer.h"
 #include "PlanetData.h"
 
 namespace ZL {

src/render/OpenGlExtensions.cpp

@@ -1,6 +1,6 @@
 #include "OpenGlExtensions.h"
 
-#include "Utils.h"
+#include "utils/Utils.h"
 #include <iostream>
 
 #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__)

src/render/Renderer.cpp

@@ -1,4 +1,4 @@
-#include "Renderer.h"
+#include "render/Renderer.h"
 #include <cmath>
 
 namespace ZL {

src/render/Renderer.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "OpenGlExtensions.h"
-#include "ZLMath.h"
+#include "utils/ZLMath.h"
 #include <exception>
 #include <stdexcept>
 #include "ShaderManager.h"

src/render/ShaderManager.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "OpenGlExtensions.h"
-#include "Utils.h"
+#include "utils/Utils.h"
 
 namespace ZL {
 

src/render/TextureManager.cpp

@@ -1,4 +1,5 @@
-#include "TextureManager.h"
+#include "render/TextureManager.h"
+#include "render/OpenGlExtensions.h"
 #ifdef PNG_ENABLED
 #include "png.h"
 #endif

src/render/TextureManager.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "OpenGlExtensions.h"
-#include "Utils.h"
+#include "utils/Utils.h"
 
 #ifdef EMSCRIPTEN
 #define PNG_ENABLED

src/utils/Perlin.h

@@ -2,7 +2,7 @@
 
 #include <vector>
 #include <cstdint>
-#include "ZLMath.h" 
+#include "utils/ZLMath.h" 
 
 namespace ZL {
 

src/utils/Utils.cpp

@@ -1,4 +1,4 @@
-#include "Utils.h"
+#include "utils/Utils.h"
 #include <cstring>
 #include <iterator>
 #include <vector>

src/utils/ZLMath.cpp

@@ -1,4 +1,4 @@
-#include "ZLMath.h"
+#include "utils/ZLMath.h"
 
 #include <exception>
 #include <cmath>