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

chore: update usages of AddAsset for template asset struct api

Browse Source
This commit is contained in:
Jan 2024-04-23 00:06:48 +02:00
parent 931fe695e1
commit ae43a994b9
No known key found for this signature in database
GPG Key ID: 44B581F78FF5C57C
49 changed files with 66 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ObjLoading/AssetLoading/AssetLoadingManager.cpp
View File

@ -50,8 +50,7 @@ XAssetInfoGeneric* AssetLoadingManager::LoadIgnoredDependency(const asset_type_t
auto* linkAsset = loader->CreateEmptyAsset(assetName, m_context.m_zone->GetMemory()); auto* linkAsset = loader->CreateEmptyAsset(assetName, m_context.m_zone->GetMemory());
if (linkAsset) if (linkAsset)
{ {
IAssetLoadingManager::AddAsset( AddAsset(std::make_unique<XAssetInfoGeneric>(assetType, assetName, linkAsset));
assetType, assetName, linkAsset, std::vector<XAssetInfoGeneric*>(), std::vector<scr_string_t>(), std::vector<IndirectAssetReference>());
auto* lastDependency = m_last_dependency_loaded; auto* lastDependency = m_last_dependency_loaded;
m_last_dependency_loaded = nullptr; m_last_dependency_loaded = nullptr;
return lastDependency; return lastDependency;

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

@ -127,7 +127,7 @@ bool AssetLoaderGfxImage::LoadFromRaw(
} }
} }
manager->AddAsset(ASSET_TYPE_IMAGE, assetName, image); manager->AddAsset<AssetImage>(assetName, image);
return true; return true;
} }

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

@ -29,7 +29,7 @@ bool AssetLoaderLocalizeEntry::LoadFromRaw(
localizeEntry->name = memory->Dup(entry.m_key.c_str()); localizeEntry->name = memory->Dup(entry.m_key.c_str());
localizeEntry->value = memory->Dup(entry.m_value.c_str()); localizeEntry->value = memory->Dup(entry.m_value.c_str());
manager->AddAsset(ASSET_TYPE_LOCALIZE_ENTRY, entry.m_key, localizeEntry); manager->AddAsset<AssetLocalize>(entry.m_key, localizeEntry);
}); });
return commonLoader.LoadLocalizeAsset(assetName, searchPath, manager, zone); return commonLoader.LoadLocalizeAsset(assetName, searchPath, manager, zone);

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

@ -38,7 +38,7 @@ bool AssetLoaderRawFile::LoadFromRaw(
fileBuffer[rawFile->len] = '\0'; fileBuffer[rawFile->len] = '\0';
rawFile->buffer = fileBuffer; rawFile->buffer = fileBuffer;
manager->AddAsset(ASSET_TYPE_RAWFILE, assetName, rawFile); manager->AddAsset<AssetRawFile>(assetName, rawFile);
return true; return true;
} }

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

@ -33,7 +33,7 @@ bool AssetLoaderStringTable::LoadFromRaw(
string_table::StringTableLoaderV1<StringTable> loader; string_table::StringTableLoaderV1<StringTable> loader;
auto* stringTable = loader.LoadFromStream(assetName, *memory, *file.m_stream); auto* stringTable = loader.LoadFromStream(assetName, *memory, *file.m_stream);
manager->AddAsset(ASSET_TYPE_STRINGTABLE, assetName, stringTable); manager->AddAsset<AssetStringTable>(assetName, stringTable);
return true; return true;
} }

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

@ -66,7 +66,7 @@ bool AssetLoaderGfxLightDef::LoadFromRaw(
lightDef->attenuation.image = imageDependency->Asset(); lightDef->attenuation.image = imageDependency->Asset();
lightDef->lmapLookupStart = static_cast<int>(static_cast<uint8_t>(lmapLookupStart)); lightDef->lmapLookupStart = static_cast<int>(static_cast<uint8_t>(lmapLookupStart));
manager->AddAsset(ASSET_TYPE_LIGHT_DEF, assetName, lightDef); manager->AddAsset<AssetLightDef>(assetName, lightDef);
return true; return true;
} }

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

@ -29,7 +29,7 @@ bool AssetLoaderLocalizeEntry::LoadFromRaw(
localizeEntry->name = memory->Dup(entry.m_key.c_str()); localizeEntry->name = memory->Dup(entry.m_key.c_str());
localizeEntry->value = memory->Dup(entry.m_value.c_str()); localizeEntry->value = memory->Dup(entry.m_value.c_str());
manager->AddAsset(ASSET_TYPE_LOCALIZE_ENTRY, entry.m_key, localizeEntry); manager->AddAsset<AssetLocalize>(entry.m_key, localizeEntry);
}); });
return commonLoader.LoadLocalizeAsset(assetName, searchPath, manager, zone); return commonLoader.LoadLocalizeAsset(assetName, searchPath, manager, zone);

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

@ -1381,7 +1381,9 @@ bool AssetLoaderMaterial::LoadFromGdt(
try try
{ {
if (loader.Load()) if (loader.Load())
manager->AddAsset(ASSET_TYPE_MATERIAL, assetName, loader.GetMaterial(), loader.GetDependencies(), std::vector<scr_string_t>()); {
manager->AddAsset<AssetMaterial>(assetName, loader.GetMaterial(), loader.GetDependencies());
}
} }
catch (const SkipMaterialException&) catch (const SkipMaterialException&)
{ {

7
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderMenuList.cpp
View File

@ -57,12 +57,11 @@ namespace IW4
} }
menus.push_back(menuAsset); menus.push_back(menuAsset);
auto* menuAssetInfo = auto* menuAssetInfo = manager->AddAsset<AssetMenu>(menu->m_name, menuAsset, std::move(converter.GetDependencies()));
manager->AddAsset(ASSET_TYPE_MENU, menu->m_name, menuAsset, std::move(converter.GetDependencies()), std::vector<scr_string_t>());
if (menuAssetInfo) if (menuAssetInfo)
{ {
allMenusOfFile.push_back(reinterpret_cast<XAssetInfo<menuDef_t>*>(menuAssetInfo)); allMenusOfFile.push_back(menuAssetInfo);
menuListDependencies.push_back(menuAssetInfo); menuListDependencies.push_back(menuAssetInfo);
} }
@ -223,7 +222,7 @@ bool AssetLoaderMenuList::LoadFromRaw(
auto* menuListAsset = MenuLoader::CreateMenuListAsset(assetName, memory, menus); auto* menuListAsset = MenuLoader::CreateMenuListAsset(assetName, memory, menus);
if (menuListAsset) if (menuListAsset)
manager->AddAsset(ASSET_TYPE_MENULIST, assetName, menuListAsset, menuListDependencies, std::vector<scr_string_t>()); manager->AddAsset<AssetMenuList>(assetName, menuListAsset, menuListDependencies);
return true; return true;
} }

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

@ -75,7 +75,7 @@ bool AssetLoaderPhysPreset::LoadFromInfoString(
CopyFromPhysPresetInfo(presetInfo.get(), physPreset); CopyFromPhysPresetInfo(presetInfo.get(), physPreset);
physPreset->name = memory->Dup(assetName.c_str()); physPreset->name = memory->Dup(assetName.c_str());
manager->AddAsset(ASSET_TYPE_PHYSPRESET, assetName, physPreset, converter.GetDependencies(), converter.GetUsedScriptStrings()); manager->AddAsset<AssetPhysPreset>(assetName, physPreset, converter.GetDependencies(), converter.GetUsedScriptStrings());
return true; return true;
} }

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

@ -57,7 +57,7 @@ bool AssetLoaderPixelShader::LoadFromRaw(
return false; return false;
pixelShader->prog.loadDef.program = fileBuffer; pixelShader->prog.loadDef.program = fileBuffer;
manager->AddAsset(ASSET_TYPE_PIXELSHADER, assetName, pixelShader); manager->AddAsset<AssetPixelShader>(assetName, pixelShader);
return true; return true;
} }

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

@ -74,7 +74,7 @@ bool AssetLoaderRawFile::LoadFromRaw(
deflateEnd(&zs); deflateEnd(&zs);
manager->AddAsset(ASSET_TYPE_RAWFILE, assetName, rawFile); manager->AddAsset<AssetRawFile>(assetName, rawFile);
return true; return true;
} }

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

@ -73,7 +73,7 @@ bool AssetLoaderSndCurve::LoadFromRaw(
} }
} }
manager->AddAsset(ASSET_TYPE_SOUND_CURVE, assetName, sndCurve); manager->AddAsset<AssetSoundCurve>(assetName, sndCurve);
return true; return true;
} }

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

@ -34,7 +34,7 @@ bool AssetLoaderStringTable::LoadFromRaw(
string_table::StringTableLoaderV2<StringTable, Common::StringTable_HashString> loader; string_table::StringTableLoaderV2<StringTable, Common::StringTable_HashString> loader;
auto* stringTable = loader.LoadFromStream(assetName, *memory, *file.m_stream); auto* stringTable = loader.LoadFromStream(assetName, *memory, *file.m_stream);
manager->AddAsset(ASSET_TYPE_STRINGTABLE, assetName, stringTable); manager->AddAsset<AssetStringTable>(assetName, stringTable);
return true; return true;
} }

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

@ -214,7 +214,7 @@ bool AssetLoaderStructuredDataDefSet::LoadFromRaw(
const auto defs = reader.ReadStructureDataDefs(readingDefsSuccessful); const auto defs = reader.ReadStructureDataDefs(readingDefsSuccessful);
if (readingDefsSuccessful) if (readingDefsSuccessful)
manager->AddAsset(ASSET_TYPE_STRUCTURED_DATA_DEF, assetName, ConvertSet(assetName, defs, memory)); manager->AddAsset<AssetStructuredDataDef>(assetName, ConvertSet(assetName, defs, memory));
return true; return true;
} }

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

@ -1329,7 +1329,7 @@ bool AssetLoaderTechniqueSet::CreateTechsetFromDefinition(
} }
} }
manager->AddAsset(ASSET_TYPE_TECHNIQUE_SET, assetName, techset, std::vector(dependencies.begin(), dependencies.end()), std::vector<scr_string_t>()); manager->AddAsset<AssetTechniqueSet>(assetName, techset, std::vector(dependencies.begin(), dependencies.end()));
return true; return true;
} }

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

@ -96,6 +96,6 @@ bool AssetLoaderVertexDecl::LoadFromRaw(
auto* allocatedDecl = memory->Create<MaterialVertexDeclaration>(decl); auto* allocatedDecl = memory->Create<MaterialVertexDeclaration>(decl);
manager->AddAsset(ASSET_TYPE_VERTEXDECL, assetName, allocatedDecl); manager->AddAsset<AssetVertexDecl>(assetName, allocatedDecl);
return true; return true;
} }

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

@ -57,7 +57,7 @@ bool AssetLoaderVertexShader::LoadFromRaw(
return false; return false;
vertexShader->prog.loadDef.program = fileBuffer; vertexShader->prog.loadDef.program = fileBuffer;
manager->AddAsset(ASSET_TYPE_VERTEXSHADER, assetName, vertexShader); manager->AddAsset<AssetVertexShader>(assetName, vertexShader);
return true; return true;
} }

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

@ -387,12 +387,8 @@ namespace
CalculateWeaponFields(weaponFullDef, memory); CalculateWeaponFields(weaponFullDef, memory);
manager->AddAsset(ASSET_TYPE_WEAPON, manager->AddAsset<AssetWeapon>(
assetName, assetName, &weaponFullDef->weapCompleteDef, converter.GetDependencies(), converter.GetUsedScriptStrings(), converter.GetIndirectAssetReferences());
&weaponFullDef->weapCompleteDef,
converter.GetDependencies(),
converter.GetUsedScriptStrings(),
converter.GetIndirectAssetReferences());
return true; return true;
} }

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

@ -29,7 +29,7 @@ bool AssetLoaderLocalizeEntry::LoadFromRaw(
localizeEntry->name = memory->Dup(entry.m_key.c_str()); localizeEntry->name = memory->Dup(entry.m_key.c_str());
localizeEntry->value = memory->Dup(entry.m_value.c_str()); localizeEntry->value = memory->Dup(entry.m_value.c_str());
manager->AddAsset(ASSET_TYPE_LOCALIZE_ENTRY, entry.m_key, localizeEntry); manager->AddAsset<AssetLocalize>(entry.m_key, localizeEntry);
}); });
return commonLoader.LoadLocalizeAsset(assetName, searchPath, manager, zone); return commonLoader.LoadLocalizeAsset(assetName, searchPath, manager, zone);

7
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderMenuList.cpp
View File

@ -57,12 +57,11 @@ namespace IW5
} }
menus.push_back(menuAsset); menus.push_back(menuAsset);
auto* menuAssetInfo = auto* menuAssetInfo = manager->AddAsset<AssetMenu>(menu->m_name, menuAsset, std::move(converter.GetDependencies()));
manager->AddAsset(ASSET_TYPE_MENU, menu->m_name, menuAsset, std::move(converter.GetDependencies()), std::vector<scr_string_t>());
if (menuAssetInfo) if (menuAssetInfo)
{ {
allMenusOfFile.push_back(reinterpret_cast<XAssetInfo<menuDef_t>*>(menuAssetInfo)); allMenusOfFile.push_back(menuAssetInfo);
menuListDependencies.push_back(menuAssetInfo); menuListDependencies.push_back(menuAssetInfo);
} }
@ -223,7 +222,7 @@ bool AssetLoaderMenuList::LoadFromRaw(
auto* menuListAsset = MenuLoader::CreateMenuListAsset(assetName, memory, menus); auto* menuListAsset = MenuLoader::CreateMenuListAsset(assetName, memory, menus);
if (menuListAsset) if (menuListAsset)
manager->AddAsset(ASSET_TYPE_MENULIST, assetName, menuListAsset, menuListDependencies, std::vector<scr_string_t>()); manager->AddAsset<AssetMenuList>(assetName, menuListAsset, menuListDependencies);
return true; return true;
} }

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

@ -74,7 +74,7 @@ bool AssetLoaderRawFile::LoadFromRaw(
deflateEnd(&zs); deflateEnd(&zs);
manager->AddAsset(ASSET_TYPE_RAWFILE, assetName, rawFile); manager->AddAsset<AssetRawFile>(assetName, rawFile);
return true; return true;
} }

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

@ -72,7 +72,7 @@ bool AssetLoaderScriptFile::LoadFromRaw(
scriptFile->bytecode = memory->Alloc<unsigned char>(scriptFile->bytecodeLen); scriptFile->bytecode = memory->Alloc<unsigned char>(scriptFile->bytecodeLen);
memcpy(scriptFile->bytecode, fileBuffer.get() + offset, scriptFile->bytecodeLen); memcpy(scriptFile->bytecode, fileBuffer.get() + offset, scriptFile->bytecodeLen);
manager->AddAsset(ASSET_TYPE_SCRIPTFILE, assetName, scriptFile); manager->AddAsset<AssetScript>(assetName, scriptFile);
return true; return true;
} }

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

@ -34,7 +34,7 @@ bool AssetLoaderStringTable::LoadFromRaw(
string_table::StringTableLoaderV2<StringTable, Common::StringTable_HashString> loader; string_table::StringTableLoaderV2<StringTable, Common::StringTable_HashString> loader;
auto* stringTable = loader.LoadFromStream(assetName, *memory, *file.m_stream); auto* stringTable = loader.LoadFromStream(assetName, *memory, *file.m_stream);
manager->AddAsset(ASSET_TYPE_STRINGTABLE, assetName, stringTable); manager->AddAsset<AssetStringTable>(assetName, stringTable);
return true; return true;
} }

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

@ -817,12 +817,8 @@ namespace
CalculateWeaponFields(weaponFullDef, memory); CalculateWeaponFields(weaponFullDef, memory);
manager->AddAsset(ASSET_TYPE_WEAPON, manager->AddAsset<AssetWeapon>(
assetName, assetName, &weaponFullDef->weapCompleteDef, converter.GetDependencies(), converter.GetUsedScriptStrings(), converter.GetIndirectAssetReferences());
&weaponFullDef->weapCompleteDef,
converter.GetDependencies(),
converter.GetUsedScriptStrings(),
converter.GetIndirectAssetReferences());
return true; return true;
} }

3
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderWeaponAttachment.cpp
View File

@ -37,8 +37,7 @@ bool AssetLoaderWeaponAttachment::LoadFromRaw(
std::vector<XAssetInfoGeneric*> dependencies; std::vector<XAssetInfoGeneric*> dependencies;
std::vector<IndirectAssetReference> indirectAssetReferences; std::vector<IndirectAssetReference> indirectAssetReferences;
if (LoadWeaponAttachmentAsJson(*file.m_stream, *attachment, memory, manager, dependencies, indirectAssetReferences)) if (LoadWeaponAttachmentAsJson(*file.m_stream, *attachment, memory, manager, dependencies, indirectAssetReferences))
manager->AddAsset( manager->AddAsset<AssetAttachment>(assetName, attachment, std::move(dependencies), std::vector<scr_string_t>(), std::move(indirectAssetReferences));
ASSET_TYPE_ATTACHMENT, assetName, attachment, std::move(dependencies), std::vector<scr_string_t>(), std::move(indirectAssetReferences));
else else
std::cerr << "Failed to load attachment \"" << assetName << "\"\n"; std::cerr << "Failed to load attachment \"" << assetName << "\"\n";

10
src/ObjLoading/Game/IW5/Weapon/JsonWeaponAttachmentLoader.cpp
View File

@ -120,7 +120,7 @@ namespace
bool CreateTracerFromJson(const std::string& assetName, TracerDef*& tracerPtr, const WeaponAttachment& attachment) const bool CreateTracerFromJson(const std::string& assetName, TracerDef*& tracerPtr, const WeaponAttachment& attachment) const
{ {
auto* tracer = static_cast<XAssetInfo<TracerDef>*>(m_manager.LoadDependency(ASSET_TYPE_TRACER, assetName)); auto* tracer = m_manager.LoadDependency<AssetTracer>(assetName);
if (!tracer) if (!tracer)
{ {
PrintError(attachment, std::format("Could not find tracer {}", assetName)); PrintError(attachment, std::format("Could not find tracer {}", assetName));
@ -134,7 +134,7 @@ namespace
bool CreateMaterialFromJson(const std::string& assetName, Material*& materialPtr, const WeaponAttachment& attachment) const bool CreateMaterialFromJson(const std::string& assetName, Material*& materialPtr, const WeaponAttachment& attachment) const
{ {
auto* material = static_cast<XAssetInfo<Material>*>(m_manager.LoadDependency(ASSET_TYPE_MATERIAL, assetName)); auto* material = m_manager.LoadDependency<AssetMaterial>(assetName);
if (!material) if (!material)
{ {
PrintError(attachment, std::format("Could not find material {}", assetName)); PrintError(attachment, std::format("Could not find material {}", assetName));
@ -148,7 +148,7 @@ namespace
bool CreateFxFromJson(const std::string& assetName, FxEffectDef*& fxPtr, const WeaponAttachment& attachment) const bool CreateFxFromJson(const std::string& assetName, FxEffectDef*& fxPtr, const WeaponAttachment& attachment) const
{ {
auto* fx = static_cast<XAssetInfo<FxEffectDef>*>(m_manager.LoadDependency(ASSET_TYPE_FX, assetName)); auto* fx = m_manager.LoadDependency<AssetFx>(assetName);
if (!fx) if (!fx)
{ {
PrintError(attachment, std::format("Could not find fx {}", assetName)); PrintError(attachment, std::format("Could not find fx {}", assetName));
@ -162,7 +162,7 @@ namespace
bool CreateSoundFromJson(const std::string& assetName, SndAliasCustom& sndAliasCustom, const WeaponAttachment& attachment) const bool CreateSoundFromJson(const std::string& assetName, SndAliasCustom& sndAliasCustom, const WeaponAttachment& attachment) const
{ {
auto sound = m_manager.LoadIndirectAssetReference(ASSET_TYPE_SOUND, assetName); auto sound = m_manager.LoadIndirectAssetReference<AssetSound>(assetName);
m_indirect_asset_references.push_back(std::move(sound)); m_indirect_asset_references.push_back(std::move(sound));
sndAliasCustom.name = m_memory.Alloc<snd_alias_list_name>(); sndAliasCustom.name = m_memory.Alloc<snd_alias_list_name>();
sndAliasCustom.name->soundName = m_memory.Dup(assetName.c_str()); sndAliasCustom.name->soundName = m_memory.Dup(assetName.c_str());
@ -172,7 +172,7 @@ namespace
bool CreateXModelFromJson(const std::string& assetName, XModel*& xmodelPtr, const WeaponAttachment& attachment) const bool CreateXModelFromJson(const std::string& assetName, XModel*& xmodelPtr, const WeaponAttachment& attachment) const
{ {
auto* xmodel = static_cast<XAssetInfo<XModel>*>(m_manager.LoadDependency(ASSET_TYPE_XMODEL, assetName)); auto* xmodel = m_manager.LoadDependency<AssetXModel>(assetName);
if (!xmodel) if (!xmodel)
{ {
PrintError(attachment, std::format("Could not find xmodel {}", assetName)); PrintError(attachment, std::format("Could not find xmodel {}", assetName));

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

@ -29,7 +29,7 @@ bool AssetLoaderLocalizeEntry::LoadFromRaw(
localizeEntry->name = memory->Dup(entry.m_key.c_str()); localizeEntry->name = memory->Dup(entry.m_key.c_str());
localizeEntry->value = memory->Dup(entry.m_value.c_str()); localizeEntry->value = memory->Dup(entry.m_value.c_str());
manager->AddAsset(ASSET_TYPE_LOCALIZE_ENTRY, entry.m_key, localizeEntry); manager->AddAsset<AssetLocalize>(entry.m_key, localizeEntry);
}); });
return commonLoader.LoadLocalizeAsset(assetName, searchPath, manager, zone); return commonLoader.LoadLocalizeAsset(assetName, searchPath, manager, zone);

4
src/ObjLoading/Game/T5/AssetLoaders/AssetLoaderRawFile.cpp
View File

@ -75,7 +75,7 @@ bool AssetLoaderRawFile::LoadGsc(
deflateEnd(&zs); deflateEnd(&zs);
manager->AddAsset(ASSET_TYPE_RAWFILE, assetName, rawFile); manager->AddAsset<AssetRawFile>(assetName, rawFile);
return true; return true;
} }
@ -94,7 +94,7 @@ bool AssetLoaderRawFile::LoadDefault(
fileBuffer[rawFile->len] = '\0'; fileBuffer[rawFile->len] = '\0';
rawFile->buffer = fileBuffer; rawFile->buffer = fileBuffer;
manager->AddAsset(ASSET_TYPE_RAWFILE, assetName, rawFile); manager->AddAsset<AssetRawFile>(assetName, rawFile);
return true; return true;
} }

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

@ -33,7 +33,7 @@ bool AssetLoaderStringTable::LoadFromRaw(
string_table::StringTableLoaderV3<StringTable, Common::Com_HashString> loader; string_table::StringTableLoaderV3<StringTable, Common::Com_HashString> loader;
auto* stringTable = loader.LoadFromStream(assetName, *memory, *file.m_stream); auto* stringTable = loader.LoadFromStream(assetName, *memory, *file.m_stream);
manager->AddAsset(ASSET_TYPE_STRINGTABLE, assetName, stringTable); manager->AddAsset<AssetStringTable>(assetName, stringTable);
return true; return true;
} }

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

@ -265,7 +265,7 @@ bool AssetLoaderFontIcon::LoadFromRaw(
else else
fontIcon->fontIconAlias = nullptr; fontIcon->fontIconAlias = nullptr;
manager->AddAsset(ASSET_TYPE_FONTICON, assetName, fontIcon); manager->AddAsset<AssetFontIcon>(assetName, fontIcon);
return true; return true;
} }

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

@ -66,7 +66,7 @@ bool AssetLoaderGfxImage::LoadFromRaw(
image->streamedParts[0].hash = dataHash & 0x1FFFFFFF; image->streamedParts[0].hash = dataHash & 0x1FFFFFFF;
image->streamedPartCount = 1; image->streamedPartCount = 1;
manager->AddAsset(ASSET_TYPE_IMAGE, assetName, image); manager->AddAsset<AssetImage>(assetName, image);
return true; return true;
} }

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

@ -29,7 +29,7 @@ bool AssetLoaderLocalizeEntry::LoadFromRaw(
localizeEntry->name = memory->Dup(entry.m_key.c_str()); localizeEntry->name = memory->Dup(entry.m_key.c_str());
localizeEntry->value = memory->Dup(entry.m_value.c_str()); localizeEntry->value = memory->Dup(entry.m_value.c_str());
manager->AddAsset(ASSET_TYPE_LOCALIZE_ENTRY, entry.m_key, localizeEntry); manager->AddAsset<AssetLocalize>(entry.m_key, localizeEntry);
}); });
return commonLoader.LoadLocalizeAsset(assetName, searchPath, manager, zone); return commonLoader.LoadLocalizeAsset(assetName, searchPath, manager, zone);

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

@ -51,7 +51,7 @@ bool AssetLoaderMaterial::LoadFromRaw(
std::vector<XAssetInfoGeneric*> dependencies; std::vector<XAssetInfoGeneric*> dependencies;
if (LoadMaterialAsJson(*file.m_stream, *material, memory, manager, dependencies)) if (LoadMaterialAsJson(*file.m_stream, *material, memory, manager, dependencies))
manager->AddAsset(ASSET_TYPE_MATERIAL, assetName, material, std::move(dependencies)); manager->AddAsset<AssetMaterial>(assetName, material, std::move(dependencies));
else else
std::cerr << "Failed to load material \"" << assetName << "\"\n"; std::cerr << "Failed to load material \"" << assetName << "\"\n";

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

@ -95,7 +95,7 @@ bool AssetLoaderPhysConstraints::LoadFromInfoString(
auto scrStrings = converter.GetUsedScriptStrings(); auto scrStrings = converter.GetUsedScriptStrings();
scrStrings.push_back(zone->m_script_strings.AddOrGetScriptString("")); scrStrings.push_back(zone->m_script_strings.AddOrGetScriptString(""));
manager->AddAsset(ASSET_TYPE_PHYSCONSTRAINTS, assetName, physConstraints, converter.GetDependencies(), scrStrings); manager->AddAsset<AssetPhysConstraints>(assetName, physConstraints, converter.GetDependencies(), scrStrings);
return true; return true;
} }

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

@ -78,7 +78,7 @@ bool AssetLoaderPhysPreset::LoadFromInfoString(
CopyFromPhysPresetInfo(presetInfo.get(), physPreset); CopyFromPhysPresetInfo(presetInfo.get(), physPreset);
physPreset->name = memory->Dup(assetName.c_str()); physPreset->name = memory->Dup(assetName.c_str());
manager->AddAsset(ASSET_TYPE_PHYSPRESET, assetName, physPreset, converter.GetDependencies(), converter.GetUsedScriptStrings()); manager->AddAsset<AssetPhysPreset>(assetName, physPreset, converter.GetDependencies(), converter.GetUsedScriptStrings());
return true; return true;
} }

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

@ -37,7 +37,7 @@ bool AssetLoaderQdb::LoadFromRaw(const std::string& assetName, ISearchPath* sear
fileBuffer[qdb->len] = '\0'; fileBuffer[qdb->len] = '\0';
qdb->buffer = static_cast<char16*>(fileBuffer); qdb->buffer = static_cast<char16*>(fileBuffer);
manager->AddAsset(ASSET_TYPE_QDB, assetName, qdb); manager->AddAsset<AssetQdb>(assetName, qdb);
return true; return true;
} }

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

@ -74,7 +74,7 @@ bool AssetLoaderRawFile::LoadAnimtree(
deflateEnd(&zs); deflateEnd(&zs);
manager->AddAsset(ASSET_TYPE_RAWFILE, assetName, rawFile); manager->AddAsset<AssetRawFile>(assetName, rawFile);
return true; return true;
} }
@ -93,7 +93,7 @@ bool AssetLoaderRawFile::LoadDefault(
fileBuffer[rawFile->len] = '\0'; fileBuffer[rawFile->len] = '\0';
rawFile->buffer = static_cast<char16*>(fileBuffer); rawFile->buffer = static_cast<char16*>(fileBuffer);
manager->AddAsset(ASSET_TYPE_RAWFILE, assetName, rawFile); manager->AddAsset<AssetRawFile>(assetName, rawFile);
return true; return true;
} }

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

@ -38,7 +38,7 @@ bool AssetLoaderScriptParseTree::LoadFromRaw(
fileBuffer[scriptParseTree->len] = '\0'; fileBuffer[scriptParseTree->len] = '\0';
scriptParseTree->buffer = static_cast<char16*>(fileBuffer); scriptParseTree->buffer = static_cast<char16*>(fileBuffer);
manager->AddAsset(ASSET_TYPE_SCRIPTPARSETREE, assetName, scriptParseTree); manager->AddAsset<AssetScript>(assetName, scriptParseTree);
return true; return true;
} }

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

@ -37,7 +37,7 @@ bool AssetLoaderSlug::LoadFromRaw(const std::string& assetName, ISearchPath* sea
fileBuffer[slug->len] = '\0'; fileBuffer[slug->len] = '\0';
slug->buffer = static_cast<char16*>(fileBuffer); slug->buffer = static_cast<char16*>(fileBuffer);
manager->AddAsset(ASSET_TYPE_SLUG, assetName, slug); manager->AddAsset<AssetSlug>(assetName, slug);
return true; return true;
} }

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

@ -569,6 +569,6 @@ bool AssetLoaderSoundBank::LoadFromRaw(
} }
} }
manager->AddAsset(ASSET_TYPE_SOUND, assetName, sndBank); manager->AddAsset<AssetSoundBank>(assetName, sndBank);
return true; return true;
} }

2
src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderStringTable.cpp
View File

@ -33,7 +33,7 @@ bool AssetLoaderStringTable::LoadFromRaw(
string_table::StringTableLoaderV3<StringTable, Common::Com_HashString> loader; string_table::StringTableLoaderV3<StringTable, Common::Com_HashString> loader;
auto* stringTable = loader.LoadFromStream(assetName, *memory, *file.m_stream); auto* stringTable = loader.LoadFromStream(assetName, *memory, *file.m_stream);
manager->AddAsset(ASSET_TYPE_STRINGTABLE, assetName, stringTable); manager->AddAsset<AssetStringTable>(assetName, stringTable);
return true; return true;
} }

2
src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderTracer.cpp
View File

@ -61,7 +61,7 @@ bool AssetLoaderTracer::LoadFromInfoString(
tracer->name = memory->Dup(assetName.c_str()); tracer->name = memory->Dup(assetName.c_str());
manager->AddAsset(ASSET_TYPE_TRACER, assetName, tracer, converter.GetDependencies(), converter.GetUsedScriptStrings()); manager->AddAsset<AssetTracer>(assetName, tracer, converter.GetDependencies(), converter.GetUsedScriptStrings());
return true; return true;
} }

2
src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderVehicle.cpp
View File

@ -124,7 +124,7 @@ bool AssetLoaderVehicle::LoadFromInfoString(
vehicleDef->name = memory->Dup(assetName.c_str()); vehicleDef->name = memory->Dup(assetName.c_str());
manager->AddAsset(ASSET_TYPE_VEHICLEDEF, assetName, vehicleDef, converter.GetDependencies(), converter.GetUsedScriptStrings()); manager->AddAsset<AssetVehicle>(assetName, vehicleDef, converter.GetDependencies(), converter.GetUsedScriptStrings());
return true; return true;
} }

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

@ -567,12 +567,8 @@ bool AssetLoaderWeapon::LoadFromInfoString(
CalculateWeaponFields(weaponFullDef); CalculateWeaponFields(weaponFullDef);
CalculateAttachmentFields(weaponFullDef); CalculateAttachmentFields(weaponFullDef);
manager->AddAsset(ASSET_TYPE_WEAPON, manager->AddAsset<AssetWeapon>(
assetName, assetName, &weaponFullDef->weapVariantDef, converter.GetDependencies(), converter.GetUsedScriptStrings(), converter.GetIndirectAssetReferences());
&weaponFullDef->weapVariantDef,
converter.GetDependencies(),
converter.GetUsedScriptStrings(),
converter.GetIndirectAssetReferences());
return true; return true;
} }

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

@ -112,8 +112,8 @@ bool AssetLoaderWeaponAttachment::LoadFromInfoString(
CalculateAttachmentFields(attachment); CalculateAttachmentFields(attachment);
attachment->szInternalName = memory->Dup(assetName.c_str()); attachment->szInternalName = memory->Dup(assetName.c_str());
manager->AddAsset( manager->AddAsset<AssetAttachment>(
ASSET_TYPE_ATTACHMENT, assetName, attachment, converter.GetDependencies(), converter.GetUsedScriptStrings(), converter.GetIndirectAssetReferences()); assetName, attachment, converter.GetDependencies(), converter.GetUsedScriptStrings(), converter.GetIndirectAssetReferences());
return true; return true;
} }

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

@ -231,12 +231,8 @@ bool AssetLoaderWeaponAttachmentUnique::LoadFromInfoString(
attachmentUniqueFull->attachment.szInternalName = memory->Dup(assetName.c_str()); attachmentUniqueFull->attachment.szInternalName = memory->Dup(assetName.c_str());
manager->AddAsset(ASSET_TYPE_ATTACHMENT_UNIQUE, manager->AddAsset<AssetAttachmentUnique>(
assetName, assetName, &attachmentUniqueFull->attachment, converter.GetDependencies(), converter.GetUsedScriptStrings(), converter.GetIndirectAssetReferences());
&attachmentUniqueFull->attachment,
converter.GetDependencies(),
converter.GetUsedScriptStrings(),
converter.GetIndirectAssetReferences());
return true; return true;
} }

2
src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeaponCamo.cpp
View File

@ -37,7 +37,7 @@ bool AssetLoaderWeaponCamo::LoadFromRaw(
std::vector<XAssetInfoGeneric*> dependencies; std::vector<XAssetInfoGeneric*> dependencies;
if (LoadWeaponCamoAsJson(*file.m_stream, *weaponCamo, memory, manager, dependencies)) if (LoadWeaponCamoAsJson(*file.m_stream, *weaponCamo, memory, manager, dependencies))
manager->AddAsset(ASSET_TYPE_WEAPON_CAMO, assetName, weaponCamo, std::move(dependencies)); manager->AddAsset<AssetWeaponCamo>(assetName, weaponCamo, std::move(dependencies));
else else
std::cerr << "Failed to load weapon camo \"" << assetName << "\"\n"; std::cerr << "Failed to load weapon camo \"" << assetName << "\"\n";

2
src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderZBarrier.cpp
View File

@ -74,7 +74,7 @@ bool AssetLoaderZBarrier::LoadFromInfoString(
CalculateZBarrierFields(zbarrier); CalculateZBarrierFields(zbarrier);
zbarrier->name = memory->Dup(assetName.c_str()); zbarrier->name = memory->Dup(assetName.c_str());
manager->AddAsset(ASSET_TYPE_ZBARRIER, assetName, zbarrier, converter.GetDependencies(), converter.GetUsedScriptStrings()); manager->AddAsset<AssetZBarrier>(assetName, zbarrier, converter.GetDependencies(), converter.GetUsedScriptStrings());
return true; return true;
} }