From 8c4f0968d8e41585aa75a2653d2661b3cfa612b1 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Tue, 19 Aug 2014 17:33:06 -0700 Subject: [PATCH] remove unused JointState::setRotation() method --- interface/src/renderer/JointState.cpp | 6 +----- interface/src/renderer/JointState.h | 3 --- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/interface/src/renderer/JointState.cpp b/interface/src/renderer/JointState.cpp index 316dfeb9ca..94b4b37a3c 100644 --- a/interface/src/renderer/JointState.cpp +++ b/interface/src/renderer/JointState.cpp @@ -173,10 +173,6 @@ void JointState::clearTransformTranslation() { _visibleTransform[3][2] = 0.0f; } -void JointState::setRotation(const glm::quat& rotation, bool constrain, float priority) { - applyRotationDelta(rotation * glm::inverse(getRotation()), true, priority); -} - void JointState::applyRotationDelta(const glm::quat& delta, bool constrain, float priority) { // NOTE: delta is in model-frame assert(_fbxJoint != NULL); @@ -267,4 +263,4 @@ void JointState::slaveVisibleTransform() { _visibleTransform = _transform; _visibleRotation = getRotation(); _visibleRotationInConstrainedFrame = _rotationInConstrainedFrame; -} \ No newline at end of file +} diff --git a/interface/src/renderer/JointState.h b/interface/src/renderer/JointState.h index 21961ba48c..56044125f1 100644 --- a/interface/src/renderer/JointState.h +++ b/interface/src/renderer/JointState.h @@ -60,9 +60,6 @@ public: int getParentIndex() const { return _fbxJoint->parentIndex; } - /// \param rotation rotation of joint in model-frame - void setRotation(const glm::quat& rotation, bool constrain, float priority); - /// \param delta is in the model-frame void applyRotationDelta(const glm::quat& delta, bool constrain = true, float priority = 1.0f);