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: not registering script strings for xmodel loading

Browse Source
This commit is contained in:
Jan 2025-01-11 11:56:39 +01:00
parent 0a98da9a79
commit 36f0764cd5
No known key found for this signature in database
GPG Key ID: 44B581F78FF5C57C
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ObjLoading/XModel/LoaderXModel.cpp.template
View File

@ -252,7 +252,8 @@ namespace
info.radiusSquared = halfSizeEigen.squaredNorm(); info.radiusSquared = halfSizeEigen.squaredNorm();
} }
bool ApplyCommonBonesToXModel(const JsonXModelLod& jLod, XModel& xmodel, unsigned lodNumber, const XModelCommon& common) bool ApplyCommonBonesToXModel(
const JsonXModelLod& jLod, XModel& xmodel, unsigned lodNumber, const XModelCommon& common, AssetRegistration<AssetXModel>& registration)
{ {
if (common.m_bones.empty()) if (common.m_bones.empty())
return true; return true;
@ -305,6 +306,7 @@ namespace
{ {
const auto& bone = common.m_bones[boneIndex]; const auto& bone = common.m_bones[boneIndex];
xmodel.boneNames[boneIndex] = m_script_strings.AddOrGetScriptString(bone.name); xmodel.boneNames[boneIndex] = m_script_strings.AddOrGetScriptString(bone.name);
registration.AddScriptString(xmodel.boneNames[boneIndex]);
xmodel.partClassification[boneIndex] = static_cast<unsigned char>(m_part_classification_state.GetPartClassificationForBoneName(bone.name)); xmodel.partClassification[boneIndex] = static_cast<unsigned char>(m_part_classification_state.GetPartClassificationForBoneName(bone.name));
ApplyBasePose(xmodel.baseMat[boneIndex], bone); ApplyBasePose(xmodel.baseMat[boneIndex], bone);
@ -656,7 +658,7 @@ namespace
if (lodNumber == 0u) if (lodNumber == 0u)
{ {
if (!ApplyCommonBonesToXModel(jLod, xmodel, lodNumber, *common)) if (!ApplyCommonBonesToXModel(jLod, xmodel, lodNumber, *common, registration))
return false; return false;
} }
else else