From 931e128eb907e8c8647223c5298a0f505c723799 Mon Sep 17 00:00:00 2001 From: Jan Date: Sun, 8 Sep 2024 18:58:32 +0200 Subject: [PATCH] chore: add asset loaders for all asset types of t6 --- .../AssetLoaders/AssetLoaderAddonMapEnts.cpp | 13 +++ .../T6/AssetLoaders/AssetLoaderAddonMapEnts.h | 14 ++++ .../T6/AssetLoaders/AssetLoaderClipMap.cpp | 23 ++++++ .../Game/T6/AssetLoaders/AssetLoaderClipMap.h | 26 ++++++ .../T6/AssetLoaders/AssetLoaderComWorld.cpp | 13 +++ .../T6/AssetLoaders/AssetLoaderComWorld.h | 14 ++++ .../Game/T6/AssetLoaders/AssetLoaderDDL.cpp | 13 +++ .../Game/T6/AssetLoaders/AssetLoaderDDL.h | 14 ++++ .../AssetLoaderDestructibleDef.cpp | 13 +++ .../AssetLoaders/AssetLoaderDestructibleDef.h | 14 ++++ .../T6/AssetLoaders/AssetLoaderEmblemSet.cpp | 13 +++ .../T6/AssetLoaders/AssetLoaderEmblemSet.h | 14 ++++ .../Game/T6/AssetLoaders/AssetLoaderFont.cpp | 13 +++ .../Game/T6/AssetLoaders/AssetLoaderFont.h | 14 ++++ .../T6/AssetLoaders/AssetLoaderFontIcon.cpp | 7 +- .../AssetLoaderFootstepFxTable.cpp | 13 +++ .../AssetLoaders/AssetLoaderFootstepFxTable.h | 14 ++++ .../AssetLoaders/AssetLoaderFootstepTable.cpp | 13 +++ .../AssetLoaders/AssetLoaderFootstepTable.h | 14 ++++ .../Game/T6/AssetLoaders/AssetLoaderFx.cpp | 13 +++ .../Game/T6/AssetLoaders/AssetLoaderFx.h | 14 ++++ .../AssetLoaders/AssetLoaderGameWorldMp.cpp | 13 +++ .../T6/AssetLoaders/AssetLoaderGameWorldMp.h | 14 ++++ .../AssetLoaders/AssetLoaderGameWorldSp.cpp | 13 +++ .../T6/AssetLoaders/AssetLoaderGameWorldSp.h | 14 ++++ .../T6/AssetLoaders/AssetLoaderGfxImage.cpp | 7 +- .../AssetLoaders/AssetLoaderGfxLightDef.cpp | 13 +++ .../T6/AssetLoaders/AssetLoaderGfxLightDef.h | 14 ++++ .../T6/AssetLoaders/AssetLoaderGfxWorld.cpp | 13 +++ .../T6/AssetLoaders/AssetLoaderGfxWorld.h | 14 ++++ .../T6/AssetLoaders/AssetLoaderGlasses.cpp | 13 +++ .../Game/T6/AssetLoaders/AssetLoaderGlasses.h | 14 ++++ .../T6/AssetLoaders/AssetLoaderImpactFx.cpp | 13 +++ .../T6/AssetLoaders/AssetLoaderImpactFx.h | 14 ++++ .../AssetLoaders/AssetLoaderLeaderboard.cpp | 7 +- .../T6/AssetLoaders/AssetLoaderMapEnts.cpp | 13 +++ .../Game/T6/AssetLoaders/AssetLoaderMapEnts.h | 14 ++++ .../T6/AssetLoaders/AssetLoaderMaterial.cpp | 8 +- .../AssetLoaders/AssetLoaderMemoryBlock.cpp | 13 +++ .../T6/AssetLoaders/AssetLoaderMemoryBlock.h | 14 ++++ .../Game/T6/AssetLoaders/AssetLoaderMenu.cpp | 13 +++ .../Game/T6/AssetLoaders/AssetLoaderMenu.h | 14 ++++ .../T6/AssetLoaders/AssetLoaderMenuList.cpp | 13 +++ .../T6/AssetLoaders/AssetLoaderMenuList.h | 14 ++++ .../AssetLoaderPhysConstraints.cpp | 7 +- .../T6/AssetLoaders/AssetLoaderPhysPreset.cpp | 7 +- .../Game/T6/AssetLoaders/AssetLoaderQdb.cpp | 7 +- .../T6/AssetLoaders/AssetLoaderRawFile.cpp | 7 +- .../AssetLoaderScriptParseTree.cpp | 7 +- .../AssetLoaders/AssetLoaderSkinnedVerts.cpp | 13 +++ .../T6/AssetLoaders/AssetLoaderSkinnedVerts.h | 14 ++++ .../Game/T6/AssetLoaders/AssetLoaderSlug.cpp | 7 +- .../T6/AssetLoaders/AssetLoaderSoundBank.cpp | 7 +- .../AssetLoaderSoundDriverGlobals.cpp | 13 +++ .../AssetLoaderSoundDriverGlobals.h | 14 ++++ .../T6/AssetLoaders/AssetLoaderSoundPatch.cpp | 13 +++ .../T6/AssetLoaders/AssetLoaderSoundPatch.h | 14 ++++ .../AssetLoaders/AssetLoaderStringTable.cpp | 7 +- .../AssetLoaders/AssetLoaderTechniqueSet.cpp | 13 +++ .../T6/AssetLoaders/AssetLoaderTechniqueSet.h | 14 ++++ .../T6/AssetLoaders/AssetLoaderTracer.cpp | 7 +- .../T6/AssetLoaders/AssetLoaderVehicle.cpp | 7 +- .../T6/AssetLoaders/AssetLoaderWeapon.cpp | 3 +- .../AssetLoaderWeaponAttachment.cpp | 3 +- .../AssetLoaderWeaponAttachmentUnique.cpp | 3 +- .../T6/AssetLoaders/AssetLoaderWeaponCamo.cpp | 8 +- .../Game/T6/AssetLoaders/AssetLoaderXAnim.cpp | 13 +++ .../Game/T6/AssetLoaders/AssetLoaderXAnim.h | 14 ++++ .../T6/AssetLoaders/AssetLoaderXGlobals.cpp | 13 +++ .../T6/AssetLoaders/AssetLoaderXGlobals.h | 14 ++++ .../T6/AssetLoaders/AssetLoaderXModel.cpp | 8 +- .../T6/AssetLoaders/AssetLoaderZBarrier.cpp | 3 +- src/ObjLoading/Game/T6/ObjLoaderT6.cpp | 80 ++++++++++++------- 73 files changed, 829 insertions(+), 102 deletions(-) create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderAddonMapEnts.cpp create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderAddonMapEnts.h create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderClipMap.cpp create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderClipMap.h create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderComWorld.cpp create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderComWorld.h create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderDDL.cpp create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderDDL.h create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderDestructibleDef.cpp create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderDestructibleDef.h create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderEmblemSet.cpp create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderEmblemSet.h create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFont.cpp create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFont.h create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFootstepFxTable.cpp create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFootstepFxTable.h create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFootstepTable.cpp create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFootstepTable.h create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFx.cpp create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFx.h create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGameWorldMp.cpp create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGameWorldMp.h create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGameWorldSp.cpp create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGameWorldSp.h create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGfxLightDef.cpp create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGfxLightDef.h create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGfxWorld.cpp create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGfxWorld.h create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGlasses.cpp create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGlasses.h create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderImpactFx.cpp create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderImpactFx.h create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderMapEnts.cpp create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderMapEnts.h create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderMemoryBlock.cpp create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderMemoryBlock.h create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderMenu.cpp create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderMenu.h create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderMenuList.cpp create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderMenuList.h create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSkinnedVerts.cpp create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSkinnedVerts.h create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundDriverGlobals.cpp create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundDriverGlobals.h create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundPatch.cpp create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundPatch.h create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderTechniqueSet.cpp create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderTechniqueSet.h create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderXAnim.cpp create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderXAnim.h create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderXGlobals.cpp create mode 100644 src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderXGlobals.h diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderAddonMapEnts.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderAddonMapEnts.cpp new file mode 100644 index 00000000..cb51edca --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderAddonMapEnts.cpp @@ -0,0 +1,13 @@ +#include "AssetLoaderAddonMapEnts.h" + +#include "Game/T6/T6.h" +#include "ObjLoading.h" + +using namespace T6; + +void* AssetLoaderAddonMapEnts::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) +{ + auto* asset = memory->Alloc(); + asset->name = memory->Dup(assetName.c_str()); + return asset; +} diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderAddonMapEnts.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderAddonMapEnts.h new file mode 100644 index 00000000..1f7f0ae9 --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderAddonMapEnts.h @@ -0,0 +1,14 @@ +#pragma once + +#include "AssetLoading/BasicAssetLoader.h" +#include "Game/T6/T6.h" +#include "SearchPath/ISearchPath.h" + +namespace T6 +{ + class AssetLoaderAddonMapEnts final : public BasicAssetLoader + { + public: + _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override; + }; +} // namespace T6 diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderClipMap.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderClipMap.cpp new file mode 100644 index 00000000..16d161e3 --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderClipMap.cpp @@ -0,0 +1,23 @@ +#include "AssetLoaderClipMap.h" + +#include "Game/T6/T6.h" +#include "ObjLoading.h" + +using namespace T6; + +void* AssetLoaderClipMapBase::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) +{ + auto* asset = memory->Alloc(); + asset->name = memory->Dup(assetName.c_str()); + return asset; +} + +asset_type_t AssetLoaderClipMap::GetHandlingAssetType() const +{ + return ASSET_TYPE_CLIPMAP; +} + +asset_type_t AssetLoaderClipMapPvs::GetHandlingAssetType() const +{ + return ASSET_TYPE_CLIPMAP_PVS; +} diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderClipMap.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderClipMap.h new file mode 100644 index 00000000..fbe0145b --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderClipMap.h @@ -0,0 +1,26 @@ +#pragma once + +#include "AssetLoading/BasicAssetLoader.h" +#include "Game/T6/T6.h" +#include "SearchPath/ISearchPath.h" + +namespace T6 +{ + class AssetLoaderClipMapBase : public BasicAssetLoaderWithoutType + { + public: + _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override; + }; + + class AssetLoaderClipMap final : public AssetLoaderClipMapBase + { + public: + [[nodiscard]] asset_type_t GetHandlingAssetType() const override; + }; + + class AssetLoaderClipMapPvs final : public AssetLoaderClipMapBase + { + public: + [[nodiscard]] asset_type_t GetHandlingAssetType() const override; + }; +} // namespace T6 diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderComWorld.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderComWorld.cpp new file mode 100644 index 00000000..db595fa5 --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderComWorld.cpp @@ -0,0 +1,13 @@ +#include "AssetLoaderComWorld.h" + +#include "Game/T6/T6.h" +#include "ObjLoading.h" + +using namespace T6; + +void* AssetLoaderComWorld::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) +{ + auto* asset = memory->Alloc(); + asset->name = memory->Dup(assetName.c_str()); + return asset; +} diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderComWorld.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderComWorld.h new file mode 100644 index 00000000..7a8879b0 --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderComWorld.h @@ -0,0 +1,14 @@ +#pragma once + +#include "AssetLoading/BasicAssetLoader.h" +#include "Game/T6/T6.h" +#include "SearchPath/ISearchPath.h" + +namespace T6 +{ + class AssetLoaderComWorld final : public BasicAssetLoader + { + public: + _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override; + }; +} // namespace T6 diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderDDL.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderDDL.cpp new file mode 100644 index 00000000..9dfe415a --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderDDL.cpp @@ -0,0 +1,13 @@ +#include "AssetLoaderDDL.h" + +#include "Game/T6/T6.h" +#include "ObjLoading.h" + +using namespace T6; + +void* AssetLoaderDDL::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) +{ + auto* asset = memory->Alloc(); + asset->name = memory->Dup(assetName.c_str()); + return asset; +} diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderDDL.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderDDL.h new file mode 100644 index 00000000..fa63756a --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderDDL.h @@ -0,0 +1,14 @@ +#pragma once + +#include "AssetLoading/BasicAssetLoader.h" +#include "Game/T6/T6.h" +#include "SearchPath/ISearchPath.h" + +namespace T6 +{ + class AssetLoaderDDL final : public BasicAssetLoader + { + public: + _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override; + }; +} // namespace T6 diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderDestructibleDef.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderDestructibleDef.cpp new file mode 100644 index 00000000..95162e2e --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderDestructibleDef.cpp @@ -0,0 +1,13 @@ +#include "AssetLoaderDestructibleDef.h" + +#include "Game/T6/T6.h" +#include "ObjLoading.h" + +using namespace T6; + +void* AssetLoaderDestructibleDef::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) +{ + auto* asset = memory->Alloc(); + asset->name = memory->Dup(assetName.c_str()); + return asset; +} diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderDestructibleDef.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderDestructibleDef.h new file mode 100644 index 00000000..67bc6e10 --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderDestructibleDef.h @@ -0,0 +1,14 @@ +#pragma once + +#include "AssetLoading/BasicAssetLoader.h" +#include "Game/T6/T6.h" +#include "SearchPath/ISearchPath.h" + +namespace T6 +{ + class AssetLoaderDestructibleDef final : public BasicAssetLoader + { + public: + _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override; + }; +} // namespace T6 diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderEmblemSet.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderEmblemSet.cpp new file mode 100644 index 00000000..a6c99892 --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderEmblemSet.cpp @@ -0,0 +1,13 @@ +#include "AssetLoaderEmblemSet.h" + +#include "Game/T6/T6.h" +#include "ObjLoading.h" + +using namespace T6; + +void* AssetLoaderEmblemSet::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) +{ + // Asset does not have a name + // So this cannot be an asset reference + return nullptr; +} diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderEmblemSet.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderEmblemSet.h new file mode 100644 index 00000000..e28fd74b --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderEmblemSet.h @@ -0,0 +1,14 @@ +#pragma once + +#include "AssetLoading/BasicAssetLoader.h" +#include "Game/T6/T6.h" +#include "SearchPath/ISearchPath.h" + +namespace T6 +{ + class AssetLoaderEmblemSet final : public BasicAssetLoader + { + public: + _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override; + }; +} // namespace T6 diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFont.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFont.cpp new file mode 100644 index 00000000..af8fd342 --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFont.cpp @@ -0,0 +1,13 @@ +#include "AssetLoaderFont.h" + +#include "Game/T6/T6.h" +#include "ObjLoading.h" + +using namespace T6; + +void* AssetLoaderFont::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) +{ + auto* asset = memory->Alloc(); + asset->fontName = memory->Dup(assetName.c_str()); + return asset; +} diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFont.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFont.h new file mode 100644 index 00000000..50826ebd --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFont.h @@ -0,0 +1,14 @@ +#pragma once + +#include "AssetLoading/BasicAssetLoader.h" +#include "Game/T6/T6.h" +#include "SearchPath/ISearchPath.h" + +namespace T6 +{ + class AssetLoaderFont final : public BasicAssetLoader + { + public: + _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override; + }; +} // namespace T6 diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFontIcon.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFontIcon.cpp index b355051f..e89d739c 100644 --- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFontIcon.cpp +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFontIcon.cpp @@ -13,10 +13,9 @@ using namespace T6; void* AssetLoaderFontIcon::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) { - auto* fontIcon = memory->Create(); - memset(fontIcon, 0, sizeof(FontIcon)); - fontIcon->name = memory->Dup(assetName.c_str()); - return fontIcon; + auto* asset = memory->Alloc(); + asset->name = memory->Dup(assetName.c_str()); + return asset; } bool AssetLoaderFontIcon::CanLoadFromRaw() const diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFootstepFxTable.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFootstepFxTable.cpp new file mode 100644 index 00000000..e2ca8f02 --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFootstepFxTable.cpp @@ -0,0 +1,13 @@ +#include "AssetLoaderFootstepFxTable.h" + +#include "Game/T6/T6.h" +#include "ObjLoading.h" + +using namespace T6; + +void* AssetLoaderFootstepFxTable::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) +{ + auto* asset = memory->Alloc(); + asset->name = memory->Dup(assetName.c_str()); + return asset; +} diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFootstepFxTable.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFootstepFxTable.h new file mode 100644 index 00000000..141ddf9c --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFootstepFxTable.h @@ -0,0 +1,14 @@ +#pragma once + +#include "AssetLoading/BasicAssetLoader.h" +#include "Game/T6/T6.h" +#include "SearchPath/ISearchPath.h" + +namespace T6 +{ + class AssetLoaderFootstepFxTable final : public BasicAssetLoader + { + public: + _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override; + }; +} // namespace T6 diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFootstepTable.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFootstepTable.cpp new file mode 100644 index 00000000..8dcd8534 --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFootstepTable.cpp @@ -0,0 +1,13 @@ +#include "AssetLoaderFootstepTable.h" + +#include "Game/T6/T6.h" +#include "ObjLoading.h" + +using namespace T6; + +void* AssetLoaderFootstepTable::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) +{ + auto* asset = memory->Alloc(); + asset->name = memory->Dup(assetName.c_str()); + return asset; +} diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFootstepTable.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFootstepTable.h new file mode 100644 index 00000000..66c00426 --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFootstepTable.h @@ -0,0 +1,14 @@ +#pragma once + +#include "AssetLoading/BasicAssetLoader.h" +#include "Game/T6/T6.h" +#include "SearchPath/ISearchPath.h" + +namespace T6 +{ + class AssetLoaderFootstepTable final : public BasicAssetLoader + { + public: + _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override; + }; +} // namespace T6 diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFx.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFx.cpp new file mode 100644 index 00000000..b20d5d6e --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFx.cpp @@ -0,0 +1,13 @@ +#include "AssetLoaderFx.h" + +#include "Game/T6/T6.h" +#include "ObjLoading.h" + +using namespace T6; + +void* AssetLoaderFx::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) +{ + auto* asset = memory->Alloc(); + asset->name = memory->Dup(assetName.c_str()); + return asset; +} diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFx.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFx.h new file mode 100644 index 00000000..ba190b4a --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFx.h @@ -0,0 +1,14 @@ +#pragma once + +#include "AssetLoading/BasicAssetLoader.h" +#include "Game/T6/T6.h" +#include "SearchPath/ISearchPath.h" + +namespace T6 +{ + class AssetLoaderFx final : public BasicAssetLoader + { + public: + _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override; + }; +} // namespace T6 diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGameWorldMp.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGameWorldMp.cpp new file mode 100644 index 00000000..a09751f9 --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGameWorldMp.cpp @@ -0,0 +1,13 @@ +#include "AssetLoaderGameWorldMp.h" + +#include "Game/T6/T6.h" +#include "ObjLoading.h" + +using namespace T6; + +void* AssetLoaderGameWorldMp::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) +{ + auto* asset = memory->Alloc(); + asset->name = memory->Dup(assetName.c_str()); + return asset; +} diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGameWorldMp.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGameWorldMp.h new file mode 100644 index 00000000..092ea981 --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGameWorldMp.h @@ -0,0 +1,14 @@ +#pragma once + +#include "AssetLoading/BasicAssetLoader.h" +#include "Game/T6/T6.h" +#include "SearchPath/ISearchPath.h" + +namespace T6 +{ + class AssetLoaderGameWorldMp final : public BasicAssetLoader + { + public: + _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override; + }; +} // namespace T6 diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGameWorldSp.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGameWorldSp.cpp new file mode 100644 index 00000000..f69f7bbe --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGameWorldSp.cpp @@ -0,0 +1,13 @@ +#include "AssetLoaderGameWorldSp.h" + +#include "Game/T6/T6.h" +#include "ObjLoading.h" + +using namespace T6; + +void* AssetLoaderGameWorldSp::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) +{ + auto* asset = memory->Alloc(); + asset->name = memory->Dup(assetName.c_str()); + return asset; +} diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGameWorldSp.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGameWorldSp.h new file mode 100644 index 00000000..bfd3ac1b --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGameWorldSp.h @@ -0,0 +1,14 @@ +#pragma once + +#include "AssetLoading/BasicAssetLoader.h" +#include "Game/T6/T6.h" +#include "SearchPath/ISearchPath.h" + +namespace T6 +{ + class AssetLoaderGameWorldSp final : public BasicAssetLoader + { + public: + _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override; + }; +} // namespace T6 diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGfxImage.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGfxImage.cpp index 746da931..dbd7e3ff 100644 --- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGfxImage.cpp +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGfxImage.cpp @@ -14,10 +14,9 @@ using namespace T6; void* AssetLoaderGfxImage::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) { - auto* image = memory->Create(); - memset(image, 0, sizeof(GfxImage)); - image->name = memory->Dup(assetName.c_str()); - return image; + auto* asset = memory->Alloc(); + asset->name = memory->Dup(assetName.c_str()); + return asset; } bool AssetLoaderGfxImage::CanLoadFromRaw() const diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGfxLightDef.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGfxLightDef.cpp new file mode 100644 index 00000000..a46bef80 --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGfxLightDef.cpp @@ -0,0 +1,13 @@ +#include "AssetLoaderGfxLightDef.h" + +#include "Game/T6/T6.h" +#include "ObjLoading.h" + +using namespace T6; + +void* AssetLoaderGfxLightDef::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) +{ + auto* asset = memory->Alloc(); + asset->name = memory->Dup(assetName.c_str()); + return asset; +} diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGfxLightDef.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGfxLightDef.h new file mode 100644 index 00000000..dd8c88c3 --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGfxLightDef.h @@ -0,0 +1,14 @@ +#pragma once + +#include "AssetLoading/BasicAssetLoader.h" +#include "Game/T6/T6.h" +#include "SearchPath/ISearchPath.h" + +namespace T6 +{ + class AssetLoaderGfxLightDef final : public BasicAssetLoader + { + public: + _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override; + }; +} // namespace T6 diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGfxWorld.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGfxWorld.cpp new file mode 100644 index 00000000..6243579b --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGfxWorld.cpp @@ -0,0 +1,13 @@ +#include "AssetLoaderGfxWorld.h" + +#include "Game/T6/T6.h" +#include "ObjLoading.h" + +using namespace T6; + +void* AssetLoaderGfxWorld::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) +{ + auto* asset = memory->Alloc(); + asset->name = memory->Dup(assetName.c_str()); + return asset; +} diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGfxWorld.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGfxWorld.h new file mode 100644 index 00000000..3653ff15 --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGfxWorld.h @@ -0,0 +1,14 @@ +#pragma once + +#include "AssetLoading/BasicAssetLoader.h" +#include "Game/T6/T6.h" +#include "SearchPath/ISearchPath.h" + +namespace T6 +{ + class AssetLoaderGfxWorld final : public BasicAssetLoader + { + public: + _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override; + }; +} // namespace T6 diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGlasses.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGlasses.cpp new file mode 100644 index 00000000..dd1e5ef5 --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGlasses.cpp @@ -0,0 +1,13 @@ +#include "AssetLoaderGlasses.h" + +#include "Game/T6/T6.h" +#include "ObjLoading.h" + +using namespace T6; + +void* AssetLoaderGlasses::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) +{ + auto* asset = memory->Alloc(); + asset->name = memory->Dup(assetName.c_str()); + return asset; +} diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGlasses.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGlasses.h new file mode 100644 index 00000000..c8deb7e4 --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGlasses.h @@ -0,0 +1,14 @@ +#pragma once + +#include "AssetLoading/BasicAssetLoader.h" +#include "Game/T6/T6.h" +#include "SearchPath/ISearchPath.h" + +namespace T6 +{ + class AssetLoaderGlasses final : public BasicAssetLoader + { + public: + _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override; + }; +} // namespace T6 diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderImpactFx.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderImpactFx.cpp new file mode 100644 index 00000000..e9478c0f --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderImpactFx.cpp @@ -0,0 +1,13 @@ +#include "AssetLoaderImpactFx.h" + +#include "Game/T6/T6.h" +#include "ObjLoading.h" + +using namespace T6; + +void* AssetLoaderImpactFx::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) +{ + auto* asset = memory->Alloc(); + asset->name = memory->Dup(assetName.c_str()); + return asset; +} diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderImpactFx.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderImpactFx.h new file mode 100644 index 00000000..779ee741 --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderImpactFx.h @@ -0,0 +1,14 @@ +#pragma once + +#include "AssetLoading/BasicAssetLoader.h" +#include "Game/T6/T6.h" +#include "SearchPath/ISearchPath.h" + +namespace T6 +{ + class AssetLoaderImpactFx final : public BasicAssetLoader + { + public: + _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override; + }; +} // namespace T6 diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderLeaderboard.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderLeaderboard.cpp index 1cb993c7..8db736f2 100644 --- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderLeaderboard.cpp +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderLeaderboard.cpp @@ -13,10 +13,9 @@ using namespace T6; void* AssetLoaderLeaderboard::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) { - auto* leaderboard = memory->Create(); - memset(leaderboard, 0, sizeof(LeaderboardDef)); - leaderboard->name = memory->Dup(assetName.c_str()); - return leaderboard; + auto* asset = memory->Alloc(); + asset->name = memory->Dup(assetName.c_str()); + return asset; } bool AssetLoaderLeaderboard::CanLoadFromRaw() const diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderMapEnts.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderMapEnts.cpp new file mode 100644 index 00000000..ed2c3a2f --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderMapEnts.cpp @@ -0,0 +1,13 @@ +#include "AssetLoaderMapEnts.h" + +#include "Game/T6/T6.h" +#include "ObjLoading.h" + +using namespace T6; + +void* AssetLoaderMapEnts::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) +{ + auto* asset = memory->Alloc(); + asset->name = memory->Dup(assetName.c_str()); + return asset; +} diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderMapEnts.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderMapEnts.h new file mode 100644 index 00000000..59ce1a65 --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderMapEnts.h @@ -0,0 +1,14 @@ +#pragma once + +#include "AssetLoading/BasicAssetLoader.h" +#include "Game/T6/T6.h" +#include "SearchPath/ISearchPath.h" + +namespace T6 +{ + class AssetLoaderMapEnts final : public BasicAssetLoader + { + public: + _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override; + }; +} // namespace T6 diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderMaterial.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderMaterial.cpp index 85e44d9f..8bfbe12b 100644 --- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderMaterial.cpp +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderMaterial.cpp @@ -12,11 +12,9 @@ using namespace T6; void* AssetLoaderMaterial::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) { - auto* material = memory->Create(); - memset(material, 0, sizeof(Material)); - material->info.name = memory->Dup(assetName.c_str()); - - return material; + auto* asset = memory->Alloc(); + asset->info.name = memory->Dup(assetName.c_str()); + return asset; } bool AssetLoaderMaterial::CanLoadFromRaw() const diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderMemoryBlock.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderMemoryBlock.cpp new file mode 100644 index 00000000..c07acc51 --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderMemoryBlock.cpp @@ -0,0 +1,13 @@ +#include "AssetLoaderMemoryBlock.h" + +#include "Game/T6/T6.h" +#include "ObjLoading.h" + +using namespace T6; + +void* AssetLoaderMemoryBlock::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) +{ + auto* asset = memory->Alloc(); + asset->name = memory->Dup(assetName.c_str()); + return asset; +} diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderMemoryBlock.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderMemoryBlock.h new file mode 100644 index 00000000..055703ce --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderMemoryBlock.h @@ -0,0 +1,14 @@ +#pragma once + +#include "AssetLoading/BasicAssetLoader.h" +#include "Game/T6/T6.h" +#include "SearchPath/ISearchPath.h" + +namespace T6 +{ + class AssetLoaderMemoryBlock final : public BasicAssetLoader + { + public: + _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override; + }; +} // namespace T6 diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderMenu.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderMenu.cpp new file mode 100644 index 00000000..dd90466e --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderMenu.cpp @@ -0,0 +1,13 @@ +#include "AssetLoaderMenu.h" + +#include "Game/T6/T6.h" +#include "ObjLoading.h" + +using namespace T6; + +void* AssetLoaderMenu::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) +{ + auto* asset = memory->Alloc(); + asset->window.name = memory->Dup(assetName.c_str()); + return asset; +} diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderMenu.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderMenu.h new file mode 100644 index 00000000..372b1de7 --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderMenu.h @@ -0,0 +1,14 @@ +#pragma once + +#include "AssetLoading/BasicAssetLoader.h" +#include "Game/T6/T6.h" +#include "SearchPath/ISearchPath.h" + +namespace T6 +{ + class AssetLoaderMenu final : public BasicAssetLoader + { + public: + _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override; + }; +} // namespace T6 diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderMenuList.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderMenuList.cpp new file mode 100644 index 00000000..71f1bdd3 --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderMenuList.cpp @@ -0,0 +1,13 @@ +#include "AssetLoaderMenuList.h" + +#include "Game/T6/T6.h" +#include "ObjLoading.h" + +using namespace T6; + +void* AssetLoaderMenuList::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) +{ + auto* asset = memory->Alloc(); + asset->name = memory->Dup(assetName.c_str()); + return asset; +} diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderMenuList.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderMenuList.h new file mode 100644 index 00000000..a786e7a2 --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderMenuList.h @@ -0,0 +1,14 @@ +#pragma once + +#include "AssetLoading/BasicAssetLoader.h" +#include "Game/T6/T6.h" +#include "SearchPath/ISearchPath.h" + +namespace T6 +{ + class AssetLoaderMenuList final : public BasicAssetLoader + { + public: + _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override; + }; +} // namespace T6 diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderPhysConstraints.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderPhysConstraints.cpp index d707d037..22433770 100644 --- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderPhysConstraints.cpp +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderPhysConstraints.cpp @@ -102,10 +102,9 @@ bool AssetLoaderPhysConstraints::LoadFromInfoString( void* AssetLoaderPhysConstraints::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) { - auto* physConstraints = memory->Create(); - memset(physConstraints, 0, sizeof(PhysConstraints)); - physConstraints->name = memory->Dup(assetName.c_str()); - return physConstraints; + auto* asset = memory->Alloc(); + asset->name = memory->Dup(assetName.c_str()); + return asset; } bool AssetLoaderPhysConstraints::CanLoadFromGdt() const diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderPhysPreset.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderPhysPreset.cpp index eac11ae8..e5fb21a1 100644 --- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderPhysPreset.cpp +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderPhysPreset.cpp @@ -85,10 +85,9 @@ bool AssetLoaderPhysPreset::LoadFromInfoString( void* AssetLoaderPhysPreset::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) { - auto* physPreset = memory->Create(); - memset(physPreset, 0, sizeof(PhysPreset)); - physPreset->name = memory->Dup(assetName.c_str()); - return physPreset; + auto* asset = memory->Alloc(); + asset->name = memory->Dup(assetName.c_str()); + return asset; } bool AssetLoaderPhysPreset::CanLoadFromGdt() const diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderQdb.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderQdb.cpp index 4366f1d5..514878ff 100644 --- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderQdb.cpp +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderQdb.cpp @@ -9,10 +9,9 @@ using namespace T6; void* AssetLoaderQdb::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) { - auto* qdb = memory->Create(); - memset(qdb, 0, sizeof(Qdb)); - qdb->name = memory->Dup(assetName.c_str()); - return qdb; + auto* asset = memory->Alloc(); + asset->name = memory->Dup(assetName.c_str()); + return asset; } bool AssetLoaderQdb::CanLoadFromRaw() const diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderRawFile.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderRawFile.cpp index 6e652691..f279574a 100644 --- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderRawFile.cpp +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderRawFile.cpp @@ -15,10 +15,9 @@ namespace fs = std::filesystem; void* AssetLoaderRawFile::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) { - auto* rawFile = memory->Create(); - memset(rawFile, 0, sizeof(RawFile)); - rawFile->name = memory->Dup(assetName.c_str()); - return rawFile; + auto* asset = memory->Alloc(); + asset->name = memory->Dup(assetName.c_str()); + return asset; } bool AssetLoaderRawFile::CanLoadFromRaw() const diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderScriptParseTree.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderScriptParseTree.cpp index 822567c6..c2ed0069 100644 --- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderScriptParseTree.cpp +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderScriptParseTree.cpp @@ -9,10 +9,9 @@ using namespace T6; void* AssetLoaderScriptParseTree::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) { - auto* scriptParseTree = memory->Create(); - memset(scriptParseTree, 0, sizeof(ScriptParseTree)); - scriptParseTree->name = memory->Dup(assetName.c_str()); - return scriptParseTree; + auto* asset = memory->Alloc(); + asset->name = memory->Dup(assetName.c_str()); + return asset; } bool AssetLoaderScriptParseTree::CanLoadFromRaw() const diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSkinnedVerts.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSkinnedVerts.cpp new file mode 100644 index 00000000..89565253 --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSkinnedVerts.cpp @@ -0,0 +1,13 @@ +#include "AssetLoaderSkinnedVerts.h" + +#include "Game/T6/T6.h" +#include "ObjLoading.h" + +using namespace T6; + +void* AssetLoaderSkinnedVerts::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) +{ + auto* asset = memory->Alloc(); + asset->name = memory->Dup(assetName.c_str()); + return asset; +} diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSkinnedVerts.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSkinnedVerts.h new file mode 100644 index 00000000..2d96097c --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSkinnedVerts.h @@ -0,0 +1,14 @@ +#pragma once + +#include "AssetLoading/BasicAssetLoader.h" +#include "Game/T6/T6.h" +#include "SearchPath/ISearchPath.h" + +namespace T6 +{ + class AssetLoaderSkinnedVerts final : public BasicAssetLoader + { + public: + _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override; + }; +} // namespace T6 diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSlug.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSlug.cpp index 5a6dac42..49f6a8d6 100644 --- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSlug.cpp +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSlug.cpp @@ -9,10 +9,9 @@ using namespace T6; void* AssetLoaderSlug::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) { - auto* slug = memory->Create(); - memset(slug, 0, sizeof(Slug)); - slug->name = memory->Dup(assetName.c_str()); - return slug; + auto* asset = memory->Alloc(); + asset->name = memory->Dup(assetName.c_str()); + return asset; } bool AssetLoaderSlug::CanLoadFromRaw() const diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundBank.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundBank.cpp index ad5c4cc8..8269dc81 100644 --- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundBank.cpp +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundBank.cpp @@ -62,10 +62,9 @@ namespace void* AssetLoaderSoundBank::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) { - auto* soundBank = memory->Create(); - memset(soundBank, 0, sizeof(SndBank)); - soundBank->name = memory->Dup(assetName.c_str()); - return soundBank; + auto* asset = memory->Alloc(); + asset->name = memory->Dup(assetName.c_str()); + return asset; } bool AssetLoaderSoundBank::CanLoadFromRaw() const diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundDriverGlobals.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundDriverGlobals.cpp new file mode 100644 index 00000000..ff897a85 --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundDriverGlobals.cpp @@ -0,0 +1,13 @@ +#include "AssetLoaderSoundDriverGlobals.h" + +#include "Game/T6/T6.h" +#include "ObjLoading.h" + +using namespace T6; + +void* AssetLoaderSoundDriverGlobals::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) +{ + auto* asset = memory->Alloc(); + asset->name = memory->Dup(assetName.c_str()); + return asset; +} diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundDriverGlobals.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundDriverGlobals.h new file mode 100644 index 00000000..de2863c9 --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundDriverGlobals.h @@ -0,0 +1,14 @@ +#pragma once + +#include "AssetLoading/BasicAssetLoader.h" +#include "Game/T6/T6.h" +#include "SearchPath/ISearchPath.h" + +namespace T6 +{ + class AssetLoaderSoundDriverGlobals final : public BasicAssetLoader + { + public: + _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override; + }; +} // namespace T6 diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundPatch.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundPatch.cpp new file mode 100644 index 00000000..9594fc40 --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundPatch.cpp @@ -0,0 +1,13 @@ +#include "AssetLoaderSoundPatch.h" + +#include "Game/T6/T6.h" +#include "ObjLoading.h" + +using namespace T6; + +void* AssetLoaderSoundPatch::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) +{ + auto* asset = memory->Alloc(); + asset->name = memory->Dup(assetName.c_str()); + return asset; +} diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundPatch.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundPatch.h new file mode 100644 index 00000000..02db1c40 --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundPatch.h @@ -0,0 +1,14 @@ +#pragma once + +#include "AssetLoading/BasicAssetLoader.h" +#include "Game/T6/T6.h" +#include "SearchPath/ISearchPath.h" + +namespace T6 +{ + class AssetLoaderSoundPatch final : public BasicAssetLoader + { + public: + _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override; + }; +} // namespace T6 diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderStringTable.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderStringTable.cpp index 5c4283f8..e4a0321d 100644 --- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderStringTable.cpp +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderStringTable.cpp @@ -12,10 +12,9 @@ using namespace T6; void* AssetLoaderStringTable::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) { - auto* stringTable = memory->Create(); - memset(stringTable, 0, sizeof(StringTable)); - stringTable->name = memory->Dup(assetName.c_str()); - return stringTable; + auto* asset = memory->Alloc(); + asset->name = memory->Dup(assetName.c_str()); + return asset; } bool AssetLoaderStringTable::CanLoadFromRaw() const diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderTechniqueSet.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderTechniqueSet.cpp new file mode 100644 index 00000000..bf4bf380 --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderTechniqueSet.cpp @@ -0,0 +1,13 @@ +#include "AssetLoaderTechniqueSet.h" + +#include "Game/T6/T6.h" +#include "ObjLoading.h" + +using namespace T6; + +void* AssetLoaderTechniqueSet::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) +{ + auto* asset = memory->Alloc(); + asset->name = memory->Dup(assetName.c_str()); + return asset; +} diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderTechniqueSet.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderTechniqueSet.h new file mode 100644 index 00000000..c9b8b6b7 --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderTechniqueSet.h @@ -0,0 +1,14 @@ +#pragma once + +#include "AssetLoading/BasicAssetLoader.h" +#include "Game/T6/T6.h" +#include "SearchPath/ISearchPath.h" + +namespace T6 +{ + class AssetLoaderTechniqueSet final : public BasicAssetLoader + { + public: + _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override; + }; +} // namespace T6 diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderTracer.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderTracer.cpp index 1d0242b8..7ac19a8c 100644 --- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderTracer.cpp +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderTracer.cpp @@ -68,10 +68,9 @@ bool AssetLoaderTracer::LoadFromInfoString( void* AssetLoaderTracer::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) { - auto* tracer = memory->Create(); - memset(tracer, 0, sizeof(TracerDef)); - tracer->name = memory->Dup(assetName.c_str()); - return tracer; + auto* asset = memory->Alloc(); + asset->name = memory->Dup(assetName.c_str()); + return asset; } bool AssetLoaderTracer::CanLoadFromGdt() const diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderVehicle.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderVehicle.cpp index 43c3ff65..2b36b60c 100644 --- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderVehicle.cpp +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderVehicle.cpp @@ -131,10 +131,9 @@ bool AssetLoaderVehicle::LoadFromInfoString( void* AssetLoaderVehicle::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) { - auto* vehicleDef = memory->Create(); - memset(vehicleDef, 0, sizeof(VehicleDef)); - vehicleDef->name = memory->Dup(assetName.c_str()); - return vehicleDef; + auto* asset = memory->Alloc(); + asset->name = memory->Dup(assetName.c_str()); + return asset; } bool AssetLoaderVehicle::CanLoadFromGdt() const diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeapon.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeapon.cpp index 524042f8..6fad7e7e 100644 --- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeapon.cpp +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeapon.cpp @@ -630,8 +630,7 @@ bool AssetLoaderWeapon::LoadFromInfoString( void* AssetLoaderWeapon::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) { - auto* weaponFullDef = memory->Create(); - memset(weaponFullDef, 0, sizeof(WeaponFullDef)); + auto* weaponFullDef = memory->Alloc(); LinkWeaponFullDefSubStructs(weaponFullDef); CalculateWeaponFields(weaponFullDef); weaponFullDef->weapVariantDef.szInternalName = memory->Dup(assetName.c_str()); diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeaponAttachment.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeaponAttachment.cpp index 2ac312c1..46ce62f9 100644 --- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeaponAttachment.cpp +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeaponAttachment.cpp @@ -120,8 +120,7 @@ bool AssetLoaderWeaponAttachment::LoadFromInfoString( void* AssetLoaderWeaponAttachment::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) { - auto* attachment = memory->Create(); - memset(attachment, 0, sizeof(WeaponAttachment)); + auto* attachment = memory->Alloc(); CalculateAttachmentFields(attachment); attachment->szInternalName = memory->Dup(assetName.c_str()); return attachment; diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeaponAttachmentUnique.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeaponAttachmentUnique.cpp index 601e3bd6..885576d1 100644 --- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeaponAttachmentUnique.cpp +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeaponAttachmentUnique.cpp @@ -239,8 +239,7 @@ bool AssetLoaderWeaponAttachmentUnique::LoadFromInfoString( void* AssetLoaderWeaponAttachmentUnique::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) { - auto* attachmentUniqueFull = memory->Create(); - memset(attachmentUniqueFull, 0, sizeof(WeaponAttachmentUniqueFull)); + auto* attachmentUniqueFull = memory->Alloc(); LinkAttachmentUniqueFullSubStructs(attachmentUniqueFull); CalculateAttachmentUniqueFields(assetName, attachmentUniqueFull); attachmentUniqueFull->attachment.szInternalName = memory->Dup(assetName.c_str()); diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeaponCamo.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeaponCamo.cpp index ac964eb0..671ecbb8 100644 --- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeaponCamo.cpp +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeaponCamo.cpp @@ -12,11 +12,9 @@ using namespace T6; void* AssetLoaderWeaponCamo::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) { - auto* weaponCamo = memory->Create(); - memset(weaponCamo, 0, sizeof(WeaponCamo)); - weaponCamo->name = memory->Dup(assetName.c_str()); - - return weaponCamo; + auto* asset = memory->Alloc(); + asset->name = memory->Dup(assetName.c_str()); + return asset; } bool AssetLoaderWeaponCamo::CanLoadFromRaw() const diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderXAnim.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderXAnim.cpp new file mode 100644 index 00000000..9e2516a0 --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderXAnim.cpp @@ -0,0 +1,13 @@ +#include "AssetLoaderXAnim.h" + +#include "Game/T6/T6.h" +#include "ObjLoading.h" + +using namespace T6; + +void* AssetLoaderXAnim::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) +{ + auto* asset = memory->Alloc(); + asset->name = memory->Dup(assetName.c_str()); + return asset; +} diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderXAnim.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderXAnim.h new file mode 100644 index 00000000..3e270ac6 --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderXAnim.h @@ -0,0 +1,14 @@ +#pragma once + +#include "AssetLoading/BasicAssetLoader.h" +#include "Game/T6/T6.h" +#include "SearchPath/ISearchPath.h" + +namespace T6 +{ + class AssetLoaderXAnim final : public BasicAssetLoader + { + public: + _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override; + }; +} // namespace T6 diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderXGlobals.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderXGlobals.cpp new file mode 100644 index 00000000..e1c2b937 --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderXGlobals.cpp @@ -0,0 +1,13 @@ +#include "AssetLoaderXGlobals.h" + +#include "Game/T6/T6.h" +#include "ObjLoading.h" + +using namespace T6; + +void* AssetLoaderXGlobals::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) +{ + auto* asset = memory->Alloc(); + asset->name = memory->Dup(assetName.c_str()); + return asset; +} diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderXGlobals.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderXGlobals.h new file mode 100644 index 00000000..c510101b --- /dev/null +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderXGlobals.h @@ -0,0 +1,14 @@ +#pragma once + +#include "AssetLoading/BasicAssetLoader.h" +#include "Game/T6/T6.h" +#include "SearchPath/ISearchPath.h" + +namespace T6 +{ + class AssetLoaderXGlobals final : public BasicAssetLoader + { + public: + _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override; + }; +} // namespace T6 diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderXModel.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderXModel.cpp index a2702425..8509d2d3 100644 --- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderXModel.cpp +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderXModel.cpp @@ -12,11 +12,9 @@ using namespace T6; void* AssetLoaderXModel::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) { - auto* xmodel = memory->Create(); - memset(xmodel, 0, sizeof(XModel)); - xmodel->name = memory->Dup(assetName.c_str()); - - return xmodel; + auto* asset = memory->Alloc(); + asset->name = memory->Dup(assetName.c_str()); + return asset; } bool AssetLoaderXModel::CanLoadFromRaw() const diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderZBarrier.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderZBarrier.cpp index 68744477..c8cf1fda 100644 --- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderZBarrier.cpp +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderZBarrier.cpp @@ -81,8 +81,7 @@ bool AssetLoaderZBarrier::LoadFromInfoString( void* AssetLoaderZBarrier::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) { - auto* zbarrier = memory->Create(); - memset(zbarrier, 0, sizeof(ZBarrierDef)); + auto* zbarrier = memory->Alloc(); CalculateZBarrierFields(zbarrier); zbarrier->name = memory->Dup(assetName.c_str()); return zbarrier; diff --git a/src/ObjLoading/Game/T6/ObjLoaderT6.cpp b/src/ObjLoading/Game/T6/ObjLoaderT6.cpp index 160923b7..67f48f20 100644 --- a/src/ObjLoading/Game/T6/ObjLoaderT6.cpp +++ b/src/ObjLoading/Game/T6/ObjLoaderT6.cpp @@ -1,24 +1,50 @@ #include "ObjLoaderT6.h" +#include "AssetLoaders/AssetLoaderAddonMapEnts.h" +#include "AssetLoaders/AssetLoaderClipMap.h" +#include "AssetLoaders/AssetLoaderComWorld.h" +#include "AssetLoaders/AssetLoaderDDL.h" +#include "AssetLoaders/AssetLoaderDestructibleDef.h" +#include "AssetLoaders/AssetLoaderEmblemSet.h" +#include "AssetLoaders/AssetLoaderFont.h" #include "AssetLoaders/AssetLoaderFontIcon.h" +#include "AssetLoaders/AssetLoaderFootstepFxTable.h" +#include "AssetLoaders/AssetLoaderFootstepTable.h" +#include "AssetLoaders/AssetLoaderFx.h" +#include "AssetLoaders/AssetLoaderGameWorldMp.h" +#include "AssetLoaders/AssetLoaderGameWorldSp.h" #include "AssetLoaders/AssetLoaderGfxImage.h" +#include "AssetLoaders/AssetLoaderGfxLightDef.h" +#include "AssetLoaders/AssetLoaderGfxWorld.h" +#include "AssetLoaders/AssetLoaderGlasses.h" +#include "AssetLoaders/AssetLoaderImpactFx.h" #include "AssetLoaders/AssetLoaderLeaderboard.h" #include "AssetLoaders/AssetLoaderLocalizeEntry.h" +#include "AssetLoaders/AssetLoaderMapEnts.h" #include "AssetLoaders/AssetLoaderMaterial.h" +#include "AssetLoaders/AssetLoaderMemoryBlock.h" +#include "AssetLoaders/AssetLoaderMenu.h" +#include "AssetLoaders/AssetLoaderMenuList.h" #include "AssetLoaders/AssetLoaderPhysConstraints.h" #include "AssetLoaders/AssetLoaderPhysPreset.h" #include "AssetLoaders/AssetLoaderQdb.h" #include "AssetLoaders/AssetLoaderRawFile.h" #include "AssetLoaders/AssetLoaderScriptParseTree.h" +#include "AssetLoaders/AssetLoaderSkinnedVerts.h" #include "AssetLoaders/AssetLoaderSlug.h" #include "AssetLoaders/AssetLoaderSoundBank.h" +#include "AssetLoaders/AssetLoaderSoundDriverGlobals.h" +#include "AssetLoaders/AssetLoaderSoundPatch.h" #include "AssetLoaders/AssetLoaderStringTable.h" +#include "AssetLoaders/AssetLoaderTechniqueSet.h" #include "AssetLoaders/AssetLoaderTracer.h" #include "AssetLoaders/AssetLoaderVehicle.h" #include "AssetLoaders/AssetLoaderWeapon.h" #include "AssetLoaders/AssetLoaderWeaponAttachment.h" #include "AssetLoaders/AssetLoaderWeaponAttachmentUnique.h" #include "AssetLoaders/AssetLoaderWeaponCamo.h" +#include "AssetLoaders/AssetLoaderXAnim.h" +#include "AssetLoaders/AssetLoaderXGlobals.h" #include "AssetLoaders/AssetLoaderXModel.h" #include "AssetLoaders/AssetLoaderZBarrier.h" #include "AssetLoading/AssetLoadingManager.h" @@ -49,51 +75,51 @@ namespace T6 REGISTER_ASSET_LOADER(AssetLoaderPhysPreset) REGISTER_ASSET_LOADER(AssetLoaderPhysConstraints) - REGISTER_ASSET_LOADER(BasicAssetLoader) - REGISTER_ASSET_LOADER(BasicAssetLoader) + REGISTER_ASSET_LOADER(AssetLoaderDestructibleDef) + REGISTER_ASSET_LOADER(AssetLoaderXAnim) REGISTER_ASSET_LOADER(AssetLoaderXModel) REGISTER_ASSET_LOADER(AssetLoaderMaterial) - REGISTER_ASSET_LOADER(BasicAssetLoader) + REGISTER_ASSET_LOADER(AssetLoaderTechniqueSet) REGISTER_ASSET_LOADER(AssetLoaderGfxImage) REGISTER_ASSET_LOADER(AssetLoaderSoundBank) - REGISTER_ASSET_LOADER(BasicAssetLoader) - REGISTER_ASSET_LOADER(BasicAssetLoader) - REGISTER_ASSET_LOADER(BasicAssetLoader) - REGISTER_ASSET_LOADER(BasicAssetLoader) - REGISTER_ASSET_LOADER(BasicAssetLoader) - REGISTER_ASSET_LOADER(BasicAssetLoader) - REGISTER_ASSET_LOADER(BasicAssetLoader) - REGISTER_ASSET_LOADER(BasicAssetLoader) - REGISTER_ASSET_LOADER(BasicAssetLoader) - REGISTER_ASSET_LOADER(BasicAssetLoader) + REGISTER_ASSET_LOADER(AssetLoaderSoundPatch) + REGISTER_ASSET_LOADER(AssetLoaderClipMap) + REGISTER_ASSET_LOADER(AssetLoaderClipMapPvs) + REGISTER_ASSET_LOADER(AssetLoaderComWorld) + REGISTER_ASSET_LOADER(AssetLoaderGameWorldSp) + REGISTER_ASSET_LOADER(AssetLoaderGameWorldMp) + REGISTER_ASSET_LOADER(AssetLoaderMapEnts) + REGISTER_ASSET_LOADER(AssetLoaderGfxWorld) + REGISTER_ASSET_LOADER(AssetLoaderGfxLightDef) + REGISTER_ASSET_LOADER(AssetLoaderFont) REGISTER_ASSET_LOADER(AssetLoaderFontIcon) - REGISTER_ASSET_LOADER(BasicAssetLoader) - REGISTER_ASSET_LOADER(BasicAssetLoader) + REGISTER_ASSET_LOADER(AssetLoaderMenuList) + REGISTER_ASSET_LOADER(AssetLoaderMenu) REGISTER_ASSET_LOADER(AssetLoaderLocalizeEntry) REGISTER_ASSET_LOADER(AssetLoaderWeapon) REGISTER_ASSET_LOADER(AssetLoaderWeaponAttachment) REGISTER_ASSET_LOADER(AssetLoaderWeaponAttachmentUnique) REGISTER_ASSET_LOADER(AssetLoaderWeaponCamo) - REGISTER_ASSET_LOADER(BasicAssetLoader) - REGISTER_ASSET_LOADER(BasicAssetLoader) - REGISTER_ASSET_LOADER(BasicAssetLoader) + REGISTER_ASSET_LOADER(AssetLoaderSoundDriverGlobals) + REGISTER_ASSET_LOADER(AssetLoaderFx) + REGISTER_ASSET_LOADER(AssetLoaderImpactFx) REGISTER_ASSET_LOADER(AssetLoaderRawFile) REGISTER_ASSET_LOADER(AssetLoaderStringTable) REGISTER_ASSET_LOADER(AssetLoaderLeaderboard) - REGISTER_ASSET_LOADER(BasicAssetLoader) - REGISTER_ASSET_LOADER(BasicAssetLoader) - REGISTER_ASSET_LOADER(BasicAssetLoader) - REGISTER_ASSET_LOADER(BasicAssetLoader) + REGISTER_ASSET_LOADER(AssetLoaderXGlobals) + REGISTER_ASSET_LOADER(AssetLoaderDDL) + REGISTER_ASSET_LOADER(AssetLoaderGlasses) + REGISTER_ASSET_LOADER(AssetLoaderEmblemSet) REGISTER_ASSET_LOADER(AssetLoaderScriptParseTree) REGISTER_ASSET_LOADER(AssetLoaderVehicle) - REGISTER_ASSET_LOADER(BasicAssetLoader) - REGISTER_ASSET_LOADER(BasicAssetLoader) + REGISTER_ASSET_LOADER(AssetLoaderMemoryBlock) + REGISTER_ASSET_LOADER(AssetLoaderAddonMapEnts) REGISTER_ASSET_LOADER(AssetLoaderTracer) - REGISTER_ASSET_LOADER(BasicAssetLoader) + REGISTER_ASSET_LOADER(AssetLoaderSkinnedVerts) REGISTER_ASSET_LOADER(AssetLoaderQdb) REGISTER_ASSET_LOADER(AssetLoaderSlug) - REGISTER_ASSET_LOADER(BasicAssetLoader) - REGISTER_ASSET_LOADER(BasicAssetLoader) + REGISTER_ASSET_LOADER(AssetLoaderFootstepTable) + REGISTER_ASSET_LOADER(AssetLoaderFootstepFxTable) REGISTER_ASSET_LOADER(AssetLoaderZBarrier) #undef REGISTER_ASSET_LOADER