From e4378dcddcafad13c1b65e73854766b07119bdc2 Mon Sep 17 00:00:00 2001 From: Derek Christ Date: Sat, 7 Dec 2024 15:46:02 +0100 Subject: [PATCH] Restructure project --- CMakeLists.txt | 1 + {src/bin => apps}/CMakeLists.txt | 0 {src/bin => apps}/fall-fever/CMakeLists.txt | 0 {src/bin => apps}/fall-fever/controller.cpp | 0 {src/bin => apps}/fall-fever/controller.h | 0 {src/bin => apps}/fall-fever/debug.cpp | 0 {src/bin => apps}/fall-fever/flycam.cpp | 0 {src/bin => apps}/fall-fever/flycam.h | 0 {src/bin => apps}/fall-fever/main.cpp | 0 src/CMakeLists.txt | 37 ++++++++++++++++++- src/{lib => }/components/color.h | 0 src/{lib => }/components/name.h | 0 src/{lib => }/components/relationship.h | 0 src/{lib => }/components/transform.cpp | 0 src/{lib => }/components/transform.h | 0 src/{lib => }/core/application.cpp | 0 src/{lib => }/core/application.h | 0 src/{lib => }/core/camera.cpp | 0 src/{lib => }/core/camera.h | 0 src/{lib => }/core/glad.cpp | 0 src/{lib => }/core/glad.h | 0 src/{lib => }/core/graphics/framebuffer.cpp | 0 src/{lib => }/core/graphics/framebuffer.h | 0 src/{lib => }/core/graphics/image.cpp | 0 src/{lib => }/core/graphics/image.h | 0 src/{lib => }/core/graphics/material.cpp | 0 src/{lib => }/core/graphics/material.h | 0 src/{lib => }/core/graphics/mesh.cpp | 0 src/{lib => }/core/graphics/mesh.h | 0 src/{lib => }/core/light.cpp | 0 src/{lib => }/core/light.h | 0 src/{lib => }/core/render.cpp | 0 src/{lib => }/core/render.h | 0 src/{lib => }/core/shader.cpp | 0 src/{lib => }/core/shader.h | 0 src/{lib => }/core/time.cpp | 0 src/{lib => }/core/time.h | 0 src/{lib => }/input/input.cpp | 0 src/{lib => }/input/input.h | 0 src/lib/CMakeLists.txt | 35 ------------------ .../post_processing/post_processing.cpp | 0 .../post_processing/post_processing.h | 0 src/{lib => }/scene/gltf.cpp | 0 src/{lib => }/scene/gltf.h | 0 src/{lib => }/scene/gltf_loader.cpp | 0 src/{lib => }/scene/gltf_loader.h | 0 src/{lib => }/scene/scene.cpp | 0 src/{lib => }/scene/scene.h | 0 src/{lib => }/util/log.cpp | 0 src/{lib => }/util/log.h | 0 src/{lib => }/window/window.cpp | 0 src/{lib => }/window/window.h | 0 52 files changed, 36 insertions(+), 37 deletions(-) rename {src/bin => apps}/CMakeLists.txt (100%) rename {src/bin => apps}/fall-fever/CMakeLists.txt (100%) rename {src/bin => apps}/fall-fever/controller.cpp (100%) rename {src/bin => apps}/fall-fever/controller.h (100%) rename {src/bin => apps}/fall-fever/debug.cpp (100%) rename {src/bin => apps}/fall-fever/flycam.cpp (100%) rename {src/bin => apps}/fall-fever/flycam.h (100%) rename {src/bin => apps}/fall-fever/main.cpp (100%) rename src/{lib => }/components/color.h (100%) rename src/{lib => }/components/name.h (100%) rename src/{lib => }/components/relationship.h (100%) rename src/{lib => }/components/transform.cpp (100%) rename src/{lib => }/components/transform.h (100%) rename src/{lib => }/core/application.cpp (100%) rename src/{lib => }/core/application.h (100%) rename src/{lib => }/core/camera.cpp (100%) rename src/{lib => }/core/camera.h (100%) rename src/{lib => }/core/glad.cpp (100%) rename src/{lib => }/core/glad.h (100%) rename src/{lib => }/core/graphics/framebuffer.cpp (100%) rename src/{lib => }/core/graphics/framebuffer.h (100%) rename src/{lib => }/core/graphics/image.cpp (100%) rename src/{lib => }/core/graphics/image.h (100%) rename src/{lib => }/core/graphics/material.cpp (100%) rename src/{lib => }/core/graphics/material.h (100%) rename src/{lib => }/core/graphics/mesh.cpp (100%) rename src/{lib => }/core/graphics/mesh.h (100%) rename src/{lib => }/core/light.cpp (100%) rename src/{lib => }/core/light.h (100%) rename src/{lib => }/core/render.cpp (100%) rename src/{lib => }/core/render.h (100%) rename src/{lib => }/core/shader.cpp (100%) rename src/{lib => }/core/shader.h (100%) rename src/{lib => }/core/time.cpp (100%) rename src/{lib => }/core/time.h (100%) rename src/{lib => }/input/input.cpp (100%) rename src/{lib => }/input/input.h (100%) delete mode 100644 src/lib/CMakeLists.txt rename src/{lib => }/post_processing/post_processing.cpp (100%) rename src/{lib => }/post_processing/post_processing.h (100%) rename src/{lib => }/scene/gltf.cpp (100%) rename src/{lib => }/scene/gltf.h (100%) rename src/{lib => }/scene/gltf_loader.cpp (100%) rename src/{lib => }/scene/gltf_loader.h (100%) rename src/{lib => }/scene/scene.cpp (100%) rename src/{lib => }/scene/scene.h (100%) rename src/{lib => }/util/log.cpp (100%) rename src/{lib => }/util/log.h (100%) rename src/{lib => }/window/window.cpp (100%) rename src/{lib => }/window/window.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3f2c46a..c1be4f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,3 +26,4 @@ endif() add_subdirectory(${PROJECT_SOURCE_DIR}/lib) add_subdirectory(${PROJECT_SOURCE_DIR}/src) +add_subdirectory(${PROJECT_SOURCE_DIR}/apps) diff --git a/src/bin/CMakeLists.txt b/apps/CMakeLists.txt similarity index 100% rename from src/bin/CMakeLists.txt rename to apps/CMakeLists.txt diff --git a/src/bin/fall-fever/CMakeLists.txt b/apps/fall-fever/CMakeLists.txt similarity index 100% rename from src/bin/fall-fever/CMakeLists.txt rename to apps/fall-fever/CMakeLists.txt diff --git a/src/bin/fall-fever/controller.cpp b/apps/fall-fever/controller.cpp similarity index 100% rename from src/bin/fall-fever/controller.cpp rename to apps/fall-fever/controller.cpp diff --git a/src/bin/fall-fever/controller.h b/apps/fall-fever/controller.h similarity index 100% rename from src/bin/fall-fever/controller.h rename to apps/fall-fever/controller.h diff --git a/src/bin/fall-fever/debug.cpp b/apps/fall-fever/debug.cpp similarity index 100% rename from src/bin/fall-fever/debug.cpp rename to apps/fall-fever/debug.cpp diff --git a/src/bin/fall-fever/flycam.cpp b/apps/fall-fever/flycam.cpp similarity index 100% rename from src/bin/fall-fever/flycam.cpp rename to apps/fall-fever/flycam.cpp diff --git a/src/bin/fall-fever/flycam.h b/apps/fall-fever/flycam.h similarity index 100% rename from src/bin/fall-fever/flycam.h rename to apps/fall-fever/flycam.h diff --git a/src/bin/fall-fever/main.cpp b/apps/fall-fever/main.cpp similarity index 100% rename from src/bin/fall-fever/main.cpp rename to apps/fall-fever/main.cpp diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1d235e1..1b0c4de 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,2 +1,35 @@ -add_subdirectory(lib) -add_subdirectory(bin) +add_library(fever_core + components/transform.cpp + core/application.cpp + core/camera.cpp + core/glad.cpp + core/graphics/framebuffer.cpp + core/graphics/image.cpp + core/graphics/material.cpp + core/graphics/mesh.cpp + core/light.cpp + core/render.cpp + core/shader.cpp + core/time.cpp + input/input.cpp + scene/gltf.cpp + scene/gltf_loader.cpp + util/log.cpp + window/window.cpp +) + +target_compile_features(fever_core PUBLIC cxx_std_20) +target_include_directories(fever_core PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) + +target_link_libraries( + fever_core PUBLIC + glad + glfw + EnTT::EnTT + pthread + spdlog + glm::glm + fx-gltf::fx-gltf + nlohmann_json::nlohmann_json + stb +) diff --git a/src/lib/components/color.h b/src/components/color.h similarity index 100% rename from src/lib/components/color.h rename to src/components/color.h diff --git a/src/lib/components/name.h b/src/components/name.h similarity index 100% rename from src/lib/components/name.h rename to src/components/name.h diff --git a/src/lib/components/relationship.h b/src/components/relationship.h similarity index 100% rename from src/lib/components/relationship.h rename to src/components/relationship.h diff --git a/src/lib/components/transform.cpp b/src/components/transform.cpp similarity index 100% rename from src/lib/components/transform.cpp rename to src/components/transform.cpp diff --git a/src/lib/components/transform.h b/src/components/transform.h similarity index 100% rename from src/lib/components/transform.h rename to src/components/transform.h diff --git a/src/lib/core/application.cpp b/src/core/application.cpp similarity index 100% rename from src/lib/core/application.cpp rename to src/core/application.cpp diff --git a/src/lib/core/application.h b/src/core/application.h similarity index 100% rename from src/lib/core/application.h rename to src/core/application.h diff --git a/src/lib/core/camera.cpp b/src/core/camera.cpp similarity index 100% rename from src/lib/core/camera.cpp rename to src/core/camera.cpp diff --git a/src/lib/core/camera.h b/src/core/camera.h similarity index 100% rename from src/lib/core/camera.h rename to src/core/camera.h diff --git a/src/lib/core/glad.cpp b/src/core/glad.cpp similarity index 100% rename from src/lib/core/glad.cpp rename to src/core/glad.cpp diff --git a/src/lib/core/glad.h b/src/core/glad.h similarity index 100% rename from src/lib/core/glad.h rename to src/core/glad.h diff --git a/src/lib/core/graphics/framebuffer.cpp b/src/core/graphics/framebuffer.cpp similarity index 100% rename from src/lib/core/graphics/framebuffer.cpp rename to src/core/graphics/framebuffer.cpp diff --git a/src/lib/core/graphics/framebuffer.h b/src/core/graphics/framebuffer.h similarity index 100% rename from src/lib/core/graphics/framebuffer.h rename to src/core/graphics/framebuffer.h diff --git a/src/lib/core/graphics/image.cpp b/src/core/graphics/image.cpp similarity index 100% rename from src/lib/core/graphics/image.cpp rename to src/core/graphics/image.cpp diff --git a/src/lib/core/graphics/image.h b/src/core/graphics/image.h similarity index 100% rename from src/lib/core/graphics/image.h rename to src/core/graphics/image.h diff --git a/src/lib/core/graphics/material.cpp b/src/core/graphics/material.cpp similarity index 100% rename from src/lib/core/graphics/material.cpp rename to src/core/graphics/material.cpp diff --git a/src/lib/core/graphics/material.h b/src/core/graphics/material.h similarity index 100% rename from src/lib/core/graphics/material.h rename to src/core/graphics/material.h diff --git a/src/lib/core/graphics/mesh.cpp b/src/core/graphics/mesh.cpp similarity index 100% rename from src/lib/core/graphics/mesh.cpp rename to src/core/graphics/mesh.cpp diff --git a/src/lib/core/graphics/mesh.h b/src/core/graphics/mesh.h similarity index 100% rename from src/lib/core/graphics/mesh.h rename to src/core/graphics/mesh.h diff --git a/src/lib/core/light.cpp b/src/core/light.cpp similarity index 100% rename from src/lib/core/light.cpp rename to src/core/light.cpp diff --git a/src/lib/core/light.h b/src/core/light.h similarity index 100% rename from src/lib/core/light.h rename to src/core/light.h diff --git a/src/lib/core/render.cpp b/src/core/render.cpp similarity index 100% rename from src/lib/core/render.cpp rename to src/core/render.cpp diff --git a/src/lib/core/render.h b/src/core/render.h similarity index 100% rename from src/lib/core/render.h rename to src/core/render.h diff --git a/src/lib/core/shader.cpp b/src/core/shader.cpp similarity index 100% rename from src/lib/core/shader.cpp rename to src/core/shader.cpp diff --git a/src/lib/core/shader.h b/src/core/shader.h similarity index 100% rename from src/lib/core/shader.h rename to src/core/shader.h diff --git a/src/lib/core/time.cpp b/src/core/time.cpp similarity index 100% rename from src/lib/core/time.cpp rename to src/core/time.cpp diff --git a/src/lib/core/time.h b/src/core/time.h similarity index 100% rename from src/lib/core/time.h rename to src/core/time.h diff --git a/src/lib/input/input.cpp b/src/input/input.cpp similarity index 100% rename from src/lib/input/input.cpp rename to src/input/input.cpp diff --git a/src/lib/input/input.h b/src/input/input.h similarity index 100% rename from src/lib/input/input.h rename to src/input/input.h diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt deleted file mode 100644 index 1b0c4de..0000000 --- a/src/lib/CMakeLists.txt +++ /dev/null @@ -1,35 +0,0 @@ -add_library(fever_core - components/transform.cpp - core/application.cpp - core/camera.cpp - core/glad.cpp - core/graphics/framebuffer.cpp - core/graphics/image.cpp - core/graphics/material.cpp - core/graphics/mesh.cpp - core/light.cpp - core/render.cpp - core/shader.cpp - core/time.cpp - input/input.cpp - scene/gltf.cpp - scene/gltf_loader.cpp - util/log.cpp - window/window.cpp -) - -target_compile_features(fever_core PUBLIC cxx_std_20) -target_include_directories(fever_core PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) - -target_link_libraries( - fever_core PUBLIC - glad - glfw - EnTT::EnTT - pthread - spdlog - glm::glm - fx-gltf::fx-gltf - nlohmann_json::nlohmann_json - stb -) diff --git a/src/lib/post_processing/post_processing.cpp b/src/post_processing/post_processing.cpp similarity index 100% rename from src/lib/post_processing/post_processing.cpp rename to src/post_processing/post_processing.cpp diff --git a/src/lib/post_processing/post_processing.h b/src/post_processing/post_processing.h similarity index 100% rename from src/lib/post_processing/post_processing.h rename to src/post_processing/post_processing.h diff --git a/src/lib/scene/gltf.cpp b/src/scene/gltf.cpp similarity index 100% rename from src/lib/scene/gltf.cpp rename to src/scene/gltf.cpp diff --git a/src/lib/scene/gltf.h b/src/scene/gltf.h similarity index 100% rename from src/lib/scene/gltf.h rename to src/scene/gltf.h diff --git a/src/lib/scene/gltf_loader.cpp b/src/scene/gltf_loader.cpp similarity index 100% rename from src/lib/scene/gltf_loader.cpp rename to src/scene/gltf_loader.cpp diff --git a/src/lib/scene/gltf_loader.h b/src/scene/gltf_loader.h similarity index 100% rename from src/lib/scene/gltf_loader.h rename to src/scene/gltf_loader.h diff --git a/src/lib/scene/scene.cpp b/src/scene/scene.cpp similarity index 100% rename from src/lib/scene/scene.cpp rename to src/scene/scene.cpp diff --git a/src/lib/scene/scene.h b/src/scene/scene.h similarity index 100% rename from src/lib/scene/scene.h rename to src/scene/scene.h diff --git a/src/lib/util/log.cpp b/src/util/log.cpp similarity index 100% rename from src/lib/util/log.cpp rename to src/util/log.cpp diff --git a/src/lib/util/log.h b/src/util/log.h similarity index 100% rename from src/lib/util/log.h rename to src/util/log.h diff --git a/src/lib/window/window.cpp b/src/window/window.cpp similarity index 100% rename from src/lib/window/window.cpp rename to src/window/window.cpp diff --git a/src/lib/window/window.h b/src/window/window.h similarity index 100% rename from src/lib/window/window.h rename to src/window/window.h