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

Make root node and direct children as breathe scaling target if no spine node marked.

master
Jeremy Hu 2018-06-16 20:04:17 +08:00
parent 22910028e9
commit cddc4c15cc
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/rigcontroller.cpp
View File

@ -74,13 +74,21 @@ void RigController::lift(QVector3D offset)
void RigController::breathe(float amount) void RigController::breathe(float amount)
{ {
if (m_spine.empty() || amount <= 0) if (m_inputJointNodeTree.joints().empty() || amount <= 0)
return; return;
std::vector<int> spineJoints; std::vector<int> spineJoints;
for (auto i = 0u; i < m_spine.size(); i++) { for (auto i = 0u; i < m_spine.size(); i++) {
int jointIndex = m_inputJointNodeTree.nodeToJointIndex(m_spine[i].first, m_spine[i].second); int jointIndex = m_inputJointNodeTree.nodeToJointIndex(m_spine[i].first, m_spine[i].second);
spineJoints.push_back(jointIndex); spineJoints.push_back(jointIndex);
} }
if (spineJoints.empty()) {
// if no spine joints found, make the root node and its direct children as spine
spineJoints.push_back(0);
for (const auto &child: m_inputJointNodeTree.joints()[0].children)
spineJoints.push_back(child);
}
if (spineJoints.empty())
return;
// make sure parent get processed first // make sure parent get processed first
std::sort(spineJoints.begin(), spineJoints.end()); std::sort(spineJoints.begin(), spineJoints.end());
float inverseAmount = 1 / amount; float inverseAmount = 1 / amount;