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

fix: failure to load xmodel does not abort loading process

Browse Source
This commit is contained in:
Jan 2024-09-20 19:39:26 +02:00
parent d05c1730fa
commit e814515b53
No known key found for this signature in database
GPG Key ID: 44B581F78FF5C57C
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderXModel.cpp
View File

@ -34,9 +34,14 @@ bool AssetLoaderXModel::LoadFromRaw(
std::vector<XAssetInfoGeneric*> dependencies; std::vector<XAssetInfoGeneric*> dependencies;
if (LoadXModel(*file.m_stream, *xmodel, memory, manager, dependencies)) if (LoadXModel(*file.m_stream, *xmodel, memory, manager, dependencies))
{
manager->AddAsset<AssetXModel>(assetName, xmodel, std::move(dependencies)); manager->AddAsset<AssetXModel>(assetName, xmodel, std::move(dependencies));
}
else else
{
std::cerr << std::format("Failed to load xmodel \"{}\"\n", assetName); std::cerr << std::format("Failed to load xmodel \"{}\"\n", assetName);
return false;
}
return true; return true;
} }

5
src/ObjLoading/Game/T5/AssetLoaders/AssetLoaderXModel.cpp
View File

@ -34,9 +34,14 @@ bool AssetLoaderXModel::LoadFromRaw(
std::vector<XAssetInfoGeneric*> dependencies; std::vector<XAssetInfoGeneric*> dependencies;
if (LoadXModel(*file.m_stream, *xmodel, memory, manager, dependencies)) if (LoadXModel(*file.m_stream, *xmodel, memory, manager, dependencies))
{
manager->AddAsset<AssetXModel>(assetName, xmodel, std::move(dependencies)); manager->AddAsset<AssetXModel>(assetName, xmodel, std::move(dependencies));
}
else else
{
std::cerr << std::format("Failed to load xmodel \"{}\"\n", assetName); std::cerr << std::format("Failed to load xmodel \"{}\"\n", assetName);
return false;
}
return true; return true;
} }

5
src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderXModel.cpp
View File

@ -34,9 +34,14 @@ bool AssetLoaderXModel::LoadFromRaw(
std::vector<XAssetInfoGeneric*> dependencies; std::vector<XAssetInfoGeneric*> dependencies;
if (LoadXModel(*file.m_stream, *xmodel, memory, manager, dependencies)) if (LoadXModel(*file.m_stream, *xmodel, memory, manager, dependencies))
{
manager->AddAsset<AssetXModel>(assetName, xmodel, std::move(dependencies)); manager->AddAsset<AssetXModel>(assetName, xmodel, std::move(dependencies));
}
else else
{
std::cerr << std::format("Failed to load xmodel \"{}\"\n", assetName); std::cerr << std::format("Failed to load xmodel \"{}\"\n", assetName);
return false;
}
return true; return true;
} }