INSANEMODE/OpenAssetTools
1
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-06-11 07:18:11 -05: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
49 changed files with 66 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,7 +66,7 @@ bool AssetLoaderGfxLightDef::LoadFromRaw(
lightDef->attenuation.image = imageDependency->Asset();
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;
}

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->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);

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

@ -1381,7 +1381,9 @@ bool AssetLoaderMaterial::LoadFromGdt(
try
{
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&)
{

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

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

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

@ -75,7 +75,7 @@ bool AssetLoaderPhysPreset::LoadFromInfoString(
CopyFromPhysPresetInfo(presetInfo.get(), physPreset);
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;
}

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

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

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

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

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;
auto* stringTable = loader.LoadFromStream(assetName, *memory, *file.m_stream);
manager->AddAsset(ASSET_TYPE_STRINGTABLE, assetName, stringTable);
manager->AddAsset<AssetStringTable>(assetName, stringTable);
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);
if (readingDefsSuccessful)
manager->AddAsset(ASSET_TYPE_STRUCTURED_DATA_DEF, assetName, ConvertSet(assetName, defs, memory));
manager->AddAsset<AssetStructuredDataDef>(assetName, ConvertSet(assetName, defs, memory));
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;
}

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

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

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

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

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

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