external code cleanup

- moved all external libraries, include files and source files to a single folder that is reused by the Game, Hub and Engine during compilation instead of each one having their own copy of mostly the same scripts
Lost-Empire-Entertainment · May 6, 2024 · e4367ad · e4367ad
1 parent fb7ea48
commit e4367ad
Show file tree

Hide file tree

Showing 1,638 changed files with 130 additions and 326,526 deletions.
diff --git a/Engine/CMakeLists.txt b/Engine/CMakeLists.txt
@@ -22,40 +22,43 @@ get_filename_component(PARENT_DIR "${CMAKE_SOURCE_DIR}" DIRECTORY)
 set(PARENT_DIR_PATH "${PARENT_DIR}")
 set(RESOURCE_FILE "${CMAKE_SOURCE_DIR}/files/icon.rc")
 
+# Engine files
 set(INCLUDE_DIR "${CMAKE_SOURCE_DIR}/include")
-set(LIB_DIR "${CMAKE_SOURCE_DIR}/lib")
-set(SRC_DIR "${CMAKE_SOURCE_DIR}/src")
+
+# Externally added files
+set(EXT_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/../_external_shared/include")
+set(EXT_LIB_DIR "${CMAKE_SOURCE_DIR}/../_external_shared/lib")
+set(EXT_SRC_DIR "${CMAKE_SOURCE_DIR}/../_external_shared/src")
 
 # Manually added source file paths
-set(SRC_CORE_DIR "${CMAKE_SOURCE_DIR}/src/engine/core")
-set(SRC_FILE_DIR "${CMAKE_SOURCE_DIR}/src/engine/file")
-set(SRC_GRAPHICS_DIR "${CMAKE_SOURCE_DIR}/src/engine/graphics")
-set(SRC_GRAPHICS_SHAPE_DIR "${CMAKE_SOURCE_DIR}/src/engine/graphics/shapes")
-set(SRC_PHYSICS_DIR "${CMAKE_SOURCE_DIR}/src/engine/physics")
-set(SRC_UTILS_DIR "${CMAKE_SOURCE_DIR}/src/engine/utils")
-set(EXTERNAL_DIR "${CMAKE_SOURCE_DIR}/src/external")
+set(SRC_CORE_DIR "${CMAKE_SOURCE_DIR}/src/core")
+set(SRC_FILE_DIR "${CMAKE_SOURCE_DIR}/src/file")
+set(SRC_GRAPHICS_DIR "${CMAKE_SOURCE_DIR}/src/graphics")
+set(SRC_GRAPHICS_SHAPE_DIR "${CMAKE_SOURCE_DIR}/src/graphics/shapes")
+set(SRC_PHYSICS_DIR "${CMAKE_SOURCE_DIR}/src/physics")
+set(SRC_UTILS_DIR "${CMAKE_SOURCE_DIR}/src/utils")
 
 # Add GLAD
-add_library(glad STATIC ${SRC_DIR}/external/glad/glad.c)
-target_include_directories(glad PUBLIC ${INCLUDE_DIR})
+add_library(glad STATIC ${EXT_SRC_DIR}/glad/glad.c)
+target_include_directories(glad PUBLIC ${EXT_INCLUDE_DIR})
 
 # Add GLFW
-set(GLFW_LIBRARY_PATH "${LIB_DIR}/glfw/glfw3.lib")
+set(GLFW_LIBRARY_PATH "${EXT_LIB_DIR}/glfw/glfw3.lib")
 
 # Add Assimp
-set(ASSIMP_LIBRARY_PATH "${LIB_DIR}/assimp/assimp-vc143-mt.lib")
+set(ASSIMP_LIBRARY_PATH "${EXT_LIB_DIR}/assimp/assimp-vc143-mt.lib")
 
 # Add magic_enum
 add_library(magic_enum INTERFACE)
-target_include_directories(magic_enum INTERFACE ${INCLUDE_DIR}/magic_enum)
+target_include_directories(magic_enum INTERFACE ${EXT_INCLUDE_DIR}/magic_enum)
 
 # Group external libraries
 add_library(external_libs INTERFACE)
 target_link_libraries(external_libs INTERFACE glad magic_enum)
 
 # Add your source files
 set(SOURCE_FILES
-	${CMAKE_SOURCE_DIR}/src/engine/main.cpp
+	${CMAKE_SOURCE_DIR}/src/main.cpp
 	${SRC_CORE_DIR}/compile.cpp
 	${SRC_CORE_DIR}/console.cpp
 	${SRC_CORE_DIR}/core.cpp
@@ -95,15 +98,15 @@ set(SOURCE_FILES
 
 # Add your external files
 list(APPEND SOURCE_FILES
-	${EXTERNAL_DIR}/glad/glad.c
-	${EXTERNAL_DIR}/imgui/imgui.cpp
-	${EXTERNAL_DIR}/imgui/imgui_demo.cpp
-	${EXTERNAL_DIR}/imgui/imgui_draw.cpp
-	${EXTERNAL_DIR}/imgui/imgui_impl_glfw.cpp
-	${EXTERNAL_DIR}/imgui/imgui_impl_opengl3.cpp
-	${EXTERNAL_DIR}/imgui/imgui_tables.cpp
-	${EXTERNAL_DIR}/imgui/imgui_widgets.cpp
-	${EXTERNAL_DIR}/stb_image/stb_image.cpp
+	${EXT_SRC_DIR}/glad/glad.c
+	${EXT_SRC_DIR}/imgui/imgui.cpp
+	${EXT_SRC_DIR}/imgui/imgui_demo.cpp
+	${EXT_SRC_DIR}/imgui/imgui_draw.cpp
+	${EXT_SRC_DIR}/imgui/imgui_impl_glfw.cpp
+	${EXT_SRC_DIR}/imgui/imgui_impl_opengl3.cpp
+	${EXT_SRC_DIR}/imgui/imgui_tables.cpp
+	${EXT_SRC_DIR}/imgui/imgui_widgets.cpp
+	${EXT_SRC_DIR}/stb_image/stb_image.cpp
 )
 
 # Add the executable
@@ -114,31 +117,26 @@ set_target_properties(Elypso_engine PROPERTIES OUTPUT_NAME "Elypso engine")
 
 target_compile_features(Elypso_engine PRIVATE cxx_std_20)
 
-# Set the runtime library option
-# target_compile_options(Elypso_engine PRIVATE /MD)
-
 target_include_directories(Elypso_engine PRIVATE 
-	${INCLUDE_DIR}/engine
-	${INCLUDE_DIR}/engine/core
-	${INCLUDE_DIR}/engine/file
-	${INCLUDE_DIR}/engine/graphics
-	${INCLUDE_DIR}/engine/graphics/gui
-	${INCLUDE_DIR}/engine/graphics/shapes
-	${INCLUDE_DIR}/engine/physics
-	${INCLUDE_DIR}/engine/utils
-	${INCLUDE_DIR}/external
-	${INCLUDE_DIR}/external/assimp
-	${INCLUDE_DIR}/external/glad
-	${INCLUDE_DIR}/external/glfw
-	${INCLUDE_DIR}/external/glm
-	${INCLUDE_DIR}/external/glm/detail
-	${INCLUDE_DIR}/external/glm/ext
-	${INCLUDE_DIR}/external/glm/gtc
-	${INCLUDE_DIR}/external/glm/gtx
-	${INCLUDE_DIR}/external/glm/simd
-	${INCLUDE_DIR}/external/magic_enum
-	${INCLUDE_DIR}/external/imgui
-	${INCLUDE_DIR}/external/stb_image
+	${INCLUDE_DIR}/core
+	${INCLUDE_DIR}/file
+	${INCLUDE_DIR}/graphics
+	${INCLUDE_DIR}/graphics/gui
+	${INCLUDE_DIR}/graphics/shapes
+	${INCLUDE_DIR}/physics
+	${INCLUDE_DIR}/utils
+	${EXT_INCLUDE_DIR}/assimp
+	${EXT_INCLUDE_DIR}/glad
+	${EXT_INCLUDE_DIR}/glfw
+	${EXT_INCLUDE_DIR}/glm
+	${EXT_INCLUDE_DIR}/glm/detail
+	${EXT_INCLUDE_DIR}/glm/ext
+	${EXT_INCLUDE_DIR}/glm/gtc
+	${EXT_INCLUDE_DIR}/glm/gtx
+	${EXT_INCLUDE_DIR}/glm/simd
+	${EXT_INCLUDE_DIR}/magic_enum
+	${EXT_INCLUDE_DIR}/imgui
+	${EXT_INCLUDE_DIR}/stb_image
 )
 
 target_link_libraries(Elypso_engine PRIVATE external_libs glad ${GLFW_LIBRARY_PATH} ${ASSIMP_LIBRARY_PATH})

diff --git a/Engine/include/engine/core/compile.hpp → Engine/include/core/compile.hpp b/Engine/include/engine/core/compile.hpp → Engine/include/core/compile.hpp
diff --git a/Engine/include/engine/core/console.hpp → Engine/include/core/console.hpp b/Engine/include/engine/core/console.hpp → Engine/include/core/console.hpp
diff --git a/Engine/include/engine/core/core.hpp → Engine/include/core/core.hpp b/Engine/include/engine/core/core.hpp → Engine/include/core/core.hpp
diff --git a/Engine/include/engine/core/input.hpp → Engine/include/core/input.hpp b/Engine/include/engine/core/input.hpp → Engine/include/core/input.hpp
diff --git a/Engine/include/engine/core/timeManager.hpp → Engine/include/core/timeManager.hpp b/Engine/include/engine/core/timeManager.hpp → Engine/include/core/timeManager.hpp
diff --git a/Engine/include/engine/file/configFile.hpp → Engine/include/file/configFile.hpp b/Engine/include/engine/file/configFile.hpp → Engine/include/file/configFile.hpp
diff --git a/Engine/include/engine/file/fileexplorer.hpp → Engine/include/file/fileexplorer.hpp b/Engine/include/engine/file/fileexplorer.hpp → Engine/include/file/fileexplorer.hpp
diff --git a/Engine/include/engine/file/sceneFile.hpp → Engine/include/file/sceneFile.hpp b/Engine/include/engine/file/sceneFile.hpp → Engine/include/file/sceneFile.hpp
diff --git a/Engine/include/engine/graphics/grid.hpp → Engine/include/graphics/grid.hpp b/Engine/include/engine/graphics/grid.hpp → Engine/include/graphics/grid.hpp
diff --git a/Engine/include/engine/graphics/gui/gui.hpp → Engine/include/graphics/gui/gui.hpp b/Engine/include/engine/graphics/gui/gui.hpp → Engine/include/graphics/gui/gui.hpp
diff --git a/...ude/engine/graphics/gui/gui_assetlist.hpp → ...ne/include/graphics/gui/gui_assetlist.hpp b/...ude/engine/graphics/gui/gui_assetlist.hpp → ...ne/include/graphics/gui/gui_assetlist.hpp
diff --git a/...clude/engine/graphics/gui/gui_console.hpp → Engine/include/graphics/gui/gui_console.hpp b/...clude/engine/graphics/gui/gui_console.hpp → Engine/include/graphics/gui/gui_console.hpp
diff --git a/...ude/engine/graphics/gui/gui_debugmenu.hpp → ...ne/include/graphics/gui/gui_debugmenu.hpp b/...ude/engine/graphics/gui/gui_debugmenu.hpp → ...ne/include/graphics/gui/gui_debugmenu.hpp
diff --git a/...e/engine/graphics/gui/gui_importAsset.hpp → .../include/graphics/gui/gui_importAsset.hpp b/...e/engine/graphics/gui/gui_importAsset.hpp → .../include/graphics/gui/gui_importAsset.hpp
diff --git a/...ude/engine/graphics/gui/gui_inspector.hpp → ...ne/include/graphics/gui/gui_inspector.hpp b/...ude/engine/graphics/gui/gui_inspector.hpp → ...ne/include/graphics/gui/gui_inspector.hpp
diff --git a/.../include/engine/graphics/gui/gui_node.hpp → Engine/include/graphics/gui/gui_node.hpp b/.../include/engine/graphics/gui/gui_node.hpp → Engine/include/graphics/gui/gui_node.hpp
diff --git a/...ude/engine/graphics/gui/gui_nodeblock.hpp → ...ne/include/graphics/gui/gui_nodeblock.hpp b/...ude/engine/graphics/gui/gui_nodeblock.hpp → ...ne/include/graphics/gui/gui_nodeblock.hpp
diff --git a/...de/engine/graphics/gui/gui_nodecircle.hpp → ...e/include/graphics/gui/gui_nodecircle.hpp b/...de/engine/graphics/gui/gui_nodecircle.hpp → ...e/include/graphics/gui/gui_nodecircle.hpp
diff --git a/...ngine/graphics/gui/gui_nodeconnection.hpp → ...clude/graphics/gui/gui_nodeconnection.hpp b/...ngine/graphics/gui/gui_nodeconnection.hpp → ...clude/graphics/gui/gui_nodeconnection.hpp
diff --git a/Engine/include/engine/graphics/render.hpp → Engine/include/graphics/render.hpp b/Engine/include/engine/graphics/render.hpp → Engine/include/graphics/render.hpp
diff --git a/Engine/include/engine/graphics/shader.hpp → Engine/include/graphics/shader.hpp b/Engine/include/engine/graphics/shader.hpp → Engine/include/graphics/shader.hpp
diff --git a/...lude/engine/graphics/shapes/billboard.hpp → Engine/include/graphics/shapes/billboard.hpp b/...lude/engine/graphics/shapes/billboard.hpp → Engine/include/graphics/shapes/billboard.hpp
diff --git a/...ude/engine/graphics/shapes/gameobject.hpp → ...ne/include/graphics/shapes/gameobject.hpp b/...ude/engine/graphics/shapes/gameobject.hpp → ...ne/include/graphics/shapes/gameobject.hpp
diff --git a/.../include/engine/graphics/shapes/model.hpp → Engine/include/graphics/shapes/model.hpp b/.../include/engine/graphics/shapes/model.hpp → Engine/include/graphics/shapes/model.hpp
diff --git a/...ude/engine/graphics/shapes/modelchild.hpp → ...ne/include/graphics/shapes/modelchild.hpp b/...ude/engine/graphics/shapes/modelchild.hpp → ...ne/include/graphics/shapes/modelchild.hpp
diff --git a/...ude/engine/graphics/shapes/pointlight.hpp → ...ne/include/graphics/shapes/pointlight.hpp b/...ude/engine/graphics/shapes/pointlight.hpp → ...ne/include/graphics/shapes/pointlight.hpp
diff --git a/.../graphics/shapes/selectedobjectaction.hpp → .../graphics/shapes/selectedobjectaction.hpp b/.../graphics/shapes/selectedobjectaction.hpp → .../graphics/shapes/selectedobjectaction.hpp
diff --git a/.../graphics/shapes/selectedobjectborder.hpp → .../graphics/shapes/selectedobjectborder.hpp b/.../graphics/shapes/selectedobjectborder.hpp → .../graphics/shapes/selectedobjectborder.hpp
diff --git a/...lude/engine/graphics/shapes/spotlight.hpp → Engine/include/graphics/shapes/spotlight.hpp b/...lude/engine/graphics/shapes/spotlight.hpp → Engine/include/graphics/shapes/spotlight.hpp
diff --git a/Engine/include/engine/graphics/texture.hpp → Engine/include/graphics/texture.hpp b/Engine/include/engine/graphics/texture.hpp → Engine/include/graphics/texture.hpp
diff --git a/Engine/include/engine/physics/collision.hpp → Engine/include/physics/collision.hpp b/Engine/include/engine/physics/collision.hpp → Engine/include/physics/collision.hpp
diff --git a/...e/include/engine/physics/selectobject.hpp → Engine/include/physics/selectobject.hpp b/...e/include/engine/physics/selectobject.hpp → Engine/include/physics/selectobject.hpp
diff --git a/Engine/include/engine/utils/browserUtils.hpp → Engine/include/utils/browserUtils.hpp b/Engine/include/engine/utils/browserUtils.hpp → Engine/include/utils/browserUtils.hpp
diff --git a/Engine/include/engine/utils/fileUtils.hpp → Engine/include/utils/fileUtils.hpp b/Engine/include/engine/utils/fileUtils.hpp → Engine/include/utils/fileUtils.hpp
diff --git a/Engine/include/engine/utils/stringUtils.hpp → Engine/include/utils/stringUtils.hpp b/Engine/include/engine/utils/stringUtils.hpp → Engine/include/utils/stringUtils.hpp
diff --git a/Engine/src/engine/core/compile.cpp → Engine/src/core/compile.cpp b/Engine/src/engine/core/compile.cpp → Engine/src/core/compile.cpp
diff --git a/Engine/src/engine/core/console.cpp → Engine/src/core/console.cpp b/Engine/src/engine/core/console.cpp → Engine/src/core/console.cpp
diff --git a/Engine/src/engine/core/core.cpp → Engine/src/core/core.cpp b/Engine/src/engine/core/core.cpp → Engine/src/core/core.cpp
diff --git a/Engine/src/engine/core/input.cpp → Engine/src/core/input.cpp b/Engine/src/engine/core/input.cpp → Engine/src/core/input.cpp
diff --git a/Engine/src/engine/core/timeManager.cpp → Engine/src/core/timeManager.cpp b/Engine/src/engine/core/timeManager.cpp → Engine/src/core/timeManager.cpp