diff --git a/.gitignore b/.gitignore index 564828ac..37827050 100644 --- a/.gitignore +++ b/.gitignore @@ -308,11 +308,11 @@ paket-files/ # Project specific folders build .vscode -dependencies/Freetype/Freetype* -dependencies/GLM/glm* -dependencies/STB_IMAGE/STB_IMAGE* -dependencies/JSON/JSON* -dependencies/FMT/FMT* -dependencies/Imgui/IMGUI* -dependencies/glfw/GLFW* +dependencies/freetype/freetype* +dependencies/glm/glm* +dependencies/stb_image/stb_image* +dependencies/json/json* +dependencies/fmt/fmt* +dependencies/imgui/imgui* +dependencies/glfw/glfw* *imgui.ini diff --git a/Assets/Fonts/segoeui.ttf b/assets/Fonts/segoeui.ttf similarity index 100% rename from Assets/Fonts/segoeui.ttf rename to assets/Fonts/segoeui.ttf diff --git a/Assets/GameInit.txt b/assets/GameInit.txt similarity index 100% rename from Assets/GameInit.txt rename to assets/GameInit.txt diff --git a/Assets/Images/Default128.png b/assets/Images/Default128.png similarity index 100% rename from Assets/Images/Default128.png rename to assets/Images/Default128.png diff --git a/Assets/Images/Enemy.png b/assets/Images/Enemy.png similarity index 100% rename from Assets/Images/Enemy.png rename to assets/Images/Enemy.png diff --git a/Assets/Images/Level1.png b/assets/Images/Level1.png similarity index 100% rename from Assets/Images/Level1.png rename to assets/Images/Level1.png diff --git a/Assets/Images/Level1_Char.png b/assets/Images/Level1_Char.png similarity index 100% rename from Assets/Images/Level1_Char.png rename to assets/Images/Level1_Char.png diff --git a/Assets/Images/Level1_VectorField.png b/assets/Images/Level1_VectorField.png similarity index 100% rename from Assets/Images/Level1_VectorField.png rename to assets/Images/Level1_VectorField.png diff --git a/Assets/Images/Level1_collision.png b/assets/Images/Level1_collision.png similarity index 100% rename from Assets/Images/Level1_collision.png rename to assets/Images/Level1_collision.png diff --git a/Assets/Images/NodeSprite.png b/assets/Images/NodeSprite.png similarity index 100% rename from Assets/Images/NodeSprite.png rename to assets/Images/NodeSprite.png diff --git a/Assets/Images/house1.png b/assets/Images/house1.png similarity index 100% rename from Assets/Images/house1.png rename to assets/Images/house1.png diff --git a/Assets/Images/white.png b/assets/Images/white.png similarity index 100% rename from Assets/Images/white.png rename to assets/Images/white.png diff --git a/Assets/Levels/Level1/Default.png b/assets/Levels/Level1/Default.png similarity index 100% rename from Assets/Levels/Level1/Default.png rename to assets/Levels/Level1/Default.png diff --git a/Assets/Levels/Level1/Default128.png b/assets/Levels/Level1/Default128.png similarity index 100% rename from Assets/Levels/Level1/Default128.png rename to assets/Levels/Level1/Default128.png diff --git a/Assets/Levels/Level1/Defaultsmall.png b/assets/Levels/Level1/Defaultsmall.png similarity index 100% rename from Assets/Levels/Level1/Defaultsmall.png rename to assets/Levels/Level1/Defaultsmall.png diff --git a/Assets/Levels/Level1/Level1.png b/assets/Levels/Level1/Level1.png similarity index 100% rename from Assets/Levels/Level1/Level1.png rename to assets/Levels/Level1/Level1.png diff --git a/Assets/Levels/Level1/Level1.txt b/assets/Levels/Level1/Level1.txt similarity index 100% rename from Assets/Levels/Level1/Level1.txt rename to assets/Levels/Level1/Level1.txt diff --git a/Assets/Levels/Level1/Level1_Char.png b/assets/Levels/Level1/Level1_Char.png similarity index 100% rename from Assets/Levels/Level1/Level1_Char.png rename to assets/Levels/Level1/Level1_Char.png diff --git a/Assets/Levels/Level1/Level1_VectorField.png b/assets/Levels/Level1/Level1_VectorField.png similarity index 100% rename from Assets/Levels/Level1/Level1_VectorField.png rename to assets/Levels/Level1/Level1_VectorField.png diff --git a/Assets/Levels/Level1/Level1_VectorFieldTest1.png b/assets/Levels/Level1/Level1_VectorFieldTest1.png similarity index 100% rename from Assets/Levels/Level1/Level1_VectorFieldTest1.png rename to assets/Levels/Level1/Level1_VectorFieldTest1.png diff --git a/Assets/Levels/Level1/Level1_VectorFieldTest2.png b/assets/Levels/Level1/Level1_VectorFieldTest2.png similarity index 100% rename from Assets/Levels/Level1/Level1_VectorFieldTest2.png rename to assets/Levels/Level1/Level1_VectorFieldTest2.png diff --git a/Assets/Levels/Level1/Level1_collision.png b/assets/Levels/Level1/Level1_collision.png similarity index 100% rename from Assets/Levels/Level1/Level1_collision.png rename to assets/Levels/Level1/Level1_collision.png diff --git a/Assets/Levels/Level1/back.png b/assets/Levels/Level1/back.png similarity index 100% rename from Assets/Levels/Level1/back.png rename to assets/Levels/Level1/back.png diff --git a/Assets/Levels/TestLevel/Default.png b/assets/Levels/TestLevel/Default.png similarity index 100% rename from Assets/Levels/TestLevel/Default.png rename to assets/Levels/TestLevel/Default.png diff --git a/Assets/Levels/TestLevel/Default128.png b/assets/Levels/TestLevel/Default128.png similarity index 100% rename from Assets/Levels/TestLevel/Default128.png rename to assets/Levels/TestLevel/Default128.png diff --git a/Assets/Levels/TestLevel/Defaultsmall.png b/assets/Levels/TestLevel/Defaultsmall.png similarity index 100% rename from Assets/Levels/TestLevel/Defaultsmall.png rename to assets/Levels/TestLevel/Defaultsmall.png diff --git a/Assets/Levels/TestLevel/Level1.png b/assets/Levels/TestLevel/Level1.png similarity index 100% rename from Assets/Levels/TestLevel/Level1.png rename to assets/Levels/TestLevel/Level1.png diff --git a/Assets/Levels/TestLevel/Level1_Char.png b/assets/Levels/TestLevel/Level1_Char.png similarity index 100% rename from Assets/Levels/TestLevel/Level1_Char.png rename to assets/Levels/TestLevel/Level1_Char.png diff --git a/Assets/Levels/TestLevel/Level1_VectorField.png b/assets/Levels/TestLevel/Level1_VectorField.png similarity index 100% rename from Assets/Levels/TestLevel/Level1_VectorField.png rename to assets/Levels/TestLevel/Level1_VectorField.png diff --git a/Assets/Levels/TestLevel/Level1_collision.png b/assets/Levels/TestLevel/Level1_collision.png similarity index 100% rename from Assets/Levels/TestLevel/Level1_collision.png rename to assets/Levels/TestLevel/Level1_collision.png diff --git a/Assets/Levels/TestLevel/TestLevel.dgl b/assets/Levels/TestLevel/TestLevel.dgl similarity index 100% rename from Assets/Levels/TestLevel/TestLevel.dgl rename to assets/Levels/TestLevel/TestLevel.dgl diff --git a/Assets/Levels/TestLevel/test123.dgl b/assets/Levels/TestLevel/test123.dgl similarity index 100% rename from Assets/Levels/TestLevel/test123.dgl rename to assets/Levels/TestLevel/test123.dgl diff --git a/Assets/Shaders/AfterEffects_fs.glsl b/assets/Shaders/AfterEffects_fs.glsl similarity index 100% rename from Assets/Shaders/AfterEffects_fs.glsl rename to assets/Shaders/AfterEffects_fs.glsl diff --git a/Assets/Shaders/AfterEffects_vs.glsl b/assets/Shaders/AfterEffects_vs.glsl similarity index 100% rename from Assets/Shaders/AfterEffects_vs.glsl rename to assets/Shaders/AfterEffects_vs.glsl diff --git a/Assets/Shaders/DefaultShader_fs.glsl b/assets/Shaders/DefaultShader_fs.glsl similarity index 100% rename from Assets/Shaders/DefaultShader_fs.glsl rename to assets/Shaders/DefaultShader_fs.glsl diff --git a/Assets/Shaders/DefaultShader_vs.glsl b/assets/Shaders/DefaultShader_vs.glsl similarity index 100% rename from Assets/Shaders/DefaultShader_vs.glsl rename to assets/Shaders/DefaultShader_vs.glsl diff --git a/Assets/Shaders/Editor_fs.glsl b/assets/Shaders/Editor_fs.glsl similarity index 100% rename from Assets/Shaders/Editor_fs.glsl rename to assets/Shaders/Editor_fs.glsl diff --git a/Assets/Shaders/Editor_vs.glsl b/assets/Shaders/Editor_vs.glsl similarity index 100% rename from Assets/Shaders/Editor_vs.glsl rename to assets/Shaders/Editor_vs.glsl diff --git a/Assets/Shaders/Font_fs.glsl b/assets/Shaders/Font_fs.glsl similarity index 100% rename from Assets/Shaders/Font_fs.glsl rename to assets/Shaders/Font_fs.glsl diff --git a/Assets/Shaders/Font_vs.glsl b/assets/Shaders/Font_vs.glsl similarity index 100% rename from Assets/Shaders/Font_vs.glsl rename to assets/Shaders/Font_vs.glsl diff --git a/Assets/Shaders/LineShader_fs.glsl b/assets/Shaders/LineShader_fs.glsl similarity index 100% rename from Assets/Shaders/LineShader_fs.glsl rename to assets/Shaders/LineShader_fs.glsl diff --git a/Assets/Shaders/LineShader_vs.glsl b/assets/Shaders/LineShader_vs.glsl similarity index 100% rename from Assets/Shaders/LineShader_vs.glsl rename to assets/Shaders/LineShader_vs.glsl diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt index e60c215a..a219c747 100644 --- a/dependencies/CMakeLists.txt +++ b/dependencies/CMakeLists.txt @@ -30,12 +30,12 @@ function(FIND_AND_DOWNLOAD_ZIP_RESOURCE ResourceURL ResourceName Version) endif() endfunction() -add_subdirectory(Glad) +add_subdirectory(glad) add_subdirectory(glfw) -add_subdirectory(Imgui) -add_subdirectory(Freetype) -add_subdirectory(STB_IMAGE) -add_subdirectory(GLM) -add_subdirectory(JSON) -add_subdirectory(FMT) +add_subdirectory(imgui) +add_subdirectory(freetype) +add_subdirectory(stb_image) +add_subdirectory(glm) +add_subdirectory(json) +add_subdirectory(fmt) diff --git a/dependencies/FMT/CMakeLists.txt b/dependencies/FMT/CMakeLists.txt deleted file mode 100644 index b7dad223..00000000 --- a/dependencies/FMT/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -FIND_AND_DOWNLOAD_GIT_RESOURCE(FMT https://github.com/fmtlib/fmt.git) -add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/FMT) diff --git a/dependencies/Imgui/CMakeLists.txt b/dependencies/Imgui/CMakeLists.txt deleted file mode 100644 index 72f39747..00000000 --- a/dependencies/Imgui/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -FIND_AND_DOWNLOAD_GIT_RESOURCE(IMGUI https://github.com/ocornut/imgui.git) - -set(HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/IMGUI/imconfig.h" "${CMAKE_CURRENT_SOURCE_DIR}/IMGUI/imgui.h" "${CMAKE_CURRENT_SOURCE_DIR}/IMGUI/imgui_internal.h" - "${CMAKE_CURRENT_SOURCE_DIR}/IMGUI/imstb_rectpack.h" "${CMAKE_CURRENT_SOURCE_DIR}/IMGUI/imstb_textedit.h" "${CMAKE_CURRENT_SOURCE_DIR}/IMGUI/imstb_truetype.h" - "${CMAKE_CURRENT_SOURCE_DIR}/IMGUI/backends/imgui_impl_glfw.h" "${CMAKE_CURRENT_SOURCE_DIR}/IMGUI/backends/imgui_impl_opengl3.h") - -set(SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/IMGUI/imgui.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/IMGUI/imgui_demo.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/IMGUI/imgui_draw.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/IMGUI/imgui_tables.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/IMGUI/backends/imgui_impl_opengl3.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/IMGUI/backends/imgui_impl_glfw.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/IMGUI/imgui_widgets.cpp") - -add_library(IMGUI STATIC ${HEADERS} ${SOURCES}) -target_include_directories(IMGUI SYSTEM PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/IMGUI/" "${CMAKE_CURRENT_SOURCE_DIR}/IMGUI/backends") - -# Needed for backend code -target_link_libraries(IMGUI PRIVATE glfw GLAD) diff --git a/dependencies/JSON/CMakeLists.txt b/dependencies/JSON/CMakeLists.txt deleted file mode 100644 index 621d6b31..00000000 --- a/dependencies/JSON/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -#JSON -FIND_AND_DOWNLOAD_GIT_RESOURCE(JSON https://github.com/nlohmann/json.git) - -set(JSON_BuildTests OFF CACHE INTERNAL "") -add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/JSON) - diff --git a/dependencies/STB_IMAGE/CMakeLists.txt b/dependencies/STB_IMAGE/CMakeLists.txt deleted file mode 100644 index b706305e..00000000 --- a/dependencies/STB_IMAGE/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -FIND_AND_DOWNLOAD_GIT_RESOURCE(STB_IMAGE https://github.com/nothings/stb.git) -add_library(STB_IMAGE INTERFACE IMPORTED GLOBAL) -target_include_directories(STB_IMAGE INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/STB_IMAGE") diff --git a/dependencies/fmt/CMakeLists.txt b/dependencies/fmt/CMakeLists.txt new file mode 100644 index 00000000..1ea717a0 --- /dev/null +++ b/dependencies/fmt/CMakeLists.txt @@ -0,0 +1,2 @@ +FIND_AND_DOWNLOAD_GIT_RESOURCE(fmt https://github.com/fmtlib/fmt.git) +add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/fmt) diff --git a/dependencies/Freetype/CMakeLists.txt b/dependencies/freetype/CMakeLists.txt similarity index 100% rename from dependencies/Freetype/CMakeLists.txt rename to dependencies/freetype/CMakeLists.txt diff --git a/dependencies/Glad/CMakeLists.txt b/dependencies/glad/CMakeLists.txt similarity index 71% rename from dependencies/Glad/CMakeLists.txt rename to dependencies/glad/CMakeLists.txt index 4502f7a1..b33c039a 100644 --- a/dependencies/Glad/CMakeLists.txt +++ b/dependencies/glad/CMakeLists.txt @@ -1,8 +1,8 @@ file(GLOB HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/include/glad/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/include/KHR/*.h") file(GLOB SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.c") -add_library(GLAD STATIC ${HEADERS} ${SOURCES} ) +add_library(glad STATIC ${HEADERS} ${SOURCES} ) #target_sources(GLAD PUBLIC ) -target_include_directories(GLAD SYSTEM PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include/") +target_include_directories(glad SYSTEM PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include/") # For linux we may need to add -ldl #target_link_libraries (GLAD INTERFACE opengl32) diff --git a/dependencies/Glad/include/KHR/khrplatform.h b/dependencies/glad/include/KHR/khrplatform.h similarity index 100% rename from dependencies/Glad/include/KHR/khrplatform.h rename to dependencies/glad/include/KHR/khrplatform.h diff --git a/dependencies/Glad/include/glad/glad.h b/dependencies/glad/include/glad/glad.h similarity index 100% rename from dependencies/Glad/include/glad/glad.h rename to dependencies/glad/include/glad/glad.h diff --git a/dependencies/Glad/src/glad.c b/dependencies/glad/src/glad.c similarity index 100% rename from dependencies/Glad/src/glad.c rename to dependencies/glad/src/glad.c diff --git a/dependencies/GLM/CMakeLists.txt b/dependencies/glm/CMakeLists.txt similarity index 100% rename from dependencies/GLM/CMakeLists.txt rename to dependencies/glm/CMakeLists.txt diff --git a/dependencies/imgui/CMakeLists.txt b/dependencies/imgui/CMakeLists.txt new file mode 100644 index 00000000..db7b139b --- /dev/null +++ b/dependencies/imgui/CMakeLists.txt @@ -0,0 +1,15 @@ +FIND_AND_DOWNLOAD_GIT_RESOURCE(imgui https://github.com/ocornut/imgui.git) + +set(HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/imgui/imconfig.h" "${CMAKE_CURRENT_SOURCE_DIR}/imgui/imgui.h" "${CMAKE_CURRENT_SOURCE_DIR}/imgui/imgui_internal.h" + "${CMAKE_CURRENT_SOURCE_DIR}/imgui/imstb_rectpack.h" "${CMAKE_CURRENT_SOURCE_DIR}/imgui/imstb_textedit.h" "${CMAKE_CURRENT_SOURCE_DIR}/imgui/imstb_truetype.h" + "${CMAKE_CURRENT_SOURCE_DIR}/imgui/backends/imgui_impl_glfw.h" "${CMAKE_CURRENT_SOURCE_DIR}/imgui/backends/imgui_impl_opengl3.h") + +set(SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/imgui/imgui.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/imgui/imgui_demo.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/imgui/imgui_draw.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/imgui/imgui_tables.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/imgui/backends/imgui_impl_opengl3.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/imgui/backends/imgui_impl_glfw.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/imgui/imgui_widgets.cpp") + +add_library(imgui STATIC ${HEADERS} ${SOURCES}) +target_include_directories(imgui SYSTEM PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/imgui/" "${CMAKE_CURRENT_SOURCE_DIR}/imgui/backends") + +# Needed for backend code +target_link_libraries(imgui PRIVATE glfw glad) diff --git a/dependencies/json/CMakeLists.txt b/dependencies/json/CMakeLists.txt new file mode 100644 index 00000000..4df3b6a4 --- /dev/null +++ b/dependencies/json/CMakeLists.txt @@ -0,0 +1,5 @@ +FIND_AND_DOWNLOAD_GIT_RESOURCE(json https://github.com/nlohmann/json.git) + +set(JSON_BuildTests OFF CACHE INTERNAL "") +add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/json) + diff --git a/dependencies/stb_image/CMakeLists.txt b/dependencies/stb_image/CMakeLists.txt new file mode 100644 index 00000000..ba4fe0a8 --- /dev/null +++ b/dependencies/stb_image/CMakeLists.txt @@ -0,0 +1,3 @@ +FIND_AND_DOWNLOAD_GIT_RESOURCE(stb_image https://github.com/nothings/stb.git) +add_library(stb_image INTERFACE IMPORTED GLOBAL) +target_include_directories(stb_image INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/stb_image") diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt index e91adb88..bccb2fa8 100644 --- a/engine/CMakeLists.txt +++ b/engine/CMakeLists.txt @@ -11,7 +11,7 @@ target_include_directories(${MODULE_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" " "${CMAKE_CURRENT_SOURCE_DIR}/Logger" "${CMAKE_CURRENT_SOURCE_DIR}/Render" "${CMAKE_CURRENT_SOURCE_DIR}/Time" "${CMAKE_CURRENT_SOURCE_DIR}/Window") -target_link_libraries_system (${MODULE_NAME} PUBLIC glm glfw GLAD STB_IMAGE freetype nlohmann_json::nlohmann_json fmt IMGUI) +target_link_libraries_system (${MODULE_NAME} PUBLIC glm glfw glad stb_image freetype nlohmann_json::nlohmann_json fmt imgui) target_link_libraries(${MODULE_NAME} PUBLIC project_warnings project_options) target_compile_features(${MODULE_NAME} PRIVATE cxx_std_20)