zcy
/
dust3d
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix node position of limb bone

master
Jeremy Hu 2020-02-29 15:50:29 +09:30
parent 178e2296ea
commit f36655bf42
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/posedocument.cpp
View File

@ -11,7 +11,7 @@
#include "snapshot.h" #include "snapshot.h"
#include "snapshotxml.h" #include "snapshotxml.h"
const float PoseDocument::m_nodeRadius = 0.02; const float PoseDocument::m_nodeRadius = 0.01;
const float PoseDocument::m_groundPlaneHalfThickness = 0.005 / 4; const float PoseDocument::m_groundPlaneHalfThickness = 0.005 / 4;
const bool PoseDocument::m_hideRootAndVirtual = true; const bool PoseDocument::m_hideRootAndVirtual = true;
const float PoseDocument::m_outcomeScaleFactor = 0.5; const float PoseDocument::m_outcomeScaleFactor = 0.5;
@ -366,6 +366,7 @@ void PoseDocument::parametersToNodes(const std::vector<RiggerBone> *rigBones,
node.setX(fromOutcomeX(bone.headPosition.x())); node.setX(fromOutcomeX(bone.headPosition.x()));
node.setY(fromOutcomeY(bone.headPosition.y())); node.setY(fromOutcomeY(bone.headPosition.y()));
node.setZ(fromOutcomeZ(bone.headPosition.z())); node.setZ(fromOutcomeZ(bone.headPosition.z()));
node.name = bone.name + "Start";
nodeMap[node.id] = node; nodeMap[node.id] = node;
//qDebug() << "Add first node:" << (*rigBones)[edgePair.first].name; //qDebug() << "Add first node:" << (*rigBones)[edgePair.first].name;
newAddedNodeIds.insert(node.id); newAddedNodeIds.insert(node.id);
@ -377,7 +378,6 @@ void PoseDocument::parametersToNodes(const std::vector<RiggerBone> *rigBones,
} }
auto findSecond = boneIndexToHeadNodeIdMap.find(edgePair.second); auto findSecond = boneIndexToHeadNodeIdMap.find(edgePair.second);
if (findSecond == boneIndexToHeadNodeIdMap.end()) { if (findSecond == boneIndexToHeadNodeIdMap.end()) {
const auto &firstBone = (*rigBones)[edgePair.first];
const auto &bone = (*rigBones)[edgePair.second]; const auto &bone = (*rigBones)[edgePair.second];
if (!bone.name.startsWith("Virtual_") || !m_hideRootAndVirtual) { if (!bone.name.startsWith("Virtual_") || !m_hideRootAndVirtual) {
SkeletonNode node; SkeletonNode node;
@ -385,9 +385,10 @@ void PoseDocument::parametersToNodes(const std::vector<RiggerBone> *rigBones,
node.id = QUuid::createUuid(); node.id = QUuid::createUuid();
partMap[node.partId].nodeIds.push_back(node.id); partMap[node.partId].nodeIds.push_back(node.id);
node.setRadius(m_nodeRadius); node.setRadius(m_nodeRadius);
node.setX(fromOutcomeX(firstBone.tailPosition.x())); node.setX(fromOutcomeX(bone.headPosition.x()));
node.setY(fromOutcomeY(firstBone.tailPosition.y())); node.setY(fromOutcomeY(bone.headPosition.y()));
node.setZ(fromOutcomeZ(firstBone.tailPosition.z())); node.setZ(fromOutcomeZ(bone.headPosition.z()));
node.name = bone.name;
nodeMap[node.id] = node; nodeMap[node.id] = node;
//qDebug() << "Add second node:" << (*rigBones)[edgePair.second].name; //qDebug() << "Add second node:" << (*rigBones)[edgePair.second].name;
newAddedNodeIds.insert(node.id); newAddedNodeIds.insert(node.id);
@ -435,6 +436,7 @@ void PoseDocument::parametersToNodes(const std::vector<RiggerBone> *rigBones,
node.setX(fromOutcomeX(bone.headPosition.x())); node.setX(fromOutcomeX(bone.headPosition.x()));
node.setY(fromOutcomeY(bone.headPosition.y())); node.setY(fromOutcomeY(bone.headPosition.y()));
node.setZ(fromOutcomeZ(bone.headPosition.z())); node.setZ(fromOutcomeZ(bone.headPosition.z()));
nodeMap[node.id] = node; nodeMap[node.id] = node;
newAddedNodeIds.insert(node.id); newAddedNodeIds.insert(node.id);
boneIndexToHeadNodeIdMap[i] = node.id; boneIndexToHeadNodeIdMap[i] = node.id;