From c9ba71aa015ef86d2a9fc89effbd77a18cbebb4a Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Tue, 10 Jun 2014 09:38:38 -0700
Subject: [PATCH] fix for broken neck on some body models

---
 interface/src/avatar/FaceModel.cpp     |  2 +-
 interface/src/avatar/SkeletonModel.cpp | 10 ++++++++--
 interface/src/avatar/SkeletonModel.h   |  4 ++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/interface/src/avatar/FaceModel.cpp b/interface/src/avatar/FaceModel.cpp
index 601dad5563..c3f31ff6e7 100644
--- a/interface/src/avatar/FaceModel.cpp
+++ b/interface/src/avatar/FaceModel.cpp
@@ -30,7 +30,7 @@ void FaceModel::simulate(float deltaTime, bool fullUpdate) {
     }
     setTranslation(neckPosition);
     glm::quat neckParentRotation;
-    if (!owningAvatar->getSkeletonModel().getNeckParentRotation(neckParentRotation)) {
+    if (!owningAvatar->getSkeletonModel().getNeckParentRotationFromDefaultOrientation(neckParentRotation)) {
         neckParentRotation = owningAvatar->getOrientation();
     }
     setRotation(neckParentRotation);
diff --git a/interface/src/avatar/SkeletonModel.cpp b/interface/src/avatar/SkeletonModel.cpp
index 1b1b2e032b..576545f115 100644
--- a/interface/src/avatar/SkeletonModel.cpp
+++ b/interface/src/avatar/SkeletonModel.cpp
@@ -434,7 +434,7 @@ bool SkeletonModel::getNeckPosition(glm::vec3& neckPosition) const {
     return isActive() && getJointPositionInWorldFrame(_geometry->getFBXGeometry().neckJointIndex, neckPosition);
 }
 
-bool SkeletonModel::getNeckParentRotation(glm::quat& neckParentRotation) const {
+bool SkeletonModel::getNeckParentRotationFromDefaultOrientation(glm::quat& neckParentRotation) const {
     if (!isActive()) {
         return false;
     }
@@ -442,7 +442,13 @@ bool SkeletonModel::getNeckParentRotation(glm::quat& neckParentRotation) const {
     if (geometry.neckJointIndex == -1) {
         return false;
     }
-    return getJointRotationInWorldFrame(geometry.joints.at(geometry.neckJointIndex).parentIndex, neckParentRotation);
+    int parentIndex = geometry.joints.at(geometry.neckJointIndex).parentIndex;
+    glm::quat worldFrameRotation;
+    if (getJointRotationInWorldFrame(parentIndex, worldFrameRotation)) {
+        neckParentRotation = worldFrameRotation * _jointStates[parentIndex].getFBXJoint().inverseDefaultRotation;
+        return true;
+    }
+    return false;
 }
 
 bool SkeletonModel::getEyePositions(glm::vec3& firstEyePosition, glm::vec3& secondEyePosition) const {
diff --git a/interface/src/avatar/SkeletonModel.h b/interface/src/avatar/SkeletonModel.h
index 086973807d..3b8e67df47 100644
--- a/interface/src/avatar/SkeletonModel.h
+++ b/interface/src/avatar/SkeletonModel.h
@@ -86,9 +86,9 @@ public:
     /// \return whether or not the neck was found
     bool getNeckPosition(glm::vec3& neckPosition) const;
     
-    /// Returns the rotation of the neck joint's parent.
+    /// Returns the rotation of the neck joint's parent from default orientation
     /// \return whether or not the neck was found
-    bool getNeckParentRotation(glm::quat& neckRotation) const;
+    bool getNeckParentRotationFromDefaultOrientation(glm::quat& neckParentRotation) const;
     
     /// Retrieve the positions of up to two eye meshes.
     /// \return whether or not both eye meshes were found