Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 20:36:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove unused propagate option for applyRotationDelta.

Browse source
This commit is contained in:
Andrzej Kapolka 2014-04-23 12:29:01 -07:00
parent d38d3db224
commit c8c3cf3664
2 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/renderer/Model.cpp
View file

@ -1026,7 +1026,7 @@ float Model::getLimbLength(int jointIndex) const {
return length; return length;
} }
void Model::applyRotationDelta(int jointIndex, const glm::quat& delta, bool constrain, bool propagate) { void Model::applyRotationDelta(int jointIndex, const glm::quat& delta, bool constrain) {
JointState& state = _jointStates[jointIndex]; JointState& state = _jointStates[jointIndex];
const FBXGeometry& geometry = _geometry->getFBXGeometry(); const FBXGeometry& geometry = _geometry->getFBXGeometry();
const FBXJoint& joint = geometry.joints[jointIndex]; const FBXJoint& joint = geometry.joints[jointIndex];
@ -1042,12 +1042,6 @@ void Model::applyRotationDelta(int jointIndex, const glm::quat& delta, bool cons
glm::quat newRotation = glm::quat(glm::clamp(eulers, joint.rotationMin, joint.rotationMax)); glm::quat newRotation = glm::quat(glm::clamp(eulers, joint.rotationMin, joint.rotationMax));
state.combinedRotation = state.combinedRotation * glm::inverse(state.rotation) * newRotation; state.combinedRotation = state.combinedRotation * glm::inverse(state.rotation) * newRotation;
state.rotation = newRotation; state.rotation = newRotation;
if (propagate && targetRotation != state.combinedRotation &&
joint.parentIndex != -1 && geometry.joints.at(joint.parentIndex).isFree) {
applyRotationDelta(joint.parentIndex, targetRotation * glm::inverse(state.combinedRotation), true, true);
state.combinedRotation = _jointStates.at(joint.parentIndex).combinedRotation * state.rotation;
}
} }
const int BALL_SUBDIVISIONS = 10; const int BALL_SUBDIVISIONS = 10;

2
interface/src/renderer/Model.h
View file

@ -257,7 +257,7 @@ protected:
/// first free ancestor. /// first free ancestor.
float getLimbLength(int jointIndex) const; float getLimbLength(int jointIndex) const;
void applyRotationDelta(int jointIndex, const glm::quat& delta, bool constrain = true, bool propagate = false); void applyRotationDelta(int jointIndex, const glm::quat& delta, bool constrain = true);
private: private: