zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-05-12 21:31:43 +00:00
Code Activity

feat: support root bone name from xmodel json

Browse Source
This commit is contained in:
Jan Laupetin
2026-05-03 13:27:35 +02:00
parent b7a22973e6
commit 989d29b359
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ObjLoading/XModel/LoaderXModel.cpp.template
+4 -4
View File
@@ -156,14 +156,14 @@ namespace
return nullptr; return nullptr;
} }
static void AutoGenerateArmature(XModelCommon& common) static void AutoGenerateArmature(XModelCommon& common, const JsonXModel& jXModel)
{ {
assert(common.m_bones.empty()); assert(common.m_bones.empty());
assert(common.m_bone_weight_data.weights.empty()); assert(common.m_bone_weight_data.weights.empty());
assert(common.m_vertex_bone_weights.size() == common.m_vertices.size()); assert(common.m_vertex_bone_weights.size() == common.m_vertices.size());
XModelBone rootBone{ XModelBone rootBone{
.name = "root", .name = jXModel.rootBoneName.value_or("root"),
.parentIndex = std::nullopt, .parentIndex = std::nullopt,
.scale = {1.0f, 1.0f, 1.0f}, .scale = {1.0f, 1.0f, 1.0f},
.globalOffset = {0.0f, 0.0f, 0.0f}, .globalOffset = {0.0f, 0.0f, 0.0f},
@@ -171,7 +171,7 @@ namespace
.globalRotation = {.x = 0.0f, .y = 0.0f, .z = 0.0f, .w = 1.0f}, .globalRotation = {.x = 0.0f, .y = 0.0f, .z = 0.0f, .w = 1.0f},
.localRotation = {.x = 0.0f, .y = 0.0f, .z = 0.0f, .w = 1.0f}, .localRotation = {.x = 0.0f, .y = 0.0f, .z = 0.0f, .w = 1.0f},
}; };
common.m_bones.emplace_back(rootBone); common.m_bones.emplace_back(std::move(rootBone));
XModelBoneWeight rootWeight{.boneIndex = 0, .weight = 1.0f}; XModelBoneWeight rootWeight{.boneIndex = 0, .weight = 1.0f};
common.m_bone_weight_data.weights.emplace_back(rootWeight); common.m_bone_weight_data.weights.emplace_back(rootWeight);
@@ -814,7 +814,7 @@ namespace
} }
if (common->m_bones.empty()) if (common->m_bones.empty())
AutoGenerateArmature(*common); AutoGenerateArmature(*common, jXModel);
if (lodNumber == 0u) if (lodNumber == 0u)
{ {