diff --git a/Bigfoot/Sources/Engine/Include/Engine/Asset/Asset.fbs b/Bigfoot/Sources/Engine/Include/Engine/Asset/Asset.fbs index 7a4e0d3..efeff7a 100644 --- a/Bigfoot/Sources/Engine/Include/Engine/Asset/Asset.fbs +++ b/Bigfoot/Sources/Engine/Include/Engine/Asset/Asset.fbs @@ -10,7 +10,6 @@ table AssetHeader name: string (required, id: 1); type_id: AssetTypeID (required, native_inline, id: 2); type_name: string (required, id: 3); - version: uint = 0 (id: 4); } table Asset diff --git a/Bigfoot/Sources/Engine/Include/Engine/Asset/Asset.hpp b/Bigfoot/Sources/Engine/Include/Engine/Asset/Asset.hpp index 42c0212..4d2f450 100644 --- a/Bigfoot/Sources/Engine/Include/Engine/Asset/Asset.hpp +++ b/Bigfoot/Sources/Engine/Include/Engine/Asset/Asset.hpp @@ -148,16 +148,6 @@ class Asset: public AssetBase m_header.name = p_name; } - /** - * Set the version of the asset - * - * \param p_name The version of the asset - */ - void SetVersion(const std::uint32_t p_version) - { - m_header.version = p_version; - } - /** * Get the asset * diff --git a/Bigfoot/Sources/Engine/Include/Engine/Asset/Asset_generated.hpp b/Bigfoot/Sources/Engine/Include/Engine/Asset/Asset_generated.hpp index 9431c76..d3ce995 100644 --- a/Bigfoot/Sources/Engine/Include/Engine/Asset/Asset_generated.hpp +++ b/Bigfoot/Sources/Engine/Include/Engine/Asset/Asset_generated.hpp @@ -53,7 +53,6 @@ struct AssetHeaderT : public ::flatbuffers::NativeTable { eastl::string name{}; ::Bigfoot::AssetTypeID type_id{}; eastl::string type_name{}; - uint32_t version = 0; }; struct AssetHeader FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { @@ -70,8 +69,7 @@ struct AssetHeader FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { VT_UUID = 4, VT_NAME = 6, VT_TYPE_ID = 8, - VT_TYPE_NAME = 10, - VT_VERSION = 12 + VT_TYPE_NAME = 10 }; const Flat::Bigfoot::UUID *uuid() const { return GetStruct(VT_UUID); @@ -85,9 +83,6 @@ struct AssetHeader FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { const ::flatbuffers::String *type_name() const { return GetPointer(VT_TYPE_NAME); } - uint32_t version() const { - return GetField(VT_VERSION, 0); - } template bool Verify(::flatbuffers::VerifierTemplate &verifier) const { return VerifyTableStart(verifier) && @@ -97,7 +92,6 @@ struct AssetHeader FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { VerifyFieldRequired(verifier, VT_TYPE_ID, 8) && VerifyOffsetRequired(verifier, VT_TYPE_NAME) && verifier.VerifyString(type_name()) && - VerifyField(verifier, VT_VERSION, 4) && verifier.EndTable(); } AssetHeaderT *UnPack(const ::flatbuffers::resolver_function_t *_resolver = nullptr) const; @@ -121,9 +115,6 @@ struct AssetHeaderBuilder { void add_type_name(::flatbuffers::Offset<::flatbuffers::String> type_name) { fbb_.AddOffset(AssetHeader::VT_TYPE_NAME, type_name); } - void add_version(uint32_t version) { - fbb_.AddElement(AssetHeader::VT_VERSION, version, 0); - } explicit AssetHeaderBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); @@ -144,10 +135,8 @@ inline ::flatbuffers::Offset CreateAssetHeader( const Flat::Bigfoot::UUID *uuid = nullptr, ::flatbuffers::Offset<::flatbuffers::String> name = 0, const Flat::Bigfoot::AssetTypeID *type_id = nullptr, - ::flatbuffers::Offset<::flatbuffers::String> type_name = 0, - uint32_t version = 0) { + ::flatbuffers::Offset<::flatbuffers::String> type_name = 0) { AssetHeaderBuilder builder_(_fbb); - builder_.add_version(version); builder_.add_type_name(type_name); builder_.add_type_id(type_id); builder_.add_name(name); @@ -262,7 +251,6 @@ inline void AssetHeader::UnPackTo(AssetHeaderT *_o, const ::flatbuffers::resolve { auto _e = name(); if (_e) _o->name = eastl::string(_e->c_str(), _e->size()); } { auto _e = type_id(); if (_e) _o->type_id = ::flatbuffers::UnPack(*_e); } { auto _e = type_name(); if (_e) _o->type_name = eastl::string(_e->c_str(), _e->size()); } - { auto _e = version(); _o->version = _e; } } inline ::flatbuffers::Offset CreateAssetHeader(::flatbuffers::FlatBufferBuilder &_fbb, const AssetHeaderT *_o, const ::flatbuffers::rehasher_function_t *_rehasher) { @@ -277,14 +265,12 @@ inline ::flatbuffers::Offset AssetHeader::Pack(::flatbuffers::FlatB auto _name = _fbb.CreateString(_o->name); auto _type_id = ::flatbuffers::Pack(_o->type_id); auto _type_name = _fbb.CreateString(_o->type_name); - auto _version = _o->version; return Flat::Bigfoot::CreateAssetHeader( _fbb, &_uuid, _name, &_type_id, - _type_name, - _version); + _type_name); } inline AssetT::AssetT(const AssetT &o) @@ -332,15 +318,14 @@ inline const ::flatbuffers::TypeTable *AssetHeaderTypeTable() { { ::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_STRING, 0, -1 } }; static const ::flatbuffers::TypeFunction type_refs[] = { Flat::Bigfoot::UUIDTypeTable, Flat::Bigfoot::AssetTypeIDTypeTable }; static const ::flatbuffers::TypeTable tt = { - ::flatbuffers::ST_TABLE, 5, type_codes, type_refs, nullptr, nullptr, nullptr + ::flatbuffers::ST_TABLE, 4, type_codes, type_refs, nullptr, nullptr, nullptr }; return &tt; } diff --git a/Bigfoot/Tests/Engine/Asset/Asset.cpp b/Bigfoot/Tests/Engine/Asset/Asset.cpp index c705fd6..e867aec 100644 --- a/Bigfoot/Tests/Engine/Asset/Asset.cpp +++ b/Bigfoot/Tests/Engine/Asset/Asset.cpp @@ -58,15 +58,6 @@ TEST_F(AssetFixture, SetName_ShouldSetTheName) /****************************************************************************************/ -TEST_F(AssetFixture, SetVersion_ShouldSetTheVersion) -{ - m_assetA.SetVersion(5); - - EXPECT_EQ(m_assetA.GetHeader().version, 5); -} - -/****************************************************************************************/ - TEST_F(AssetFixture, GetAsset_ShouldReturnAMutableReferenceToTheUnderlyingAsset) { m_assetA.GetAsset().health = 10; @@ -103,7 +94,6 @@ TEST_F(AssetFixture, GetTypeName_ShouldReturnTheFlatbufferFullyQualifiedName) TEST_F(AssetFixture, PackThenUnpack_ShouldRoundTripTheHeaderAndTheAsset) { m_assetA.SetName("MyAsset"); - m_assetA.SetVersion(3); m_assetA.GetAsset().health = 42; m_assetA.GetAsset().mana = 7; @@ -112,7 +102,6 @@ TEST_F(AssetFixture, PackThenUnpack_ShouldRoundTripTheHeaderAndTheAsset) EXPECT_EQ(unpacked.GetHeader().uuid, m_assetA.GetHeader().uuid); EXPECT_STREQ(unpacked.GetHeader().name.c_str(), m_assetA.GetHeader().name.c_str()); - EXPECT_EQ(unpacked.GetHeader().version, m_assetA.GetHeader().version); EXPECT_EQ(unpacked.GetHeader().type_id, m_assetA.GetHeader().type_id); EXPECT_STREQ(unpacked.GetHeader().type_name.c_str(), m_assetA.GetHeader().type_name.c_str()); EXPECT_EQ(unpacked.GetAsset().health, m_assetA.GetAsset().health);