Showing the changes to interface/src/avatar/SkeletonModel.cpp (1 of 6 files). Show all
Unified · Split
| @@ -106,21 +106,6 @@ void SkeletonModel::simulate(float deltaTime, bool fullUpdate) { · 105 unmodified lines | |||
| 106 | } | 106 | } |
| 107 | 107 | ||
| 108 | const FBXGeometry& geometry = _geometry->getFBXGeometry(); | 108 | const FBXGeometry& geometry = _geometry->getFBXGeometry(); |
| 109 | PrioVR* prioVR = Application::getInstance()->getPrioVR(); | ||
| 110 | if (prioVR->isActive()) { | ||
| 111 | for (int i = 0; i < prioVR->getJointRotations().size(); i++) { | ||
| 112 | int humanIKJointIndex = prioVR->getHumanIKJointIndices().at(i); | ||
| 113 | if (humanIKJointIndex == -1) { | ||
| 114 | continue; | ||
| 115 | } | ||
| 116 | int jointIndex = geometry.humanIKJointIndices.at(humanIKJointIndex); | ||
| 117 | if (jointIndex != -1) { | ||
| 118 | JointState& state = _jointStates[jointIndex]; | ||
| 119 | state.setRotationInBindFrame(prioVR->getJointRotations().at(i), PALM_PRIORITY); | ||
| 120 | } | ||
| 121 | } | ||
| 122 | return; | ||
| 123 | } | ||
| 124 | 109 | ||
| 125 | // find the left and rightmost active palms | 110 | // find the left and rightmost active palms |
| 126 | int leftPalmIndex, rightPalmIndex; | 111 | int leftPalmIndex, rightPalmIndex; |
| @@ -294,7 +279,7 @@ void SkeletonModel::updateJointState(int index) { · 167 unmodified lines | |||
| 294 | } | 279 | } |
| 295 | 280 | ||
| 296 | void SkeletonModel::maybeUpdateLeanRotation(const JointState& parentState, JointState& state) { | 281 | void SkeletonModel::maybeUpdateLeanRotation(const JointState& parentState, JointState& state) { |
| 297 | if (!_owningAvatar->isMyAvatar() || Application::getInstance()->getPrioVR()->isActive()) { | 282 | if (!_owningAvatar->isMyAvatar()) { |
| 298 | return; | 283 | return; |
| 299 | } | 284 | } |
| 300 | // get the rotation axes in joint space and use them to adjust the rotation | 285 | // get the rotation axes in joint space and use them to adjust the rotation |