From d6dfaacf6fd4eca7b4e71c84757c80aa8eae2a42 Mon Sep 17 00:00:00 2001
From: amantley <amantley@googlemail.com>
Date: Fri, 15 Feb 2019 10:35:25 -0800
Subject: [PATCH] adding ifdef for android os

---
 interface/src/avatar/MyAvatar.cpp        |  3 +++
 libraries/animation/src/AnimSplineIK.cpp |  8 ++++----
 libraries/animation/src/Rig.cpp          | 11 ++++++++---
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index b5a938faba..aa47c63572 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -2951,6 +2951,9 @@ void MyAvatar::initAnimGraph() {
         graphUrl = _fstAnimGraphOverrideUrl;
     } else {
         graphUrl = PathUtils::resourcesUrl("avatar/avatar-animation.json");
+    #ifdef Q_OS_ANDROID
+        graphUrl = PathUtils::resourcesUrl("avatar/avatar-animation_withSplineIKNode.json");
+    #endif
     }
 
     emit animGraphUrlChanged(graphUrl);
diff --git a/libraries/animation/src/AnimSplineIK.cpp b/libraries/animation/src/AnimSplineIK.cpp
index 72dcbfc5e7..c91bd3bae2 100644
--- a/libraries/animation/src/AnimSplineIK.cpp
+++ b/libraries/animation/src/AnimSplineIK.cpp
@@ -131,7 +131,7 @@ const AnimPoseVec& AnimSplineIK::evaluate(const AnimVariantMap& animVars, const
         baseParentAbsPose = _skeleton->getAbsolutePose(baseParentIndex, _poses);
     }
     _poses[_baseJointIndex] = baseParentAbsPose.inverse() * baseTargetAbsolutePose;
-    _poses[_baseJointIndex].scale() = glm::vec3(1.0f);
+    _poses[_baseJointIndex].scale() = 1.0f;
 
     // initialize the middle joint target
     IKTarget midTarget;
@@ -290,7 +290,7 @@ void AnimSplineIK::setSkeletonInternal(AnimSkeleton::ConstPointer skeleton) {
 void AnimSplineIK::solveTargetWithSpline(const AnimContext& context, int base, const IKTarget& target, const AnimPoseVec& absolutePoses, bool debug, AnimChain& chainInfoOut) const {
 
     // build spline from tip to base
-    AnimPose tipPose = AnimPose(glm::vec3(1.0f), target.getRotation(), target.getTranslation());
+    AnimPose tipPose = AnimPose(1.0f, target.getRotation(), target.getTranslation());
     AnimPose basePose = absolutePoses[base];
 
     CubicHermiteSplineFunctorWithArcLength spline;
@@ -338,7 +338,7 @@ void AnimSplineIK::solveTargetWithSpline(const AnimContext& context, int base, c
             glm::mat3 m(u, v, glm::cross(u, v));
             glm::quat rot = glm::normalize(glm::quat_cast(m));
 
-            AnimPose desiredAbsPose = AnimPose(glm::vec3(1.0f), rot, trans) * splineJointInfo.offsetPose;
+            AnimPose desiredAbsPose = AnimPose(1.0f, rot, trans) * splineJointInfo.offsetPose;
 
             // apply flex coefficent
             AnimPose flexedAbsPose;
@@ -457,7 +457,7 @@ void AnimSplineIK::computeAndCacheSplineJointInfosForIKTarget(const AnimContext&
         glm::mat3 m(u, v, glm::cross(u, v));
         glm::quat rot = glm::normalize(glm::quat_cast(m));
 
-        AnimPose pose(glm::vec3(1.0f), rot, spline(t));
+        AnimPose pose(1.0f, rot, spline(t));
         AnimPose offsetPose = pose.inverse() * defaultPose;
 
         SplineJointInfo splineJointInfo = { index, ratio, offsetPose };
diff --git a/libraries/animation/src/Rig.cpp b/libraries/animation/src/Rig.cpp
index d25ea4669c..e3b997e8cc 100644
--- a/libraries/animation/src/Rig.cpp
+++ b/libraries/animation/src/Rig.cpp
@@ -1516,8 +1516,13 @@ void Rig::updateHands(bool leftHandEnabled, bool rightHandEnabled, bool hipsEnab
 
         if (ENABLE_POLE_VECTORS && handJointIndex >= 0 && armJointIndex >= 0 && elbowJointIndex >= 0 && oppositeArmJointIndex >= 0) {
             glm::vec3 poleVector;
-            //bool usePoleVector = calculateElbowPoleVector(handJointIndex, elbowJointIndex, armJointIndex, oppositeArmJointIndex, poleVector);
-            bool usePoleVector = calculateElbowPoleVectorOptimized(handJointIndex, elbowJointIndex, armJointIndex, false, poleVector);
+            bool usePoleVector = false;
+        #ifdef Q_OS_ANDROID
+            usePoleVector = calculateElbowPoleVectorOptimized(handJointIndex, elbowJointIndex, armJointIndex, false, poleVector);
+        #else
+            usePoleVector = calculateElbowPoleVectorOptimized(handJointIndex, elbowJointIndex, armJointIndex, false, poleVector);
+            // bool usePoleVector = calculateElbowPoleVector(handJointIndex, elbowJointIndex, armJointIndex, oppositeArmJointIndex, poleVector);
+        #endif
             if (usePoleVector) {
                 glm::vec3 sensorPoleVector = transformVectorFast(rigToSensorMatrix, poleVector);
                 _animVars.set("rightHandPoleVectorEnabled", true);
@@ -1708,7 +1713,7 @@ bool Rig::calculateElbowPoleVectorOptimized(int handIndex, int elbowIndex, int s
 
     // calculate the reference axis and the side axis.
     // Look up refVector from animVars, make sure to convert into geom space.
-    glm::vec3 refVector = (AnimPose(_rigToGeometryTransform) * elbowPose).xformVectorFast(Vectors::UNIT_X);
+    glm::vec3 refVector = (AnimPose(_rigToGeometryTransform) * elbowPose).xformVector(Vectors::UNIT_X);
     float refVectorLength = glm::length(refVector);
 
     if (left) {