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

refactor: make LoadDependency and LoadIndirectAssetReference functions work with Asset template types

Browse Source
This commit is contained in:
Jan 2024-04-22 23:36:21 +02:00
parent 0b61fc6e81
commit eb0cec1d81
No known key found for this signature in database
GPG Key ID: 44B581F78FF5C57C
16 changed files with 106 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ObjLoading/AssetLoading/IAssetLoadingManager.h
View File

@ -1,5 +1,6 @@
#pragma once #pragma once
#include "AssetLoadingContext.h" #include "AssetLoadingContext.h"
#include "Game/IAsset.h"
#include "Pool/XAssetInfo.h" #include "Pool/XAssetInfo.h"
#include "Utils/ClassUtils.h" #include "Utils/ClassUtils.h"
#include "Zone/ZoneTypes.h" #include "Zone/ZoneTypes.h"
@ -50,6 +51,21 @@ public:
assetType, assetName, asset, std::move(dependencies), std::move(usedScriptStrings), std::move(indirectAssetReferences))); assetType, assetName, asset, std::move(dependencies), std::move(usedScriptStrings), std::move(indirectAssetReferences)));
} }
template<typename AssetType> XAssetInfo<typename AssetType::Type>* LoadDependency(const std::string& assetName)
{
static_assert(std::is_base_of_v<IAssetBase, AssetType>);
return static_cast<XAssetInfo<typename AssetType::Type>*>(LoadDependency(AssetType::EnumEntry, assetName));
}
template<typename AssetType> IndirectAssetReference LoadIndirectAssetReference(const std::string& assetName)
{
static_assert(std::is_base_of_v<IAssetBase, AssetType>);
return LoadIndirectAssetReference(AssetType::EnumEntry, assetName);
}
protected:
virtual XAssetInfoGeneric* LoadDependency(asset_type_t assetType, const std::string& assetName) = 0; virtual XAssetInfoGeneric* LoadDependency(asset_type_t assetType, const std::string& assetName) = 0;
virtual IndirectAssetReference LoadIndirectAssetReference(asset_type_t assetType, const std::string& assetName) = 0; virtual IndirectAssetReference LoadIndirectAssetReference(asset_type_t assetType, const std::string& assetName) = 0;
}; };

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

@ -52,7 +52,7 @@ bool AssetLoaderGfxLightDef::LoadFromRaw(
file.m_stream->read(&imageName[0], static_cast<size_t>(imageNameSize)); file.m_stream->read(&imageName[0], static_cast<size_t>(imageNameSize));
file.m_stream->read(reinterpret_cast<char*>(&lmapLookupStart), sizeof(int8_t)); file.m_stream->read(reinterpret_cast<char*>(&lmapLookupStart), sizeof(int8_t));
auto* imageDependency = reinterpret_cast<XAssetInfo<GfxImage>*>(manager->LoadDependency(ASSET_TYPE_IMAGE, imageName)); auto* imageDependency = manager->LoadDependency<AssetImage>(imageName);
if (!imageDependency) if (!imageDependency)
{ {

4
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderMaterial.cpp
View File

@ -808,7 +808,7 @@ namespace IW4
void SetTechniqueSet(const std::string& techsetName) void SetTechniqueSet(const std::string& techsetName)
{ {
auto* techset = reinterpret_cast<XAssetInfo<MaterialTechniqueSet>*>(m_manager->LoadDependency(ASSET_TYPE_TECHNIQUE_SET, techsetName)); auto* techset = m_manager->LoadDependency<AssetTechniqueSet>(techsetName);
if (techset == nullptr) if (techset == nullptr)
{ {
@ -994,7 +994,7 @@ namespace IW4
break; break;
} }
auto* image = reinterpret_cast<XAssetInfo<GfxImage>*>(m_manager->LoadDependency(ASSET_TYPE_IMAGE, textureName)); auto* image = m_manager->LoadDependency<AssetImage>(textureName);
if (image == nullptr) if (image == nullptr)
{ {

10
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderTechniqueSet.cpp
View File

@ -391,7 +391,7 @@ namespace IW4
ss << materialStreamSourceAbbreviation[stream.source] << materialStreamDestinationAbbreviation[stream.dest]; ss << materialStreamSourceAbbreviation[stream.source] << materialStreamDestinationAbbreviation[stream.dest];
} }
pass.m_vertex_decl_asset = reinterpret_cast<XAssetInfo<MaterialVertexDeclaration>*>(m_manager->LoadDependency(ASSET_TYPE_VERTEXDECL, ss.str())); pass.m_vertex_decl_asset = m_manager->LoadDependency<AssetVertexDecl>(ss.str());
} }
bool AcceptEndPass(std::string& errorMessage) override bool AcceptEndPass(std::string& errorMessage) override
@ -461,7 +461,7 @@ namespace IW4
bool AcceptVertexShader(const std::string& vertexShaderName, std::string& errorMessage) override bool AcceptVertexShader(const std::string& vertexShaderName, std::string& errorMessage) override
{ {
auto* vertexShaderDependency = m_manager->LoadDependency(ASSET_TYPE_VERTEXSHADER, vertexShaderName); auto* vertexShaderDependency = m_manager->LoadDependency<AssetVertexShader>(vertexShaderName);
if (vertexShaderDependency == nullptr) if (vertexShaderDependency == nullptr)
{ {
std::ostringstream ss; std::ostringstream ss;
@ -472,7 +472,7 @@ namespace IW4
assert(!m_passes.empty()); assert(!m_passes.empty());
auto& pass = m_passes.at(m_passes.size() - 1); auto& pass = m_passes.at(m_passes.size() - 1);
pass.m_vertex_shader = reinterpret_cast<XAssetInfo<MaterialVertexShader>*>(vertexShaderDependency); pass.m_vertex_shader = vertexShaderDependency;
if (pass.m_vertex_shader->Asset()->name && pass.m_vertex_shader->Asset()->name[0] == ',') if (pass.m_vertex_shader->Asset()->name && pass.m_vertex_shader->Asset()->name[0] == ',')
{ {
@ -501,7 +501,7 @@ namespace IW4
bool AcceptPixelShader(const std::string& pixelShaderName, std::string& errorMessage) override bool AcceptPixelShader(const std::string& pixelShaderName, std::string& errorMessage) override
{ {
auto* pixelShaderDependency = m_manager->LoadDependency(ASSET_TYPE_PIXELSHADER, pixelShaderName); auto* pixelShaderDependency = m_manager->LoadDependency<AssetPixelShader>(pixelShaderName);
if (pixelShaderDependency == nullptr) if (pixelShaderDependency == nullptr)
{ {
std::ostringstream ss; std::ostringstream ss;
@ -512,7 +512,7 @@ namespace IW4
assert(!m_passes.empty()); assert(!m_passes.empty());
auto& pass = m_passes.at(m_passes.size() - 1); auto& pass = m_passes.at(m_passes.size() - 1);
pass.m_pixel_shader = reinterpret_cast<XAssetInfo<MaterialPixelShader>*>(pixelShaderDependency); pass.m_pixel_shader = pixelShaderDependency;
if (pass.m_pixel_shader->Asset()->name && pass.m_pixel_shader->Asset()->name[0] == ',') if (pass.m_pixel_shader->Asset()->name && pass.m_pixel_shader->Asset()->name[0] == ',')
{ {

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

@ -137,7 +137,7 @@ namespace
if (ConvertString(value, field.iOffset)) if (ConvertString(value, field.iOffset))
{ {
if (!value.empty()) if (!value.empty())
m_indirect_asset_references.emplace(m_loading_manager->LoadIndirectAssetReference(ASSET_TYPE_XANIMPARTS, value)); m_indirect_asset_references.emplace(m_loading_manager->LoadIndirectAssetReference<AssetXAnim>(value));
return true; return true;
} }

30
src/ObjLoading/Game/IW4/InfoString/InfoStringToStructConverter.cpp
View File

@ -54,11 +54,11 @@ bool InfoStringToStructConverter::ConvertBaseField(const cspField_t& field, cons
{ {
if (value.empty()) if (value.empty())
{ {
*reinterpret_cast<void**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = nullptr; *reinterpret_cast<FxEffectDef**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = nullptr;
return true; return true;
} }
auto* fx = m_loading_manager->LoadDependency(ASSET_TYPE_FX, value); auto* fx = m_loading_manager->LoadDependency<AssetFx>(value);
if (fx == nullptr) if (fx == nullptr)
{ {
@ -67,7 +67,7 @@ bool InfoStringToStructConverter::ConvertBaseField(const cspField_t& field, cons
} }
m_dependencies.emplace(fx); m_dependencies.emplace(fx);
*reinterpret_cast<void**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = fx->m_ptr; *reinterpret_cast<FxEffectDef**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = fx->Asset();
return true; return true;
} }
@ -76,11 +76,11 @@ bool InfoStringToStructConverter::ConvertBaseField(const cspField_t& field, cons
{ {
if (value.empty()) if (value.empty())
{ {
*reinterpret_cast<void**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = nullptr; *reinterpret_cast<XModel**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = nullptr;
return true; return true;
} }
auto* xmodel = m_loading_manager->LoadDependency(ASSET_TYPE_XMODEL, value); auto* xmodel = m_loading_manager->LoadDependency<AssetXModel>(value);
if (xmodel == nullptr) if (xmodel == nullptr)
{ {
@ -89,7 +89,7 @@ bool InfoStringToStructConverter::ConvertBaseField(const cspField_t& field, cons
} }
m_dependencies.emplace(xmodel); m_dependencies.emplace(xmodel);
*reinterpret_cast<void**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = xmodel->m_ptr; *reinterpret_cast<XModel**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = xmodel->Asset();
return true; return true;
} }
@ -98,11 +98,11 @@ bool InfoStringToStructConverter::ConvertBaseField(const cspField_t& field, cons
{ {
if (value.empty()) if (value.empty())
{ {
*reinterpret_cast<void**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = nullptr; *reinterpret_cast<Material**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = nullptr;
return true; return true;
} }
auto* material = m_loading_manager->LoadDependency(ASSET_TYPE_MATERIAL, value); auto* material = m_loading_manager->LoadDependency<AssetMaterial>(value);
if (material == nullptr) if (material == nullptr)
{ {
@ -111,7 +111,7 @@ bool InfoStringToStructConverter::ConvertBaseField(const cspField_t& field, cons
} }
m_dependencies.emplace(material); m_dependencies.emplace(material);
*reinterpret_cast<void**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = material->m_ptr; *reinterpret_cast<Material**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = material->Asset();
return true; return true;
} }
@ -120,11 +120,11 @@ bool InfoStringToStructConverter::ConvertBaseField(const cspField_t& field, cons
{ {
if (value.empty()) if (value.empty())
{ {
*reinterpret_cast<void**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = nullptr; *reinterpret_cast<TracerDef**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = nullptr;
return true; return true;
} }
auto* tracer = m_loading_manager->LoadDependency(ASSET_TYPE_TRACER, value); auto* tracer = m_loading_manager->LoadDependency<AssetTracer>(value);
if (tracer == nullptr) if (tracer == nullptr)
{ {
@ -133,7 +133,7 @@ bool InfoStringToStructConverter::ConvertBaseField(const cspField_t& field, cons
} }
m_dependencies.emplace(tracer); m_dependencies.emplace(tracer);
*reinterpret_cast<void**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = tracer->m_ptr; *reinterpret_cast<TracerDef**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = tracer->Asset();
return true; return true;
} }
@ -156,11 +156,11 @@ bool InfoStringToStructConverter::ConvertBaseField(const cspField_t& field, cons
{ {
if (value.empty()) if (value.empty())
{ {
*reinterpret_cast<void**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = nullptr; *reinterpret_cast<PhysCollmap**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = nullptr;
return true; return true;
} }
auto* collmap = m_loading_manager->LoadDependency(ASSET_TYPE_PHYSCOLLMAP, value); auto* collmap = m_loading_manager->LoadDependency<AssetPhysCollMap>(value);
if (collmap == nullptr) if (collmap == nullptr)
{ {
@ -169,7 +169,7 @@ bool InfoStringToStructConverter::ConvertBaseField(const cspField_t& field, cons
} }
m_dependencies.emplace(collmap); m_dependencies.emplace(collmap);
*reinterpret_cast<void**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = collmap->m_ptr; *reinterpret_cast<PhysCollmap**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = collmap->Asset();
return true; return true;
} }

8
src/ObjLoading/Game/IW4/Menu/MenuConverterIW4.cpp
View File

@ -83,11 +83,11 @@ namespace IW4
if (materialName.empty()) if (materialName.empty())
return nullptr; return nullptr;
auto* materialDependency = m_manager->LoadDependency(ASSET_TYPE_MATERIAL, materialName); auto* materialDependency = m_manager->LoadDependency<AssetMaterial>(materialName);
if (!materialDependency) if (!materialDependency)
throw MenuConversionException("Failed to load material \"" + materialName + "\"", menu, item); throw MenuConversionException("Failed to load material \"" + materialName + "\"", menu, item);
return static_cast<Material*>(materialDependency->m_ptr); return materialDependency->Asset();
} }
_NODISCARD snd_alias_list_t* ConvertSound(const std::string& soundName, const CommonMenuDef* menu, const CommonItemDef* item = nullptr) const _NODISCARD snd_alias_list_t* ConvertSound(const std::string& soundName, const CommonMenuDef* menu, const CommonItemDef* item = nullptr) const
@ -95,11 +95,11 @@ namespace IW4
if (soundName.empty()) if (soundName.empty())
return nullptr; return nullptr;
auto* soundDependency = m_manager->LoadDependency(ASSET_TYPE_SOUND, soundName); auto* soundDependency = m_manager->LoadDependency<AssetSound>(soundName);
if (!soundDependency) if (!soundDependency)
throw MenuConversionException("Failed to load sound \"" + soundName + "\"", menu, item); throw MenuConversionException("Failed to load sound \"" + soundName + "\"", menu, item);
return static_cast<snd_alias_list_t*>(soundDependency->m_ptr); return soundDependency->Asset();
} }
bool HandleStaticDvarFunctionCall(Statement_s* gameStatement, bool HandleStaticDvarFunctionCall(Statement_s* gameStatement,

10
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderWeapon.cpp
View File

@ -135,7 +135,7 @@ namespace
if (ConvertString(value, field.iOffset)) if (ConvertString(value, field.iOffset))
{ {
if (!value.empty()) if (!value.empty())
m_indirect_asset_references.emplace(m_loading_manager->LoadIndirectAssetReference(ASSET_TYPE_XANIMPARTS, value)); m_indirect_asset_references.emplace(m_loading_manager->LoadIndirectAssetReference<AssetXAnim>(value));
return true; return true;
} }
@ -157,7 +157,7 @@ namespace
auto currentOther = 0u; auto currentOther = 0u;
for (const auto& attachmentName : valueArray) for (const auto& attachmentName : valueArray)
{ {
auto* attachmentInfo = static_cast<XAssetInfo<WeaponAttachment>*>(m_loading_manager->LoadDependency(ASSET_TYPE_ATTACHMENT, attachmentName)); auto* attachmentInfo = m_loading_manager->LoadDependency<AssetAttachment>(attachmentName);
if (!attachmentInfo) if (!attachmentInfo)
return false; return false;
m_dependencies.emplace(attachmentInfo); m_dependencies.emplace(attachmentInfo);
@ -448,7 +448,7 @@ namespace
} }
animName = m_memory->Dup(value.c_str()); animName = m_memory->Dup(value.c_str());
m_indirect_asset_references.emplace(m_loading_manager->LoadIndirectAssetReference(ASSET_TYPE_XANIMPARTS, value)); m_indirect_asset_references.emplace(m_loading_manager->LoadIndirectAssetReference<AssetXAnim>(value));
} }
void ParseSoundAlias(const std::string& value, SndAliasCustom& soundAlias) void ParseSoundAlias(const std::string& value, SndAliasCustom& soundAlias)
@ -461,7 +461,7 @@ namespace
soundAlias.name = m_memory->Alloc<snd_alias_list_name>(); soundAlias.name = m_memory->Alloc<snd_alias_list_name>();
soundAlias.name->soundName = m_memory->Dup(value.c_str()); soundAlias.name->soundName = m_memory->Dup(value.c_str());
m_indirect_asset_references.emplace(m_loading_manager->LoadIndirectAssetReference(ASSET_TYPE_SOUND, value)); m_indirect_asset_references.emplace(m_loading_manager->LoadIndirectAssetReference<AssetSound>(value));
} }
bool ParseFxEffectDef(const std::string& value, FxEffectDef*& fx) bool ParseFxEffectDef(const std::string& value, FxEffectDef*& fx)
@ -472,7 +472,7 @@ namespace
return true; return true;
} }
auto* fxInfo = static_cast<XAssetInfo<FxEffectDef>*>(m_loading_manager->LoadDependency(ASSET_TYPE_FX, value)); auto* fxInfo = m_loading_manager->LoadDependency<AssetFx>(value);
if (!fxInfo) if (!fxInfo)
{ {
std::cerr << "Failed to load fx for override \"" << value << "\"\n"; std::cerr << "Failed to load fx for override \"" << value << "\"\n";

30
src/ObjLoading/Game/IW5/InfoString/InfoStringToStructConverter.cpp
View File

@ -54,11 +54,11 @@ bool InfoStringToStructConverter::ConvertBaseField(const cspField_t& field, cons
{ {
if (value.empty()) if (value.empty())
{ {
*reinterpret_cast<void**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = nullptr; *reinterpret_cast<FxEffectDef**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = nullptr;
return true; return true;
} }
auto* fx = m_loading_manager->LoadDependency(ASSET_TYPE_FX, value); auto* fx = m_loading_manager->LoadDependency<AssetFx>(value);
if (fx == nullptr) if (fx == nullptr)
{ {
@ -67,7 +67,7 @@ bool InfoStringToStructConverter::ConvertBaseField(const cspField_t& field, cons
} }
m_dependencies.emplace(fx); m_dependencies.emplace(fx);
*reinterpret_cast<void**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = fx->m_ptr; *reinterpret_cast<FxEffectDef**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = fx->Asset();
return true; return true;
} }
@ -76,11 +76,11 @@ bool InfoStringToStructConverter::ConvertBaseField(const cspField_t& field, cons
{ {
if (value.empty()) if (value.empty())
{ {
*reinterpret_cast<void**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = nullptr; *reinterpret_cast<XModel**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = nullptr;
return true; return true;
} }
auto* xmodel = m_loading_manager->LoadDependency(ASSET_TYPE_XMODEL, value); auto* xmodel = m_loading_manager->LoadDependency<AssetXModel>(value);
if (xmodel == nullptr) if (xmodel == nullptr)
{ {
@ -89,7 +89,7 @@ bool InfoStringToStructConverter::ConvertBaseField(const cspField_t& field, cons
} }
m_dependencies.emplace(xmodel); m_dependencies.emplace(xmodel);
*reinterpret_cast<void**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = xmodel->m_ptr; *reinterpret_cast<XModel**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = xmodel->Asset();
return true; return true;
} }
@ -98,11 +98,11 @@ bool InfoStringToStructConverter::ConvertBaseField(const cspField_t& field, cons
{ {
if (value.empty()) if (value.empty())
{ {
*reinterpret_cast<void**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = nullptr; *reinterpret_cast<Material**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = nullptr;
return true; return true;
} }
auto* material = m_loading_manager->LoadDependency(ASSET_TYPE_MATERIAL, value); auto* material = m_loading_manager->LoadDependency<AssetMaterial>(value);
if (material == nullptr) if (material == nullptr)
{ {
@ -111,7 +111,7 @@ bool InfoStringToStructConverter::ConvertBaseField(const cspField_t& field, cons
} }
m_dependencies.emplace(material); m_dependencies.emplace(material);
*reinterpret_cast<void**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = material->m_ptr; *reinterpret_cast<Material**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = material->Asset();
return true; return true;
} }
@ -120,11 +120,11 @@ bool InfoStringToStructConverter::ConvertBaseField(const cspField_t& field, cons
{ {
if (value.empty()) if (value.empty())
{ {
*reinterpret_cast<void**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = nullptr; *reinterpret_cast<TracerDef**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = nullptr;
return true; return true;
} }
auto* tracer = m_loading_manager->LoadDependency(ASSET_TYPE_TRACER, value); auto* tracer = m_loading_manager->LoadDependency<AssetTracer>(value);
if (tracer == nullptr) if (tracer == nullptr)
{ {
@ -133,7 +133,7 @@ bool InfoStringToStructConverter::ConvertBaseField(const cspField_t& field, cons
} }
m_dependencies.emplace(tracer); m_dependencies.emplace(tracer);
*reinterpret_cast<void**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = tracer->m_ptr; *reinterpret_cast<TracerDef**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = tracer->Asset();
return true; return true;
} }
@ -156,11 +156,11 @@ bool InfoStringToStructConverter::ConvertBaseField(const cspField_t& field, cons
{ {
if (value.empty()) if (value.empty())
{ {
*reinterpret_cast<void**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = nullptr; *reinterpret_cast<PhysCollmap**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = nullptr;
return true; return true;
} }
auto* collmap = m_loading_manager->LoadDependency(ASSET_TYPE_PHYSCOLLMAP, value); auto* collmap = m_loading_manager->LoadDependency<AssetPhysCollMap>(value);
if (collmap == nullptr) if (collmap == nullptr)
{ {
@ -169,7 +169,7 @@ bool InfoStringToStructConverter::ConvertBaseField(const cspField_t& field, cons
} }
m_dependencies.emplace(collmap); m_dependencies.emplace(collmap);
*reinterpret_cast<void**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = collmap->m_ptr; *reinterpret_cast<PhysCollmap**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = collmap->Asset();
return true; return true;
} }

8
src/ObjLoading/Game/IW5/Menu/MenuConverterIW5.cpp
View File

@ -83,11 +83,11 @@ namespace IW5
if (materialName.empty()) if (materialName.empty())
return nullptr; return nullptr;
auto* materialDependency = m_manager->LoadDependency(ASSET_TYPE_MATERIAL, materialName); auto* materialDependency = m_manager->LoadDependency<AssetMaterial>(materialName);
if (!materialDependency) if (!materialDependency)
throw MenuConversionException("Failed to load material \"" + materialName + "\"", menu, item); throw MenuConversionException("Failed to load material \"" + materialName + "\"", menu, item);
return static_cast<Material*>(materialDependency->m_ptr); return materialDependency->Asset();
} }
_NODISCARD snd_alias_list_t* ConvertSound(const std::string& soundName, const CommonMenuDef* menu, const CommonItemDef* item = nullptr) const _NODISCARD snd_alias_list_t* ConvertSound(const std::string& soundName, const CommonMenuDef* menu, const CommonItemDef* item = nullptr) const
@ -95,11 +95,11 @@ namespace IW5
if (soundName.empty()) if (soundName.empty())
return nullptr; return nullptr;
auto* soundDependency = m_manager->LoadDependency(ASSET_TYPE_SOUND, soundName); auto* soundDependency = m_manager->LoadDependency<AssetSound>(soundName);
if (!soundDependency) if (!soundDependency)
throw MenuConversionException("Failed to load sound \"" + soundName + "\"", menu, item); throw MenuConversionException("Failed to load sound \"" + soundName + "\"", menu, item);
return static_cast<snd_alias_list_t*>(soundDependency->m_ptr); return soundDependency->Asset();
} }
bool HandleStaticDvarFunctionCall(Statement_s* gameStatement, bool HandleStaticDvarFunctionCall(Statement_s* gameStatement,

4
src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderFontIcon.cpp
View File

@ -117,14 +117,14 @@ bool AssetLoaderFontIcon::ReadIconRow(const std::vector<std::string>& row,
return false; return false;
} }
auto* materialDependency = manager->LoadDependency(ASSET_TYPE_MATERIAL, row[ROW_ICON_MATERIAL]); auto* materialDependency = manager->LoadDependency<AssetMaterial>(row[ROW_ICON_MATERIAL]);
if (materialDependency == nullptr) if (materialDependency == nullptr)
{ {
std::cout << ErrorPrefix(assetName, rowIndex) << "Failed to load material \"" << row[ROW_ICON_MATERIAL] << "\"\n"; std::cout << ErrorPrefix(assetName, rowIndex) << "Failed to load material \"" << row[ROW_ICON_MATERIAL] << "\"\n";
return false; return false;
} }
icon.fontIconMaterialHandle = static_cast<Material*>(materialDependency->m_ptr); icon.fontIconMaterialHandle = materialDependency->Asset();
icon.fontIconName.string = memory->Dup(row[ROW_ICON_NAME].c_str()); icon.fontIconName.string = memory->Dup(row[ROW_ICON_NAME].c_str());
icon.fontIconName.hash = Common::Com_HashString(icon.fontIconName.string); icon.fontIconName.hash = Common::Com_HashString(icon.fontIconName.string);

16
src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeapon.cpp
View File

@ -132,11 +132,11 @@ namespace T6
{ {
if (value.empty()) if (value.empty())
{ {
*reinterpret_cast<void**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = nullptr; *reinterpret_cast<WeaponCamo**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = nullptr;
return true; return true;
} }
auto* camo = m_loading_manager->LoadDependency(ASSET_TYPE_WEAPON_CAMO, value); auto* camo = m_loading_manager->LoadDependency<AssetWeaponCamo>(value);
if (camo == nullptr) if (camo == nullptr)
{ {
@ -145,7 +145,7 @@ namespace T6
} }
m_dependencies.emplace(camo); m_dependencies.emplace(camo);
*reinterpret_cast<void**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = camo->m_ptr; *reinterpret_cast<WeaponCamo**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = camo->Asset();
return true; return true;
} }
@ -163,14 +163,14 @@ namespace T6
for (const auto& attachmentName : valueArray) for (const auto& attachmentName : valueArray)
{ {
auto* attachmentAssetInfo = m_loading_manager->LoadDependency(ASSET_TYPE_ATTACHMENT, attachmentName); auto* attachmentAssetInfo = m_loading_manager->LoadDependency<AssetAttachment>(attachmentName);
if (attachmentAssetInfo == nullptr) if (attachmentAssetInfo == nullptr)
{ {
std::cerr << "Failed to load attachment asset \"" << attachmentName << "\"\n"; std::cerr << "Failed to load attachment asset \"" << attachmentName << "\"\n";
return false; return false;
} }
auto* attachmentAsset = static_cast<WeaponAttachment*>(attachmentAssetInfo->m_ptr); auto* attachmentAsset = attachmentAssetInfo->Asset();
if (static_cast<unsigned>(attachmentAsset->attachmentType) >= ATTACHMENT_TYPE_COUNT) if (static_cast<unsigned>(attachmentAsset->attachmentType) >= ATTACHMENT_TYPE_COUNT)
{ {
@ -212,14 +212,14 @@ namespace T6
for (const auto& attachmentUniqueName : valueArray) for (const auto& attachmentUniqueName : valueArray)
{ {
auto* attachmentUniqueAssetInfo = m_loading_manager->LoadDependency(ASSET_TYPE_ATTACHMENT_UNIQUE, attachmentUniqueName); auto* attachmentUniqueAssetInfo = m_loading_manager->LoadDependency<AssetAttachmentUnique>(attachmentUniqueName);
if (attachmentUniqueAssetInfo == nullptr) if (attachmentUniqueAssetInfo == nullptr)
{ {
std::cerr << "Failed to load attachment unique asset \"" << attachmentUniqueName << "\"\n"; std::cerr << "Failed to load attachment unique asset \"" << attachmentUniqueName << "\"\n";
return false; return false;
} }
auto* attachmentUniqueAsset = static_cast<WeaponAttachmentUnique*>(attachmentUniqueAssetInfo->m_ptr); auto* attachmentUniqueAsset = attachmentUniqueAssetInfo->Asset();
if (HasMoreThanOneAttachmentSetInMask(attachmentUniqueAsset->combinedAttachmentTypeMask)) if (HasMoreThanOneAttachmentSetInMask(attachmentUniqueAsset->combinedAttachmentTypeMask))
{ {
@ -263,7 +263,7 @@ namespace T6
if (ConvertString(value, field.iOffset)) if (ConvertString(value, field.iOffset))
{ {
if (!value.empty()) if (!value.empty())
m_indirect_asset_references.emplace(m_loading_manager->LoadIndirectAssetReference(ASSET_TYPE_XANIMPARTS, value)); m_indirect_asset_references.emplace(m_loading_manager->LoadIndirectAssetReference<AssetXAnim>(value));
return true; return true;
} }

8
src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeaponAttachmentUnique.cpp
View File

@ -62,11 +62,11 @@ namespace T6
{ {
if (value.empty()) if (value.empty())
{ {
*reinterpret_cast<void**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = nullptr; *reinterpret_cast<WeaponCamo**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = nullptr;
return true; return true;
} }
auto* camo = m_loading_manager->LoadDependency(ASSET_TYPE_WEAPON_CAMO, value); auto* camo = m_loading_manager->LoadDependency<AssetWeaponCamo>(value);
if (camo == nullptr) if (camo == nullptr)
{ {
@ -75,7 +75,7 @@ namespace T6
} }
m_dependencies.emplace(camo); m_dependencies.emplace(camo);
*reinterpret_cast<void**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = camo->m_ptr; *reinterpret_cast<WeaponCamo**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = camo->Asset();
return true; return true;
} }
@ -85,7 +85,7 @@ namespace T6
if (ConvertString(value, field.iOffset)) if (ConvertString(value, field.iOffset))
{ {
if (!value.empty()) if (!value.empty())
m_indirect_asset_references.emplace(m_loading_manager->LoadIndirectAssetReference(ASSET_TYPE_XANIMPARTS, value)); m_indirect_asset_references.emplace(m_loading_manager->LoadIndirectAssetReference<AssetXAnim>(value));
return true; return true;
} }

30
src/ObjLoading/Game/T6/InfoString/InfoStringToStructConverter.cpp
View File

@ -72,11 +72,11 @@ bool InfoStringToStructConverter::ConvertBaseField(const cspField_t& field, cons
{ {
if (value.empty()) if (value.empty())
{ {
*reinterpret_cast<void**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = nullptr; *reinterpret_cast<FxEffectDef**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = nullptr;
return true; return true;
} }
auto* fx = m_loading_manager->LoadDependency(ASSET_TYPE_FX, value); auto* fx = m_loading_manager->LoadDependency<AssetFx>(value);
if (fx == nullptr) if (fx == nullptr)
{ {
@ -85,7 +85,7 @@ bool InfoStringToStructConverter::ConvertBaseField(const cspField_t& field, cons
} }
m_dependencies.emplace(fx); m_dependencies.emplace(fx);
*reinterpret_cast<void**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = fx->m_ptr; *reinterpret_cast<FxEffectDef**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = fx->Asset();
return true; return true;
} }
@ -94,11 +94,11 @@ bool InfoStringToStructConverter::ConvertBaseField(const cspField_t& field, cons
{ {
if (value.empty()) if (value.empty())
{ {
*reinterpret_cast<void**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = nullptr; *reinterpret_cast<XModel**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = nullptr;
return true; return true;
} }
auto* xmodel = m_loading_manager->LoadDependency(ASSET_TYPE_XMODEL, value); auto* xmodel = m_loading_manager->LoadDependency<AssetXModel>(value);
if (xmodel == nullptr) if (xmodel == nullptr)
{ {
@ -107,7 +107,7 @@ bool InfoStringToStructConverter::ConvertBaseField(const cspField_t& field, cons
} }
m_dependencies.emplace(xmodel); m_dependencies.emplace(xmodel);
*reinterpret_cast<void**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = xmodel->m_ptr; *reinterpret_cast<XModel**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = xmodel->Asset();
return true; return true;
} }
@ -117,11 +117,11 @@ bool InfoStringToStructConverter::ConvertBaseField(const cspField_t& field, cons
{ {
if (value.empty()) if (value.empty())
{ {
*reinterpret_cast<void**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = nullptr; *reinterpret_cast<Material**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = nullptr;
return true; return true;
} }
auto* material = m_loading_manager->LoadDependency(ASSET_TYPE_MATERIAL, value); auto* material = m_loading_manager->LoadDependency<AssetMaterial>(value);
if (material == nullptr) if (material == nullptr)
{ {
@ -130,7 +130,7 @@ bool InfoStringToStructConverter::ConvertBaseField(const cspField_t& field, cons
} }
m_dependencies.emplace(material); m_dependencies.emplace(material);
*reinterpret_cast<void**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = material->m_ptr; *reinterpret_cast<Material**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = material->Asset();
return true; return true;
} }
@ -139,11 +139,11 @@ bool InfoStringToStructConverter::ConvertBaseField(const cspField_t& field, cons
{ {
if (value.empty()) if (value.empty())
{ {
*reinterpret_cast<void**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = nullptr; *reinterpret_cast<PhysPreset**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = nullptr;
return true; return true;
} }
auto* physPreset = m_loading_manager->LoadDependency(ASSET_TYPE_PHYSPRESET, value); auto* physPreset = m_loading_manager->LoadDependency<AssetPhysPreset>(value);
if (physPreset == nullptr) if (physPreset == nullptr)
{ {
@ -152,7 +152,7 @@ bool InfoStringToStructConverter::ConvertBaseField(const cspField_t& field, cons
} }
m_dependencies.emplace(physPreset); m_dependencies.emplace(physPreset);
*reinterpret_cast<void**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = physPreset->m_ptr; *reinterpret_cast<PhysPreset**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = physPreset->Asset();
return true; return true;
} }
@ -164,11 +164,11 @@ bool InfoStringToStructConverter::ConvertBaseField(const cspField_t& field, cons
{ {
if (value.empty()) if (value.empty())
{ {
*reinterpret_cast<void**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = nullptr; *reinterpret_cast<TracerDef**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = nullptr;
return true; return true;
} }
auto* tracer = m_loading_manager->LoadDependency(ASSET_TYPE_TRACER, value); auto* tracer = m_loading_manager->LoadDependency<AssetTracer>(value);
if (tracer == nullptr) if (tracer == nullptr)
{ {
@ -177,7 +177,7 @@ bool InfoStringToStructConverter::ConvertBaseField(const cspField_t& field, cons
} }
m_dependencies.emplace(tracer); m_dependencies.emplace(tracer);
*reinterpret_cast<void**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = tracer->m_ptr; *reinterpret_cast<TracerDef**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset) = tracer->Asset();
return true; return true;
} }

6
src/ObjLoading/Game/T6/Material/JsonMaterialLoader.cpp
View File

@ -99,7 +99,7 @@ namespace
textureDef.semantic = jTexture.semantic; textureDef.semantic = jTexture.semantic;
textureDef.isMatureContent = jTexture.isMatureContent; textureDef.isMatureContent = jTexture.isMatureContent;
auto* image = static_cast<XAssetInfo<GfxImage>*>(m_manager.LoadDependency(ASSET_TYPE_IMAGE, jTexture.image)); auto* image = m_manager.LoadDependency<AssetImage>(jTexture.image);
if (!image) if (!image)
{ {
PrintError(material, std::format("Could not find textureDef image: {}", jTexture.image)); PrintError(material, std::format("Could not find textureDef image: {}", jTexture.image));
@ -275,7 +275,7 @@ namespace
material.cameraRegion = jMaterial.cameraRegion; material.cameraRegion = jMaterial.cameraRegion;
material.probeMipBits = jMaterial.probeMipBits; material.probeMipBits = jMaterial.probeMipBits;
auto* techniqueSet = static_cast<XAssetInfo<MaterialTechniqueSet>*>(m_manager.LoadDependency(ASSET_TYPE_TECHNIQUE_SET, jMaterial.techniqueSet)); auto* techniqueSet = m_manager.LoadDependency<AssetTechniqueSet>(jMaterial.techniqueSet);
if (!techniqueSet) if (!techniqueSet)
{ {
PrintError(material, "Could not find technique set"); PrintError(material, "Could not find technique set");
@ -337,7 +337,7 @@ namespace
if (jMaterial.thermalMaterial) if (jMaterial.thermalMaterial)
{ {
auto* thermalMaterial = static_cast<XAssetInfo<Material>*>(m_manager.LoadDependency(ASSET_TYPE_MATERIAL, jMaterial.thermalMaterial.value())); auto* thermalMaterial = m_manager.LoadDependency<AssetMaterial>(jMaterial.thermalMaterial.value());
if (!thermalMaterial) if (!thermalMaterial)
{ {
PrintError(material, "Could not find thermal material"); PrintError(material, "Could not find thermal material");

12
src/ObjLoading/Game/T6/WeaponCamo/JsonWeaponCamoLoader.cpp
View File

@ -53,7 +53,7 @@ namespace
{ {
if (jWeaponCamoSet.solidCamoImage) if (jWeaponCamoSet.solidCamoImage)
{ {
auto* image = static_cast<XAssetInfo<GfxImage>*>(m_manager.LoadDependency(ASSET_TYPE_IMAGE, jWeaponCamoSet.solidCamoImage.value())); auto* image = m_manager.LoadDependency<AssetImage>(jWeaponCamoSet.solidCamoImage.value());
if (!image) if (!image)
{ {
PrintError(weaponCamo, "Could not find solidCamoImage"); PrintError(weaponCamo, "Could not find solidCamoImage");
@ -65,7 +65,7 @@ namespace
if (jWeaponCamoSet.patternCamoImage) if (jWeaponCamoSet.patternCamoImage)
{ {
auto* image = static_cast<XAssetInfo<GfxImage>*>(m_manager.LoadDependency(ASSET_TYPE_IMAGE, jWeaponCamoSet.patternCamoImage.value())); auto* image = m_manager.LoadDependency<AssetImage>(jWeaponCamoSet.patternCamoImage.value());
if (!image) if (!image)
{ {
PrintError(weaponCamo, "Could not find patternCamoImage"); PrintError(weaponCamo, "Could not find patternCamoImage");
@ -102,8 +102,8 @@ namespace
for (auto i = 0u; i < weaponCamoMaterial.numBaseMaterials; i++) for (auto i = 0u; i < weaponCamoMaterial.numBaseMaterials; i++)
{ {
const auto& materialOverride = jWeaponCamoMaterial.materialOverrides[i]; const auto& materialOverride = jWeaponCamoMaterial.materialOverrides[i];
auto* baseMaterial = static_cast<XAssetInfo<Material>*>(m_manager.LoadDependency(ASSET_TYPE_MATERIAL, materialOverride.baseMaterial)); auto* baseMaterial = m_manager.LoadDependency<AssetMaterial>(materialOverride.baseMaterial);
auto* camoMaterial = static_cast<XAssetInfo<Material>*>(m_manager.LoadDependency(ASSET_TYPE_MATERIAL, materialOverride.camoMaterial)); auto* camoMaterial = m_manager.LoadDependency<AssetMaterial>(materialOverride.camoMaterial);
if (!baseMaterial) if (!baseMaterial)
{ {
@ -164,7 +164,7 @@ namespace
{ {
if (jWeaponCamo.solidBaseImage) if (jWeaponCamo.solidBaseImage)
{ {
auto* image = static_cast<XAssetInfo<GfxImage>*>(m_manager.LoadDependency(ASSET_TYPE_IMAGE, jWeaponCamo.solidBaseImage.value())); auto* image = m_manager.LoadDependency<AssetImage>(jWeaponCamo.solidBaseImage.value());
if (!image) if (!image)
{ {
PrintError(weaponCamo, "Could not find solidBaseImage"); PrintError(weaponCamo, "Could not find solidBaseImage");
@ -176,7 +176,7 @@ namespace
if (jWeaponCamo.patternBaseImage) if (jWeaponCamo.patternBaseImage)
{ {
auto* image = static_cast<XAssetInfo<GfxImage>*>(m_manager.LoadDependency(ASSET_TYPE_IMAGE, jWeaponCamo.patternBaseImage.value())); auto* image = m_manager.LoadDependency<AssetImage>(jWeaponCamo.patternBaseImage.value());
if (!image) if (!image)
{ {
PrintError(weaponCamo, "Could not find patternBaseImage"); PrintError(weaponCamo, "Could not find patternBaseImage");