moved source code into subdirectories, split webgpu and opengl

GrigoryGraborenko · Sep 24, 2024 · ed3157d · ed3157d
1 parent 8954f67
commit ed3157d
Show file tree

Hide file tree

Showing 75 changed files with 21 additions and 21 deletions.
diff --git a/CMake/Jumbo.txt b/CMake/Jumbo.txt
@@ -60,7 +60,7 @@ target_include_directories(${PROJECT_NAME}
     PRIVATE
     ${NESHNY_DIR}/External
     ${CMAKE_SOURCE_DIR}/src
-    ${NESHNY_DIR}
+    ${NESHNY_DIR}/Src
     ${SDL2_DIR}/include
 )
 
@@ -155,22 +155,22 @@ if (NOT EMSCRIPTEN)
         add_custom_command(
             OUTPUT ${CMAKE_SOURCE_DIR}/src/EmbeddedFiles.cpp
             COMMAND "${CMAKE_COMMAND}" -D BASE_DIR=${CMAKE_SOURCE_DIR} -P ${NESHNY_DIR}/CMake/EmbeddedFiles.txt
-            DEPENDS "${BASE_DIR}/${SHADER_PATH}/*.*" DEPENDS ${NESHNY_DIR}/Shaders/*.wgsl
+            DEPENDS "${BASE_DIR}/${SHADER_PATH}/*.*" DEPENDS ${NESHNY_DIR}/Src/Shaders/*.wgsl
         )
     else()
         add_custom_command(
             OUTPUT ${CMAKE_SOURCE_DIR}/src/EmbeddedFiles.cpp
             COMMAND "${CMAKE_COMMAND}" -D BASE_DIR=${CMAKE_SOURCE_DIR} -P ${NESHNY_DIR}/CMake/EmbeddedFiles.txt
             DEPENDS ${BASE_DIR}/${SHADER_PATH}/*.vert DEPENDS ${BASE_DIR}/${SHADER_PATH}/*.frag DEPENDS ${BASE_DIR}/${SHADER_PATH}/*.comp DEPENDS ${BASE_DIR}/${SHADER_PATH}/*.glsl
-            DEPENDS ${NESHNY_DIR}/shaders/*.vert DEPENDS ${NESHNY_DIR}/shaders/*.frag DEPENDS ${NESHNY_DIR}/shaders/*.comp DEPENDS ${NESHNY_DIR}/shaders/*.glsl
+            DEPENDS ${NESHNY_DIR}/Src/Shaders/*.vert DEPENDS ${NESHNY_DIR}/Src/Shaders/*.frag DEPENDS ${NESHNY_DIR}/Src/Shaders/*.comp DEPENDS ${NESHNY_DIR}/Src/Shaders/*.glsl
         )
     endif()
 
     # command that embeds list of unit tests and their names into a cpp file
     add_custom_command(
         OUTPUT ${CMAKE_SOURCE_DIR}/src/UnitTestList.cpp
         COMMAND "${CMAKE_COMMAND}" -D BASE_DIR=${CMAKE_SOURCE_DIR} -P ${NESHNY_DIR}/CMake/UnitTests.txt
-        DEPENDS ${NESHNY_DIR}/UnitTests/*.cpp
+        DEPENDS ${NESHNY_DIR}/Src/UnitTests/*.cpp
         DEPENDS ${CMAKE_SOURCE_DIR}/src/UnitTests/*.cpp
     )
 
@@ -182,7 +182,7 @@ else()
 endif()
 
 # adds list of shader directories to allow dynamic runtime loading in debug
-file(WRITE "src/EmbeddedDirectories.cpp" "std::vector<std::string> g_ShaderBaseDirs={ \"${NESHNY_DIR}/shaders\", \"${CMAKE_CURRENT_SOURCE_DIR}/${SHADER_PATH}\" };\n")
+file(WRITE "src/EmbeddedDirectories.cpp" "std::vector<std::string> g_ShaderBaseDirs={ \"${NESHNY_DIR}/Src/Shaders\", \"${CMAKE_CURRENT_SOURCE_DIR}/${SHADER_PATH}\" };\n")
 
 ###############################################################################
 message(STATUS "Project Structure")
@@ -200,9 +200,9 @@ file(GLOB_RECURSE GeneratedList *.cxx *.hxx)
 
 # all files from neshny
 if (WEBGPU)
-    file(GLOB NeshnyList ${NESHNY_DIR}/*.h ${NESHNY_DIR}/*.cpp ${NESHNY_DIR}/UnitTests/*.cpp ${NESHNY_DIR}/shaders/*.wgsl)
+    file(GLOB NeshnyList ${NESHNY_DIR}/Src/*.* ${NESHNY_DIR}/Src/WebGPU/*.* ${NESHNY_DIR}/Src/UnitTests/*.cpp ${NESHNY_DIR}/Src/Shaders/*.wgsl)
 else()
-    file(GLOB NeshnyList ${NESHNY_DIR}/*.h ${NESHNY_DIR}/*.cpp ${NESHNY_DIR}/UnitTests/*.cpp ${NESHNY_DIR}/shaders/*.*)
+    file(GLOB NeshnyList ${NESHNY_DIR}/Src/*.* ${NESHNY_DIR}/Src/OpenGL/*.* ${NESHNY_DIR}/Src/UnitTests/*.cpp ${NESHNY_DIR}/Src/Shaders/*.*)
 endif()
 
 list(APPEND FullList ${HeaderList} ${SourceList} ${ShaderList})
@@ -217,7 +217,7 @@ set_source_files_properties(src/main.cpp src/PreCompiledHeader.cpp PROPERTIES
 )
 
 if (APPLE)
-    list(APPEND NeshnyList ${NESHNY_DIR}/metal.mm)
+    list(APPEND NeshnyList ${NESHNY_DIR}/Src/metal.mm)
 endif()
 
 target_sources(${PROJECT_NAME}
@@ -229,7 +229,7 @@ target_sources(${PROJECT_NAME}
 )
 
 source_group(TREE ${CMAKE_SOURCE_DIR}/src PREFIX src FILES ${FullList})
-source_group(TREE ${NESHNY_DIR} PREFIX neshny FILES ${NeshnyList})
+source_group(TREE ${NESHNY_DIR}/Src PREFIX neshny FILES ${NeshnyList})
 source_group("generated" FILES ${GeneratedList})
 
 ###############################################################################

diff --git a/Core.cpp → Src/Core.cpp b/Core.cpp → Src/Core.cpp
diff --git a/Core.h → Src/Core.h b/Core.h → Src/Core.h
diff --git a/EditorViewers.cpp → Src/EditorViewers.cpp b/EditorViewers.cpp → Src/EditorViewers.cpp
diff --git a/EditorViewers.h → Src/EditorViewers.h b/EditorViewers.h → Src/EditorViewers.h
diff --git a/Geometry.cpp → Src/Geometry.cpp b/Geometry.cpp → Src/Geometry.cpp
diff --git a/Geometry.h → Src/Geometry.h b/Geometry.h → Src/Geometry.h
diff --git a/HexGrid.cpp → Src/HexGrid.cpp b/HexGrid.cpp → Src/HexGrid.cpp
diff --git a/HexGrid.h → Src/HexGrid.h b/HexGrid.h → Src/HexGrid.h
diff --git a/IncludeAll.cpp → Src/IncludeAll.cpp b/IncludeAll.cpp → Src/IncludeAll.cpp
@@ -12,13 +12,13 @@
 #include "Preprocessor.cpp"
 #include "NeshnyUtils.cpp"
 #ifdef NESHNY_WEBGPU
-    #include "WGPUUtils.cpp"
-    #include "EntityWebGPU.cpp"
-    #include "PipelineWebGPU.cpp"
+    #include "WebGPU/WGPUUtils.cpp"
+    #include "WebGPU/EntityWebGPU.cpp"
+    #include "WebGPU/PipelineWebGPU.cpp"
 #elif defined(NESHNY_GL)
-    #include "GLUtils.cpp"
-    #include "EntityGL.cpp"
-    #include "PipelineGL.cpp"
+    #include "OpenGL/GLUtils.cpp"
+    #include "OpenGL/EntityGL.cpp"
+    #include "OpenGL/PipelineGL.cpp"
 #endif
 #include "Core.cpp"
 #include "EditorViewers.cpp"

diff --git a/IncludeAll.h → Src/IncludeAll.h b/IncludeAll.h → Src/IncludeAll.h
@@ -34,24 +34,24 @@
 #include "LinearAlgebra.h"
 #include "Preprocessor.h"
 #ifdef NESHNY_WEBGPU
-    #include "WGPUUtils.h"
+    #include "WebGPU/WGPUUtils.h"
 #elif defined(NESHNY_GL)
-    #include "GLUtils.h"
+    #include "OpenGL/GLUtils.h"
 #endif
 #include "NeshnyStructs.h"
 #include "Serialization.h"
 #include "Core.h"
 #include "Resources.h"
 #ifdef NESHNY_WEBGPU
-    #include "EntityWebGPU.h"
+    #include "WebGPU/EntityWebGPU.h"
 #elif defined(NESHNY_GL)
-    #include "EntityGL.h"
+    #include "OpenGL/EntityGL.h"
 #endif
 #include "EditorViewers.h"
 #ifdef NESHNY_WEBGPU
-    #include "PipelineWebGPU.h"
+    #include "WebGPU/PipelineWebGPU.h"
 #elif defined(NESHNY_GL)
-    #include "PipelineGL.h"
+    #include "OpenGL/PipelineGL.h"
 #endif
 #include "Geometry.h"
 #ifndef NESHNY_SKIP_TESTS

diff --git a/LinearAlgebra.cpp → Src/LinearAlgebra.cpp b/LinearAlgebra.cpp → Src/LinearAlgebra.cpp
diff --git a/LinearAlgebra.h → Src/LinearAlgebra.h b/LinearAlgebra.h → Src/LinearAlgebra.h
diff --git a/NeshnyStructs.h → Src/NeshnyStructs.h b/NeshnyStructs.h → Src/NeshnyStructs.h
diff --git a/NeshnyUtils.cpp → Src/NeshnyUtils.cpp b/NeshnyUtils.cpp → Src/NeshnyUtils.cpp
diff --git a/NeshnyUtils.h → Src/NeshnyUtils.h b/NeshnyUtils.h → Src/NeshnyUtils.h
diff --git a/EntityGL.cpp → Src/OpenGL/EntityGL.cpp b/EntityGL.cpp → Src/OpenGL/EntityGL.cpp
diff --git a/EntityGL.h → Src/OpenGL/EntityGL.h b/EntityGL.h → Src/OpenGL/EntityGL.h
diff --git a/GLUtils.cpp → Src/OpenGL/GLUtils.cpp b/GLUtils.cpp → Src/OpenGL/GLUtils.cpp
diff --git a/GLUtils.h → Src/OpenGL/GLUtils.h b/GLUtils.h → Src/OpenGL/GLUtils.h
diff --git a/PipelineGL.cpp → Src/OpenGL/PipelineGL.cpp b/PipelineGL.cpp → Src/OpenGL/PipelineGL.cpp
diff --git a/PipelineGL.h → Src/OpenGL/PipelineGL.h b/PipelineGL.h → Src/OpenGL/PipelineGL.h
diff --git a/Preprocessor.cpp → Src/Preprocessor.cpp b/Preprocessor.cpp → Src/Preprocessor.cpp
diff --git a/Preprocessor.h → Src/Preprocessor.h b/Preprocessor.h → Src/Preprocessor.h
diff --git a/Resources.h → Src/Resources.h b/Resources.h → Src/Resources.h
diff --git a/Serialization.h → Src/Serialization.h b/Serialization.h → Src/Serialization.h
diff --git a/Shaders/CacheUtils.wgsl → Src/Shaders/CacheUtils.wgsl b/Shaders/CacheUtils.wgsl → Src/Shaders/CacheUtils.wgsl
diff --git a/Shaders/Death.comp → Src/Shaders/Death.comp b/Shaders/Death.comp → Src/Shaders/Death.comp
diff --git a/Shaders/Debug.frag → Src/Shaders/Debug.frag b/Shaders/Debug.frag → Src/Shaders/Debug.frag
diff --git a/Shaders/Debug.vert → Src/Shaders/Debug.vert b/Shaders/Debug.vert → Src/Shaders/Debug.vert
diff --git a/Shaders/DebugCircle.wgsl → Src/Shaders/DebugCircle.wgsl b/Shaders/DebugCircle.wgsl → Src/Shaders/DebugCircle.wgsl
diff --git a/Shaders/DebugPoint.frag → Src/Shaders/DebugPoint.frag b/Shaders/DebugPoint.frag → Src/Shaders/DebugPoint.frag
diff --git a/Shaders/DebugPoint.vert → Src/Shaders/DebugPoint.vert b/Shaders/DebugPoint.vert → Src/Shaders/DebugPoint.vert
diff --git a/Shaders/DebugTriangle.frag → Src/Shaders/DebugTriangle.frag b/Shaders/DebugTriangle.frag → Src/Shaders/DebugTriangle.frag
diff --git a/Shaders/DebugTriangle.vert → Src/Shaders/DebugTriangle.vert b/Shaders/DebugTriangle.vert → Src/Shaders/DebugTriangle.vert
diff --git a/Shaders/EntityCreation.wgsl → Src/Shaders/EntityCreation.wgsl b/Shaders/EntityCreation.wgsl → Src/Shaders/EntityCreation.wgsl
diff --git a/Shaders/GridCache2D.comp → Src/Shaders/GridCache2D.comp b/Shaders/GridCache2D.comp → Src/Shaders/GridCache2D.comp
diff --git a/Shaders/GridCache2D.wgsl → Src/Shaders/GridCache2D.wgsl b/Shaders/GridCache2D.wgsl → Src/Shaders/GridCache2D.wgsl
diff --git a/Shaders/GridCache2D.wgsl.template → Src/Shaders/GridCache2D.wgsl.template b/Shaders/GridCache2D.wgsl.template → Src/Shaders/GridCache2D.wgsl.template
diff --git a/Shaders/PBR.glsl → Src/Shaders/PBR.glsl b/Shaders/PBR.glsl → Src/Shaders/PBR.glsl
diff --git a/Shaders/Query.comp → Src/Shaders/Query.comp b/Shaders/Query.comp → Src/Shaders/Query.comp
diff --git a/Shaders/Random.glsl → Src/Shaders/Random.glsl b/Shaders/Random.glsl → Src/Shaders/Random.glsl
diff --git a/Shaders/Random.wgsl → Src/Shaders/Random.wgsl b/Shaders/Random.wgsl → Src/Shaders/Random.wgsl
diff --git a/Shaders/RayTracing.glsl → Src/Shaders/RayTracing.glsl b/Shaders/RayTracing.glsl → Src/Shaders/RayTracing.glsl
diff --git a/Shaders/SimplePoint.wgsl → Src/Shaders/SimplePoint.wgsl b/Shaders/SimplePoint.wgsl → Src/Shaders/SimplePoint.wgsl
diff --git a/Shaders/SimpleTexture.wgsl → Src/Shaders/SimpleTexture.wgsl b/Shaders/SimpleTexture.wgsl → Src/Shaders/SimpleTexture.wgsl
diff --git a/Shaders/Skybox.frag → Src/Shaders/Skybox.frag b/Shaders/Skybox.frag → Src/Shaders/Skybox.frag
diff --git a/Shaders/Skybox.vert → Src/Shaders/Skybox.vert b/Shaders/Skybox.vert → Src/Shaders/Skybox.vert
diff --git a/Shaders/UnitTest.comp → Src/Shaders/UnitTest.comp b/Shaders/UnitTest.comp → Src/Shaders/UnitTest.comp
diff --git a/Shaders/UnitTest.wgsl → Src/Shaders/UnitTest.wgsl b/Shaders/UnitTest.wgsl → Src/Shaders/UnitTest.wgsl
diff --git a/Shaders/UnitTestCache.wgsl → Src/Shaders/UnitTestCache.wgsl b/Shaders/UnitTestCache.wgsl → Src/Shaders/UnitTestCache.wgsl
diff --git a/Shaders/UnitTestEntity.comp → Src/Shaders/UnitTestEntity.comp b/Shaders/UnitTestEntity.comp → Src/Shaders/UnitTestEntity.comp
diff --git a/Shaders/UnitTestEntity.wgsl → Src/Shaders/UnitTestEntity.wgsl b/Shaders/UnitTestEntity.wgsl → Src/Shaders/UnitTestEntity.wgsl
diff --git a/Shaders/Utils.glsl → Src/Shaders/Utils.glsl b/Shaders/Utils.glsl → Src/Shaders/Utils.glsl
diff --git a/Shaders/Utils.wgsl → Src/Shaders/Utils.wgsl b/Shaders/Utils.wgsl → Src/Shaders/Utils.wgsl
diff --git a/Testing.cpp → Src/Testing.cpp b/Testing.cpp → Src/Testing.cpp
diff --git a/Testing.h → Src/Testing.h b/Testing.h → Src/Testing.h
diff --git a/UnitTests/EntityTest.cpp → Src/UnitTests/EntityTest.cpp b/UnitTests/EntityTest.cpp → Src/UnitTests/EntityTest.cpp
diff --git a/UnitTests/GeometryTest.cpp → Src/UnitTests/GeometryTest.cpp b/UnitTests/GeometryTest.cpp → Src/UnitTests/GeometryTest.cpp
diff --git a/UnitTests/PreprocessorTest.cpp → Src/UnitTests/PreprocessorTest.cpp b/UnitTests/PreprocessorTest.cpp → Src/UnitTests/PreprocessorTest.cpp
diff --git a/UnitTests/SSBOTest.cpp → Src/UnitTests/SSBOTest.cpp b/UnitTests/SSBOTest.cpp → Src/UnitTests/SSBOTest.cpp
diff --git a/UnitTests/Serialization.cpp → Src/UnitTests/Serialization.cpp b/UnitTests/Serialization.cpp → Src/UnitTests/Serialization.cpp
diff --git a/UnitTests/UtilsTest.cpp → Src/UnitTests/UtilsTest.cpp b/UnitTests/UtilsTest.cpp → Src/UnitTests/UtilsTest.cpp
diff --git a/UnitTests/Vec2Test.cpp → Src/UnitTests/Vec2Test.cpp b/UnitTests/Vec2Test.cpp → Src/UnitTests/Vec2Test.cpp
diff --git a/Utils/ImGuiQTAdapter/QtImGui.cpp → Src/Utils/ImGuiQTAdapter/QtImGui.cpp b/Utils/ImGuiQTAdapter/QtImGui.cpp → Src/Utils/ImGuiQTAdapter/QtImGui.cpp
diff --git a/Utils/ImGuiQTAdapter/QtImGui.h → Src/Utils/ImGuiQTAdapter/QtImGui.h b/Utils/ImGuiQTAdapter/QtImGui.h → Src/Utils/ImGuiQTAdapter/QtImGui.h
diff --git a/Utils/ImGuiQTAdapter/QtImGuiRenderer.cpp → Src/Utils/ImGuiQTAdapter/QtImGuiRenderer.cpp b/Utils/ImGuiQTAdapter/QtImGuiRenderer.cpp → Src/Utils/ImGuiQTAdapter/QtImGuiRenderer.cpp
diff --git a/Utils/ImGuiQTAdapter/QtImGuiRenderer.h → Src/Utils/ImGuiQTAdapter/QtImGuiRenderer.h b/Utils/ImGuiQTAdapter/QtImGuiRenderer.h → Src/Utils/ImGuiQTAdapter/QtImGuiRenderer.h
diff --git a/EntityWebGPU.cpp → Src/WebGPU/EntityWebGPU.cpp b/EntityWebGPU.cpp → Src/WebGPU/EntityWebGPU.cpp
diff --git a/EntityWebGPU.h → Src/WebGPU/EntityWebGPU.h b/EntityWebGPU.h → Src/WebGPU/EntityWebGPU.h
diff --git a/PipelineWebGPU.cpp → Src/WebGPU/PipelineWebGPU.cpp b/PipelineWebGPU.cpp → Src/WebGPU/PipelineWebGPU.cpp
diff --git a/PipelineWebGPU.h → Src/WebGPU/PipelineWebGPU.h b/PipelineWebGPU.h → Src/WebGPU/PipelineWebGPU.h
diff --git a/WGPUUtils.cpp → Src/WebGPU/WGPUUtils.cpp b/WGPUUtils.cpp → Src/WebGPU/WGPUUtils.cpp
diff --git a/WGPUUtils.h → Src/WebGPU/WGPUUtils.h b/WGPUUtils.h → Src/WebGPU/WGPUUtils.h
diff --git a/metal.mm → Src/metal.mm b/metal.mm → Src/metal.mm