From afed0b54421a662da8910d3e930be5218532a86b Mon Sep 17 00:00:00 2001 From: amantley Date: Thu, 21 Feb 2019 11:08:29 -0800 Subject: [PATCH] review changes --- interface/src/avatar/MyAvatar.cpp | 4 ++-- interface/src/avatar/MySkeletonModel.cpp | 2 ++ interface/src/avatar/MySkeletonModel.h | 1 - libraries/animation/src/AnimPoleVectorConstraint.h | 4 ---- libraries/avatars-renderer/src/avatars-renderer/Avatar.h | 1 - 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 8ae59ebdc1..5bccd4650b 100755 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -2952,9 +2952,9 @@ void MyAvatar::initAnimGraph() { } else { graphUrl = PathUtils::resourcesUrl("avatar/avatar-animation.json"); - #if defined(Q_OS_ANDROID) || defined(HIFI_USE_Q_OS_ANDROID) +#if defined(Q_OS_ANDROID) || defined(HIFI_USE_Q_OS_ANDROID) graphUrl = PathUtils::resourcesUrl("avatar/avatar-animation_withSplineIKNode.json"); - #endif +#endif } emit animGraphUrlChanged(graphUrl); diff --git a/interface/src/avatar/MySkeletonModel.cpp b/interface/src/avatar/MySkeletonModel.cpp index 86a0dceae0..58071cfab1 100755 --- a/interface/src/avatar/MySkeletonModel.cpp +++ b/interface/src/avatar/MySkeletonModel.cpp @@ -10,12 +10,14 @@ #include #include +#include #include "Application.h" #include "InterfaceLogging.h" #include "AnimUtil.h" + MySkeletonModel::MySkeletonModel(Avatar* owningAvatar, QObject* parent) : SkeletonModel(owningAvatar, parent) { } diff --git a/interface/src/avatar/MySkeletonModel.h b/interface/src/avatar/MySkeletonModel.h index 7ea142b011..9a3559ddf7 100644 --- a/interface/src/avatar/MySkeletonModel.h +++ b/interface/src/avatar/MySkeletonModel.h @@ -12,7 +12,6 @@ #include #include #include "MyAvatar.h" -#include /// A skeleton loaded from a model. class MySkeletonModel : public SkeletonModel { diff --git a/libraries/animation/src/AnimPoleVectorConstraint.h b/libraries/animation/src/AnimPoleVectorConstraint.h index d0c80a393b..44e22671c1 100644 --- a/libraries/animation/src/AnimPoleVectorConstraint.h +++ b/libraries/animation/src/AnimPoleVectorConstraint.h @@ -25,8 +25,6 @@ public: const QString& enabledVar, const QString& poleVectorVar); virtual ~AnimPoleVectorConstraint() override; - float findThetaNewWay(const glm::vec3& hand, const glm::vec3& shoulder, bool left) const; - virtual const AnimPoseVec& evaluate(const AnimVariantMap& animVars, const AnimContext& context, float dt, AnimVariantMap& triggersOut) override; protected: @@ -66,8 +64,6 @@ protected: float _interpAlphaVel { 0.0f }; float _interpAlpha { 0.0f }; - float _lastTheta { 0.0f }; - AnimChain _snapshotChain; // no copies diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.h b/libraries/avatars-renderer/src/avatars-renderer/Avatar.h index 11bf2986d1..c9f1c4bdfe 100644 --- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.h +++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.h @@ -25,7 +25,6 @@ #include #include #include -#include #include #include