Showing the changes to interface/src/avatar/SkeletonModel.cpp (1 of 3 files). Show all
Unified · Split
| @@ -147,7 +147,7 @@ void SkeletonModel::applyHandPosition(int jointIndex, const glm::vec3& position) · 146 unmodified lines | |||
| 147 | return; | 147 | return; |
| 148 | } | 148 | } |
| 149 | JointState& state = _jointStates[jointIndex]; | 149 | JointState& state = _jointStates[jointIndex]; |
| 150 | glm::quat handRotation = state.getJointRotation(true); | 150 | glm::quat handRotation = state.getJointRotation(); |
| 151 | 151 | ||
| 152 | // align hand with forearm | 152 | // align hand with forearm |
| 153 | float sign = (jointIndex == geometry.rightHandJointIndex) ? 1.0f : -1.0f; | 153 | float sign = (jointIndex == geometry.rightHandJointIndex) ? 1.0f : -1.0f; |
| @@ -170,10 +170,10 @@ void SkeletonModel::applyPalmData(int jointIndex, PalmData& palm) { · 16 unmodified lines | |||
| 170 | if (!Menu::getInstance()->isOptionChecked(MenuOption::AlternateIK) && | 170 | if (!Menu::getInstance()->isOptionChecked(MenuOption::AlternateIK) && |
| 171 | Menu::getInstance()->isOptionChecked(MenuOption::AlignForearmsWithWrists)) { | 171 | Menu::getInstance()->isOptionChecked(MenuOption::AlignForearmsWithWrists)) { |
| 172 | JointState parentState = _jointStates[parentJointIndex]; | 172 | JointState parentState = _jointStates[parentJointIndex]; |
| 173 | palmRotation = parentState.getJointRotation(true); | 173 | palmRotation = parentState.getJointRotation(); |
| 174 | } else { | 174 | } else { |
| 175 | JointState state = _jointStates[jointIndex]; | 175 | JointState state = _jointStates[jointIndex]; |
| 176 | palmRotation = state.getJointRotation(true); | 176 | palmRotation = state.getJointRotation(); |
| 177 | } | 177 | } |
| 178 | palmRotation = rotationBetween(palmRotation * geometry.palmDirection, palm.getNormal()) * palmRotation; | 178 | palmRotation = rotationBetween(palmRotation * geometry.palmDirection, palm.getNormal()) * palmRotation; |
| 179 | 179 | ||