From 722c024f610aaf9ce558303e6bee1a2e594216e8 Mon Sep 17 00:00:00 2001
From: Howard Stearns <howard@highfidelity.io>
Date: Thu, 13 Aug 2015 15:08:26 -0700
Subject: [PATCH] Remove obsolete code.

---
 interface/src/avatar/FaceModel.cpp | 56 ------------------------------
 interface/src/avatar/FaceModel.h   |  4 ---
 2 files changed, 60 deletions(-)

diff --git a/interface/src/avatar/FaceModel.cpp b/interface/src/avatar/FaceModel.cpp
index e31c804185..0e8e5a6a91 100644
--- a/interface/src/avatar/FaceModel.cpp
+++ b/interface/src/avatar/FaceModel.cpp
@@ -47,66 +47,10 @@ void FaceModel::simulate(float deltaTime, bool fullUpdate) {
 
     if (isActive()) {
         setOffset(-_geometry->getFBXGeometry().neckPivot);
-
-        for (int i = 0; i < _rig->getJointStateCount(); i++) {
-            maybeUpdateNeckAndEyeRotation(i);
-        }
-
         Model::simulateInternal(deltaTime);
     }
 }
 
-void FaceModel::maybeUpdateNeckRotation(const JointState& parentState, const JointState& state, int index) {
-    // get the rotation axes in joint space and use them to adjust the rotation
-    glm::mat3 axes = glm::mat3_cast(glm::quat());
-    glm::mat3 inverse = glm::mat3(glm::inverse(parentState.getTransform() *
-                                               glm::translate(_rig->getJointDefaultTranslationInConstrainedFrame(index)) *
-                                               state.getPreTransform() * glm::mat4_cast(state.getPreRotation())));
-    glm::vec3 pitchYawRoll = safeEulerAngles(_owningHead->getFinalOrientationInLocalFrame());
-    glm::vec3 lean = glm::radians(glm::vec3(_owningHead->getFinalLeanForward(),
-                                            _owningHead->getTorsoTwist(),
-                                            _owningHead->getFinalLeanSideways()));
-    pitchYawRoll -= lean;
-    _rig->setJointRotationInConstrainedFrame(index,
-                                             glm::angleAxis(-pitchYawRoll.z, glm::normalize(inverse * axes[2]))
-                                             * glm::angleAxis(pitchYawRoll.y, glm::normalize(inverse * axes[1]))
-                                             * glm::angleAxis(-pitchYawRoll.x, glm::normalize(inverse * axes[0]))
-                                             * state.getDefaultRotation(), DEFAULT_PRIORITY);
-}
-
-void FaceModel::maybeUpdateEyeRotation(Model* model, const JointState& parentState, const JointState& state, int index) {
-    // likewise with the eye joints
-    // NOTE: at the moment we do the math in the world-frame, hence the inverse transform is more complex than usual.
-    glm::mat4 inverse = glm::inverse(glm::mat4_cast(model->getRotation()) * parentState.getTransform() *
-                                     glm::translate(_rig->getJointDefaultTranslationInConstrainedFrame(index)) *
-                                     state.getPreTransform() * glm::mat4_cast(state.getPreRotation() * state.getDefaultRotation()));
-    glm::vec3 front = glm::vec3(inverse * glm::vec4(_owningHead->getFinalOrientationInWorldFrame() * IDENTITY_FRONT, 0.0f));
-    glm::vec3 lookAtDelta = _owningHead->getCorrectedLookAtPosition() - model->getTranslation();
-    glm::vec3 lookAt = glm::vec3(inverse * glm::vec4(lookAtDelta + glm::length(lookAtDelta) * _owningHead->getSaccade(), 1.0f));
-    glm::quat between = rotationBetween(front, lookAt);
-    const float MAX_ANGLE = 30.0f * RADIANS_PER_DEGREE;
-    _rig->setJointRotationInConstrainedFrame(index, glm::angleAxis(glm::clamp(glm::angle(between),
-                                                                              -MAX_ANGLE, MAX_ANGLE), glm::axis(between)) *
-                                             state.getDefaultRotation(), DEFAULT_PRIORITY);
-}
-
-void FaceModel::maybeUpdateNeckAndEyeRotation(int index) {
-    const JointState& state = _rig->getJointState(index);
-    const FBXGeometry& geometry = _geometry->getFBXGeometry();
-    const int parentIndex = state.getParentIndex();
-
-    // guard against out-of-bounds access to _jointStates
-    if (parentIndex != -1 && parentIndex >= 0 && parentIndex < _rig->getJointStateCount()) {
-        const JointState& parentState = _rig->getJointState(parentIndex);
-        if (index == geometry.neckJointIndex) {
-            maybeUpdateNeckRotation(parentState, state, index);
-
-        } else if (index == geometry.leftEyeJointIndex || index == geometry.rightEyeJointIndex) {
-            maybeUpdateEyeRotation(this, parentState, state, index);
-        }
-    }
-}
-
 bool FaceModel::getEyePositions(glm::vec3& firstEyePosition, glm::vec3& secondEyePosition) const {
     if (!isActive()) {
         return false;
diff --git a/interface/src/avatar/FaceModel.h b/interface/src/avatar/FaceModel.h
index ed1ea28508..5a19a8ea29 100644
--- a/interface/src/avatar/FaceModel.h
+++ b/interface/src/avatar/FaceModel.h
@@ -26,10 +26,6 @@ public:
 
     virtual void simulate(float deltaTime, bool fullUpdate = true);
 
-    void maybeUpdateNeckRotation(const JointState& parentState, const JointState& state, int index);
-    void maybeUpdateEyeRotation(Model* model, const JointState& parentState, const JointState& state, int index);
-    void maybeUpdateNeckAndEyeRotation(int index);
-
     /// Retrieve the positions of up to two eye meshes.
     /// \return whether or not both eye meshes were found
     bool getEyePositions(glm::vec3& firstEyePosition, glm::vec3& secondEyePosition) const;