From f82d40532caa346ea3984176b6595b7672c93013 Mon Sep 17 00:00:00 2001 From: Romain BOULLARD Date: Thu, 3 Sep 2026 00:02:09 +0200 Subject: [PATCH] Refactor Bigfoot files layout + Create our three graphics libraries --- .../AssetsForBenchmarking/CMakeLists.txt | 4 +--- Bigfoot/Benchmarks/CMakeLists.txt | 1 + Bigfoot/Benchmarks/Engine/CMakeLists.txt | 4 ++-- Bigfoot/Benchmarks/Graphics/CMakeLists.txt | 4 ++++ .../Graphics/GraphicsCore/CMakeLists.txt | 5 +++++ .../Graphics/GraphicsCore/GraphicsCore.cpp | 1 + .../Graphics/GraphicsVulkan/CMakeLists.txt | 5 +++++ .../GraphicsVulkan/GraphicsVulkan.cpp | 1 + Bigfoot/Benchmarks/Utils/CMakeLists.txt | 2 +- Bigfoot/Libs/CMakeLists.txt | 4 ++++ .../Engine/Asset/AssetBase.cpp | 0 .../Engine/Asset/AssetContainer.cpp | 0 .../Engine/Asset/AssetLibrary.cpp | 0 .../Engine/Asset/AssetTypeID.cpp | 0 .../Engine/BigFile/BigFile.cpp | 0 .../Engine/BigFile/BigFileSchema.sql | 0 .../{Sources => Libs}/Engine/CMakeLists.txt | 2 +- .../Engine/DataAccessor/DataAccessor.cpp | 0 .../Engine/Include/Engine/Asset/Asset.fbs | 0 .../Engine/Include/Engine/Asset/Asset.hpp | 0 .../Engine/Include/Engine/Asset/AssetBase.hpp | 0 .../Include/Engine/Asset/AssetConcepts.hpp | 0 .../Include/Engine/Asset/AssetContainer.hpp | 0 .../Include/Engine/Asset/AssetHelper.hpp | 0 .../Include/Engine/Asset/AssetLibrary.hpp | 0 .../Include/Engine/Asset/AssetTypeID.fbs | 0 .../Include/Engine/Asset/AssetTypeID.hpp | 0 .../Engine/Asset/AssetTypeID_generated.hpp | 0 .../Include/Engine/Asset/Asset_generated.hpp | 0 .../Engine/Include/Engine/Asset/Reference.fbs | 0 .../Engine/Include/Engine/Asset/Reference.hpp | 0 .../Engine/Asset/Reference_generated.hpp | 0 .../Engine/Include/Engine/BigFile/BigFile.hpp | 0 .../BigFile/BigFileInfo_generated.hpp.in | 0 .../Engine/DataAccessor/DataAccessor.hpp | 0 .../Include/Engine/EngineAssertHandler.hpp | 0 .../Include/Engine/EngineInfo_generated.hpp | 0 .../Engine/EngineInfo_generated.hpp.in | 0 .../Include/Engine/EngineLogger_generated.hpp | 0 .../Include/Engine/Sasquatch/Sasquatch.hpp | 0 .../Sasquatch/SasquatchInfo_generated.hpp.in | 0 .../SerializationManager.hpp | 0 .../Engine/Sasquatch/Sasquatch.cpp | 0 .../SerializationManager.cpp | 0 Bigfoot/Libs/Graphics/CMakeLists.txt | 5 +++++ .../Libs/Graphics/GraphicsCore/CMakeLists.txt | 18 ++++++++++++++++ .../Graphics/GraphicsCore/GraphicsCore.cpp | 1 + .../GraphicsCoreAssertHandler.hpp | 20 ++++++++++++++++++ .../GraphicsCoreLogger_generated.hpp | 21 +++++++++++++++++++ .../Graphics/GraphicsInterface/CMakeLists.txt | 18 ++++++++++++++++ .../GraphicsInterface/GraphicsInterface.cpp | 1 + .../GraphicsInterfaceAssertHandler.hpp | 20 ++++++++++++++++++ .../GraphicsInterfaceLogger_generated.hpp | 21 +++++++++++++++++++ .../Graphics/GraphicsVulkan/CMakeLists.txt | 20 ++++++++++++++++++ .../GraphicsVulkan/GraphicsVulkan.cpp | 1 + .../GraphicsVulkanAssertHandler.hpp | 20 ++++++++++++++++++ .../GraphicsVulkanLogger_generated.hpp | 21 +++++++++++++++++++ .../{Sources => Libs}/System/CMakeLists.txt | 2 +- .../{Sources => Libs}/System/File/File.cpp | 0 .../System/File/MemoryMappedFile.cpp | 0 .../System/Include/System/File/File.hpp | 0 .../Include/System/File/MemoryMappedFile.hpp | 0 .../Include/System/SystemAssertHandler.hpp | 0 .../Include/System/SystemLogger_generated.hpp | 0 .../System/Include/System/Time.hpp | 0 .../System/Include/System/Time/Time.fbs | 0 .../System/Include/System/Time/Time.hpp | 0 .../Include/System/Time/Time_generated.hpp | 0 .../System/Include/System/UUID/FlatUUID.hpp | 0 .../System/Include/System/UUID/UUID.fbs | 0 .../System/Include/System/UUID/UUID.hpp | 0 .../Include/System/UUID/UUID_generated.hpp | 0 .../{Sources => Libs}/System/Time/Time.cpp | 0 .../{Sources => Libs}/System/UUID/UUID.cpp | 0 .../{Sources => Libs}/Utils/CMakeLists.txt | 2 +- .../Utils/Include/Utils/Algorithm/Graph.hpp | 0 .../Utils/Include/Utils/Assert/Assert.hpp | 0 .../Include/Utils/Assert/AssertHandler.hpp | 0 .../Utils/Include/Utils/Caster.hpp | 0 .../Utils/Include/Utils/Concat.h | 0 .../Include/Utils/Containers/SlotMap.hpp | 0 .../Utils/Include/Utils/Format.hpp | 0 .../Include/Utils/Log/EASTLFormatters.hpp | 0 .../Utils/Include/Utils/Log/Log.fbs | 0 .../Utils/Include/Utils/Log/Log.hpp | 0 .../Utils/Include/Utils/Log/LogMacros.hpp | 0 .../Utils/Include/Utils/Log/Log_generated.hpp | 0 .../Utils/Log/TargetLogger_generated.hpp.in | 0 .../Utils/Include/Utils/Profiler.hpp | 0 .../Utils/Include/Utils/Singleton.hpp | 0 .../Utils/Include/Utils/TaggedType.hpp | 0 .../Utils/Include/Utils/TargetMacros.h | 0 .../Include/Utils/UtilsAssertHandler.hpp | 0 .../Include/Utils/UtilsLogger_generated.hpp | 0 .../Utils/Include/Utils/Version.hpp | 0 Bigfoot/{Sources => Libs}/Utils/Log/Log.cpp | 0 .../{Sources => Libs}/Utils/MimallocImpl.cpp | 0 Bigfoot/{Sources => Libs}/Utils/Version.cpp | 0 Bigfoot/Sources/CMakeLists.txt | 3 --- Bigfoot/Tests/CMakeLists.txt | 3 ++- Bigfoot/Tests/Engine/CMakeLists.txt | 4 ++-- Bigfoot/Tests/Graphics/CMakeLists.txt | 4 ++++ .../Graphics/GraphicsCore/CMakeLists.txt | 10 +++++++++ .../GraphicsCore/GraphicsCoreTests/main.cpp | 21 +++++++++++++++++++ .../Graphics/GraphicsVulkan/CMakeLists.txt | 10 +++++++++ .../GraphicsVulkanTests/main.cpp | 21 +++++++++++++++++++ .../Misc/AssetsForTesting/CMakeLists.txt | 2 +- Bigfoot/Tests/System/CMakeLists.txt | 2 +- Bigfoot/Tests/Utils/CMakeLists.txt | 2 +- CMake/FindDependencies.cmake | 1 + CMake/Package.cmake | 16 +++++++------- CMake/Utils.cmake | 10 ++++----- CMakeLists.txt | 2 +- .../Benchmarks/SasquatchBaker/CMakeLists.txt | 4 ++-- .../Executables/SasquatchBaker/CMakeLists.txt | 2 +- Tools/Tests/SasquatchBaker/CMakeLists.txt | 4 ++-- conanfile.py | 2 +- sonar-project.properties | 2 +- 118 files changed, 310 insertions(+), 39 deletions(-) create mode 100644 Bigfoot/Benchmarks/Graphics/CMakeLists.txt create mode 100644 Bigfoot/Benchmarks/Graphics/GraphicsCore/CMakeLists.txt create mode 100644 Bigfoot/Benchmarks/Graphics/GraphicsCore/GraphicsCore.cpp create mode 100644 Bigfoot/Benchmarks/Graphics/GraphicsVulkan/CMakeLists.txt create mode 100644 Bigfoot/Benchmarks/Graphics/GraphicsVulkan/GraphicsVulkan.cpp create mode 100644 Bigfoot/Libs/CMakeLists.txt rename Bigfoot/{Sources => Libs}/Engine/Asset/AssetBase.cpp (100%) rename Bigfoot/{Sources => Libs}/Engine/Asset/AssetContainer.cpp (100%) rename Bigfoot/{Sources => Libs}/Engine/Asset/AssetLibrary.cpp (100%) rename Bigfoot/{Sources => Libs}/Engine/Asset/AssetTypeID.cpp (100%) rename Bigfoot/{Sources => Libs}/Engine/BigFile/BigFile.cpp (100%) rename Bigfoot/{Sources => Libs}/Engine/BigFile/BigFileSchema.sql (100%) rename Bigfoot/{Sources => Libs}/Engine/CMakeLists.txt (97%) rename Bigfoot/{Sources => Libs}/Engine/DataAccessor/DataAccessor.cpp (100%) rename Bigfoot/{Sources => Libs}/Engine/Include/Engine/Asset/Asset.fbs (100%) rename Bigfoot/{Sources => Libs}/Engine/Include/Engine/Asset/Asset.hpp (100%) rename Bigfoot/{Sources => Libs}/Engine/Include/Engine/Asset/AssetBase.hpp (100%) rename Bigfoot/{Sources => Libs}/Engine/Include/Engine/Asset/AssetConcepts.hpp (100%) rename Bigfoot/{Sources => Libs}/Engine/Include/Engine/Asset/AssetContainer.hpp (100%) rename Bigfoot/{Sources => Libs}/Engine/Include/Engine/Asset/AssetHelper.hpp (100%) rename Bigfoot/{Sources => Libs}/Engine/Include/Engine/Asset/AssetLibrary.hpp (100%) rename Bigfoot/{Sources => Libs}/Engine/Include/Engine/Asset/AssetTypeID.fbs (100%) rename Bigfoot/{Sources => Libs}/Engine/Include/Engine/Asset/AssetTypeID.hpp (100%) rename Bigfoot/{Sources => Libs}/Engine/Include/Engine/Asset/AssetTypeID_generated.hpp (100%) rename Bigfoot/{Sources => Libs}/Engine/Include/Engine/Asset/Asset_generated.hpp (100%) rename Bigfoot/{Sources => Libs}/Engine/Include/Engine/Asset/Reference.fbs (100%) rename Bigfoot/{Sources => Libs}/Engine/Include/Engine/Asset/Reference.hpp (100%) rename Bigfoot/{Sources => Libs}/Engine/Include/Engine/Asset/Reference_generated.hpp (100%) rename Bigfoot/{Sources => Libs}/Engine/Include/Engine/BigFile/BigFile.hpp (100%) rename Bigfoot/{Sources => Libs}/Engine/Include/Engine/BigFile/BigFileInfo_generated.hpp.in (100%) rename Bigfoot/{Sources => Libs}/Engine/Include/Engine/DataAccessor/DataAccessor.hpp (100%) rename Bigfoot/{Sources => Libs}/Engine/Include/Engine/EngineAssertHandler.hpp (100%) rename Bigfoot/{Sources => Libs}/Engine/Include/Engine/EngineInfo_generated.hpp (100%) rename Bigfoot/{Sources => Libs}/Engine/Include/Engine/EngineInfo_generated.hpp.in (100%) rename Bigfoot/{Sources => Libs}/Engine/Include/Engine/EngineLogger_generated.hpp (100%) rename Bigfoot/{Sources => Libs}/Engine/Include/Engine/Sasquatch/Sasquatch.hpp (100%) rename Bigfoot/{Sources => Libs}/Engine/Include/Engine/Sasquatch/SasquatchInfo_generated.hpp.in (100%) rename Bigfoot/{Sources => Libs}/Engine/Include/Engine/SerializationManager/SerializationManager.hpp (100%) rename Bigfoot/{Sources => Libs}/Engine/Sasquatch/Sasquatch.cpp (100%) rename Bigfoot/{Sources => Libs}/Engine/SerializationManager/SerializationManager.cpp (100%) create mode 100644 Bigfoot/Libs/Graphics/CMakeLists.txt create mode 100644 Bigfoot/Libs/Graphics/GraphicsCore/CMakeLists.txt create mode 100644 Bigfoot/Libs/Graphics/GraphicsCore/GraphicsCore.cpp create mode 100644 Bigfoot/Libs/Graphics/GraphicsCore/Include/GraphicsCore/GraphicsCoreAssertHandler.hpp create mode 100644 Bigfoot/Libs/Graphics/GraphicsCore/Include/GraphicsCore/GraphicsCoreLogger_generated.hpp create mode 100644 Bigfoot/Libs/Graphics/GraphicsInterface/CMakeLists.txt create mode 100644 Bigfoot/Libs/Graphics/GraphicsInterface/GraphicsInterface.cpp create mode 100644 Bigfoot/Libs/Graphics/GraphicsInterface/Include/GraphicsInterface/GraphicsInterfaceAssertHandler.hpp create mode 100644 Bigfoot/Libs/Graphics/GraphicsInterface/Include/GraphicsInterface/GraphicsInterfaceLogger_generated.hpp create mode 100644 Bigfoot/Libs/Graphics/GraphicsVulkan/CMakeLists.txt create mode 100644 Bigfoot/Libs/Graphics/GraphicsVulkan/GraphicsVulkan.cpp create mode 100644 Bigfoot/Libs/Graphics/GraphicsVulkan/Include/GraphicsVulkan/GraphicsVulkanAssertHandler.hpp create mode 100644 Bigfoot/Libs/Graphics/GraphicsVulkan/Include/GraphicsVulkan/GraphicsVulkanLogger_generated.hpp rename Bigfoot/{Sources => Libs}/System/CMakeLists.txt (95%) rename Bigfoot/{Sources => Libs}/System/File/File.cpp (100%) rename Bigfoot/{Sources => Libs}/System/File/MemoryMappedFile.cpp (100%) rename Bigfoot/{Sources => Libs}/System/Include/System/File/File.hpp (100%) rename Bigfoot/{Sources => Libs}/System/Include/System/File/MemoryMappedFile.hpp (100%) rename Bigfoot/{Sources => Libs}/System/Include/System/SystemAssertHandler.hpp (100%) rename Bigfoot/{Sources => Libs}/System/Include/System/SystemLogger_generated.hpp (100%) rename Bigfoot/{Sources => Libs}/System/Include/System/Time.hpp (100%) rename Bigfoot/{Sources => Libs}/System/Include/System/Time/Time.fbs (100%) rename Bigfoot/{Sources => Libs}/System/Include/System/Time/Time.hpp (100%) rename Bigfoot/{Sources => Libs}/System/Include/System/Time/Time_generated.hpp (100%) rename Bigfoot/{Sources => Libs}/System/Include/System/UUID/FlatUUID.hpp (100%) rename Bigfoot/{Sources => Libs}/System/Include/System/UUID/UUID.fbs (100%) rename Bigfoot/{Sources => Libs}/System/Include/System/UUID/UUID.hpp (100%) rename Bigfoot/{Sources => Libs}/System/Include/System/UUID/UUID_generated.hpp (100%) rename Bigfoot/{Sources => Libs}/System/Time/Time.cpp (100%) rename Bigfoot/{Sources => Libs}/System/UUID/UUID.cpp (100%) rename Bigfoot/{Sources => Libs}/Utils/CMakeLists.txt (98%) rename Bigfoot/{Sources => Libs}/Utils/Include/Utils/Algorithm/Graph.hpp (100%) rename Bigfoot/{Sources => Libs}/Utils/Include/Utils/Assert/Assert.hpp (100%) rename Bigfoot/{Sources => Libs}/Utils/Include/Utils/Assert/AssertHandler.hpp (100%) rename Bigfoot/{Sources => Libs}/Utils/Include/Utils/Caster.hpp (100%) rename Bigfoot/{Sources => Libs}/Utils/Include/Utils/Concat.h (100%) rename Bigfoot/{Sources => Libs}/Utils/Include/Utils/Containers/SlotMap.hpp (100%) rename Bigfoot/{Sources => Libs}/Utils/Include/Utils/Format.hpp (100%) rename Bigfoot/{Sources => Libs}/Utils/Include/Utils/Log/EASTLFormatters.hpp (100%) rename Bigfoot/{Sources => Libs}/Utils/Include/Utils/Log/Log.fbs (100%) rename Bigfoot/{Sources => Libs}/Utils/Include/Utils/Log/Log.hpp (100%) rename Bigfoot/{Sources => Libs}/Utils/Include/Utils/Log/LogMacros.hpp (100%) rename Bigfoot/{Sources => Libs}/Utils/Include/Utils/Log/Log_generated.hpp (100%) rename Bigfoot/{Sources => Libs}/Utils/Include/Utils/Log/TargetLogger_generated.hpp.in (100%) rename Bigfoot/{Sources => Libs}/Utils/Include/Utils/Profiler.hpp (100%) rename Bigfoot/{Sources => Libs}/Utils/Include/Utils/Singleton.hpp (100%) rename Bigfoot/{Sources => Libs}/Utils/Include/Utils/TaggedType.hpp (100%) rename Bigfoot/{Sources => Libs}/Utils/Include/Utils/TargetMacros.h (100%) rename Bigfoot/{Sources => Libs}/Utils/Include/Utils/UtilsAssertHandler.hpp (100%) rename Bigfoot/{Sources => Libs}/Utils/Include/Utils/UtilsLogger_generated.hpp (100%) rename Bigfoot/{Sources => Libs}/Utils/Include/Utils/Version.hpp (100%) rename Bigfoot/{Sources => Libs}/Utils/Log/Log.cpp (100%) rename Bigfoot/{Sources => Libs}/Utils/MimallocImpl.cpp (100%) rename Bigfoot/{Sources => Libs}/Utils/Version.cpp (100%) delete mode 100644 Bigfoot/Sources/CMakeLists.txt create mode 100644 Bigfoot/Tests/Graphics/CMakeLists.txt create mode 100644 Bigfoot/Tests/Graphics/GraphicsCore/CMakeLists.txt create mode 100644 Bigfoot/Tests/Graphics/GraphicsCore/GraphicsCoreTests/main.cpp create mode 100644 Bigfoot/Tests/Graphics/GraphicsVulkan/CMakeLists.txt create mode 100644 Bigfoot/Tests/Graphics/GraphicsVulkan/GraphicsVulkanTests/main.cpp diff --git a/Bigfoot/Benchmarks/AssetsForBenchmarking/CMakeLists.txt b/Bigfoot/Benchmarks/AssetsForBenchmarking/CMakeLists.txt index 950fef7..2079827 100644 --- a/Bigfoot/Benchmarks/AssetsForBenchmarking/CMakeLists.txt +++ b/Bigfoot/Benchmarks/AssetsForBenchmarking/CMakeLists.txt @@ -12,6 +12,4 @@ bigfoot_create_package_lib( "${PrivateDependencies}" "${BigfootPublicDependencies}" "${BigfootPrivateDependencies}" - "") - -set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER Benchmarks/Bigfoot) + "Bigfoot/Benchmarks") diff --git a/Bigfoot/Benchmarks/CMakeLists.txt b/Bigfoot/Benchmarks/CMakeLists.txt index 4c48d68..51e4576 100644 --- a/Bigfoot/Benchmarks/CMakeLists.txt +++ b/Bigfoot/Benchmarks/CMakeLists.txt @@ -2,3 +2,4 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/AssetsForBenchmarking) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Engine) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Utils) +add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Graphics) diff --git a/Bigfoot/Benchmarks/Engine/CMakeLists.txt b/Bigfoot/Benchmarks/Engine/CMakeLists.txt index 0bc14d1..46a1009 100644 --- a/Bigfoot/Benchmarks/Engine/CMakeLists.txt +++ b/Bigfoot/Benchmarks/Engine/CMakeLists.txt @@ -2,13 +2,13 @@ get_filename_component(PackageName ${CMAKE_CURRENT_SOURCE_DIR} NAME) project(${PackageName}Benchmarks) bigfoot_create_package_benchmarks( - "") + "Bigfoot/Benchmarks") target_link_libraries(${PROJECT_NAME} PRIVATE effolkronium_random $) -bigfoot_create_bigfile("Benchmarks/Bigfoot") +bigfoot_create_bigfile("Bigfoot/Benchmarks") bigfoot_create_sasquatch_info() diff --git a/Bigfoot/Benchmarks/Graphics/CMakeLists.txt b/Bigfoot/Benchmarks/Graphics/CMakeLists.txt new file mode 100644 index 0000000..5d00b6c --- /dev/null +++ b/Bigfoot/Benchmarks/Graphics/CMakeLists.txt @@ -0,0 +1,4 @@ +if(${VULKAN}) + add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/GraphicsVulkan) + add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/GraphicsCore) +endif() diff --git a/Bigfoot/Benchmarks/Graphics/GraphicsCore/CMakeLists.txt b/Bigfoot/Benchmarks/Graphics/GraphicsCore/CMakeLists.txt new file mode 100644 index 0000000..843565c --- /dev/null +++ b/Bigfoot/Benchmarks/Graphics/GraphicsCore/CMakeLists.txt @@ -0,0 +1,5 @@ +get_filename_component(PackageName ${CMAKE_CURRENT_SOURCE_DIR} NAME) +project(${PackageName}Benchmarks) + +bigfoot_create_package_benchmarks( + "Bigfoot/Benchmarks/Graphics") diff --git a/Bigfoot/Benchmarks/Graphics/GraphicsCore/GraphicsCore.cpp b/Bigfoot/Benchmarks/Graphics/GraphicsCore/GraphicsCore.cpp new file mode 100644 index 0000000..8fe106f --- /dev/null +++ b/Bigfoot/Benchmarks/Graphics/GraphicsCore/GraphicsCore.cpp @@ -0,0 +1 @@ +#include diff --git a/Bigfoot/Benchmarks/Graphics/GraphicsVulkan/CMakeLists.txt b/Bigfoot/Benchmarks/Graphics/GraphicsVulkan/CMakeLists.txt new file mode 100644 index 0000000..843565c --- /dev/null +++ b/Bigfoot/Benchmarks/Graphics/GraphicsVulkan/CMakeLists.txt @@ -0,0 +1,5 @@ +get_filename_component(PackageName ${CMAKE_CURRENT_SOURCE_DIR} NAME) +project(${PackageName}Benchmarks) + +bigfoot_create_package_benchmarks( + "Bigfoot/Benchmarks/Graphics") diff --git a/Bigfoot/Benchmarks/Graphics/GraphicsVulkan/GraphicsVulkan.cpp b/Bigfoot/Benchmarks/Graphics/GraphicsVulkan/GraphicsVulkan.cpp new file mode 100644 index 0000000..e3abd0a --- /dev/null +++ b/Bigfoot/Benchmarks/Graphics/GraphicsVulkan/GraphicsVulkan.cpp @@ -0,0 +1 @@ +#include diff --git a/Bigfoot/Benchmarks/Utils/CMakeLists.txt b/Bigfoot/Benchmarks/Utils/CMakeLists.txt index 53a5d66..8fd61fe 100644 --- a/Bigfoot/Benchmarks/Utils/CMakeLists.txt +++ b/Bigfoot/Benchmarks/Utils/CMakeLists.txt @@ -2,4 +2,4 @@ get_filename_component(PackageName ${CMAKE_CURRENT_SOURCE_DIR} NAME) project(${PackageName}Benchmarks) bigfoot_create_package_benchmarks( - "") \ No newline at end of file + "Bigfoot/Benchmarks") \ No newline at end of file diff --git a/Bigfoot/Libs/CMakeLists.txt b/Bigfoot/Libs/CMakeLists.txt new file mode 100644 index 0000000..63c115c --- /dev/null +++ b/Bigfoot/Libs/CMakeLists.txt @@ -0,0 +1,4 @@ +add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Utils) +add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/System) +add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Engine) +add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Graphics) \ No newline at end of file diff --git a/Bigfoot/Sources/Engine/Asset/AssetBase.cpp b/Bigfoot/Libs/Engine/Asset/AssetBase.cpp similarity index 100% rename from Bigfoot/Sources/Engine/Asset/AssetBase.cpp rename to Bigfoot/Libs/Engine/Asset/AssetBase.cpp diff --git a/Bigfoot/Sources/Engine/Asset/AssetContainer.cpp b/Bigfoot/Libs/Engine/Asset/AssetContainer.cpp similarity index 100% rename from Bigfoot/Sources/Engine/Asset/AssetContainer.cpp rename to Bigfoot/Libs/Engine/Asset/AssetContainer.cpp diff --git a/Bigfoot/Sources/Engine/Asset/AssetLibrary.cpp b/Bigfoot/Libs/Engine/Asset/AssetLibrary.cpp similarity index 100% rename from Bigfoot/Sources/Engine/Asset/AssetLibrary.cpp rename to Bigfoot/Libs/Engine/Asset/AssetLibrary.cpp diff --git a/Bigfoot/Sources/Engine/Asset/AssetTypeID.cpp b/Bigfoot/Libs/Engine/Asset/AssetTypeID.cpp similarity index 100% rename from Bigfoot/Sources/Engine/Asset/AssetTypeID.cpp rename to Bigfoot/Libs/Engine/Asset/AssetTypeID.cpp diff --git a/Bigfoot/Sources/Engine/BigFile/BigFile.cpp b/Bigfoot/Libs/Engine/BigFile/BigFile.cpp similarity index 100% rename from Bigfoot/Sources/Engine/BigFile/BigFile.cpp rename to Bigfoot/Libs/Engine/BigFile/BigFile.cpp diff --git a/Bigfoot/Sources/Engine/BigFile/BigFileSchema.sql b/Bigfoot/Libs/Engine/BigFile/BigFileSchema.sql similarity index 100% rename from Bigfoot/Sources/Engine/BigFile/BigFileSchema.sql rename to Bigfoot/Libs/Engine/BigFile/BigFileSchema.sql diff --git a/Bigfoot/Sources/Engine/CMakeLists.txt b/Bigfoot/Libs/Engine/CMakeLists.txt similarity index 97% rename from Bigfoot/Sources/Engine/CMakeLists.txt rename to Bigfoot/Libs/Engine/CMakeLists.txt index 32ebc90..491af32 100644 --- a/Bigfoot/Sources/Engine/CMakeLists.txt +++ b/Bigfoot/Libs/Engine/CMakeLists.txt @@ -21,4 +21,4 @@ bigfoot_create_package_lib( "${PrivateDependencies}" "${BigfootPublicDependencies}" "${BigfootPrivateDependencies}" - "") \ No newline at end of file + "Bigfoot/Libs") \ No newline at end of file diff --git a/Bigfoot/Sources/Engine/DataAccessor/DataAccessor.cpp b/Bigfoot/Libs/Engine/DataAccessor/DataAccessor.cpp similarity index 100% rename from Bigfoot/Sources/Engine/DataAccessor/DataAccessor.cpp rename to Bigfoot/Libs/Engine/DataAccessor/DataAccessor.cpp diff --git a/Bigfoot/Sources/Engine/Include/Engine/Asset/Asset.fbs b/Bigfoot/Libs/Engine/Include/Engine/Asset/Asset.fbs similarity index 100% rename from Bigfoot/Sources/Engine/Include/Engine/Asset/Asset.fbs rename to Bigfoot/Libs/Engine/Include/Engine/Asset/Asset.fbs diff --git a/Bigfoot/Sources/Engine/Include/Engine/Asset/Asset.hpp b/Bigfoot/Libs/Engine/Include/Engine/Asset/Asset.hpp similarity index 100% rename from Bigfoot/Sources/Engine/Include/Engine/Asset/Asset.hpp rename to Bigfoot/Libs/Engine/Include/Engine/Asset/Asset.hpp diff --git a/Bigfoot/Sources/Engine/Include/Engine/Asset/AssetBase.hpp b/Bigfoot/Libs/Engine/Include/Engine/Asset/AssetBase.hpp similarity index 100% rename from Bigfoot/Sources/Engine/Include/Engine/Asset/AssetBase.hpp rename to Bigfoot/Libs/Engine/Include/Engine/Asset/AssetBase.hpp diff --git a/Bigfoot/Sources/Engine/Include/Engine/Asset/AssetConcepts.hpp b/Bigfoot/Libs/Engine/Include/Engine/Asset/AssetConcepts.hpp similarity index 100% rename from Bigfoot/Sources/Engine/Include/Engine/Asset/AssetConcepts.hpp rename to Bigfoot/Libs/Engine/Include/Engine/Asset/AssetConcepts.hpp diff --git a/Bigfoot/Sources/Engine/Include/Engine/Asset/AssetContainer.hpp b/Bigfoot/Libs/Engine/Include/Engine/Asset/AssetContainer.hpp similarity index 100% rename from Bigfoot/Sources/Engine/Include/Engine/Asset/AssetContainer.hpp rename to Bigfoot/Libs/Engine/Include/Engine/Asset/AssetContainer.hpp diff --git a/Bigfoot/Sources/Engine/Include/Engine/Asset/AssetHelper.hpp b/Bigfoot/Libs/Engine/Include/Engine/Asset/AssetHelper.hpp similarity index 100% rename from Bigfoot/Sources/Engine/Include/Engine/Asset/AssetHelper.hpp rename to Bigfoot/Libs/Engine/Include/Engine/Asset/AssetHelper.hpp diff --git a/Bigfoot/Sources/Engine/Include/Engine/Asset/AssetLibrary.hpp b/Bigfoot/Libs/Engine/Include/Engine/Asset/AssetLibrary.hpp similarity index 100% rename from Bigfoot/Sources/Engine/Include/Engine/Asset/AssetLibrary.hpp rename to Bigfoot/Libs/Engine/Include/Engine/Asset/AssetLibrary.hpp diff --git a/Bigfoot/Sources/Engine/Include/Engine/Asset/AssetTypeID.fbs b/Bigfoot/Libs/Engine/Include/Engine/Asset/AssetTypeID.fbs similarity index 100% rename from Bigfoot/Sources/Engine/Include/Engine/Asset/AssetTypeID.fbs rename to Bigfoot/Libs/Engine/Include/Engine/Asset/AssetTypeID.fbs diff --git a/Bigfoot/Sources/Engine/Include/Engine/Asset/AssetTypeID.hpp b/Bigfoot/Libs/Engine/Include/Engine/Asset/AssetTypeID.hpp similarity index 100% rename from Bigfoot/Sources/Engine/Include/Engine/Asset/AssetTypeID.hpp rename to Bigfoot/Libs/Engine/Include/Engine/Asset/AssetTypeID.hpp diff --git a/Bigfoot/Sources/Engine/Include/Engine/Asset/AssetTypeID_generated.hpp b/Bigfoot/Libs/Engine/Include/Engine/Asset/AssetTypeID_generated.hpp similarity index 100% rename from Bigfoot/Sources/Engine/Include/Engine/Asset/AssetTypeID_generated.hpp rename to Bigfoot/Libs/Engine/Include/Engine/Asset/AssetTypeID_generated.hpp diff --git a/Bigfoot/Sources/Engine/Include/Engine/Asset/Asset_generated.hpp b/Bigfoot/Libs/Engine/Include/Engine/Asset/Asset_generated.hpp similarity index 100% rename from Bigfoot/Sources/Engine/Include/Engine/Asset/Asset_generated.hpp rename to Bigfoot/Libs/Engine/Include/Engine/Asset/Asset_generated.hpp diff --git a/Bigfoot/Sources/Engine/Include/Engine/Asset/Reference.fbs b/Bigfoot/Libs/Engine/Include/Engine/Asset/Reference.fbs similarity index 100% rename from Bigfoot/Sources/Engine/Include/Engine/Asset/Reference.fbs rename to Bigfoot/Libs/Engine/Include/Engine/Asset/Reference.fbs diff --git a/Bigfoot/Sources/Engine/Include/Engine/Asset/Reference.hpp b/Bigfoot/Libs/Engine/Include/Engine/Asset/Reference.hpp similarity index 100% rename from Bigfoot/Sources/Engine/Include/Engine/Asset/Reference.hpp rename to Bigfoot/Libs/Engine/Include/Engine/Asset/Reference.hpp diff --git a/Bigfoot/Sources/Engine/Include/Engine/Asset/Reference_generated.hpp b/Bigfoot/Libs/Engine/Include/Engine/Asset/Reference_generated.hpp similarity index 100% rename from Bigfoot/Sources/Engine/Include/Engine/Asset/Reference_generated.hpp rename to Bigfoot/Libs/Engine/Include/Engine/Asset/Reference_generated.hpp diff --git a/Bigfoot/Sources/Engine/Include/Engine/BigFile/BigFile.hpp b/Bigfoot/Libs/Engine/Include/Engine/BigFile/BigFile.hpp similarity index 100% rename from Bigfoot/Sources/Engine/Include/Engine/BigFile/BigFile.hpp rename to Bigfoot/Libs/Engine/Include/Engine/BigFile/BigFile.hpp diff --git a/Bigfoot/Sources/Engine/Include/Engine/BigFile/BigFileInfo_generated.hpp.in b/Bigfoot/Libs/Engine/Include/Engine/BigFile/BigFileInfo_generated.hpp.in similarity index 100% rename from Bigfoot/Sources/Engine/Include/Engine/BigFile/BigFileInfo_generated.hpp.in rename to Bigfoot/Libs/Engine/Include/Engine/BigFile/BigFileInfo_generated.hpp.in diff --git a/Bigfoot/Sources/Engine/Include/Engine/DataAccessor/DataAccessor.hpp b/Bigfoot/Libs/Engine/Include/Engine/DataAccessor/DataAccessor.hpp similarity index 100% rename from Bigfoot/Sources/Engine/Include/Engine/DataAccessor/DataAccessor.hpp rename to Bigfoot/Libs/Engine/Include/Engine/DataAccessor/DataAccessor.hpp diff --git a/Bigfoot/Sources/Engine/Include/Engine/EngineAssertHandler.hpp b/Bigfoot/Libs/Engine/Include/Engine/EngineAssertHandler.hpp similarity index 100% rename from Bigfoot/Sources/Engine/Include/Engine/EngineAssertHandler.hpp rename to Bigfoot/Libs/Engine/Include/Engine/EngineAssertHandler.hpp diff --git a/Bigfoot/Sources/Engine/Include/Engine/EngineInfo_generated.hpp b/Bigfoot/Libs/Engine/Include/Engine/EngineInfo_generated.hpp similarity index 100% rename from Bigfoot/Sources/Engine/Include/Engine/EngineInfo_generated.hpp rename to Bigfoot/Libs/Engine/Include/Engine/EngineInfo_generated.hpp diff --git a/Bigfoot/Sources/Engine/Include/Engine/EngineInfo_generated.hpp.in b/Bigfoot/Libs/Engine/Include/Engine/EngineInfo_generated.hpp.in similarity index 100% rename from Bigfoot/Sources/Engine/Include/Engine/EngineInfo_generated.hpp.in rename to Bigfoot/Libs/Engine/Include/Engine/EngineInfo_generated.hpp.in diff --git a/Bigfoot/Sources/Engine/Include/Engine/EngineLogger_generated.hpp b/Bigfoot/Libs/Engine/Include/Engine/EngineLogger_generated.hpp similarity index 100% rename from Bigfoot/Sources/Engine/Include/Engine/EngineLogger_generated.hpp rename to Bigfoot/Libs/Engine/Include/Engine/EngineLogger_generated.hpp diff --git a/Bigfoot/Sources/Engine/Include/Engine/Sasquatch/Sasquatch.hpp b/Bigfoot/Libs/Engine/Include/Engine/Sasquatch/Sasquatch.hpp similarity index 100% rename from Bigfoot/Sources/Engine/Include/Engine/Sasquatch/Sasquatch.hpp rename to Bigfoot/Libs/Engine/Include/Engine/Sasquatch/Sasquatch.hpp diff --git a/Bigfoot/Sources/Engine/Include/Engine/Sasquatch/SasquatchInfo_generated.hpp.in b/Bigfoot/Libs/Engine/Include/Engine/Sasquatch/SasquatchInfo_generated.hpp.in similarity index 100% rename from Bigfoot/Sources/Engine/Include/Engine/Sasquatch/SasquatchInfo_generated.hpp.in rename to Bigfoot/Libs/Engine/Include/Engine/Sasquatch/SasquatchInfo_generated.hpp.in diff --git a/Bigfoot/Sources/Engine/Include/Engine/SerializationManager/SerializationManager.hpp b/Bigfoot/Libs/Engine/Include/Engine/SerializationManager/SerializationManager.hpp similarity index 100% rename from Bigfoot/Sources/Engine/Include/Engine/SerializationManager/SerializationManager.hpp rename to Bigfoot/Libs/Engine/Include/Engine/SerializationManager/SerializationManager.hpp diff --git a/Bigfoot/Sources/Engine/Sasquatch/Sasquatch.cpp b/Bigfoot/Libs/Engine/Sasquatch/Sasquatch.cpp similarity index 100% rename from Bigfoot/Sources/Engine/Sasquatch/Sasquatch.cpp rename to Bigfoot/Libs/Engine/Sasquatch/Sasquatch.cpp diff --git a/Bigfoot/Sources/Engine/SerializationManager/SerializationManager.cpp b/Bigfoot/Libs/Engine/SerializationManager/SerializationManager.cpp similarity index 100% rename from Bigfoot/Sources/Engine/SerializationManager/SerializationManager.cpp rename to Bigfoot/Libs/Engine/SerializationManager/SerializationManager.cpp diff --git a/Bigfoot/Libs/Graphics/CMakeLists.txt b/Bigfoot/Libs/Graphics/CMakeLists.txt new file mode 100644 index 0000000..70b25ca --- /dev/null +++ b/Bigfoot/Libs/Graphics/CMakeLists.txt @@ -0,0 +1,5 @@ +add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/GraphicsInterface) +if(${VULKAN}) + add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/GraphicsVulkan) + add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/GraphicsCore) +endif() diff --git a/Bigfoot/Libs/Graphics/GraphicsCore/CMakeLists.txt b/Bigfoot/Libs/Graphics/GraphicsCore/CMakeLists.txt new file mode 100644 index 0000000..b20fc1f --- /dev/null +++ b/Bigfoot/Libs/Graphics/GraphicsCore/CMakeLists.txt @@ -0,0 +1,18 @@ +get_filename_component(PackageName ${CMAKE_CURRENT_SOURCE_DIR} NAME) +project(${PackageName}) + +set(PublicDependencies) +set(PrivateDependencies) +set(BigfootPublicDependencies + GraphicsVulkan + Engine) +set(BigfootPrivateDependencies) + +bigfoot_create_package_lib( + "${PublicDependencies}" + "${PrivateDependencies}" + "${BigfootPublicDependencies}" + "${BigfootPrivateDependencies}" + "Bigfoot/Libs/Graphics") + +bigfoot_create_logger() diff --git a/Bigfoot/Libs/Graphics/GraphicsCore/GraphicsCore.cpp b/Bigfoot/Libs/Graphics/GraphicsCore/GraphicsCore.cpp new file mode 100644 index 0000000..8fe106f --- /dev/null +++ b/Bigfoot/Libs/Graphics/GraphicsCore/GraphicsCore.cpp @@ -0,0 +1 @@ +#include diff --git a/Bigfoot/Libs/Graphics/GraphicsCore/Include/GraphicsCore/GraphicsCoreAssertHandler.hpp b/Bigfoot/Libs/Graphics/GraphicsCore/Include/GraphicsCore/GraphicsCoreAssertHandler.hpp new file mode 100644 index 0000000..47b9cde --- /dev/null +++ b/Bigfoot/Libs/Graphics/GraphicsCore/Include/GraphicsCore/GraphicsCoreAssertHandler.hpp @@ -0,0 +1,20 @@ +/********************************************************************* + * \file GraphicsCoreAssertHandler.hpp + * + * \author Romain BOULLARD + * \date September 2026 + *********************************************************************/ +#ifndef BIGFOOT_GRAPHICSCORE_GRAPHICSCOREASSERTHANDLER_HPP +#define BIGFOOT_GRAPHICSCORE_GRAPHICSCOREASSERTHANDLER_HPP +#include + +#include + +#ifdef BIGFOOT_NOT_OPTIMIZED + +namespace Bigfoot +{ +using GraphicsCoreAssertHandler = AssertHandler; +} // namespace Bigfoot +#endif +#endif diff --git a/Bigfoot/Libs/Graphics/GraphicsCore/Include/GraphicsCore/GraphicsCoreLogger_generated.hpp b/Bigfoot/Libs/Graphics/GraphicsCore/Include/GraphicsCore/GraphicsCoreLogger_generated.hpp new file mode 100644 index 0000000..c7946b2 --- /dev/null +++ b/Bigfoot/Libs/Graphics/GraphicsCore/Include/GraphicsCore/GraphicsCoreLogger_generated.hpp @@ -0,0 +1,21 @@ +// AUTO-GENERATED DO NOT TOUCH + +/********************************************************************* + * \file GraphicsCoreLogger.generated.hpp + * + *********************************************************************/ +#ifndef BIGFOOT_GRAPHICSCORELOGGER_GENERATED_HPP +#define BIGFOOT_GRAPHICSCORELOGGER_GENERATED_HPP +#include + +#if defined BIGFOOT_NOT_OPTIMIZED + +namespace Bigfoot +{ +/* + * Logger + */ +inline Log::LoggerInfo GRAPHICSCORE_LOGGER { .m_name = "GRAPHICSCORE_LOGGER", .m_level = Flat::LogLevel::Trace}; +} // namespace Bigfoot +#endif +#endif diff --git a/Bigfoot/Libs/Graphics/GraphicsInterface/CMakeLists.txt b/Bigfoot/Libs/Graphics/GraphicsInterface/CMakeLists.txt new file mode 100644 index 0000000..b09d037 --- /dev/null +++ b/Bigfoot/Libs/Graphics/GraphicsInterface/CMakeLists.txt @@ -0,0 +1,18 @@ +get_filename_component(PackageName ${CMAKE_CURRENT_SOURCE_DIR} NAME) +project(${PackageName}) + +set(PublicDependencies + glm::glm) +set(PrivateDependencies) +set(BigfootPublicDependencies + Utils) +set(BigfootPrivateDependencies) + +bigfoot_create_package_lib( + "${PublicDependencies}" + "${PrivateDependencies}" + "${BigfootPublicDependencies}" + "${BigfootPrivateDependencies}" + "Bigfoot/Libs/Graphics") + +bigfoot_create_logger() diff --git a/Bigfoot/Libs/Graphics/GraphicsInterface/GraphicsInterface.cpp b/Bigfoot/Libs/Graphics/GraphicsInterface/GraphicsInterface.cpp new file mode 100644 index 0000000..6692191 --- /dev/null +++ b/Bigfoot/Libs/Graphics/GraphicsInterface/GraphicsInterface.cpp @@ -0,0 +1 @@ +#include diff --git a/Bigfoot/Libs/Graphics/GraphicsInterface/Include/GraphicsInterface/GraphicsInterfaceAssertHandler.hpp b/Bigfoot/Libs/Graphics/GraphicsInterface/Include/GraphicsInterface/GraphicsInterfaceAssertHandler.hpp new file mode 100644 index 0000000..fe9267b --- /dev/null +++ b/Bigfoot/Libs/Graphics/GraphicsInterface/Include/GraphicsInterface/GraphicsInterfaceAssertHandler.hpp @@ -0,0 +1,20 @@ +/********************************************************************* + * \file GraphicsInterfaceAssertHandler.hpp + * + * \author Romain BOULLARD + * \date September 2026 + *********************************************************************/ +#ifndef BIGFOOT_GRAPHICSINTERFACE_GRAPHICSINTERFACEASSERTHANDLER_HPP +#define BIGFOOT_GRAPHICSINTERFACE_GRAPHICSINTERFACEASSERTHANDLER_HPP +#include + +#include + +#ifdef BIGFOOT_NOT_OPTIMIZED + +namespace Bigfoot +{ +using GraphicsInterfaceAssertHandler = AssertHandler; +} // namespace Bigfoot +#endif +#endif diff --git a/Bigfoot/Libs/Graphics/GraphicsInterface/Include/GraphicsInterface/GraphicsInterfaceLogger_generated.hpp b/Bigfoot/Libs/Graphics/GraphicsInterface/Include/GraphicsInterface/GraphicsInterfaceLogger_generated.hpp new file mode 100644 index 0000000..900ac83 --- /dev/null +++ b/Bigfoot/Libs/Graphics/GraphicsInterface/Include/GraphicsInterface/GraphicsInterfaceLogger_generated.hpp @@ -0,0 +1,21 @@ +// AUTO-GENERATED DO NOT TOUCH + +/********************************************************************* + * \file GraphicsInterfaceLogger.generated.hpp + * + *********************************************************************/ +#ifndef BIGFOOT_GRAPHICSINTERFACELOGGER_GENERATED_HPP +#define BIGFOOT_GRAPHICSINTERFACELOGGER_GENERATED_HPP +#include + +#if defined BIGFOOT_NOT_OPTIMIZED + +namespace Bigfoot +{ +/* + * Logger + */ +inline Log::LoggerInfo GRAPHICSINTERFACE_LOGGER { .m_name = "GRAPHICSINTERFACE_LOGGER", .m_level = Flat::LogLevel::Trace}; +} // namespace Bigfoot +#endif +#endif diff --git a/Bigfoot/Libs/Graphics/GraphicsVulkan/CMakeLists.txt b/Bigfoot/Libs/Graphics/GraphicsVulkan/CMakeLists.txt new file mode 100644 index 0000000..0e4a71f --- /dev/null +++ b/Bigfoot/Libs/Graphics/GraphicsVulkan/CMakeLists.txt @@ -0,0 +1,20 @@ +get_filename_component(PackageName ${CMAKE_CURRENT_SOURCE_DIR} NAME) +project(${PackageName}) + +set(PublicDependencies + vulkan-headers::vulkan-headers + volk::volk + vulkan-memory-allocator::vulkan-memory-allocator) +set(PrivateDependencies) +set(BigfootPublicDependencies + GraphicsInterface) +set(BigfootPrivateDependencies) + +bigfoot_create_package_lib( + "${PublicDependencies}" + "${PrivateDependencies}" + "${BigfootPublicDependencies}" + "${BigfootPrivateDependencies}" + "Bigfoot/Libs/Graphics") + +bigfoot_create_logger() diff --git a/Bigfoot/Libs/Graphics/GraphicsVulkan/GraphicsVulkan.cpp b/Bigfoot/Libs/Graphics/GraphicsVulkan/GraphicsVulkan.cpp new file mode 100644 index 0000000..e3abd0a --- /dev/null +++ b/Bigfoot/Libs/Graphics/GraphicsVulkan/GraphicsVulkan.cpp @@ -0,0 +1 @@ +#include diff --git a/Bigfoot/Libs/Graphics/GraphicsVulkan/Include/GraphicsVulkan/GraphicsVulkanAssertHandler.hpp b/Bigfoot/Libs/Graphics/GraphicsVulkan/Include/GraphicsVulkan/GraphicsVulkanAssertHandler.hpp new file mode 100644 index 0000000..eb0f6dc --- /dev/null +++ b/Bigfoot/Libs/Graphics/GraphicsVulkan/Include/GraphicsVulkan/GraphicsVulkanAssertHandler.hpp @@ -0,0 +1,20 @@ +/********************************************************************* + * \file GraphicsVulkanAssertHandler.hpp + * + * \author Romain BOULLARD + * \date September 2026 + *********************************************************************/ +#ifndef BIGFOOT_GRAPHICSVULKAN_GRAPHICSVULKANASSERTHANDLER_HPP +#define BIGFOOT_GRAPHICSVULKAN_GRAPHICSVULKANASSERTHANDLER_HPP +#include + +#include + +#ifdef BIGFOOT_NOT_OPTIMIZED + +namespace Bigfoot +{ +using GraphicsVulkanAssertHandler = AssertHandler; +} // namespace Bigfoot +#endif +#endif diff --git a/Bigfoot/Libs/Graphics/GraphicsVulkan/Include/GraphicsVulkan/GraphicsVulkanLogger_generated.hpp b/Bigfoot/Libs/Graphics/GraphicsVulkan/Include/GraphicsVulkan/GraphicsVulkanLogger_generated.hpp new file mode 100644 index 0000000..83b3b2c --- /dev/null +++ b/Bigfoot/Libs/Graphics/GraphicsVulkan/Include/GraphicsVulkan/GraphicsVulkanLogger_generated.hpp @@ -0,0 +1,21 @@ +// AUTO-GENERATED DO NOT TOUCH + +/********************************************************************* + * \file GraphicsVulkanLogger.generated.hpp + * + *********************************************************************/ +#ifndef BIGFOOT_GRAPHICSVULKANLOGGER_GENERATED_HPP +#define BIGFOOT_GRAPHICSVULKANLOGGER_GENERATED_HPP +#include + +#if defined BIGFOOT_NOT_OPTIMIZED + +namespace Bigfoot +{ +/* + * Logger + */ +inline Log::LoggerInfo GRAPHICSVULKAN_LOGGER { .m_name = "GRAPHICSVULKAN_LOGGER", .m_level = Flat::LogLevel::Trace}; +} // namespace Bigfoot +#endif +#endif diff --git a/Bigfoot/Sources/System/CMakeLists.txt b/Bigfoot/Libs/System/CMakeLists.txt similarity index 95% rename from Bigfoot/Sources/System/CMakeLists.txt rename to Bigfoot/Libs/System/CMakeLists.txt index 1688ada..beb3262 100644 --- a/Bigfoot/Sources/System/CMakeLists.txt +++ b/Bigfoot/Libs/System/CMakeLists.txt @@ -13,6 +13,6 @@ bigfoot_create_package_lib( "${PrivateLibraries}" "${BigfootPublicDependencies}" "${BigfootPrivateDependencies}" - "") + "Bigfoot/Libs") bigfoot_create_logger() diff --git a/Bigfoot/Sources/System/File/File.cpp b/Bigfoot/Libs/System/File/File.cpp similarity index 100% rename from Bigfoot/Sources/System/File/File.cpp rename to Bigfoot/Libs/System/File/File.cpp diff --git a/Bigfoot/Sources/System/File/MemoryMappedFile.cpp b/Bigfoot/Libs/System/File/MemoryMappedFile.cpp similarity index 100% rename from Bigfoot/Sources/System/File/MemoryMappedFile.cpp rename to Bigfoot/Libs/System/File/MemoryMappedFile.cpp diff --git a/Bigfoot/Sources/System/Include/System/File/File.hpp b/Bigfoot/Libs/System/Include/System/File/File.hpp similarity index 100% rename from Bigfoot/Sources/System/Include/System/File/File.hpp rename to Bigfoot/Libs/System/Include/System/File/File.hpp diff --git a/Bigfoot/Sources/System/Include/System/File/MemoryMappedFile.hpp b/Bigfoot/Libs/System/Include/System/File/MemoryMappedFile.hpp similarity index 100% rename from Bigfoot/Sources/System/Include/System/File/MemoryMappedFile.hpp rename to Bigfoot/Libs/System/Include/System/File/MemoryMappedFile.hpp diff --git a/Bigfoot/Sources/System/Include/System/SystemAssertHandler.hpp b/Bigfoot/Libs/System/Include/System/SystemAssertHandler.hpp similarity index 100% rename from Bigfoot/Sources/System/Include/System/SystemAssertHandler.hpp rename to Bigfoot/Libs/System/Include/System/SystemAssertHandler.hpp diff --git a/Bigfoot/Sources/System/Include/System/SystemLogger_generated.hpp b/Bigfoot/Libs/System/Include/System/SystemLogger_generated.hpp similarity index 100% rename from Bigfoot/Sources/System/Include/System/SystemLogger_generated.hpp rename to Bigfoot/Libs/System/Include/System/SystemLogger_generated.hpp diff --git a/Bigfoot/Sources/System/Include/System/Time.hpp b/Bigfoot/Libs/System/Include/System/Time.hpp similarity index 100% rename from Bigfoot/Sources/System/Include/System/Time.hpp rename to Bigfoot/Libs/System/Include/System/Time.hpp diff --git a/Bigfoot/Sources/System/Include/System/Time/Time.fbs b/Bigfoot/Libs/System/Include/System/Time/Time.fbs similarity index 100% rename from Bigfoot/Sources/System/Include/System/Time/Time.fbs rename to Bigfoot/Libs/System/Include/System/Time/Time.fbs diff --git a/Bigfoot/Sources/System/Include/System/Time/Time.hpp b/Bigfoot/Libs/System/Include/System/Time/Time.hpp similarity index 100% rename from Bigfoot/Sources/System/Include/System/Time/Time.hpp rename to Bigfoot/Libs/System/Include/System/Time/Time.hpp diff --git a/Bigfoot/Sources/System/Include/System/Time/Time_generated.hpp b/Bigfoot/Libs/System/Include/System/Time/Time_generated.hpp similarity index 100% rename from Bigfoot/Sources/System/Include/System/Time/Time_generated.hpp rename to Bigfoot/Libs/System/Include/System/Time/Time_generated.hpp diff --git a/Bigfoot/Sources/System/Include/System/UUID/FlatUUID.hpp b/Bigfoot/Libs/System/Include/System/UUID/FlatUUID.hpp similarity index 100% rename from Bigfoot/Sources/System/Include/System/UUID/FlatUUID.hpp rename to Bigfoot/Libs/System/Include/System/UUID/FlatUUID.hpp diff --git a/Bigfoot/Sources/System/Include/System/UUID/UUID.fbs b/Bigfoot/Libs/System/Include/System/UUID/UUID.fbs similarity index 100% rename from Bigfoot/Sources/System/Include/System/UUID/UUID.fbs rename to Bigfoot/Libs/System/Include/System/UUID/UUID.fbs diff --git a/Bigfoot/Sources/System/Include/System/UUID/UUID.hpp b/Bigfoot/Libs/System/Include/System/UUID/UUID.hpp similarity index 100% rename from Bigfoot/Sources/System/Include/System/UUID/UUID.hpp rename to Bigfoot/Libs/System/Include/System/UUID/UUID.hpp diff --git a/Bigfoot/Sources/System/Include/System/UUID/UUID_generated.hpp b/Bigfoot/Libs/System/Include/System/UUID/UUID_generated.hpp similarity index 100% rename from Bigfoot/Sources/System/Include/System/UUID/UUID_generated.hpp rename to Bigfoot/Libs/System/Include/System/UUID/UUID_generated.hpp diff --git a/Bigfoot/Sources/System/Time/Time.cpp b/Bigfoot/Libs/System/Time/Time.cpp similarity index 100% rename from Bigfoot/Sources/System/Time/Time.cpp rename to Bigfoot/Libs/System/Time/Time.cpp diff --git a/Bigfoot/Sources/System/UUID/UUID.cpp b/Bigfoot/Libs/System/UUID/UUID.cpp similarity index 100% rename from Bigfoot/Sources/System/UUID/UUID.cpp rename to Bigfoot/Libs/System/UUID/UUID.cpp diff --git a/Bigfoot/Sources/Utils/CMakeLists.txt b/Bigfoot/Libs/Utils/CMakeLists.txt similarity index 98% rename from Bigfoot/Sources/Utils/CMakeLists.txt rename to Bigfoot/Libs/Utils/CMakeLists.txt index 26ed4ab..ae4c891 100644 --- a/Bigfoot/Sources/Utils/CMakeLists.txt +++ b/Bigfoot/Libs/Utils/CMakeLists.txt @@ -20,7 +20,7 @@ bigfoot_create_package_lib( "${PrivateLibraries}" "${BigfootPublicDependencies}" "${BigfootPrivateDependencies}" - "") + "Bigfoot/Libs") set_source_files_properties(../Utils/MimallocImpl.cpp PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON) set_source_files_properties(../Utils/EASTLVsnprintfImpl.cpp PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON) diff --git a/Bigfoot/Sources/Utils/Include/Utils/Algorithm/Graph.hpp b/Bigfoot/Libs/Utils/Include/Utils/Algorithm/Graph.hpp similarity index 100% rename from Bigfoot/Sources/Utils/Include/Utils/Algorithm/Graph.hpp rename to Bigfoot/Libs/Utils/Include/Utils/Algorithm/Graph.hpp diff --git a/Bigfoot/Sources/Utils/Include/Utils/Assert/Assert.hpp b/Bigfoot/Libs/Utils/Include/Utils/Assert/Assert.hpp similarity index 100% rename from Bigfoot/Sources/Utils/Include/Utils/Assert/Assert.hpp rename to Bigfoot/Libs/Utils/Include/Utils/Assert/Assert.hpp diff --git a/Bigfoot/Sources/Utils/Include/Utils/Assert/AssertHandler.hpp b/Bigfoot/Libs/Utils/Include/Utils/Assert/AssertHandler.hpp similarity index 100% rename from Bigfoot/Sources/Utils/Include/Utils/Assert/AssertHandler.hpp rename to Bigfoot/Libs/Utils/Include/Utils/Assert/AssertHandler.hpp diff --git a/Bigfoot/Sources/Utils/Include/Utils/Caster.hpp b/Bigfoot/Libs/Utils/Include/Utils/Caster.hpp similarity index 100% rename from Bigfoot/Sources/Utils/Include/Utils/Caster.hpp rename to Bigfoot/Libs/Utils/Include/Utils/Caster.hpp diff --git a/Bigfoot/Sources/Utils/Include/Utils/Concat.h b/Bigfoot/Libs/Utils/Include/Utils/Concat.h similarity index 100% rename from Bigfoot/Sources/Utils/Include/Utils/Concat.h rename to Bigfoot/Libs/Utils/Include/Utils/Concat.h diff --git a/Bigfoot/Sources/Utils/Include/Utils/Containers/SlotMap.hpp b/Bigfoot/Libs/Utils/Include/Utils/Containers/SlotMap.hpp similarity index 100% rename from Bigfoot/Sources/Utils/Include/Utils/Containers/SlotMap.hpp rename to Bigfoot/Libs/Utils/Include/Utils/Containers/SlotMap.hpp diff --git a/Bigfoot/Sources/Utils/Include/Utils/Format.hpp b/Bigfoot/Libs/Utils/Include/Utils/Format.hpp similarity index 100% rename from Bigfoot/Sources/Utils/Include/Utils/Format.hpp rename to Bigfoot/Libs/Utils/Include/Utils/Format.hpp diff --git a/Bigfoot/Sources/Utils/Include/Utils/Log/EASTLFormatters.hpp b/Bigfoot/Libs/Utils/Include/Utils/Log/EASTLFormatters.hpp similarity index 100% rename from Bigfoot/Sources/Utils/Include/Utils/Log/EASTLFormatters.hpp rename to Bigfoot/Libs/Utils/Include/Utils/Log/EASTLFormatters.hpp diff --git a/Bigfoot/Sources/Utils/Include/Utils/Log/Log.fbs b/Bigfoot/Libs/Utils/Include/Utils/Log/Log.fbs similarity index 100% rename from Bigfoot/Sources/Utils/Include/Utils/Log/Log.fbs rename to Bigfoot/Libs/Utils/Include/Utils/Log/Log.fbs diff --git a/Bigfoot/Sources/Utils/Include/Utils/Log/Log.hpp b/Bigfoot/Libs/Utils/Include/Utils/Log/Log.hpp similarity index 100% rename from Bigfoot/Sources/Utils/Include/Utils/Log/Log.hpp rename to Bigfoot/Libs/Utils/Include/Utils/Log/Log.hpp diff --git a/Bigfoot/Sources/Utils/Include/Utils/Log/LogMacros.hpp b/Bigfoot/Libs/Utils/Include/Utils/Log/LogMacros.hpp similarity index 100% rename from Bigfoot/Sources/Utils/Include/Utils/Log/LogMacros.hpp rename to Bigfoot/Libs/Utils/Include/Utils/Log/LogMacros.hpp diff --git a/Bigfoot/Sources/Utils/Include/Utils/Log/Log_generated.hpp b/Bigfoot/Libs/Utils/Include/Utils/Log/Log_generated.hpp similarity index 100% rename from Bigfoot/Sources/Utils/Include/Utils/Log/Log_generated.hpp rename to Bigfoot/Libs/Utils/Include/Utils/Log/Log_generated.hpp diff --git a/Bigfoot/Sources/Utils/Include/Utils/Log/TargetLogger_generated.hpp.in b/Bigfoot/Libs/Utils/Include/Utils/Log/TargetLogger_generated.hpp.in similarity index 100% rename from Bigfoot/Sources/Utils/Include/Utils/Log/TargetLogger_generated.hpp.in rename to Bigfoot/Libs/Utils/Include/Utils/Log/TargetLogger_generated.hpp.in diff --git a/Bigfoot/Sources/Utils/Include/Utils/Profiler.hpp b/Bigfoot/Libs/Utils/Include/Utils/Profiler.hpp similarity index 100% rename from Bigfoot/Sources/Utils/Include/Utils/Profiler.hpp rename to Bigfoot/Libs/Utils/Include/Utils/Profiler.hpp diff --git a/Bigfoot/Sources/Utils/Include/Utils/Singleton.hpp b/Bigfoot/Libs/Utils/Include/Utils/Singleton.hpp similarity index 100% rename from Bigfoot/Sources/Utils/Include/Utils/Singleton.hpp rename to Bigfoot/Libs/Utils/Include/Utils/Singleton.hpp diff --git a/Bigfoot/Sources/Utils/Include/Utils/TaggedType.hpp b/Bigfoot/Libs/Utils/Include/Utils/TaggedType.hpp similarity index 100% rename from Bigfoot/Sources/Utils/Include/Utils/TaggedType.hpp rename to Bigfoot/Libs/Utils/Include/Utils/TaggedType.hpp diff --git a/Bigfoot/Sources/Utils/Include/Utils/TargetMacros.h b/Bigfoot/Libs/Utils/Include/Utils/TargetMacros.h similarity index 100% rename from Bigfoot/Sources/Utils/Include/Utils/TargetMacros.h rename to Bigfoot/Libs/Utils/Include/Utils/TargetMacros.h diff --git a/Bigfoot/Sources/Utils/Include/Utils/UtilsAssertHandler.hpp b/Bigfoot/Libs/Utils/Include/Utils/UtilsAssertHandler.hpp similarity index 100% rename from Bigfoot/Sources/Utils/Include/Utils/UtilsAssertHandler.hpp rename to Bigfoot/Libs/Utils/Include/Utils/UtilsAssertHandler.hpp diff --git a/Bigfoot/Sources/Utils/Include/Utils/UtilsLogger_generated.hpp b/Bigfoot/Libs/Utils/Include/Utils/UtilsLogger_generated.hpp similarity index 100% rename from Bigfoot/Sources/Utils/Include/Utils/UtilsLogger_generated.hpp rename to Bigfoot/Libs/Utils/Include/Utils/UtilsLogger_generated.hpp diff --git a/Bigfoot/Sources/Utils/Include/Utils/Version.hpp b/Bigfoot/Libs/Utils/Include/Utils/Version.hpp similarity index 100% rename from Bigfoot/Sources/Utils/Include/Utils/Version.hpp rename to Bigfoot/Libs/Utils/Include/Utils/Version.hpp diff --git a/Bigfoot/Sources/Utils/Log/Log.cpp b/Bigfoot/Libs/Utils/Log/Log.cpp similarity index 100% rename from Bigfoot/Sources/Utils/Log/Log.cpp rename to Bigfoot/Libs/Utils/Log/Log.cpp diff --git a/Bigfoot/Sources/Utils/MimallocImpl.cpp b/Bigfoot/Libs/Utils/MimallocImpl.cpp similarity index 100% rename from Bigfoot/Sources/Utils/MimallocImpl.cpp rename to Bigfoot/Libs/Utils/MimallocImpl.cpp diff --git a/Bigfoot/Sources/Utils/Version.cpp b/Bigfoot/Libs/Utils/Version.cpp similarity index 100% rename from Bigfoot/Sources/Utils/Version.cpp rename to Bigfoot/Libs/Utils/Version.cpp diff --git a/Bigfoot/Sources/CMakeLists.txt b/Bigfoot/Sources/CMakeLists.txt deleted file mode 100644 index 8eca193..0000000 --- a/Bigfoot/Sources/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Utils) -add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/System) -add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Engine) \ No newline at end of file diff --git a/Bigfoot/Tests/CMakeLists.txt b/Bigfoot/Tests/CMakeLists.txt index cbbb5ea..fbcd266 100644 --- a/Bigfoot/Tests/CMakeLists.txt +++ b/Bigfoot/Tests/CMakeLists.txt @@ -2,4 +2,5 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Misc) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Utils) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/System) -add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Engine) \ No newline at end of file +add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Engine) +add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Graphics) \ No newline at end of file diff --git a/Bigfoot/Tests/Engine/CMakeLists.txt b/Bigfoot/Tests/Engine/CMakeLists.txt index bc71b72..161feee 100644 --- a/Bigfoot/Tests/Engine/CMakeLists.txt +++ b/Bigfoot/Tests/Engine/CMakeLists.txt @@ -8,8 +8,8 @@ set(BigfootDependencies bigfoot_create_package_tests( "${Dependencies}" "${BigfootDependencies}" - "") + "Bigfoot/Tests") -bigfoot_create_bigfile("Tests/Bigfoot") +bigfoot_create_bigfile("Bigfoot/Tests") bigfoot_create_sasquatch_info() \ No newline at end of file diff --git a/Bigfoot/Tests/Graphics/CMakeLists.txt b/Bigfoot/Tests/Graphics/CMakeLists.txt new file mode 100644 index 0000000..5d00b6c --- /dev/null +++ b/Bigfoot/Tests/Graphics/CMakeLists.txt @@ -0,0 +1,4 @@ +if(${VULKAN}) + add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/GraphicsVulkan) + add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/GraphicsCore) +endif() diff --git a/Bigfoot/Tests/Graphics/GraphicsCore/CMakeLists.txt b/Bigfoot/Tests/Graphics/GraphicsCore/CMakeLists.txt new file mode 100644 index 0000000..5a2714f --- /dev/null +++ b/Bigfoot/Tests/Graphics/GraphicsCore/CMakeLists.txt @@ -0,0 +1,10 @@ +get_filename_component(PackageName ${CMAKE_CURRENT_SOURCE_DIR} NAME) +project(${PackageName}Tests) + +set(Dependencies) +set(BigfootDependencies) + +bigfoot_create_package_tests( + "${Dependencies}" + "${BigfootDependencies}" + "Bigfoot/Tests/Graphics") diff --git a/Bigfoot/Tests/Graphics/GraphicsCore/GraphicsCoreTests/main.cpp b/Bigfoot/Tests/Graphics/GraphicsCore/GraphicsCoreTests/main.cpp new file mode 100644 index 0000000..145e914 --- /dev/null +++ b/Bigfoot/Tests/Graphics/GraphicsCore/GraphicsCoreTests/main.cpp @@ -0,0 +1,21 @@ +/********************************************************************* + * \file main.cpp + * + * \author Romain BOULLARD + * \date September 2026 + *********************************************************************/ +#include +#include + +#include + +int main(int argc, char** argv) +{ + testing::InitGoogleTest(&argc, argv); + + GTEST_FLAG_SET(death_test_style, "threadsafe"); + + BIGFOOT_NOT_OPTIMIZED_ONLY(::Bigfoot::Singleton<::Bigfoot::Log>::Lifetime m_lifetime); + + return RUN_ALL_TESTS(); +} diff --git a/Bigfoot/Tests/Graphics/GraphicsVulkan/CMakeLists.txt b/Bigfoot/Tests/Graphics/GraphicsVulkan/CMakeLists.txt new file mode 100644 index 0000000..5a2714f --- /dev/null +++ b/Bigfoot/Tests/Graphics/GraphicsVulkan/CMakeLists.txt @@ -0,0 +1,10 @@ +get_filename_component(PackageName ${CMAKE_CURRENT_SOURCE_DIR} NAME) +project(${PackageName}Tests) + +set(Dependencies) +set(BigfootDependencies) + +bigfoot_create_package_tests( + "${Dependencies}" + "${BigfootDependencies}" + "Bigfoot/Tests/Graphics") diff --git a/Bigfoot/Tests/Graphics/GraphicsVulkan/GraphicsVulkanTests/main.cpp b/Bigfoot/Tests/Graphics/GraphicsVulkan/GraphicsVulkanTests/main.cpp new file mode 100644 index 0000000..145e914 --- /dev/null +++ b/Bigfoot/Tests/Graphics/GraphicsVulkan/GraphicsVulkanTests/main.cpp @@ -0,0 +1,21 @@ +/********************************************************************* + * \file main.cpp + * + * \author Romain BOULLARD + * \date September 2026 + *********************************************************************/ +#include +#include + +#include + +int main(int argc, char** argv) +{ + testing::InitGoogleTest(&argc, argv); + + GTEST_FLAG_SET(death_test_style, "threadsafe"); + + BIGFOOT_NOT_OPTIMIZED_ONLY(::Bigfoot::Singleton<::Bigfoot::Log>::Lifetime m_lifetime); + + return RUN_ALL_TESTS(); +} diff --git a/Bigfoot/Tests/Misc/AssetsForTesting/CMakeLists.txt b/Bigfoot/Tests/Misc/AssetsForTesting/CMakeLists.txt index c38a828..beb5e24 100644 --- a/Bigfoot/Tests/Misc/AssetsForTesting/CMakeLists.txt +++ b/Bigfoot/Tests/Misc/AssetsForTesting/CMakeLists.txt @@ -12,4 +12,4 @@ bigfoot_create_package_tests_helper_lib( "${PrivateDependencies}" "${BigfootPublicDependencies}" "${BigfootPrivateDependencies}" - "") \ No newline at end of file + "Bigfoot/Tests/Misc") \ No newline at end of file diff --git a/Bigfoot/Tests/System/CMakeLists.txt b/Bigfoot/Tests/System/CMakeLists.txt index 07d7c3d..dfc6095 100644 --- a/Bigfoot/Tests/System/CMakeLists.txt +++ b/Bigfoot/Tests/System/CMakeLists.txt @@ -7,4 +7,4 @@ set(BigfootDependencies) bigfoot_create_package_tests( "${Dependencies}" "${BigfootDependencies}" - "") \ No newline at end of file + "Bigfoot/Tests") \ No newline at end of file diff --git a/Bigfoot/Tests/Utils/CMakeLists.txt b/Bigfoot/Tests/Utils/CMakeLists.txt index d6c67dd..6b3c797 100644 --- a/Bigfoot/Tests/Utils/CMakeLists.txt +++ b/Bigfoot/Tests/Utils/CMakeLists.txt @@ -7,6 +7,6 @@ set(BigfootDependencies) bigfoot_create_package_tests( "${Dependencies}" "${BigfootDependencies}" - "") + "Bigfoot/Tests") bigfoot_create_logger() \ No newline at end of file diff --git a/CMake/FindDependencies.cmake b/CMake/FindDependencies.cmake index e8f3d6e..fec9c56 100644 --- a/CMake/FindDependencies.cmake +++ b/CMake/FindDependencies.cmake @@ -36,6 +36,7 @@ endif() if(VULKAN) find_package(VulkanHeaders REQUIRED) + find_package(volk REQUIRED) find_package(vulkan-memory-allocator REQUIRED) endif() diff --git a/CMake/Package.cmake b/CMake/Package.cmake index ea6baac..3355a69 100644 --- a/CMake/Package.cmake +++ b/CMake/Package.cmake @@ -48,7 +48,7 @@ function(bigfoot_create_package_lib PackagePublicDependencies PackagePrivateDepe source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} PREFIX Src FILES ${_SOURCES} ${_HEADERS} ${_OTHERS}) - set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER Bigfoot/${ParentFolder}) + set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER ${ParentFolder}) endfunction() function(bigfoot_create_package_tests PackageDependencies PackageBigfootDependencies ParentFolder) @@ -103,7 +103,7 @@ function(bigfoot_create_package_tests PackageDependencies PackageBigfootDependen source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} PREFIX Src/ FILES ${_SOURCES} ${_HEADERS} ${_OTHERS}) - set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER Tests/Bigfoot/${ParentFolder}) + set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER ${ParentFolder}) set_target_properties(${PROJECT_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "$") ##################ASAN SETUP################### @@ -126,7 +126,7 @@ function(bigfoot_create_package_tests PackageDependencies PackageBigfootDependen ) add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}Asan) - set_target_properties(${PROJECT_NAME}Asan PROPERTIES FOLDER UtilityTargets/Tests/Bigfoot/${ParentFolder}) + set_target_properties(${PROJECT_NAME}Asan PROPERTIES FOLDER UtilityTargets/${ParentFolder}) endif() endif() @@ -154,7 +154,7 @@ function(bigfoot_create_package_tests PackageDependencies PackageBigfootDependen ) add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}Fixture) - set_target_properties(${PROJECT_NAME}Fixture PROPERTIES FOLDER UtilityTargets/Tests/Bigfoot/${ParentFolder}) + set_target_properties(${PROJECT_NAME}Fixture PROPERTIES FOLDER UtilityTargets/${ParentFolder}) endfunction() function(bigfoot_create_package_tests_helper_lib PackagePublicDependencies PackagePrivateDependencies PackageBigfootPublicDependencies PackageBigfootPrivateDependencies ParentFolder) @@ -207,7 +207,7 @@ function(bigfoot_create_package_tests_helper_lib PackagePublicDependencies Packa source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} PREFIX Src FILES ${_SOURCES} ${_HEADERS} ${_OTHERS}) - set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER Tests/Bigfoot/${ParentFolder}) + set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER ${ParentFolder}) endfunction() function(bigfoot_create_package_benchmarks ParentFolder) @@ -255,7 +255,7 @@ function(bigfoot_create_package_benchmarks ParentFolder) source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} PREFIX Src/ FILES ${_SOURCES} ${_HEADERS} ${_OTHERS}) - set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER Benchmarks/Bigfoot/${ParentFolder}) + set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER ${ParentFolder}) set_target_properties(${PROJECT_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "$") ##################ASAN SETUP################### @@ -278,7 +278,7 @@ function(bigfoot_create_package_benchmarks ParentFolder) ) add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}Asan) - set_target_properties(${PROJECT_NAME}Asan PROPERTIES FOLDER UtilityTargets/Benchmarks/Bigfoot/${ParentFolder}) + set_target_properties(${PROJECT_NAME}Asan PROPERTIES FOLDER UtilityTargets/${ParentFolder}) endif() endif() @@ -306,5 +306,5 @@ function(bigfoot_create_package_benchmarks ParentFolder) ) add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}Fixture) - set_target_properties(${PROJECT_NAME}Fixture PROPERTIES FOLDER UtilityTargets/Benchmarks/Bigfoot/${ParentFolder}) + set_target_properties(${PROJECT_NAME}Fixture PROPERTIES FOLDER UtilityTargets/${ParentFolder}) endfunction() \ No newline at end of file diff --git a/CMake/Utils.cmake b/CMake/Utils.cmake index ce0d0df..849798a 100644 --- a/CMake/Utils.cmake +++ b/CMake/Utils.cmake @@ -2,7 +2,7 @@ function(bigfoot_create_logger) set(LOGGER_FILENAME ${PROJECT_NAME}Logger) string(TOUPPER ${PROJECT_NAME}_Logger LOGGER_NAME) string(TOUPPER ${LOGGER_FILENAME} LOGGER_FILENAME_UPPER) - configure_file( ${CMAKE_SOURCE_DIR}/Bigfoot/Sources/Utils/Include/Utils/Log/TargetLogger_generated.hpp.in + configure_file( ${CMAKE_SOURCE_DIR}/Bigfoot/Libs/Utils/Include/Utils/Log/TargetLogger_generated.hpp.in ${CMAKE_CURRENT_SOURCE_DIR}/Include/${PROJECT_NAME}/${LOGGER_FILENAME}_generated.hpp @ONLY) endfunction() @@ -14,9 +14,9 @@ function(bigfoot_create_bigfile ParentFolder) add_custom_command( OUTPUT ${OUTPUT_PATH_BIGFILE_ABSOLUTE}.bftimestamp ${OUTPUT_PATH_BIGFILE_ABSOLUTE} - DEPENDS ${CMAKE_SOURCE_DIR}/Bigfoot/Sources/Engine/BigFile/BigFileSchema.sql + DEPENDS ${CMAKE_SOURCE_DIR}/Bigfoot/Libs/Engine/BigFile/BigFileSchema.sql COMMAND ${CMAKE_COMMAND} -E make_directory ${OUTPUT_PATH_BIGFILE_DIRECTORY} - COMMAND ${SQLITE3_EXECUTABLE} ${OUTPUT_PATH_BIGFILE_ABSOLUTE} < ${CMAKE_SOURCE_DIR}/Bigfoot/Sources/Engine/BigFile/BigFileSchema.sql + COMMAND ${SQLITE3_EXECUTABLE} ${OUTPUT_PATH_BIGFILE_ABSOLUTE} < ${CMAKE_SOURCE_DIR}/Bigfoot/Libs/Engine/BigFile/BigFileSchema.sql COMMAND ${CMAKE_COMMAND} -E touch ${OUTPUT_PATH_BIGFILE_ABSOLUTE}.bftimestamp COMMENT "Creating Bigfile ${OUTPUT_PATH_BIGFILE_ABSOLUTE}" ) @@ -32,7 +32,7 @@ function(bigfoot_create_bigfile ParentFolder) string(TOUPPER ${PROJECT_NAME} BIGFILE_NAME) set(BIGFILE_LOCATION "./${PROJECT_NAME}.db") configure_file( - ${CMAKE_SOURCE_DIR}/Bigfoot/Sources/Engine/Include/Engine/BigFile/BigFileInfo_generated.hpp.in + ${CMAKE_SOURCE_DIR}/Bigfoot/Libs/Engine/Include/Engine/BigFile/BigFileInfo_generated.hpp.in ${CMAKE_CURRENT_SOURCE_DIR}/Include/${PROJECT_NAME}/BigFileInfo_generated.hpp @ONLY ) @@ -42,7 +42,7 @@ function(bigfoot_create_sasquatch_info) string(TOUPPER ${PROJECT_NAME} SASQUATCH_NAME) set(SASQUATCH_LOCATION "./${PROJECT_NAME}.sasquatch") configure_file( - ${CMAKE_SOURCE_DIR}/Bigfoot/Sources/Engine/Include/Engine/Sasquatch/SasquatchInfo_generated.hpp.in + ${CMAKE_SOURCE_DIR}/Bigfoot/Libs/Engine/Include/Engine/Sasquatch/SasquatchInfo_generated.hpp.in ${CMAKE_CURRENT_SOURCE_DIR}/Include/${PROJECT_NAME}/SasquatchInfo_generated.hpp @ONLY ) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4904625..b3400b9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,7 +60,7 @@ SET(CMAKE_SKIP_BUILD_RPATH FALSE) SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) SET(CMAKE_INSTALL_RPATH "\${ORIGIN}") -add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Bigfoot/Sources) +add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Bigfoot/Libs) if(${TOOLMODE}) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Tools) endif() diff --git a/Tools/Benchmarks/SasquatchBaker/CMakeLists.txt b/Tools/Benchmarks/SasquatchBaker/CMakeLists.txt index baa81a7..4207167 100644 --- a/Tools/Benchmarks/SasquatchBaker/CMakeLists.txt +++ b/Tools/Benchmarks/SasquatchBaker/CMakeLists.txt @@ -2,10 +2,10 @@ get_filename_component(PackageName ${CMAKE_CURRENT_SOURCE_DIR} NAME) project(${PackageName}Benchmarks) bigfoot_create_package_benchmarks( - "Tools") + "Tools/Benchmarks") target_link_libraries(${PROJECT_NAME} PRIVATE $) -bigfoot_create_bigfile("Benchmarks/Tools") +bigfoot_create_bigfile("Tools/Benchmarks") diff --git a/Tools/Executables/SasquatchBaker/CMakeLists.txt b/Tools/Executables/SasquatchBaker/CMakeLists.txt index b98d3b3..dc5a41a 100644 --- a/Tools/Executables/SasquatchBaker/CMakeLists.txt +++ b/Tools/Executables/SasquatchBaker/CMakeLists.txt @@ -29,5 +29,5 @@ target_sources(${PROJECT_NAME} source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} PREFIX Src FILES ${_SOURCES} ${_HEADERS}) -set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER Bigfoot/Tools/Executables) +set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER Tools/Executables) set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME SasquatchBaker) diff --git a/Tools/Tests/SasquatchBaker/CMakeLists.txt b/Tools/Tests/SasquatchBaker/CMakeLists.txt index f3d4afd..0b2a195 100644 --- a/Tools/Tests/SasquatchBaker/CMakeLists.txt +++ b/Tools/Tests/SasquatchBaker/CMakeLists.txt @@ -8,6 +8,6 @@ set(BigfootDependencies bigfoot_create_package_tests( "${Dependencies}" "${BigfootDependencies}" - "Tools") + "Tools/Tests") -bigfoot_create_bigfile("Tests/Tools") +bigfoot_create_bigfile("Tools/Tests") diff --git a/conanfile.py b/conanfile.py index 937763b..b7c95a7 100644 --- a/conanfile.py +++ b/conanfile.py @@ -87,7 +87,7 @@ class Bigfoot(ConanFile): self.requires("tracy/0.13.1", transitive_headers=True) if(self.options.vulkan): - self.requires("vulkan-headers/1.4.350.0", override=True) + self.requires("vulkan-headers/1.4.350.0") self.requires("volk/1.4.350.0") self.requires("vulkan-memory-allocator/3.3.0") diff --git a/sonar-project.properties b/sonar-project.properties index 9ac7aa0..fb6b9c1 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,6 +1,6 @@ sonar.sourceEncoding=UTF-8 -sonar.sources=Bigfoot/Sources +sonar.sources=Bigfoot/Libs sonar.tests=Bigfoot/Tests sonar.cxx.file.suffixes=.hpp,.cpp,.h