From 831a8cf580a7aea49a4156fb401d20eab48b98a3 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Wed, 5 Mar 2014 12:15:34 -0800 Subject: [PATCH] remove unused cruft from Model class API --- interface/src/renderer/Model.cpp | 16 ---------------- interface/src/renderer/Model.h | 16 ---------------- 2 files changed, 32 deletions(-) diff --git a/interface/src/renderer/Model.cpp b/interface/src/renderer/Model.cpp index 1e2c445f37..5055b16c4d 100644 --- a/interface/src/renderer/Model.cpp +++ b/interface/src/renderer/Model.cpp @@ -418,18 +418,10 @@ bool Model::getRightHandRotation(glm::quat& rotation) const { return getJointRotation(getRightHandJointIndex(), rotation); } -bool Model::setLeftHandPosition(const glm::vec3& position) { - return setJointPosition(getLeftHandJointIndex(), position); -} - bool Model::restoreLeftHandPosition(float percent) { return restoreJointPosition(getLeftHandJointIndex(), percent); } -bool Model::setLeftHandRotation(const glm::quat& rotation) { - return setJointRotation(getLeftHandJointIndex(), rotation); -} - bool Model::getLeftShoulderPosition(glm::vec3& position) const { return getJointPosition(getLastFreeJointIndex(getLeftHandJointIndex()), position); } @@ -438,18 +430,10 @@ float Model::getLeftArmLength() const { return getLimbLength(getLeftHandJointIndex()); } -bool Model::setRightHandPosition(const glm::vec3& position) { - return setJointPosition(getRightHandJointIndex(), position); -} - bool Model::restoreRightHandPosition(float percent) { return restoreJointPosition(getRightHandJointIndex(), percent); } -bool Model::setRightHandRotation(const glm::quat& rotation) { - return setJointRotation(getRightHandJointIndex(), rotation); -} - bool Model::getRightShoulderPosition(glm::vec3& position) const { return getJointPosition(getLastFreeJointIndex(getRightHandJointIndex()), position); } diff --git a/interface/src/renderer/Model.h b/interface/src/renderer/Model.h index fc4643374f..4891c86779 100644 --- a/interface/src/renderer/Model.h +++ b/interface/src/renderer/Model.h @@ -125,19 +125,11 @@ public: /// \return true whether or not the rotation was found bool getRightHandRotation(glm::quat& rotation) const; - /// Sets the position of the left hand using inverse kinematics. - /// \return whether or not the left hand joint was found - bool setLeftHandPosition(const glm::vec3& position); - /// Restores some percentage of the default position of the left hand. /// \param percent the percentage of the default position to restore /// \return whether or not the left hand joint was found bool restoreLeftHandPosition(float percent = 1.0f); - /// Sets the rotation of the left hand. - /// \return whether or not the left hand joint was found - bool setLeftHandRotation(const glm::quat& rotation); - /// Gets the position of the left shoulder. /// \return whether or not the left shoulder joint was found bool getLeftShoulderPosition(glm::vec3& position) const; @@ -145,19 +137,11 @@ public: /// Returns the extended length from the left hand to its last free ancestor. float getLeftArmLength() const; - /// Sets the position of the right hand using inverse kinematics. - /// \return whether or not the right hand joint was found - bool setRightHandPosition(const glm::vec3& position); - /// Restores some percentage of the default position of the right hand. /// \param percent the percentage of the default position to restore /// \return whether or not the right hand joint was found bool restoreRightHandPosition(float percent = 1.0f); - /// Sets the rotation of the right hand. - /// \return whether or not the right hand joint was found - bool setRightHandRotation(const glm::quat& rotation); - /// Gets the position of the right shoulder. /// \return whether or not the right shoulder joint was found bool getRightShoulderPosition(glm::vec3& position) const;