mirror of
https://github.com/Armored-Dragon/overte.git
synced 2025-03-11 16:13:16 +01:00
review changes
This commit is contained in:
parent
33fd64c68c
commit
afed0b5442
5 changed files with 4 additions and 8 deletions
|
@ -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);
|
||||
|
|
|
@ -10,12 +10,14 @@
|
|||
|
||||
#include <avatars-renderer/Avatar.h>
|
||||
#include <DebugDraw.h>
|
||||
#include <CubicHermiteSpline.h>
|
||||
|
||||
#include "Application.h"
|
||||
#include "InterfaceLogging.h"
|
||||
#include "AnimUtil.h"
|
||||
|
||||
|
||||
|
||||
MySkeletonModel::MySkeletonModel(Avatar* owningAvatar, QObject* parent) : SkeletonModel(owningAvatar, parent) {
|
||||
}
|
||||
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
#include <avatars-renderer/SkeletonModel.h>
|
||||
#include <AnimUtil.h>
|
||||
#include "MyAvatar.h"
|
||||
#include <CubicHermiteSpline.h>
|
||||
|
||||
/// A skeleton loaded from a model.
|
||||
class MySkeletonModel : public SkeletonModel {
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
#include <render/Scene.h>
|
||||
#include <graphics-scripting/Forward.h>
|
||||
#include <GLMHelpers.h>
|
||||
#include <CubicHermiteSpline.h>
|
||||
#include <EntityItem.h>
|
||||
|
||||
#include <Grab.h>
|
||||
|
|
Loading…
Reference in a new issue