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

chore: update default root bone name to empty string and do not specify if matching default name

Browse Source
This commit is contained in:
Jan Laupetin
2026-05-03 13:51:56 +02:00
parent ed1ed73c73
commit 0c1bc747dc
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ObjCommon/XModel/XModelCommon.h
+3 -1
View File
@@ -132,5 +132,7 @@ typedef DistinctMapper<VertexMergerPos> VertexMerger;
namespace xmodel namespace xmodel
{ {
constexpr auto DEFAULT_XMODEL_ROOT_BONE_NAME = "";
std::string GetJsonFileNameForAssetName(const std::string& assetName); std::string GetJsonFileNameForAssetName(const std::string& assetName);
} } // namespace xmodel
src/ObjLoading/XModel/LoaderXModel.cpp.template
+1 -1
View File
@@ -163,7 +163,7 @@ namespace
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 = jXModel.rootBoneName.value_or("root"), .name = jXModel.rootBoneName.value_or(xmodel::DEFAULT_XMODEL_ROOT_BONE_NAME),
.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},
src/ObjWriting/XModel/XModelDumper.cpp.template
+4 -1
View File
@@ -797,8 +797,11 @@ namespace
if (!model.boneNames || model.boneNames[0] >= context.m_zone.m_script_strings.Count() || model.numRootBones == 0) if (!model.boneNames || model.boneNames[0] >= context.m_zone.m_script_strings.Count() || model.numRootBones == 0)
return; return;
const auto& rootBoneName = context.m_zone.m_script_strings[model.boneNames[0]];
jXModel.rootBoneName = context.m_zone.m_script_strings[model.boneNames[0]]; if (rootBoneName != xmodel::DEFAULT_XMODEL_ROOT_BONE_NAME)
jXModel.rootBoneName = rootBoneName;
} }
void CreateJsonXModel(AssetDumpingContext& context, JsonXModel& jXModel, const XModel& model) void CreateJsonXModel(AssetDumpingContext& context, JsonXModel& jXModel, const XModel& model)