Showing the changes to interface/src/avatar/SkeletonModel.cpp (1 of 8 files). Show all
Unified · Split
| @@ -101,10 +101,10 @@ void SkeletonModel::simulate(float deltaTime, bool fullUpdate) { · 100 unmodified lines | |||
| 101 | applyPalmData(geometry.rightHandJointIndex, hand->getPalms()[rightPalmIndex]); | 101 | applyPalmData(geometry.rightHandJointIndex, hand->getPalms()[rightPalmIndex]); |
| 102 | } | 102 | } |
| 103 | 103 | ||
| 104 | simulateRagDoll(deltaTime); | 104 | simulateRagdoll(deltaTime); |
| 105 | } | 105 | } |
| 106 | 106 | ||
| 107 | void SkeletonModel::simulateRagDoll(float deltaTime) { | 107 | void SkeletonModel::simulateRagdoll(float deltaTime) { |
| 108 | // move ragdoll points toward joints | 108 | // move ragdoll points toward joints |
| 109 | QVector<glm::vec3>& points = _ragDoll.getPoints(); | 109 | QVector<glm::vec3>& points = _ragDoll.getPoints(); |
| 110 | const int numStates = _jointStates.size(); | 110 | const int numStates = _jointStates.size(); |
| @@ -171,7 +171,7 @@ void SkeletonModel::renderIKConstraints() { · 60 unmodified lines | |||
| 171 | renderJointConstraints(getRightHandJointIndex()); | 171 | renderJointConstraints(getRightHandJointIndex()); |
| 172 | renderJointConstraints(getLeftHandJointIndex()); | 172 | renderJointConstraints(getLeftHandJointIndex()); |
| 173 | //if (isActive() && _owningAvatar->isMyAvatar()) { | 173 | //if (isActive() && _owningAvatar->isMyAvatar()) { |
| 174 | // renderRagDoll(); | 174 | // renderRagdoll(); |
| 175 | //} | 175 | //} |
| 176 | } | 176 | } |
| 177 | 177 | ||
| @@ -272,7 +272,7 @@ void SkeletonModel::updateJointState(int index) { · 94 unmodified lines | |||
| 272 | 272 | ||
| 273 | void SkeletonModel::updateShapePositions() { | 273 | void SkeletonModel::updateShapePositions() { |
| 274 | if (isActive() && _owningAvatar->isMyAvatar() && | 274 | if (isActive() && _owningAvatar->isMyAvatar() && |
| 275 | Menu::getInstance()->isOptionChecked(MenuOption::CollideAsRagDoll)) { | 275 | Menu::getInstance()->isOptionChecked(MenuOption::CollideAsRagdoll)) { |
| 276 | _ragDoll.updateShapes(_rotation, _translation); | 276 | _ragDoll.updateShapes(_rotation, _translation); |
| 277 | } else { | 277 | } else { |
| 278 | Model::updateShapePositions(); | 278 | Model::updateShapePositions(); |
| @@ -498,7 +498,7 @@ bool SkeletonModel::getEyePositions(glm::vec3& firstEyePosition, glm::vec3& seco · 219 unmodified lines | |||
| 498 | return false; | 498 | return false; |
| 499 | } | 499 | } |
| 500 | 500 | ||
| 501 | void SkeletonModel::renderRagDoll() { | 501 | void SkeletonModel::renderRagdoll() { |
| 502 | const int BALL_SUBDIVISIONS = 6; | 502 | const int BALL_SUBDIVISIONS = 6; |
| 503 | glDisable(GL_DEPTH_TEST); | 503 | glDisable(GL_DEPTH_TEST); |
| 504 | glDisable(GL_LIGHTING); | 504 | glDisable(GL_LIGHTING); |