zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-19 15:52:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: use template based asset structs for AssetLoaders

Browse Source
This commit is contained in:
Jan 2024-05-25 11:17:04 +02:00
parent ef69bbb239
commit a166878f7d
No known key found for this signature in database
GPG Key ID: 44B581F78FF5C57C
110 changed files with 195 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Common/Game/IW3/IW3.h
View File

@ -96,6 +96,7 @@ namespace IW3
using AssetSoundCurve = Asset<ASSET_TYPE_SOUND_CURVE, SndCurve>;
using AssetLoadedSound = Asset<ASSET_TYPE_LOADED_SOUND, LoadedSound>;
using AssetClipMap = Asset<ASSET_TYPE_CLIPMAP, clipMap_t>;
using AssetClipMapPvs = Asset<ASSET_TYPE_CLIPMAP_PVS, clipMap_t>;
using AssetComWorld = Asset<ASSET_TYPE_COMWORLD, ComWorld>;
using AssetGameWorldSp = Asset<ASSET_TYPE_GAMEWORLD_SP, GameWorldSp>;
using AssetGameWorldMp = Asset<ASSET_TYPE_GAMEWORLD_MP, GameWorldMp>;
@ -107,7 +108,7 @@ namespace IW3
using AssetMenu = Asset<ASSET_TYPE_MENU, menuDef_t>;
using AssetLocalize = Asset<ASSET_TYPE_LOCALIZE_ENTRY, LocalizeEntry>;
using AssetWeapon = Asset<ASSET_TYPE_WEAPON, WeaponDef>;
using AssetSndDriverGlobals = Asset<ASSET_TYPE_SNDDRIVER_GLOBALS, SndDriverGlobals>;
using AssetSoundDriverGlobals = Asset<ASSET_TYPE_SNDDRIVER_GLOBALS, SndDriverGlobals>;
using AssetFx = Asset<ASSET_TYPE_FX, FxEffectDef>;
using AssetImpactFx = Asset<ASSET_TYPE_IMPACT_FX, FxImpactTable>;
using AssetRawFile = Asset<ASSET_TYPE_RAWFILE, RawFile>;

3
src/Common/Game/T5/T5.h
View File

@ -126,7 +126,8 @@ namespace T5
using AssetImage = Asset<ASSET_TYPE_IMAGE, GfxImage>;
using AssetSoundBank = Asset<ASSET_TYPE_SOUND, SndBank>;
using AssetSoundPatch = Asset<ASSET_TYPE_SOUND_PATCH, SndPatch>;
using AssetClipMap = Asset<ASSET_TYPE_CLIPMAP_PVS, clipMap_t>;
using AssetClipMap = Asset<ASSET_TYPE_CLIPMAP, clipMap_t>;
using AssetClipMapPvs = Asset<ASSET_TYPE_CLIPMAP_PVS, clipMap_t>;
using AssetComWorld = Asset<ASSET_TYPE_COMWORLD, ComWorld>;
using AssetGameWorldSp = Asset<ASSET_TYPE_GAMEWORLD_SP, GameWorldSp>;
using AssetGameWorldMp = Asset<ASSET_TYPE_GAMEWORLD_MP, GameWorldMp>;

3
src/Common/Game/T6/T6.h
View File

@ -170,7 +170,8 @@ namespace T6
using AssetImage = Asset<ASSET_TYPE_IMAGE, GfxImage>;
using AssetSoundBank = Asset<ASSET_TYPE_SOUND, SndBank>;
using AssetSoundPatch = Asset<ASSET_TYPE_SOUND_PATCH, SndPatch>;
using AssetClipMap = Asset<ASSET_TYPE_CLIPMAP_PVS, clipMap_t>;
using AssetClipMap = Asset<ASSET_TYPE_CLIPMAP, clipMap_t>;
using AssetClipMapPvs = Asset<ASSET_TYPE_CLIPMAP_PVS, clipMap_t>;
using AssetComWorld = Asset<ASSET_TYPE_COMWORLD, ComWorld>;
using AssetGameWorldSp = Asset<ASSET_TYPE_GAMEWORLD_SP, GameWorldSp>;
using AssetGameWorldMp = Asset<ASSET_TYPE_GAMEWORLD_MP, GameWorldMp>;

6
src/ObjLoading/AssetLoading/BasicAssetLoader.h
View File

@ -11,11 +11,13 @@ public:
}
};
template<asset_type_t AssetType, typename T> class BasicAssetLoader : public BasicAssetLoaderWithoutType<T>
template<typename AssetType> class BasicAssetLoader : public BasicAssetLoaderWithoutType<typename AssetType::Type>
{
public:
static_assert(std::is_base_of_v<IAssetBase, AssetType>);
_NODISCARD asset_type_t GetHandlingAssetType() const override
{
return AssetType;
return AssetType::EnumEntry;
}
};

2
src/ObjLoading/Game/IW3/AssetLoaders/AssetLoaderGfxImage.h
View File

@ -6,7 +6,7 @@
namespace IW3
{
class AssetLoaderGfxImage final : public BasicAssetLoader<ASSET_TYPE_IMAGE, GfxImage>
class AssetLoaderGfxImage final : public BasicAssetLoader<AssetImage>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW3/AssetLoaders/AssetLoaderLocalizeEntry.h
View File

@ -7,7 +7,7 @@
namespace IW3
{
class AssetLoaderLocalizeEntry final : public BasicAssetLoader<ASSET_TYPE_LOCALIZE_ENTRY, LocalizeEntry>
class AssetLoaderLocalizeEntry final : public BasicAssetLoader<AssetLocalize>
{
public:
_NODISCARD XAssetInfoGeneric* LoadFromGlobalAssetPools(const std::string& assetName) const override;

2
src/ObjLoading/Game/IW3/AssetLoaders/AssetLoaderRawFile.h
View File

@ -6,7 +6,7 @@
namespace IW3
{
class AssetLoaderRawFile final : public BasicAssetLoader<ASSET_TYPE_RAWFILE, RawFile>
class AssetLoaderRawFile final : public BasicAssetLoader<AssetRawFile>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW3/AssetLoaders/AssetLoaderStringTable.h
View File

@ -6,7 +6,7 @@
namespace IW3
{
class AssetLoaderStringTable final : public BasicAssetLoader<ASSET_TYPE_STRINGTABLE, StringTable>
class AssetLoaderStringTable final : public BasicAssetLoader<AssetStringTable>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

50
src/ObjLoading/Game/IW3/ObjLoaderIW3.cpp
View File

@ -22,37 +22,35 @@ ObjLoader::ObjLoader()
auto l = std::make_unique<t>(); \
m_asset_loaders_by_type[l->GetHandlingAssetType()] = std::move(l); \
}
#define BASIC_LOADER(assetType, assetClass) BasicAssetLoader<assetType, assetClass>
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_PHYSPRESET, PhysPreset))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_XANIMPARTS, XAnimParts))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_XMODEL, XModel))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_MATERIAL, Material))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_TECHNIQUE_SET, MaterialTechniqueSet))
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetPhysPreset>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetXAnim>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetXModel>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetMaterial>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetTechniqueSet>)
REGISTER_ASSET_LOADER(AssetLoaderGfxImage)
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_SOUND, snd_alias_list_t))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_SOUND_CURVE, SndCurve))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_LOADED_SOUND, LoadedSound))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_CLIPMAP, clipMap_t))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_CLIPMAP_PVS, clipMap_t))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_COMWORLD, ComWorld))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_GAMEWORLD_SP, GameWorldSp))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_GAMEWORLD_MP, GameWorldMp))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_MAP_ENTS, MapEnts))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_GFXWORLD, GfxWorld))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_LIGHT_DEF, GfxLightDef))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_FONT, Font_s))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_MENULIST, MenuList))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_MENU, menuDef_t))
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetSound>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetSoundCurve>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetLoadedSound>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetClipMap>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetClipMapPvs>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetComWorld>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetGameWorldSp>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetGameWorldMp>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetMapEnts>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetGfxWorld>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetLightDef>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetFont>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetMenuList>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetMenu>)
REGISTER_ASSET_LOADER(AssetLoaderLocalizeEntry)
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_WEAPON, WeaponDef))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_SNDDRIVER_GLOBALS, SndDriverGlobals))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_FX, FxEffectDef))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_IMPACT_FX, FxImpactTable))
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetWeapon>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetSoundDriverGlobals>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetFx>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetImpactFx>)
REGISTER_ASSET_LOADER(AssetLoaderRawFile)
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_STRINGTABLE, StringTable))
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetStringTable>)
#undef BASIC_LOADER
#undef REGISTER_ASSET_LOADER
}

2
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderAddonMapEnts.h
View File

@ -6,7 +6,7 @@
namespace IW4
{
class AssetLoaderAddonMapEnts final : public BasicAssetLoader<ASSET_TYPE_ADDON_MAP_ENTS, AddonMapEnts>
class AssetLoaderAddonMapEnts final : public BasicAssetLoader<AssetAddonMapEnts>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderComWorld.h
View File

@ -6,7 +6,7 @@
namespace IW4
{
class AssetLoaderComWorld final : public BasicAssetLoader<ASSET_TYPE_COMWORLD, ComWorld>
class AssetLoaderComWorld final : public BasicAssetLoader<AssetComWorld>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderFont.h
View File

@ -6,7 +6,7 @@
namespace IW4
{
class AssetLoaderFont final : public BasicAssetLoader<ASSET_TYPE_FONT, Font_s>
class AssetLoaderFont final : public BasicAssetLoader<AssetFont>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderFx.h
View File

@ -6,7 +6,7 @@
namespace IW4
{
class AssetLoaderFx final : public BasicAssetLoader<ASSET_TYPE_FX, FxEffectDef>
class AssetLoaderFx final : public BasicAssetLoader<AssetFx>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderFxImpactTable.h
View File

@ -6,7 +6,7 @@
namespace IW4
{
class AssetLoaderFxImpactTable final : public BasicAssetLoader<ASSET_TYPE_IMPACT_FX, FxImpactTable>
class AssetLoaderFxImpactTable final : public BasicAssetLoader<AssetImpactFx>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderFxWorld.h
View File

@ -6,7 +6,7 @@
namespace IW4
{
class AssetLoaderFxWorld final : public BasicAssetLoader<ASSET_TYPE_FXWORLD, FxWorld>
class AssetLoaderFxWorld final : public BasicAssetLoader<AssetFxWorld>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderGameWorldMp.h
View File

@ -6,7 +6,7 @@
namespace IW4
{
class AssetLoaderGameWorldMp final : public BasicAssetLoader<ASSET_TYPE_GAMEWORLD_MP, GameWorldMp>
class AssetLoaderGameWorldMp final : public BasicAssetLoader<AssetGameWorldMp>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderGameWorldSp.h
View File

@ -6,7 +6,7 @@
namespace IW4
{
class AssetLoaderGameWorldSp final : public BasicAssetLoader<ASSET_TYPE_GAMEWORLD_SP, GameWorldSp>
class AssetLoaderGameWorldSp final : public BasicAssetLoader<AssetGameWorldSp>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderGfxImage.h
View File

@ -6,7 +6,7 @@
namespace IW4
{
class AssetLoaderGfxImage final : public BasicAssetLoader<ASSET_TYPE_IMAGE, GfxImage>
class AssetLoaderGfxImage final : public BasicAssetLoader<AssetImage>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderGfxLightDef.h
View File

@ -6,7 +6,7 @@
namespace IW4
{
class AssetLoaderGfxLightDef final : public BasicAssetLoader<ASSET_TYPE_LIGHT_DEF, GfxLightDef>
class AssetLoaderGfxLightDef final : public BasicAssetLoader<AssetLightDef>
{
static constexpr auto MAX_IMAGE_NAME_SIZE = 0x800;

2
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderGfxWorld.h
View File

@ -6,7 +6,7 @@
namespace IW4
{
class AssetLoaderGfxWorld final : public BasicAssetLoader<ASSET_TYPE_GFXWORLD, GfxWorld>
class AssetLoaderGfxWorld final : public BasicAssetLoader<AssetGfxWorld>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderLeaderboard.h
View File

@ -6,7 +6,7 @@
namespace IW4
{
class AssetLoaderLeaderboard final : public BasicAssetLoader<ASSET_TYPE_LEADERBOARD, LeaderboardDef>
class AssetLoaderLeaderboard final : public BasicAssetLoader<AssetLeaderBoard>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderLoadedSound.h
View File

@ -6,7 +6,7 @@
namespace IW4
{
class AssetLoaderLoadedSound final : public BasicAssetLoader<ASSET_TYPE_LOADED_SOUND, LoadedSound>
class AssetLoaderLoadedSound final : public BasicAssetLoader<AssetLoadedSound>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderLocalizeEntry.h
View File

@ -7,7 +7,7 @@
namespace IW4
{
class AssetLoaderLocalizeEntry final : public BasicAssetLoader<ASSET_TYPE_LOCALIZE_ENTRY, LocalizeEntry>
class AssetLoaderLocalizeEntry final : public BasicAssetLoader<AssetLocalize>
{
public:
_NODISCARD XAssetInfoGeneric* LoadFromGlobalAssetPools(const std::string& assetName) const override;

2
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderMapEnts.h
View File

@ -6,7 +6,7 @@
namespace IW4
{
class AssetLoaderMapEnts final : public BasicAssetLoader<ASSET_TYPE_MAP_ENTS, MapEnts>
class AssetLoaderMapEnts final : public BasicAssetLoader<AssetMapEnts>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderMaterial.h
View File

@ -6,7 +6,7 @@
namespace IW4
{
class AssetLoaderMaterial final : public BasicAssetLoader<ASSET_TYPE_MATERIAL, Material>
class AssetLoaderMaterial final : public BasicAssetLoader<AssetMaterial>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderMenuDef.h
View File

@ -6,7 +6,7 @@
namespace IW4
{
class AssetLoaderMenuDef final : public BasicAssetLoader<ASSET_TYPE_MENU, menuDef_t>
class AssetLoaderMenuDef final : public BasicAssetLoader<AssetMenu>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderMenuList.h
View File

@ -7,7 +7,7 @@
namespace IW4
{
class AssetLoaderMenuList final : public BasicAssetLoader<ASSET_TYPE_MENULIST, MenuList>
class AssetLoaderMenuList final : public BasicAssetLoader<AssetMenuList>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderPhysCollmap.h
View File

@ -6,7 +6,7 @@
namespace IW4
{
class AssetLoaderPhysCollmap final : public BasicAssetLoader<ASSET_TYPE_PHYSCOLLMAP, PhysCollmap>
class AssetLoaderPhysCollmap final : public BasicAssetLoader<AssetPhysCollMap>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderPhysPreset.h
View File

@ -7,7 +7,7 @@
namespace IW4
{
class AssetLoaderPhysPreset final : public BasicAssetLoader<ASSET_TYPE_PHYSPRESET, PhysPreset>
class AssetLoaderPhysPreset final : public BasicAssetLoader<AssetPhysPreset>
{
static void CopyFromPhysPresetInfo(const PhysPresetInfo* physPresetInfo, PhysPreset* physPreset);

2
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderPixelShader.h
View File

@ -8,7 +8,7 @@
namespace IW4
{
class AssetLoaderPixelShader final : public BasicAssetLoader<ASSET_TYPE_PIXELSHADER, MaterialPixelShader>
class AssetLoaderPixelShader final : public BasicAssetLoader<AssetPixelShader>
{
public:
_NODISCARD static std::string GetFileNameForAsset(const std::string& assetName);

2
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderRawFile.h
View File

@ -6,7 +6,7 @@
namespace IW4
{
class AssetLoaderRawFile final : public BasicAssetLoader<ASSET_TYPE_RAWFILE, RawFile>
class AssetLoaderRawFile final : public BasicAssetLoader<AssetRawFile>
{
static constexpr size_t COMPRESSED_BUFFER_SIZE_PADDING = 64;

2
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderSndCurve.h
View File

@ -6,7 +6,7 @@
namespace IW4
{
class AssetLoaderSndCurve final : public BasicAssetLoader<ASSET_TYPE_SOUND_CURVE, SndCurve>
class AssetLoaderSndCurve final : public BasicAssetLoader<AssetSoundCurve>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderSoundAliasList.h
View File

@ -6,7 +6,7 @@
namespace IW4
{
class AssetLoaderSoundAliasList final : public BasicAssetLoader<ASSET_TYPE_SOUND, snd_alias_list_t>
class AssetLoaderSoundAliasList final : public BasicAssetLoader<AssetSound>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderStringTable.h
View File

@ -6,7 +6,7 @@
namespace IW4
{
class AssetLoaderStringTable final : public BasicAssetLoader<ASSET_TYPE_STRINGTABLE, StringTable>
class AssetLoaderStringTable final : public BasicAssetLoader<AssetStringTable>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderStructuredDataDefSet.h
View File

@ -7,7 +7,7 @@
namespace IW4
{
class AssetLoaderStructuredDataDefSet final : public BasicAssetLoader<ASSET_TYPE_STRUCTURED_DATA_DEF, StructuredDataDefSet>
class AssetLoaderStructuredDataDefSet final : public BasicAssetLoader<AssetStructuredDataDef>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderTechniqueSet.h
View File

@ -10,7 +10,7 @@
namespace IW4
{
class AssetLoaderTechniqueSet final : public BasicAssetLoader<ASSET_TYPE_TECHNIQUE_SET, MaterialTechniqueSet>
class AssetLoaderTechniqueSet final : public BasicAssetLoader<AssetTechniqueSet>
{
static bool CreateTechsetFromDefinition(const std::string& assetName,
const techset::TechsetDefinition& definition,

2
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderTracer.h
View File

@ -6,7 +6,7 @@
namespace IW4
{
class AssetLoaderTracer final : public BasicAssetLoader<ASSET_TYPE_TRACER, TracerDef>
class AssetLoaderTracer final : public BasicAssetLoader<AssetTracer>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderVehicle.h
View File

@ -6,7 +6,7 @@
namespace IW4
{
class AssetLoaderVehicle final : public BasicAssetLoader<ASSET_TYPE_VEHICLE, VehicleDef>
class AssetLoaderVehicle final : public BasicAssetLoader<AssetVehicle>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderVertexDecl.h
View File

@ -6,7 +6,7 @@
namespace IW4
{
class AssetLoaderVertexDecl final : public BasicAssetLoader<ASSET_TYPE_VERTEXDECL, MaterialVertexDeclaration>
class AssetLoaderVertexDecl final : public BasicAssetLoader<AssetVertexDecl>
{
static bool NextAbbreviation(const std::string& assetName, std::string& abbreviation, size_t& offset);

2
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderVertexShader.h
View File

@ -6,7 +6,7 @@
namespace IW4
{
class AssetLoaderVertexShader final : public BasicAssetLoader<ASSET_TYPE_VERTEXSHADER, MaterialVertexShader>
class AssetLoaderVertexShader final : public BasicAssetLoader<AssetVertexShader>
{
public:
_NODISCARD static std::string GetFileNameForAsset(const std::string& assetName);

2
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderWeapon.h
View File

@ -6,7 +6,7 @@
namespace IW4
{
class AssetLoaderWeapon final : public BasicAssetLoader<ASSET_TYPE_WEAPON, WeaponCompleteDef>
class AssetLoaderWeapon final : public BasicAssetLoader<AssetWeapon>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderXAnim.h
View File

@ -6,7 +6,7 @@
namespace IW4
{
class AssetLoaderXAnim final : public BasicAssetLoader<ASSET_TYPE_XANIMPARTS, XAnimParts>
class AssetLoaderXAnim final : public BasicAssetLoader<AssetXAnim>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderXModel.h
View File

@ -6,7 +6,7 @@
namespace IW4
{
class AssetLoaderXModel final : public BasicAssetLoader<ASSET_TYPE_XMODEL, XModel>
class AssetLoaderXModel final : public BasicAssetLoader<AssetXModel>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderXModelSurfs.h
View File

@ -6,7 +6,7 @@
namespace IW4
{
class AssetLoaderXModelSurfs final : public BasicAssetLoader<ASSET_TYPE_XMODEL_SURFS, XModelSurfs>
class AssetLoaderXModelSurfs final : public BasicAssetLoader<AssetXModelSurfs>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderAddonMapEnts.h
View File

@ -6,7 +6,7 @@
namespace IW5
{
class AssetLoaderAddonMapEnts final : public BasicAssetLoader<ASSET_TYPE_ADDON_MAP_ENTS, AddonMapEnts>
class AssetLoaderAddonMapEnts final : public BasicAssetLoader<AssetAddonMapEnts>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderClipMap.h
View File

@ -6,7 +6,7 @@
namespace IW5
{
class AssetLoaderClipMap : public BasicAssetLoader<ASSET_TYPE_CLIPMAP, clipMap_t>
class AssetLoaderClipMap : public BasicAssetLoader<AssetClipMap>
{
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
};

2
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderComWorld.h
View File

@ -6,7 +6,7 @@
namespace IW5
{
class AssetLoaderComWorld final : public BasicAssetLoader<ASSET_TYPE_COMWORLD, ComWorld>
class AssetLoaderComWorld final : public BasicAssetLoader<AssetComWorld>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderFont.h
View File

@ -6,7 +6,7 @@
namespace IW5
{
class AssetLoaderFont final : public BasicAssetLoader<ASSET_TYPE_FONT, Font_s>
class AssetLoaderFont final : public BasicAssetLoader<AssetFont>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderFx.h
View File

@ -6,7 +6,7 @@
namespace IW5
{
class AssetLoaderFx final : public BasicAssetLoader<ASSET_TYPE_FX, FxEffectDef>
class AssetLoaderFx final : public BasicAssetLoader<AssetFx>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderFxImpactTable.h
View File

@ -6,7 +6,7 @@
namespace IW5
{
class AssetLoaderFxImpactTable final : public BasicAssetLoader<ASSET_TYPE_IMPACT_FX, FxImpactTable>
class AssetLoaderFxImpactTable final : public BasicAssetLoader<AssetImpactFx>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderFxWorld.h
View File

@ -6,7 +6,7 @@
namespace IW5
{
class AssetLoaderFxWorld final : public BasicAssetLoader<ASSET_TYPE_FXWORLD, FxWorld>
class AssetLoaderFxWorld final : public BasicAssetLoader<AssetFxWorld>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderGfxImage.h
View File

@ -6,7 +6,7 @@
namespace IW5
{
class AssetLoaderGfxImage final : public BasicAssetLoader<ASSET_TYPE_IMAGE, GfxImage>
class AssetLoaderGfxImage final : public BasicAssetLoader<AssetImage>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderGfxLightDef.h
View File

@ -6,7 +6,7 @@
namespace IW5
{
class AssetLoaderGfxLightDef final : public BasicAssetLoader<ASSET_TYPE_LIGHT_DEF, GfxLightDef>
class AssetLoaderGfxLightDef final : public BasicAssetLoader<AssetLightDef>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderGfxWorld.h
View File

@ -6,7 +6,7 @@
namespace IW5
{
class AssetLoaderGfxWorld final : public BasicAssetLoader<ASSET_TYPE_GFXWORLD, GfxWorld>
class AssetLoaderGfxWorld final : public BasicAssetLoader<AssetGfxWorld>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderGlassWorld.h
View File

@ -6,7 +6,7 @@
namespace IW5
{
class AssetLoaderGlassWorld final : public BasicAssetLoader<ASSET_TYPE_GLASSWORLD, GlassWorld>
class AssetLoaderGlassWorld final : public BasicAssetLoader<AssetGlassWorld>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderLeaderboard.h
View File

@ -6,7 +6,7 @@
namespace IW5
{
class AssetLoaderLeaderboard final : public BasicAssetLoader<ASSET_TYPE_LEADERBOARD, LeaderboardDef>
class AssetLoaderLeaderboard final : public BasicAssetLoader<AssetLeaderBoard>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderLoadedSound.h
View File

@ -6,7 +6,7 @@
namespace IW5
{
class AssetLoaderLoadedSound final : public BasicAssetLoader<ASSET_TYPE_LOADED_SOUND, LoadedSound>
class AssetLoaderLoadedSound final : public BasicAssetLoader<AssetLoadedSound>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderLocalizeEntry.h
View File

@ -7,7 +7,7 @@
namespace IW5
{
class AssetLoaderLocalizeEntry final : public BasicAssetLoader<ASSET_TYPE_LOCALIZE_ENTRY, LocalizeEntry>
class AssetLoaderLocalizeEntry final : public BasicAssetLoader<AssetLocalize>
{
public:
_NODISCARD XAssetInfoGeneric* LoadFromGlobalAssetPools(const std::string& assetName) const override;

2
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderMapEnts.h
View File

@ -6,7 +6,7 @@
namespace IW5
{
class AssetLoaderMapEnts final : public BasicAssetLoader<ASSET_TYPE_MAP_ENTS, MapEnts>
class AssetLoaderMapEnts final : public BasicAssetLoader<AssetMapEnts>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderMaterial.h
View File

@ -6,7 +6,7 @@
namespace IW5
{
class AssetLoaderMaterial final : public BasicAssetLoader<ASSET_TYPE_MATERIAL, Material>
class AssetLoaderMaterial final : public BasicAssetLoader<AssetMaterial>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderMenuDef.h
View File

@ -6,7 +6,7 @@
namespace IW5
{
class AssetLoaderMenuDef final : public BasicAssetLoader<ASSET_TYPE_MENU, menuDef_t>
class AssetLoaderMenuDef final : public BasicAssetLoader<AssetMenu>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderMenuList.h
View File

@ -7,7 +7,7 @@
namespace IW5
{
class AssetLoaderMenuList final : public BasicAssetLoader<ASSET_TYPE_MENULIST, MenuList>
class AssetLoaderMenuList final : public BasicAssetLoader<AssetMenuList>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderPathData.h
View File

@ -6,7 +6,7 @@
namespace IW5
{
class AssetLoaderPathData final : public BasicAssetLoader<ASSET_TYPE_PATHDATA, PathData>
class AssetLoaderPathData final : public BasicAssetLoader<AssetPathData>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderPhysCollmap.h
View File

@ -6,7 +6,7 @@
namespace IW5
{
class AssetLoaderPhysCollmap final : public BasicAssetLoader<ASSET_TYPE_PHYSCOLLMAP, PhysCollmap>
class AssetLoaderPhysCollmap final : public BasicAssetLoader<AssetPhysCollMap>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderPhysPreset.h
View File

@ -6,7 +6,7 @@
namespace IW5
{
class AssetLoaderPhysPreset final : public BasicAssetLoader<ASSET_TYPE_PHYSPRESET, PhysPreset>
class AssetLoaderPhysPreset final : public BasicAssetLoader<AssetPhysPreset>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderPixelShader.h
View File

@ -6,7 +6,7 @@
namespace IW5
{
class AssetLoaderPixelShader final : public BasicAssetLoader<ASSET_TYPE_PIXELSHADER, MaterialPixelShader>
class AssetLoaderPixelShader final : public BasicAssetLoader<AssetPixelShader>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderRawFile.h
View File

@ -6,7 +6,7 @@
namespace IW5
{
class AssetLoaderRawFile final : public BasicAssetLoader<ASSET_TYPE_RAWFILE, RawFile>
class AssetLoaderRawFile final : public BasicAssetLoader<AssetRawFile>
{
static constexpr size_t COMPRESSED_BUFFER_SIZE_PADDING = 64;

2
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderScriptFile.h
View File

@ -6,7 +6,7 @@
namespace IW5
{
class AssetLoaderScriptFile final : public BasicAssetLoader<ASSET_TYPE_SCRIPTFILE, ScriptFile>
class AssetLoaderScriptFile final : public BasicAssetLoader<AssetScript>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderSoundAliasList.h
View File

@ -6,7 +6,7 @@
namespace IW5
{
class AssetLoaderSoundAliasList final : public BasicAssetLoader<ASSET_TYPE_SOUND, snd_alias_list_t>
class AssetLoaderSoundAliasList final : public BasicAssetLoader<AssetSound>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderSoundCurve.h
View File

@ -6,7 +6,7 @@
namespace IW5
{
class AssetLoaderSoundCurve final : public BasicAssetLoader<ASSET_TYPE_SOUND_CURVE, SndCurve>
class AssetLoaderSoundCurve final : public BasicAssetLoader<AssetSoundCurve>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderStringTable.h
View File

@ -6,7 +6,7 @@
namespace IW5
{
class AssetLoaderStringTable final : public BasicAssetLoader<ASSET_TYPE_STRINGTABLE, StringTable>
class AssetLoaderStringTable final : public BasicAssetLoader<AssetStringTable>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderStructuredDataDef.h
View File

@ -6,7 +6,7 @@
namespace IW5
{
class AssetLoaderStructuredDataDef final : public BasicAssetLoader<ASSET_TYPE_STRUCTURED_DATA_DEF, StructuredDataDefSet>
class AssetLoaderStructuredDataDef final : public BasicAssetLoader<AssetStructuredDataDef>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderSurfaceFxTable.h
View File

@ -6,7 +6,7 @@
namespace IW5
{
class AssetLoaderSurfaceFxTable final : public BasicAssetLoader<ASSET_TYPE_SURFACE_FX, SurfaceFxTable>
class AssetLoaderSurfaceFxTable final : public BasicAssetLoader<AssetSurfaceFx>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderTechniqueSet.h
View File

@ -6,7 +6,7 @@
namespace IW5
{
class AssetLoaderTechniqueSet final : public BasicAssetLoader<ASSET_TYPE_TECHNIQUE_SET, MaterialTechniqueSet>
class AssetLoaderTechniqueSet final : public BasicAssetLoader<AssetTechniqueSet>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderTracerDef.h
View File

@ -6,7 +6,7 @@
namespace IW5
{
class AssetLoaderTracerDef final : public BasicAssetLoader<ASSET_TYPE_TRACER, TracerDef>
class AssetLoaderTracerDef final : public BasicAssetLoader<AssetTracer>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderVehicleDef.h
View File

@ -6,7 +6,7 @@
namespace IW5
{
class AssetLoaderVehicleDef final : public BasicAssetLoader<ASSET_TYPE_VEHICLE, VehicleDef>
class AssetLoaderVehicleDef final : public BasicAssetLoader<AssetVehicle>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderVehicleTrack.h
View File

@ -6,7 +6,7 @@
namespace IW5
{
class AssetLoaderVehicleTrack final : public BasicAssetLoader<ASSET_TYPE_VEHICLE_TRACK, VehicleTrack>
class AssetLoaderVehicleTrack final : public BasicAssetLoader<AssetVehicleTrack>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderVertexDecl.h
View File

@ -6,7 +6,7 @@
namespace IW5
{
class AssetLoaderVertexDecl final : public BasicAssetLoader<ASSET_TYPE_VERTEXDECL, MaterialVertexDeclaration>
class AssetLoaderVertexDecl final : public BasicAssetLoader<AssetVertexDecl>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderVertexShader.h
View File

@ -6,7 +6,7 @@
namespace IW5
{
class AssetLoaderVertexShader final : public BasicAssetLoader<ASSET_TYPE_VERTEXSHADER, MaterialVertexShader>
class AssetLoaderVertexShader final : public BasicAssetLoader<AssetVertexShader>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderWeapon.h
View File

@ -6,7 +6,7 @@
namespace IW5
{
class AssetLoaderWeapon final : public BasicAssetLoader<ASSET_TYPE_WEAPON, WeaponCompleteDef>
class AssetLoaderWeapon final : public BasicAssetLoader<AssetWeapon>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderWeaponAttachment.h
View File

@ -6,7 +6,7 @@
namespace IW5
{
class AssetLoaderWeaponAttachment final : public BasicAssetLoader<ASSET_TYPE_ATTACHMENT, WeaponAttachment>
class AssetLoaderWeaponAttachment final : public BasicAssetLoader<AssetAttachment>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderXAnim.h
View File

@ -6,7 +6,7 @@
namespace IW5
{
class AssetLoaderXAnim final : public BasicAssetLoader<ASSET_TYPE_XANIMPARTS, XAnimParts>
class AssetLoaderXAnim final : public BasicAssetLoader<AssetXAnim>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderXModel.h
View File

@ -6,7 +6,7 @@
namespace IW5
{
class AssetLoaderXModel final : public BasicAssetLoader<ASSET_TYPE_XMODEL, XModel>
class AssetLoaderXModel final : public BasicAssetLoader<AssetXModel>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderXModelSurfs.h
View File

@ -6,7 +6,7 @@
namespace IW5
{
class AssetLoaderXModelSurfs final : public BasicAssetLoader<ASSET_TYPE_XMODEL_SURFS, XModelSurfs>
class AssetLoaderXModelSurfs final : public BasicAssetLoader<AssetXModelSurfs>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/IW5/ObjLoaderIW5.cpp
View File

@ -59,7 +59,6 @@ ObjLoader::ObjLoader()
auto l = std::make_unique<t>(); \
m_asset_loaders_by_type[l->GetHandlingAssetType()] = std::move(l); \
}
#define BASIC_LOADER(assetType, assetClass) BasicAssetLoader<assetType, assetClass>
REGISTER_ASSET_LOADER(AssetLoaderPhysPreset)
REGISTER_ASSET_LOADER(AssetLoaderPhysCollmap)
@ -102,7 +101,6 @@ ObjLoader::ObjLoader()
REGISTER_ASSET_LOADER(AssetLoaderVehicleDef)
REGISTER_ASSET_LOADER(AssetLoaderAddonMapEnts)
#undef BASIC_LOADER
#undef REGISTER_ASSET_LOADER
}

2
src/ObjLoading/Game/T5/AssetLoaders/AssetLoaderLocalizeEntry.h
View File

@ -7,7 +7,7 @@
namespace T5
{
class AssetLoaderLocalizeEntry final : public BasicAssetLoader<ASSET_TYPE_LOCALIZE_ENTRY, LocalizeEntry>
class AssetLoaderLocalizeEntry final : public BasicAssetLoader<AssetLocalize>
{
public:
_NODISCARD XAssetInfoGeneric* LoadFromGlobalAssetPools(const std::string& assetName) const override;

2
src/ObjLoading/Game/T5/AssetLoaders/AssetLoaderRawFile.h
View File

@ -6,7 +6,7 @@
namespace T5
{
class AssetLoaderRawFile final : public BasicAssetLoader<ASSET_TYPE_RAWFILE, RawFile>
class AssetLoaderRawFile final : public BasicAssetLoader<AssetRawFile>
{
static constexpr size_t COMPRESSED_BUFFER_SIZE_PADDING = 64;

2
src/ObjLoading/Game/T5/AssetLoaders/AssetLoaderStringTable.h
View File

@ -6,7 +6,7 @@
namespace T5
{
class AssetLoaderStringTable final : public BasicAssetLoader<ASSET_TYPE_STRINGTABLE, StringTable>
class AssetLoaderStringTable final : public BasicAssetLoader<AssetStringTable>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

62
src/ObjLoading/Game/T5/ObjLoaderT5.cpp
View File

@ -22,43 +22,41 @@ ObjLoader::ObjLoader()
auto l = std::make_unique<t>(); \
m_asset_loaders_by_type[l->GetHandlingAssetType()] = std::move(l); \
}
#define BASIC_LOADER(assetType, assetClass) BasicAssetLoader<assetType, assetClass>
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_PHYSPRESET, PhysPreset))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_PHYSCONSTRAINTS, PhysConstraints))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_DESTRUCTIBLEDEF, DestructibleDef))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_XANIMPARTS, XAnimParts))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_XMODEL, XModel))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_MATERIAL, Material))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_TECHNIQUE_SET, MaterialTechniqueSet))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_IMAGE, GfxImage))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_SOUND, SndBank))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_SOUND_PATCH, SndPatch))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_CLIPMAP, clipMap_t))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_CLIPMAP_PVS, clipMap_t))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_COMWORLD, ComWorld))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_GAMEWORLD_SP, GameWorldSp))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_GAMEWORLD_MP, GameWorldMp))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_MAP_ENTS, MapEnts))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_GFXWORLD, GfxWorld))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_LIGHT_DEF, GfxLightDef))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_FONT, Font_s))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_MENULIST, MenuList))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_MENU, menuDef_t))
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetPhysPreset>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetPhysConstraints>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetDestructibleDef>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetXAnim>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetXModel>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetMaterial>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetTechniqueSet>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetImage>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetSoundBank>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetSoundPatch>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetClipMap>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetClipMapPvs>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetComWorld>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetGameWorldSp>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetGameWorldMp>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetMapEnts>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetGfxWorld>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetLightDef>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetFont>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetMenuList>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetMenu>)
REGISTER_ASSET_LOADER(AssetLoaderLocalizeEntry)
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_WEAPON, WeaponVariantDef))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_SNDDRIVER_GLOBALS, SndDriverGlobals))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_FX, FxEffectDef))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_IMPACT_FX, FxImpactTable))
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetWeapon>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetSoundDriverGlobals>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetFx>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetImpactFx>)
REGISTER_ASSET_LOADER(AssetLoaderRawFile)
REGISTER_ASSET_LOADER(AssetLoaderStringTable)
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_PACK_INDEX, PackIndex))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_XGLOBALS, XGlobals))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_DDL, ddlRoot_t))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_GLASSES, Glasses))
REGISTER_ASSET_LOADER(BASIC_LOADER(ASSET_TYPE_EMBLEMSET, EmblemSet))
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetPackIndex>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetXGlobals>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetDDL>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetGlasses>)
REGISTER_ASSET_LOADER(BasicAssetLoader<AssetEmblemSet>)
#undef BASIC_LOADER
#undef REGISTER_ASSET_LOADER
}

2
src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFontIcon.h
View File

@ -11,7 +11,7 @@
namespace T6
{
class AssetLoaderFontIcon final : public BasicAssetLoader<ASSET_TYPE_FONTICON, FontIcon>
class AssetLoaderFontIcon final : public BasicAssetLoader<AssetFontIcon>
{
static constexpr unsigned ROW_INDEX = 0;
static constexpr unsigned ROW_TYPE = 1;

2
src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderGfxImage.h
View File

@ -6,7 +6,7 @@
namespace T6
{
class AssetLoaderGfxImage final : public BasicAssetLoader<ASSET_TYPE_IMAGE, GfxImage>
class AssetLoaderGfxImage final : public BasicAssetLoader<AssetImage>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderLocalizeEntry.h
View File

@ -6,7 +6,7 @@
namespace T6
{
class AssetLoaderLocalizeEntry final : public BasicAssetLoader<ASSET_TYPE_LOCALIZE_ENTRY, LocalizeEntry>
class AssetLoaderLocalizeEntry final : public BasicAssetLoader<AssetLocalize>
{
public:
_NODISCARD XAssetInfoGeneric* LoadFromGlobalAssetPools(const std::string& assetName) const override;

2
src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderMaterial.h
View File

@ -6,7 +6,7 @@
namespace T6
{
class AssetLoaderMaterial final : public BasicAssetLoader<ASSET_TYPE_MATERIAL, Material>
class AssetLoaderMaterial final : public BasicAssetLoader<AssetMaterial>
{
static std::string GetFileNameForAsset(const std::string& assetName);

2
src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderPhysConstraints.h
View File

@ -7,7 +7,7 @@
namespace T6
{
class AssetLoaderPhysConstraints final : public BasicAssetLoader<ASSET_TYPE_PHYSCONSTRAINTS, PhysConstraints>
class AssetLoaderPhysConstraints final : public BasicAssetLoader<AssetPhysConstraints>
{
static void CalculatePhysConstraintsFields(PhysConstraints* physConstraints, Zone* zone);

2
src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderPhysPreset.h
View File

@ -7,7 +7,7 @@
namespace T6
{
class AssetLoaderPhysPreset final : public BasicAssetLoader<ASSET_TYPE_PHYSPRESET, PhysPreset>
class AssetLoaderPhysPreset final : public BasicAssetLoader<AssetPhysPreset>
{
static void CopyFromPhysPresetInfo(const PhysPresetInfo* physPresetInfo, PhysPreset* physPreset);

2
src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderQdb.h
View File

@ -6,7 +6,7 @@
namespace T6
{
class AssetLoaderQdb final : public BasicAssetLoader<ASSET_TYPE_QDB, Qdb>
class AssetLoaderQdb final : public BasicAssetLoader<AssetQdb>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderRawFile.h
View File

@ -6,7 +6,7 @@
namespace T6
{
class AssetLoaderRawFile final : public BasicAssetLoader<ASSET_TYPE_RAWFILE, RawFile>
class AssetLoaderRawFile final : public BasicAssetLoader<AssetRawFile>
{
static constexpr size_t COMPRESSED_BUFFER_SIZE_PADDING = 64;

2
src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderScriptParseTree.h
View File

@ -6,7 +6,7 @@
namespace T6
{
class AssetLoaderScriptParseTree final : public BasicAssetLoader<ASSET_TYPE_SCRIPTPARSETREE, ScriptParseTree>
class AssetLoaderScriptParseTree final : public BasicAssetLoader<AssetScript>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSlug.h
View File

@ -6,7 +6,7 @@
namespace T6
{
class AssetLoaderSlug final : public BasicAssetLoader<ASSET_TYPE_SLUG, Slug>
class AssetLoaderSlug final : public BasicAssetLoader<AssetSlug>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

2
src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundBank.h
View File

@ -6,7 +6,7 @@
namespace T6
{
class AssetLoaderSoundBank final : public BasicAssetLoader<ASSET_TYPE_SOUND, SndBank>
class AssetLoaderSoundBank final : public BasicAssetLoader<AssetSoundBank>
{
public:
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;

Some files were not shown because too many files have changed in this diff Show More