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

Merge pull request #254 from Laupetin/fix/models-without-bones

Browse Source 
fix: auto generate armature when imported gltf has none
This commit is contained in:
Jan 2024-09-08 14:15:44 +02:00 committed by GitHub
commit abae48ead2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/ObjLoading/Game/T6/XModel/JsonXModelLoader.cpp
View File

@ -262,6 +262,33 @@ namespace
return nullptr; return nullptr;
} }
static void AutoGenerateArmature(XModelCommon& common)
{
assert(common.m_bones.empty());
assert(common.m_bone_weight_data.weights.empty());
assert(common.m_vertex_bone_weights.size() == common.m_vertices.size());
XModelBone rootBone{
"root",
std::nullopt,
{1.0f, 1.0f, 1.0f},
{0.0f, 0.0f, 0.0f},
{0.0f, 0.0f, 0.0f},
{0.0f, 0.0f, 0.0f, 1.0f},
{0.0f, 0.0f, 0.0f, 1.0f},
};
common.m_bones.emplace_back(rootBone);
XModelBoneWeight rootWeight{0, 1.0f};
common.m_bone_weight_data.weights.emplace_back(rootWeight);
for (auto& vertexBoneWeights : common.m_vertex_bone_weights)
{
vertexBoneWeights.weightOffset = 0u;
vertexBoneWeights.weightCount = 1u;
}
}
static void ApplyBasePose(DObjAnimMat& baseMat, const XModelBone& bone) static void ApplyBasePose(DObjAnimMat& baseMat, const XModelBone& bone)
{ {
baseMat.trans.x = bone.globalOffset[0]; baseMat.trans.x = bone.globalOffset[0];
@ -713,6 +740,9 @@ namespace
return false; return false;
} }
if (common->m_bones.empty())
AutoGenerateArmature(*common);
if (lodNumber == 0u) if (lodNumber == 0u)
{ {
if (!ApplyCommonBonesToXModel(jLod, xmodel, lodNumber, *common)) if (!ApplyCommonBonesToXModel(jLod, xmodel, lodNumber, *common))