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

Fix rig 

Fix the left and right limbs pairing algorithm
master
Jeremy Hu 2019-06-10 10:09:30 +09:30
parent de88930acb
commit 6ca06f4e80
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/animalrigger.cpp
View File

@ -201,13 +201,17 @@ bool AnimalRigger::rig()
std::set<int> bodyVerticies; std::set<int> bodyVerticies;
bool isMainBodyVerticalAligned = false; bool isMainBodyVerticalAligned = false;
float bodyLength = 0;
addTrianglesToVertices(bodyTriangles, bodyVerticies); addTrianglesToVertices(bodyTriangles, bodyVerticies);
{ {
QVector3D xMin, xMax, yMin, yMax, zMin, zMax; QVector3D xMin, xMax, yMin, yMax, zMin, zMax;
resolveBoundingBox(bodyVerticies, xMin, xMax, yMin, yMax, zMin, zMax); resolveBoundingBox(bodyVerticies, xMin, xMax, yMin, yMax, zMin, zMax);
isMainBodyVerticalAligned = fabs(yMax.y() - yMin.y()) > fabs(zMax.z() - zMin.z()); float yLength = fabs(yMax.y() - yMin.y());
float zLength = fabs(zMax.z() - zMin.z());
isMainBodyVerticalAligned = yLength > zLength;
bodyLength = isMainBodyVerticalAligned ? yLength : zLength;
} }
qDebug() << "isMainBodyVerticalAligned:" << isMainBodyVerticalAligned; qDebug() << "isMainBodyVerticalAligned:" << isMainBodyVerticalAligned << "bodyLength:" << bodyLength;
// Collect all branchs // Collect all branchs
auto neckIndices = m_marksMap.find(std::make_pair(BoneMark::Neck, SkeletonSide::None)); auto neckIndices = m_marksMap.find(std::make_pair(BoneMark::Neck, SkeletonSide::None));
@ -291,7 +295,7 @@ bool AnimalRigger::rig()
const auto &mark = m_marks[chainColumns[side]->at(sideIndices[side])]; const auto &mark = m_marks[chainColumns[side]->at(sideIndices[side])];
const auto &coord = isMainBodyVerticalAligned ? mark.bonePosition.y() : const auto &coord = isMainBodyVerticalAligned ? mark.bonePosition.y() :
mark.bonePosition.z(); mark.bonePosition.z();
if (coord <= choosenCoord + 0.001) { if (coord <= choosenCoord + bodyLength / 5) {
chainMarkIndices.insert(chainColumns[side]->at(sideIndices[side])); chainMarkIndices.insert(chainColumns[side]->at(sideIndices[side]));
sumOfChainPositions += mark.bonePosition; sumOfChainPositions += mark.bonePosition;
++countOfChains; ++countOfChains;