diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index c7dbc02..632d7d2 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -39,7 +39,7 @@ jobs: - name: Build run: | - conan install . --remote=bigfootpackages -pr:h=${{ matrix.conan_profile }} -pr:b=./ConanProfiles/Tools/clang --build=* -s build_type=${{ matrix.build_type }} -o bigfoot/*:build_tests=True -o bigfoot/*:tracy=False -o bigfoot/*:vulkan=True + conan install . --remote=bigfootpackages -pr:h=${{ matrix.conan_profile }} -pr:b=./ConanProfiles/Tools/clang --build=* -s build_type=${{ matrix.build_type }} -o bigfoot/*:build_tests=True -o bigfoot/*:build_benchmarks=True -o bigfoot/*:tracy=False -o bigfoot/*:vulkan=True . ./build/${{ matrix.build_type }}/generators/conanbuild.sh cmake -S . -B ./build/${{ matrix.build_type }} --toolchain ./build/${{ matrix.build_type }}/generators/conan_toolchain.cmake -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_UNITY_BUILD=${{ matrix.unity_build }} -G "Ninja" cmake --build build/${{ matrix.build_type }} --parallel $(nproc) diff --git a/.gitea/workflows/sonarqube.yml b/.gitea/workflows/sonarqube.yml index de8b1a2..6b3a3cf 100644 --- a/.gitea/workflows/sonarqube.yml +++ b/.gitea/workflows/sonarqube.yml @@ -35,7 +35,7 @@ jobs: - name: Build run: | - conan install . --remote=bigfootpackages -pr:h=./ConanProfiles/clang_coverage -pr:b=./ConanProfiles/Tools/clang --build=* -s build_type=Debug -o bigfoot/*:build_tests=True -o bigfoot/*:tracy=False -o bigfoot/*:build_tools=True -o bigfoot/*:vulkan=True + conan install . --remote=bigfootpackages -pr:h=./ConanProfiles/clang_coverage -pr:b=./ConanProfiles/Tools/clang --build=* -s build_type=Debug -o bigfoot/*:build_tests=True -o bigfoot/*:build_benchmarks=True -o bigfoot/*:tracy=False -o bigfoot/*:build_tools=True -o bigfoot/*:vulkan=True . ./build/Debug/generators/conanbuild.sh cmake -S . -B ./build/Debug --toolchain ./build/Debug/generators/conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Debug -G "Ninja" cmake --build build/Debug --parallel $(nproc) diff --git a/Bigfoot/Sources/Engine/Include/Engine/Asset/Asset.bfbs_generated.hpp b/Bigfoot/Sources/Engine/Include/Engine/Asset/Asset.bfbs_generated.hpp index c04f843..d5f62cb 100644 --- a/Bigfoot/Sources/Engine/Include/Engine/Asset/Asset.bfbs_generated.hpp +++ b/Bigfoot/Sources/Engine/Include/Engine/Asset/Asset.bfbs_generated.hpp @@ -9,7 +9,7 @@ #include #include -namespace Bigfoot +namespace Flat::Bigfoot { inline constexpr eastl::array g_Asset_bfbs = { std::byte{0x20}, std::byte{0x00}, std::byte{0x00}, std::byte{0x00}, std::byte{0x42}, std::byte{0x46}, std::byte{0x42}, std::byte{0x53}, std::byte{0x00}, std::byte{0x00}, std::byte{0x00}, std::byte{0x00}, std::byte{0x14}, std::byte{0x00}, std::byte{0x28}, std::byte{0x00}, @@ -89,6 +89,6 @@ namespace Bigfoot std::byte{0x76}, std::byte{0x61}, std::byte{0x6C}, std::byte{0x75}, std::byte{0x65}, std::byte{0x00}, std::byte{0x00}, std::byte{0x00} }; -} // namespace Bigfoot +} // namespace Flat::Bigfoot #endif // ASSET_BFBS_HPP diff --git a/Bigfoot/Sources/Engine/Include/Engine/Asset/AssetTypeID.bfbs_generated.hpp b/Bigfoot/Sources/Engine/Include/Engine/Asset/AssetTypeID.bfbs_generated.hpp index bbd85c2..cf806be 100644 --- a/Bigfoot/Sources/Engine/Include/Engine/Asset/AssetTypeID.bfbs_generated.hpp +++ b/Bigfoot/Sources/Engine/Include/Engine/Asset/AssetTypeID.bfbs_generated.hpp @@ -9,7 +9,7 @@ #include #include -namespace Bigfoot +namespace Flat::Bigfoot { inline constexpr eastl::array g_AssetTypeID_bfbs = { std::byte{0x1C}, std::byte{0x00}, std::byte{0x00}, std::byte{0x00}, std::byte{0x42}, std::byte{0x46}, std::byte{0x42}, std::byte{0x53}, std::byte{0x14}, std::byte{0x00}, std::byte{0x1C}, std::byte{0x00}, std::byte{0x04}, std::byte{0x00}, std::byte{0x08}, std::byte{0x00}, @@ -32,6 +32,6 @@ namespace Bigfoot std::byte{0x01}, std::byte{0x00}, std::byte{0x00}, std::byte{0x00}, std::byte{0x05}, std::byte{0x00}, std::byte{0x00}, std::byte{0x00}, std::byte{0x76}, std::byte{0x61}, std::byte{0x6C}, std::byte{0x75}, std::byte{0x65}, std::byte{0x00}, std::byte{0x00}, std::byte{0x00} }; -} // namespace Bigfoot +} // namespace Flat::Bigfoot #endif // ASSETTYPEID_BFBS_HPP diff --git a/Bigfoot/Sources/Engine/Include/Engine/Asset/AssetTypeID_generated.hpp b/Bigfoot/Sources/Engine/Include/Engine/Asset/AssetTypeID_generated.hpp index 9baaf79..10b295c 100644 --- a/Bigfoot/Sources/Engine/Include/Engine/Asset/AssetTypeID_generated.hpp +++ b/Bigfoot/Sources/Engine/Include/Engine/Asset/AssetTypeID_generated.hpp @@ -24,17 +24,12 @@ namespace Bigfoot { struct AssetTypeID; -inline const ::flatbuffers::TypeTable *AssetTypeIDTypeTable(); - FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(8) AssetTypeID FLATBUFFERS_FINAL_CLASS { private: uint64_t value_; public: struct Traits; - static const ::flatbuffers::TypeTable *MiniReflectTypeTable() { - return AssetTypeIDTypeTable(); - } static FLATBUFFERS_CONSTEXPR_CPP11 const char *GetFullyQualifiedName() { return "Flat.Bigfoot.AssetTypeID"; } @@ -54,20 +49,6 @@ struct AssetTypeID::Traits { using type = AssetTypeID; }; -inline const ::flatbuffers::TypeTable *AssetTypeIDTypeTable() { - static const ::flatbuffers::TypeCode type_codes[] = { - { ::flatbuffers::ET_ULONG, 0, -1 } - }; - static const int64_t values[] = { 0, 8 }; - static const char * const names[] = { - "value" - }; - static const ::flatbuffers::TypeTable tt = { - ::flatbuffers::ST_STRUCT, 1, type_codes, nullptr, nullptr, values, names - }; - return &tt; -} - } // namespace Bigfoot } // namespace Flat diff --git a/Bigfoot/Sources/Engine/Include/Engine/Asset/Asset_generated.hpp b/Bigfoot/Sources/Engine/Include/Engine/Asset/Asset_generated.hpp index 973bfa3..019936a 100644 --- a/Bigfoot/Sources/Engine/Include/Engine/Asset/Asset_generated.hpp +++ b/Bigfoot/Sources/Engine/Include/Engine/Asset/Asset_generated.hpp @@ -33,10 +33,6 @@ struct Asset; struct AssetBuilder; struct AssetT; -inline const ::flatbuffers::TypeTable *AssetHeaderTypeTable(); - -inline const ::flatbuffers::TypeTable *AssetTypeTable(); - struct AssetHeaderT : public ::flatbuffers::NativeTable { typedef AssetHeader TableType; static FLATBUFFERS_CONSTEXPR_CPP11 const char *GetFullyQualifiedName() { @@ -54,9 +50,6 @@ struct AssetHeader FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef AssetHeaderT NativeTableType; typedef AssetHeaderBuilder Builder; struct Traits; - static const ::flatbuffers::TypeTable *MiniReflectTypeTable() { - return AssetHeaderTypeTable(); - } static FLATBUFFERS_CONSTEXPR_CPP11 const char *GetFullyQualifiedName() { return "Flat.Bigfoot.AssetHeader"; } @@ -185,9 +178,6 @@ struct Asset FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef AssetT NativeTableType; typedef AssetBuilder Builder; struct Traits; - static const ::flatbuffers::TypeTable *MiniReflectTypeTable() { - return AssetTypeTable(); - } static FLATBUFFERS_CONSTEXPR_CPP11 const char *GetFullyQualifiedName() { return "Flat.Bigfoot.Asset"; } @@ -336,51 +326,6 @@ inline ::flatbuffers::Offset Asset::Pack(::flatbuffers::FlatBufferBuilder _inner_asset); } -inline const ::flatbuffers::TypeTable *AssetHeaderTypeTable() { - static const ::flatbuffers::TypeCode type_codes[] = { - { ::flatbuffers::ET_SEQUENCE, 0, 0 }, - { ::flatbuffers::ET_STRING, 0, -1 }, - { ::flatbuffers::ET_SEQUENCE, 0, 1 }, - { ::flatbuffers::ET_STRING, 0, -1 }, - { ::flatbuffers::ET_UINT, 0, -1 }, - { ::flatbuffers::ET_SEQUENCE, 1, 0 } - }; - static const ::flatbuffers::TypeFunction type_refs[] = { - Flat::Bigfoot::UUIDTypeTable, - Flat::Bigfoot::AssetTypeIDTypeTable - }; - static const char * const names[] = { - "uuid", - "name", - "type_id", - "type_name", - "version", - "dependencies" - }; - static const ::flatbuffers::TypeTable tt = { - ::flatbuffers::ST_TABLE, 6, type_codes, type_refs, nullptr, nullptr, names - }; - return &tt; -} - -inline const ::flatbuffers::TypeTable *AssetTypeTable() { - static const ::flatbuffers::TypeCode type_codes[] = { - { ::flatbuffers::ET_SEQUENCE, 0, 0 }, - { ::flatbuffers::ET_UCHAR, 1, -1 } - }; - static const ::flatbuffers::TypeFunction type_refs[] = { - Flat::Bigfoot::AssetHeaderTypeTable - }; - static const char * const names[] = { - "header", - "inner_asset" - }; - static const ::flatbuffers::TypeTable tt = { - ::flatbuffers::ST_TABLE, 2, type_codes, type_refs, nullptr, nullptr, names - }; - return &tt; -} - inline const Flat::Bigfoot::Asset *GetAsset(const void *buf) { return ::flatbuffers::GetRoot(buf); } diff --git a/Bigfoot/Sources/Engine/Include/Engine/Asset/Reference.bfbs_generated.hpp b/Bigfoot/Sources/Engine/Include/Engine/Asset/Reference.bfbs_generated.hpp index 19fab66..cc1b7b9 100644 --- a/Bigfoot/Sources/Engine/Include/Engine/Asset/Reference.bfbs_generated.hpp +++ b/Bigfoot/Sources/Engine/Include/Engine/Asset/Reference.bfbs_generated.hpp @@ -9,7 +9,7 @@ #include #include -namespace Bigfoot +namespace Flat::Bigfoot { inline constexpr eastl::array g_Reference_bfbs = { std::byte{0x1C}, std::byte{0x00}, std::byte{0x00}, std::byte{0x00}, std::byte{0x42}, std::byte{0x46}, std::byte{0x42}, std::byte{0x53}, std::byte{0x14}, std::byte{0x00}, std::byte{0x24}, std::byte{0x00}, std::byte{0x04}, std::byte{0x00}, std::byte{0x08}, std::byte{0x00}, @@ -51,6 +51,6 @@ namespace Bigfoot std::byte{0x01}, std::byte{0x00}, std::byte{0x00}, std::byte{0x00}, std::byte{0x05}, std::byte{0x00}, std::byte{0x00}, std::byte{0x00}, std::byte{0x62}, std::byte{0x79}, std::byte{0x74}, std::byte{0x65}, std::byte{0x73}, std::byte{0x00}, std::byte{0x00}, std::byte{0x00} }; -} // namespace Bigfoot +} // namespace Flat::Bigfoot #endif // REFERENCE_BFBS_HPP diff --git a/Bigfoot/Sources/Engine/Include/Engine/Asset/Reference_generated.hpp b/Bigfoot/Sources/Engine/Include/Engine/Asset/Reference_generated.hpp index c25740f..6052e2f 100644 --- a/Bigfoot/Sources/Engine/Include/Engine/Asset/Reference_generated.hpp +++ b/Bigfoot/Sources/Engine/Include/Engine/Asset/Reference_generated.hpp @@ -29,19 +29,12 @@ struct HardRef; struct SoftRef; -inline const ::flatbuffers::TypeTable *HardRefTypeTable(); - -inline const ::flatbuffers::TypeTable *SoftRefTypeTable(); - FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(1) HardRef FLATBUFFERS_FINAL_CLASS { private: Flat::Bigfoot::UUID uuid_; public: struct Traits; - static const ::flatbuffers::TypeTable *MiniReflectTypeTable() { - return HardRefTypeTable(); - } static FLATBUFFERS_CONSTEXPR_CPP11 const char *GetFullyQualifiedName() { return "Flat.Bigfoot.HardRef"; } @@ -67,9 +60,6 @@ FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(1) SoftRef FLATBUFFERS_FINAL_CLASS { public: struct Traits; - static const ::flatbuffers::TypeTable *MiniReflectTypeTable() { - return SoftRefTypeTable(); - } static FLATBUFFERS_CONSTEXPR_CPP11 const char *GetFullyQualifiedName() { return "Flat.Bigfoot.SoftRef"; } @@ -89,40 +79,6 @@ struct SoftRef::Traits { using type = SoftRef; }; -inline const ::flatbuffers::TypeTable *HardRefTypeTable() { - static const ::flatbuffers::TypeCode type_codes[] = { - { ::flatbuffers::ET_SEQUENCE, 0, 0 } - }; - static const ::flatbuffers::TypeFunction type_refs[] = { - Flat::Bigfoot::UUIDTypeTable - }; - static const int64_t values[] = { 0, 16 }; - static const char * const names[] = { - "uuid" - }; - static const ::flatbuffers::TypeTable tt = { - ::flatbuffers::ST_STRUCT, 1, type_codes, type_refs, nullptr, values, names - }; - return &tt; -} - -inline const ::flatbuffers::TypeTable *SoftRefTypeTable() { - static const ::flatbuffers::TypeCode type_codes[] = { - { ::flatbuffers::ET_SEQUENCE, 0, 0 } - }; - static const ::flatbuffers::TypeFunction type_refs[] = { - Flat::Bigfoot::UUIDTypeTable - }; - static const int64_t values[] = { 0, 16 }; - static const char * const names[] = { - "uuid" - }; - static const ::flatbuffers::TypeTable tt = { - ::flatbuffers::ST_STRUCT, 1, type_codes, type_refs, nullptr, values, names - }; - return &tt; -} - } // namespace Bigfoot } // namespace Flat diff --git a/Bigfoot/Sources/System/Include/System/Log/Log.bfbs_generated.hpp b/Bigfoot/Sources/System/Include/System/Log/Log.bfbs_generated.hpp index 035bd76..1cabcc8 100644 --- a/Bigfoot/Sources/System/Include/System/Log/Log.bfbs_generated.hpp +++ b/Bigfoot/Sources/System/Include/System/Log/Log.bfbs_generated.hpp @@ -9,7 +9,7 @@ #include #include -namespace Bigfoot +namespace Flat::Bigfoot { inline constexpr eastl::array g_Log_bfbs = { std::byte{0x1C}, std::byte{0x00}, std::byte{0x00}, std::byte{0x00}, std::byte{0x42}, std::byte{0x46}, std::byte{0x42}, std::byte{0x53}, std::byte{0x14}, std::byte{0x00}, std::byte{0x1C}, std::byte{0x00}, std::byte{0x04}, std::byte{0x00}, std::byte{0x08}, std::byte{0x00}, @@ -58,6 +58,6 @@ namespace Bigfoot std::byte{0x01}, std::byte{0x00}, std::byte{0x00}, std::byte{0x00}, std::byte{0x07}, std::byte{0x00}, std::byte{0x00}, std::byte{0x00}, std::byte{0x43}, std::byte{0x6F}, std::byte{0x6E}, std::byte{0x73}, std::byte{0x6F}, std::byte{0x6C}, std::byte{0x65}, std::byte{0x00} }; -} // namespace Bigfoot +} // namespace Flat::Bigfoot #endif // LOG_BFBS_HPP diff --git a/Bigfoot/Sources/System/Include/System/Log/Log_generated.hpp b/Bigfoot/Sources/System/Include/System/Log/Log_generated.hpp index 33a06d8..6831592 100644 --- a/Bigfoot/Sources/System/Include/System/Log/Log_generated.hpp +++ b/Bigfoot/Sources/System/Include/System/Log/Log_generated.hpp @@ -89,48 +89,6 @@ inline const char *EnumNameLogLevel(LogLevel e) { return EnumNamesLogLevel()[index]; } -inline const ::flatbuffers::TypeTable *LogSinkTypeTypeTable() { - static const ::flatbuffers::TypeCode type_codes[] = { - { ::flatbuffers::ET_CHAR, 0, 0 } - }; - static const ::flatbuffers::TypeFunction type_refs[] = { - Bigfoot::Flat::LogSinkTypeTypeTable - }; - static const char * const names[] = { - "Console" - }; - static const ::flatbuffers::TypeTable tt = { - ::flatbuffers::ST_ENUM, 1, type_codes, type_refs, nullptr, nullptr, names - }; - return &tt; -} - -inline const ::flatbuffers::TypeTable *LogLevelTypeTable() { - static const ::flatbuffers::TypeCode type_codes[] = { - { ::flatbuffers::ET_CHAR, 0, 0 }, - { ::flatbuffers::ET_CHAR, 0, 0 }, - { ::flatbuffers::ET_CHAR, 0, 0 }, - { ::flatbuffers::ET_CHAR, 0, 0 }, - { ::flatbuffers::ET_CHAR, 0, 0 }, - { ::flatbuffers::ET_CHAR, 0, 0 } - }; - static const ::flatbuffers::TypeFunction type_refs[] = { - Bigfoot::Flat::LogLevelTypeTable - }; - static const char * const names[] = { - "Debug", - "Trace", - "Info", - "Warn", - "Error", - "Critical" - }; - static const ::flatbuffers::TypeTable tt = { - ::flatbuffers::ST_ENUM, 6, type_codes, type_refs, nullptr, nullptr, names - }; - return &tt; -} - } // namespace Flat } // namespace Bigfoot diff --git a/Bigfoot/Sources/System/Include/System/Time/Time.bfbs_generated.hpp b/Bigfoot/Sources/System/Include/System/Time/Time.bfbs_generated.hpp index f8bd273..05623e6 100644 --- a/Bigfoot/Sources/System/Include/System/Time/Time.bfbs_generated.hpp +++ b/Bigfoot/Sources/System/Include/System/Time/Time.bfbs_generated.hpp @@ -9,7 +9,7 @@ #include #include -namespace Bigfoot +namespace Flat::Bigfoot { inline constexpr eastl::array g_Time_bfbs = { std::byte{0x1C}, std::byte{0x00}, std::byte{0x00}, std::byte{0x00}, std::byte{0x42}, std::byte{0x46}, std::byte{0x42}, std::byte{0x53}, std::byte{0x14}, std::byte{0x00}, std::byte{0x1C}, std::byte{0x00}, std::byte{0x04}, std::byte{0x00}, std::byte{0x08}, std::byte{0x00}, @@ -31,6 +31,6 @@ namespace Bigfoot std::byte{0x01}, std::byte{0x00}, std::byte{0x00}, std::byte{0x00}, std::byte{0x05}, std::byte{0x00}, std::byte{0x00}, std::byte{0x00}, std::byte{0x65}, std::byte{0x70}, std::byte{0x6F}, std::byte{0x63}, std::byte{0x68}, std::byte{0x00}, std::byte{0x00}, std::byte{0x00} }; -} // namespace Bigfoot +} // namespace Flat::Bigfoot #endif // TIME_BFBS_HPP diff --git a/Bigfoot/Sources/System/Include/System/Time/Time_generated.hpp b/Bigfoot/Sources/System/Include/System/Time/Time_generated.hpp index bc45238..ccb1421 100644 --- a/Bigfoot/Sources/System/Include/System/Time/Time_generated.hpp +++ b/Bigfoot/Sources/System/Include/System/Time/Time_generated.hpp @@ -24,17 +24,12 @@ namespace Bigfoot { struct Time; -inline const ::flatbuffers::TypeTable *TimeTypeTable(); - FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(8) Time FLATBUFFERS_FINAL_CLASS { private: uint64_t epoch_; public: struct Traits; - static const ::flatbuffers::TypeTable *MiniReflectTypeTable() { - return TimeTypeTable(); - } static FLATBUFFERS_CONSTEXPR_CPP11 const char *GetFullyQualifiedName() { return "Flat.Bigfoot.Time"; } @@ -54,20 +49,6 @@ struct Time::Traits { using type = Time; }; -inline const ::flatbuffers::TypeTable *TimeTypeTable() { - static const ::flatbuffers::TypeCode type_codes[] = { - { ::flatbuffers::ET_ULONG, 0, -1 } - }; - static const int64_t values[] = { 0, 8 }; - static const char * const names[] = { - "epoch" - }; - static const ::flatbuffers::TypeTable tt = { - ::flatbuffers::ST_STRUCT, 1, type_codes, nullptr, nullptr, values, names - }; - return &tt; -} - } // namespace Bigfoot } // namespace Flat diff --git a/Bigfoot/Sources/System/Include/System/UUID/UUID.bfbs_generated.hpp b/Bigfoot/Sources/System/Include/System/UUID/UUID.bfbs_generated.hpp index ef94287..f9c312c 100644 --- a/Bigfoot/Sources/System/Include/System/UUID/UUID.bfbs_generated.hpp +++ b/Bigfoot/Sources/System/Include/System/UUID/UUID.bfbs_generated.hpp @@ -9,7 +9,7 @@ #include #include -namespace Bigfoot +namespace Flat::Bigfoot { inline constexpr eastl::array g_UUID_bfbs = { std::byte{0x1C}, std::byte{0x00}, std::byte{0x00}, std::byte{0x00}, std::byte{0x42}, std::byte{0x46}, std::byte{0x42}, std::byte{0x53}, std::byte{0x14}, std::byte{0x00}, std::byte{0x28}, std::byte{0x00}, std::byte{0x04}, std::byte{0x00}, std::byte{0x08}, std::byte{0x00}, @@ -32,6 +32,6 @@ namespace Bigfoot std::byte{0x62}, std::byte{0x79}, std::byte{0x74}, std::byte{0x65}, std::byte{0x73}, std::byte{0x00}, std::byte{0x00}, std::byte{0x00} }; -} // namespace Bigfoot +} // namespace Flat::Bigfoot #endif // UUID_BFBS_HPP diff --git a/Bigfoot/Sources/System/Include/System/UUID/UUID_generated.hpp b/Bigfoot/Sources/System/Include/System/UUID/UUID_generated.hpp index 138bdf0..02f7cd7 100644 --- a/Bigfoot/Sources/System/Include/System/UUID/UUID_generated.hpp +++ b/Bigfoot/Sources/System/Include/System/UUID/UUID_generated.hpp @@ -24,17 +24,12 @@ namespace Bigfoot { struct UUID; -inline const ::flatbuffers::TypeTable *UUIDTypeTable(); - FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(1) UUID FLATBUFFERS_FINAL_CLASS { private: uint8_t bytes_[16]; public: struct Traits; - static const ::flatbuffers::TypeTable *MiniReflectTypeTable() { - return UUIDTypeTable(); - } static FLATBUFFERS_CONSTEXPR_CPP11 const char *GetFullyQualifiedName() { return "Flat.Bigfoot.UUID"; } @@ -54,21 +49,6 @@ struct UUID::Traits { using type = UUID; }; -inline const ::flatbuffers::TypeTable *UUIDTypeTable() { - static const ::flatbuffers::TypeCode type_codes[] = { - { ::flatbuffers::ET_UCHAR, 1, -1 } - }; - static const int16_t array_sizes[] = { 16, }; - static const int64_t values[] = { 0, 16 }; - static const char * const names[] = { - "bytes" - }; - static const ::flatbuffers::TypeTable tt = { - ::flatbuffers::ST_STRUCT, 1, type_codes, nullptr, array_sizes, values, names - }; - return &tt; -} - } // namespace Bigfoot } // namespace Flat diff --git a/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetA.bfbs_generated.hpp b/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetA.bfbs_generated.hpp index 3392fd2..60267e0 100644 --- a/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetA.bfbs_generated.hpp +++ b/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetA.bfbs_generated.hpp @@ -9,7 +9,7 @@ #include #include -namespace Bigfoot +namespace Flat::Bigfoot { inline constexpr eastl::array g_AssetA_bfbs = { std::byte{0x20}, std::byte{0x00}, std::byte{0x00}, std::byte{0x00}, std::byte{0x42}, std::byte{0x46}, std::byte{0x42}, std::byte{0x53}, std::byte{0x00}, std::byte{0x00}, std::byte{0x00}, std::byte{0x00}, std::byte{0x14}, std::byte{0x00}, std::byte{0x2C}, std::byte{0x00}, @@ -71,6 +71,6 @@ namespace Bigfoot std::byte{0x01}, std::byte{0x00}, std::byte{0x00}, std::byte{0x00}, std::byte{0x05}, std::byte{0x00}, std::byte{0x00}, std::byte{0x00}, std::byte{0x62}, std::byte{0x79}, std::byte{0x74}, std::byte{0x65}, std::byte{0x73}, std::byte{0x00}, std::byte{0x00}, std::byte{0x00} }; -} // namespace Bigfoot +} // namespace Flat::Bigfoot #endif // ASSETA_BFBS_HPP diff --git a/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetA.hpp b/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetA.hpp index db91b4e..e8b828d 100644 --- a/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetA.hpp +++ b/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetA.hpp @@ -19,7 +19,7 @@ struct AssetATraits static constexpr eastl::span ReflectionInfo() { - return g_AssetA_bfbs; + return ::Flat::Bigfoot::g_AssetA_bfbs; } }; diff --git a/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetA_generated.hpp b/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetA_generated.hpp index 66a22ce..9fc8539 100644 --- a/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetA_generated.hpp +++ b/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetA_generated.hpp @@ -30,8 +30,6 @@ struct AssetA; struct AssetABuilder; struct AssetAT; -inline const ::flatbuffers::TypeTable *AssetATypeTable(); - struct AssetAT : public ::flatbuffers::NativeTable { typedef AssetA TableType; static FLATBUFFERS_CONSTEXPR_CPP11 const char *GetFullyQualifiedName() { @@ -45,9 +43,6 @@ struct AssetA FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef AssetAT NativeTableType; typedef AssetABuilder Builder; struct Traits; - static const ::flatbuffers::TypeTable *MiniReflectTypeTable() { - return AssetATypeTable(); - } static FLATBUFFERS_CONSTEXPR_CPP11 const char *GetFullyQualifiedName() { return "Flat.Bigfoot.AssetA"; } @@ -140,21 +135,6 @@ inline ::flatbuffers::Offset AssetA::Pack(::flatbuffers::FlatBufferBuild _mana); } -inline const ::flatbuffers::TypeTable *AssetATypeTable() { - static const ::flatbuffers::TypeCode type_codes[] = { - { ::flatbuffers::ET_UINT, 0, -1 }, - { ::flatbuffers::ET_UINT, 0, -1 } - }; - static const char * const names[] = { - "health", - "mana" - }; - static const ::flatbuffers::TypeTable tt = { - ::flatbuffers::ST_TABLE, 2, type_codes, nullptr, nullptr, nullptr, names - }; - return &tt; -} - inline const Flat::Bigfoot::AssetA *GetAssetA(const void *buf) { return ::flatbuffers::GetRoot(buf); } diff --git a/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetB.bfbs_generated.hpp b/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetB.bfbs_generated.hpp index a3e5c49..c2e49e7 100644 --- a/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetB.bfbs_generated.hpp +++ b/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetB.bfbs_generated.hpp @@ -9,7 +9,7 @@ #include #include -namespace Bigfoot +namespace Flat::Bigfoot { inline constexpr eastl::array g_AssetB_bfbs = { std::byte{0x20}, std::byte{0x00}, std::byte{0x00}, std::byte{0x00}, std::byte{0x42}, std::byte{0x46}, std::byte{0x42}, std::byte{0x53}, std::byte{0x00}, std::byte{0x00}, std::byte{0x00}, std::byte{0x00}, std::byte{0x14}, std::byte{0x00}, std::byte{0x28}, std::byte{0x00}, @@ -89,6 +89,6 @@ namespace Bigfoot std::byte{0x62}, std::byte{0x79}, std::byte{0x74}, std::byte{0x65}, std::byte{0x73}, std::byte{0x00}, std::byte{0x00}, std::byte{0x00} }; -} // namespace Bigfoot +} // namespace Flat::Bigfoot #endif // ASSETB_BFBS_HPP diff --git a/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetB.hpp b/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetB.hpp index 689d67e..1fbd296 100644 --- a/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetB.hpp +++ b/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetB.hpp @@ -19,7 +19,7 @@ struct AssetBTraits static constexpr eastl::span ReflectionInfo() { - return g_AssetB_bfbs; + return ::Flat::Bigfoot::g_AssetB_bfbs; } }; diff --git a/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetB_generated.hpp b/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetB_generated.hpp index 18441bb..2d40603 100644 --- a/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetB_generated.hpp +++ b/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetB_generated.hpp @@ -32,8 +32,6 @@ struct AssetB; struct AssetBBuilder; struct AssetBT; -inline const ::flatbuffers::TypeTable *AssetBTypeTable(); - struct AssetBT : public ::flatbuffers::NativeTable { typedef AssetB TableType; static FLATBUFFERS_CONSTEXPR_CPP11 const char *GetFullyQualifiedName() { @@ -47,9 +45,6 @@ struct AssetB FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef AssetBT NativeTableType; typedef AssetBBuilder Builder; struct Traits; - static const ::flatbuffers::TypeTable *MiniReflectTypeTable() { - return AssetBTypeTable(); - } static FLATBUFFERS_CONSTEXPR_CPP11 const char *GetFullyQualifiedName() { return "Flat.Bigfoot.AssetB"; } @@ -143,25 +138,6 @@ inline ::flatbuffers::Offset AssetB::Pack(::flatbuffers::FlatBufferBuild _asset_a_refs); } -inline const ::flatbuffers::TypeTable *AssetBTypeTable() { - static const ::flatbuffers::TypeCode type_codes[] = { - { ::flatbuffers::ET_SEQUENCE, 0, 0 }, - { ::flatbuffers::ET_SEQUENCE, 1, 1 } - }; - static const ::flatbuffers::TypeFunction type_refs[] = { - Flat::Bigfoot::HardRefTypeTable, - Flat::Bigfoot::SoftRefTypeTable - }; - static const char * const names[] = { - "asset_a_ref", - "asset_a_refs" - }; - static const ::flatbuffers::TypeTable tt = { - ::flatbuffers::ST_TABLE, 2, type_codes, type_refs, nullptr, nullptr, names - }; - return &tt; -} - inline const Flat::Bigfoot::AssetB *GetAssetB(const void *buf) { return ::flatbuffers::GetRoot(buf); } diff --git a/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetC.bfbs_generated.hpp b/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetC.bfbs_generated.hpp index f8ceb3c..db15402 100644 --- a/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetC.bfbs_generated.hpp +++ b/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetC.bfbs_generated.hpp @@ -9,7 +9,7 @@ #include #include -namespace Bigfoot +namespace Flat::Bigfoot { inline constexpr eastl::array g_AssetC_bfbs = { std::byte{0x20}, std::byte{0x00}, std::byte{0x00}, std::byte{0x00}, std::byte{0x42}, std::byte{0x46}, std::byte{0x42}, std::byte{0x53}, std::byte{0x00}, std::byte{0x00}, std::byte{0x00}, std::byte{0x00}, std::byte{0x14}, std::byte{0x00}, std::byte{0x2C}, std::byte{0x00}, @@ -118,6 +118,6 @@ namespace Bigfoot std::byte{0x62}, std::byte{0x79}, std::byte{0x74}, std::byte{0x65}, std::byte{0x73}, std::byte{0x00}, std::byte{0x00}, std::byte{0x00} }; -} // namespace Bigfoot +} // namespace Flat::Bigfoot #endif // ASSETC_BFBS_HPP diff --git a/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetC.hpp b/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetC.hpp index 1bf5d47..3223ce0 100644 --- a/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetC.hpp +++ b/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetC.hpp @@ -19,7 +19,7 @@ struct AssetCTraits static constexpr eastl::span ReflectionInfo() { - return g_AssetC_bfbs; + return ::Flat::Bigfoot::g_AssetC_bfbs; } }; diff --git a/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetC_generated.hpp b/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetC_generated.hpp index c2577fd..35adead 100644 --- a/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetC_generated.hpp +++ b/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetC_generated.hpp @@ -38,10 +38,6 @@ struct AssetC; struct AssetCBuilder; struct AssetCT; -inline const ::flatbuffers::TypeTable *InnerTableTypeTable(); - -inline const ::flatbuffers::TypeTable *AssetCTypeTable(); - struct InnerTableT : public ::flatbuffers::NativeTable { typedef InnerTable TableType; static FLATBUFFERS_CONSTEXPR_CPP11 const char *GetFullyQualifiedName() { @@ -55,9 +51,6 @@ struct InnerTable FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef InnerTableT NativeTableType; typedef InnerTableBuilder Builder; struct Traits; - static const ::flatbuffers::TypeTable *MiniReflectTypeTable() { - return InnerTableTypeTable(); - } static FLATBUFFERS_CONSTEXPR_CPP11 const char *GetFullyQualifiedName() { return "Flat.Bigfoot.InnerTable"; } @@ -140,9 +133,6 @@ struct AssetC FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef AssetCT NativeTableType; typedef AssetCBuilder Builder; struct Traits; - static const ::flatbuffers::TypeTable *MiniReflectTypeTable() { - return AssetCTypeTable(); - } static FLATBUFFERS_CONSTEXPR_CPP11 const char *GetFullyQualifiedName() { return "Flat.Bigfoot.AssetC"; } @@ -293,46 +283,6 @@ inline ::flatbuffers::Offset AssetC::Pack(::flatbuffers::FlatBufferBuild _asset_b_refs); } -inline const ::flatbuffers::TypeTable *InnerTableTypeTable() { - static const ::flatbuffers::TypeCode type_codes[] = { - { ::flatbuffers::ET_SEQUENCE, 0, 0 }, - { ::flatbuffers::ET_SEQUENCE, 1, 0 } - }; - static const ::flatbuffers::TypeFunction type_refs[] = { - Flat::Bigfoot::HardRefTypeTable - }; - static const char * const names[] = { - "asset_a_ref", - "asset_a_refs" - }; - static const ::flatbuffers::TypeTable tt = { - ::flatbuffers::ST_TABLE, 2, type_codes, type_refs, nullptr, nullptr, names - }; - return &tt; -} - -inline const ::flatbuffers::TypeTable *AssetCTypeTable() { - static const ::flatbuffers::TypeCode type_codes[] = { - { ::flatbuffers::ET_SEQUENCE, 0, 0 }, - { ::flatbuffers::ET_SEQUENCE, 0, 1 }, - { ::flatbuffers::ET_SEQUENCE, 1, 2 } - }; - static const ::flatbuffers::TypeFunction type_refs[] = { - Flat::Bigfoot::InnerTableTypeTable, - Flat::Bigfoot::HardRefTypeTable, - Flat::Bigfoot::SoftRefTypeTable - }; - static const char * const names[] = { - "inner_table", - "asset_b_ref", - "asset_b_refs" - }; - static const ::flatbuffers::TypeTable tt = { - ::flatbuffers::ST_TABLE, 3, type_codes, type_refs, nullptr, nullptr, names - }; - return &tt; -} - inline const Flat::Bigfoot::AssetC *GetAssetC(const void *buf) { return ::flatbuffers::GetRoot(buf); } diff --git a/CMake/FindDependencies.cmake b/CMake/FindDependencies.cmake index b54e740..a344941 100644 --- a/CMake/FindDependencies.cmake +++ b/CMake/FindDependencies.cmake @@ -37,11 +37,11 @@ if(VULKAN) find_package(vulkan-memory-allocator REQUIRED) endif() -if(BUILD_TESTS OR SAMPLE_APP) - find_package(glfw3 REQUIRED) -endif() - if(BUILD_TESTS) find_package(GTest REQUIRED) find_package(pixelmatch-cpp17 REQUIRED) +endif() + +if(BUILD_BENCHMARKS) + find_package(benchmark REQUIRED) endif() \ No newline at end of file diff --git a/CMake/Utils.cmake b/CMake/Utils.cmake index 3908f2b..ac5863f 100644 --- a/CMake/Utils.cmake +++ b/CMake/Utils.cmake @@ -78,9 +78,7 @@ function(bigfoot_compile_flatbuffers BigfootDependencies) ${IncludeFlags} --keep-prefix --filename-ext "hpp" - --reflect-types --cpp-std c++17 - --reflect-names --gen-name-strings --gen-object-api --cpp-str-flex-ctor @@ -102,7 +100,7 @@ function(bigfoot_compile_flatbuffers BigfootDependencies) --output "${SOURCE_DIRECTORY}/${SOURCE_NAME_WE}.bfbs_generated.hpp" --arrayType eastl::array --arrayInclude - --namespace Bigfoot + --namespace Flat::Bigfoot ) endforeach() endfunction() diff --git a/CMakeLists.txt b/CMakeLists.txt index 7693d78..e2c8892 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,7 @@ get_property(IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) set(CMAKE_CONFIGURATION_TYPES "Release;RelWithDebInfo;Debug" CACHE STRING "" FORCE) option(BUILD_TESTS OFF) +option(BUILD_BENCHMARKS OFF) option(ASAN OFF) option(COVERAGE OFF) option(TRACY ON) diff --git a/conanfile.py b/conanfile.py index 8eb8b3c..076d948 100644 --- a/conanfile.py +++ b/conanfile.py @@ -21,6 +21,7 @@ class Bigfoot(ConanFile): "asan": [True, False], "coverage": [True, False], "build_tests": [True, False], + "build_benchmarks": [True, False], "tracy": [True, False], "vulkan": [True, False] } @@ -30,6 +31,7 @@ class Bigfoot(ConanFile): "asan": False, "coverage": False, "build_tests": False, + "build_benchmarks": False, "tracy": False, "vulkan": True, } @@ -61,40 +63,41 @@ class Bigfoot(ConanFile): def requirements(self): self.requires("eastl/3.27.01@bigfootdev/main", transitive_headers=True) self.requires("unordered_dense/4.8.1@bigfootdev/main", transitive_headers=True) - self.requires("mimalloc/3.3.1@bigfootdev/main", transitive_headers=True) + self.requires("mimalloc/3.3.2@bigfootdev/main", transitive_headers=True) self.requires("stduuid/1.2.3@bigfootdev/main", transitive_headers=True) - self.requires("sqlite3/3.51.2@bigfootdev/main", transitive_headers=True) + self.requires("sqlite3/3.53.1@bigfootdev/main", transitive_headers=True) self.requires("rapidhash/3.0@bigfootdev/main", transitive_headers=True) self.requires("effolkronium-random/1.5.0", transitive_headers=True) self.requires("flatbuffers/25.12.19-2026-02-06-03fffb2-bigfoot@bigfootdev/main", transitive_headers=True) if(self.settings.build_type == "RelWithDebInfo" or self.settings.build_type == "Debug"): - self.requires("quill/11.0.2", transitive_headers=True) + self.requires("quill/11.1.0", transitive_headers=True) if(self.options.tracy): self.requires("tracy/0.13.1", transitive_headers=True) - self.requires("glm/1.0.1", transitive_headers=True) + self.requires("glm/1.0.3@bigfootdev/main", transitive_headers=True) self.requires("lodepng/cci.20260210@bigfootdev/main", transitive_headers=True) - self.requires("imgui/1.92.6-docking@bigfootdev/main", transitive_headers=True) + self.requires("imgui/1.92.7-docking@bigfootdev/main", transitive_headers=True) if(self.options.vulkan): self.requires("vulkan-headers/1.4.341.0@bigfootdev/main", override=True) self.requires("vulkan-memory-allocator/3.3.0@bigfootdev/main") - if(self.options.build_tests): - self.requires("glfw/3.4") - if(self.options.build_tests): self.test_requires("gtest/1.17.0") self.test_requires("pixelmatch-cpp17/1.0.3@bigfootdev/main") + if(self.options.build_benchmarks): + self.requires("benchmark/1.9.5") + def generate(self): tc = CMakeToolchain(self) tc.variables["ASAN"] = self.options.asan tc.variables["COVERAGE"] = self.options.coverage tc.variables["BUILD_TESTS"] = self.options.build_tests + tc.variables["BUILD_BENCHMARKS"] = self.options.build_benchmarks tc.variables["TRACY"] = self.options.tracy tc.variables["VULKAN"] = self.options.vulkan diff --git a/generate_bigfoot.bat b/generate_bigfoot.bat index 7847c21..b397175 100644 --- a/generate_bigfoot.bat +++ b/generate_bigfoot.bat @@ -25,7 +25,7 @@ if errorlevel 1 ( ) REM ─── Shared flags ──────────────────────────────────────────────────────────── -set "conan_common=--remote=bigfootpackages -pr:h=./ConanProfiles/msvc -pr:b=./ConanProfiles/Tools/msvc -of build -o bigfoot/*:build_tests=True -o bigfoot/*:tracy=True -o bigfoot/*:vulkan=True" +set "conan_common=--remote=bigfootpackages -pr:h=./ConanProfiles/msvc -pr:b=./ConanProfiles/Tools/msvc -of build -o bigfoot/*:build_tests=True -o bigfoot/*:build_benchmarks=True -o bigfoot/*:tracy=True -o bigfoot/*:vulkan=True" REM ─── Install dependencies for each build type ──────────────────────────────── for %%C in (Release RelWithDebInfo Debug) do ( diff --git a/generate_bigfoot.sh b/generate_bigfoot.sh index 7054f1c..b64ab9e 100755 --- a/generate_bigfoot.sh +++ b/generate_bigfoot.sh @@ -57,6 +57,7 @@ conan_common=( -pr:b=./ConanProfiles/Tools/clang -of build -o "bigfoot/*:build_tests=True" + -o "bigfoot/*:build_benchmarks=True" -o "bigfoot/*:tracy=True" -o "bigfoot/*:vulkan=True" )