Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 04:57:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

review changes

Browse source
This commit is contained in:
amantley 2019-02-21 11:08:29 -08:00
parent 33fd64c68c
commit afed0b5442
5 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/avatar/MyAvatar.cpp
View file

@ -2952,9 +2952,9 @@ void MyAvatar::initAnimGraph() {
} else { } else {
graphUrl = PathUtils::resourcesUrl("avatar/avatar-animation.json"); 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"); graphUrl = PathUtils::resourcesUrl("avatar/avatar-animation_withSplineIKNode.json");
#endif #endif
} }
emit animGraphUrlChanged(graphUrl); emit animGraphUrlChanged(graphUrl);

2
interface/src/avatar/MySkeletonModel.cpp
View file

@ -10,12 +10,14 @@
#include <avatars-renderer/Avatar.h> #include <avatars-renderer/Avatar.h>
#include <DebugDraw.h> #include <DebugDraw.h>
#include <CubicHermiteSpline.h>
#include "Application.h" #include "Application.h"
#include "InterfaceLogging.h" #include "InterfaceLogging.h"
#include "AnimUtil.h" #include "AnimUtil.h"
MySkeletonModel::MySkeletonModel(Avatar* owningAvatar, QObject* parent) : SkeletonModel(owningAvatar, parent) { MySkeletonModel::MySkeletonModel(Avatar* owningAvatar, QObject* parent) : SkeletonModel(owningAvatar, parent) {
} }

1
interface/src/avatar/MySkeletonModel.h
View file

@ -12,7 +12,6 @@
#include <avatars-renderer/SkeletonModel.h> #include <avatars-renderer/SkeletonModel.h>
#include <AnimUtil.h> #include <AnimUtil.h>
#include "MyAvatar.h" #include "MyAvatar.h"
#include <CubicHermiteSpline.h>
/// A skeleton loaded from a model. /// A skeleton loaded from a model.
class MySkeletonModel : public SkeletonModel { class MySkeletonModel : public SkeletonModel {

4
libraries/animation/src/AnimPoleVectorConstraint.h
View file

@ -25,8 +25,6 @@ public:
const QString& enabledVar, const QString& poleVectorVar); const QString& enabledVar, const QString& poleVectorVar);
virtual ~AnimPoleVectorConstraint() override; 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; virtual const AnimPoseVec& evaluate(const AnimVariantMap& animVars, const AnimContext& context, float dt, AnimVariantMap& triggersOut) override;
protected: protected:
@ -66,8 +64,6 @@ protected:
float _interpAlphaVel { 0.0f }; float _interpAlphaVel { 0.0f };
float _interpAlpha { 0.0f }; float _interpAlpha { 0.0f };
float _lastTheta { 0.0f };
AnimChain _snapshotChain; AnimChain _snapshotChain;
// no copies // no copies

1
libraries/avatars-renderer/src/avatars-renderer/Avatar.h
View file

@ -25,7 +25,6 @@
#include <render/Scene.h> #include <render/Scene.h>
#include <graphics-scripting/Forward.h> #include <graphics-scripting/Forward.h>
#include <GLMHelpers.h> #include <GLMHelpers.h>
#include <CubicHermiteSpline.h>
#include <EntityItem.h> #include <EntityItem.h>
#include <Grab.h> #include <Grab.h>