Merge branch 'rig' of https://github.com/sethalves/hifi into sethalves-rig2

interface/src/avatar/Avatar.h

@@ -166,9 +166,10 @@ public:
 
     virtual void computeShapeInfo(ShapeInfo& shapeInfo);
 
-    friend class AvatarManager;
+    void setMotionState(AvatarMotionState* motionState) { _motionState = motionState; }
+    AvatarMotionState* getMotionState() { return _motionState; }
 
-signals:
+ signals:
     void collisionWithAvatar(const QUuid& myUUID, const QUuid& theirUUID, const CollisionInfo& collision);
 
 protected:

interface/src/avatar/AvatarManager.cpp

@@ -179,11 +179,11 @@ AvatarSharedPointer AvatarManager::addAvatar(const QUuid& sessionUUID, const QWe
 // protected
 void AvatarManager::removeAvatarMotionState(AvatarSharedPointer avatar) {
     auto rawPointer = std::static_pointer_cast<Avatar>(avatar);
-    AvatarMotionState* motionState= rawPointer->_motionState;
+    AvatarMotionState* motionState = rawPointer->getMotionState();
     if (motionState) {
         // clean up physics stuff
         motionState->clearObjectBackPointer();
-        rawPointer->_motionState = nullptr;
+        rawPointer->setMotionState(nullptr);
         _avatarMotionStates.remove(motionState);
         _motionStatesToAdd.remove(motionState);
         _motionStatesToDelete.push_back(motionState);
@@ -307,7 +307,7 @@ void AvatarManager::updateAvatarPhysicsShape(const QUuid& id) {
     AvatarHash::iterator avatarItr = _avatarHash.find(id);
     if (avatarItr != _avatarHash.end()) {
         auto avatar = std::static_pointer_cast<Avatar>(avatarItr.value());
-        AvatarMotionState* motionState = avatar->_motionState;
+        AvatarMotionState* motionState = avatar->getMotionState();
         if (motionState) {
             motionState->addDirtyFlags(EntityItem::DIRTY_SHAPE);
         } else {
@@ -316,7 +316,7 @@ void AvatarManager::updateAvatarPhysicsShape(const QUuid& id) {
             btCollisionShape* shape = ObjectMotionState::getShapeManager()->getShape(shapeInfo);
             if (shape) {
                 AvatarMotionState* motionState = new AvatarMotionState(avatar.get(), shape);
-                avatar->_motionState = motionState;
+                avatar->setMotionState(motionState);
                 _motionStatesToAdd.insert(motionState);
                 _avatarMotionStates.insert(motionState);
             }

interface/src/avatar/MyAvatar.cpp

@@ -909,15 +909,15 @@ void MyAvatar::setJointRotations(QVector<glm::quat> jointRotations) {
 void MyAvatar::setJointData(int index, const glm::quat& rotation) {
     if (QThread::currentThread() == thread()) {
         // HACK: ATM only JS scripts call setJointData() on MyAvatar so we hardcode the priority
-        _skeletonModel.setJointState(index, true, rotation, SCRIPT_PRIORITY);
+        _rig->setJointState(index, true, rotation, SCRIPT_PRIORITY);
     }
 }
 
 void MyAvatar::clearJointData(int index) {
     if (QThread::currentThread() == thread()) {
         // HACK: ATM only JS scripts call clearJointData() on MyAvatar so we hardcode the priority
-        _skeletonModel.setJointState(index, false, glm::quat(), 0.0f);
-        _skeletonModel.clearJointAnimationPriority(index);
+        _rig->setJointState(index, false, glm::quat(), 0.0f);
+        _rig->clearJointAnimationPriority(index);
     }
 }
 
@@ -928,7 +928,7 @@ void MyAvatar::clearJointsData() {
 void MyAvatar::clearJointAnimationPriorities() {
     int numStates = _skeletonModel.getJointStateCount();
     for (int i = 0; i < numStates; ++i) {
-        _skeletonModel.clearJointAnimationPriority(i);
+        _rig->clearJointAnimationPriority(i);
     }
 }
 

interface/src/avatar/MyAvatar.h

@@ -39,36 +39,26 @@ public:
     MyAvatar(RigPointer rig);
     ~MyAvatar();
 
-    QByteArray toByteArray();
+
     void reset();
     void update(float deltaTime);
-    void simulate(float deltaTime);
     void preRender(RenderArgs* renderArgs);
-    void updateFromTrackers(float deltaTime);
 
-    virtual void render(RenderArgs* renderArgs, const glm::vec3& cameraPositio) override;
-    virtual void renderBody(RenderArgs* renderArgs, ViewFrustum* renderFrustum, float glowLevel = 0.0f) override;
-    virtual bool shouldRenderHead(const RenderArgs* renderArgs) const override;
-
-    // setters
     void setLeanScale(float scale) { _leanScale = scale; }
-    void setShouldRenderLocally(bool shouldRender) { _shouldRender = shouldRender; }
     void setRealWorldFieldOfView(float realWorldFov) { _realWorldFieldOfView.set(realWorldFov); }
 
-    // getters
     float getLeanScale() const { return _leanScale; }
     Q_INVOKABLE glm::vec3 getDefaultEyePosition() const;
-    bool getShouldRenderLocally() const { return _shouldRender; }
+
     float getRealWorldFieldOfView() { return _realWorldFieldOfView.get(); }
 
     const QList<AnimationHandlePointer>& getAnimationHandles() const { return _rig->getAnimationHandles(); }
     AnimationHandlePointer addAnimationHandle() { return _rig->createAnimationHandle(); }
     void removeAnimationHandle(const AnimationHandlePointer& handle) { _rig->removeAnimationHandle(handle); }
-    
     /// Allows scripts to run animations.
     Q_INVOKABLE void startAnimation(const QString& url, float fps = 30.0f, float priority = 1.0f, bool loop = false,
-        bool hold = false, float firstFrame = 0.0f, float lastFrame = FLT_MAX, const QStringList& maskedJoints = QStringList());
-    
+                                    bool hold = false, float firstFrame = 0.0f,
+                                    float lastFrame = FLT_MAX, const QStringList& maskedJoints = QStringList());
     /// Stops an animation as identified by a URL.
     Q_INVOKABLE void stopAnimation(const QString& url);
 
@@ -77,12 +67,11 @@ public:
     Q_INVOKABLE void startAnimationByRole(const QString& role, const QString& url = QString(), float fps = 30.0f,
                                           float priority = 1.0f, bool loop = false, bool hold = false, float firstFrame = 0.0f,
                                           float lastFrame = FLT_MAX, const QStringList& maskedJoints = QStringList());
-    
     /// Stops an animation identified by its role.
     Q_INVOKABLE void stopAnimationByRole(const QString& role);
-
     Q_INVOKABLE AnimationDetails getAnimationDetailsByRole(const QString& role);
     Q_INVOKABLE AnimationDetails getAnimationDetails(const QString& url);
+    void clearJointAnimationPriorities();
 
     // get/set avatar data
     void saveData();
@@ -94,16 +83,10 @@ public:
     //  Set what driving keys are being pressed to control thrust levels
     void clearDriveKeys();
     void setDriveKeys(int key, float val) { _driveKeys[key] = val; };
-    bool getDriveKeys(int key) { return _driveKeys[key] != 0.0f; };
-    
     void relayDriveKeysToCharacterController();
 
-    bool isMyAvatar() const { return true; }
-    
     eyeContactTarget getEyeContactTarget();
 
-    virtual int parseDataFromBuffer(const QByteArray& buffer);
-    
     static void sendKillAvatar();
 
     Q_INVOKABLE glm::vec3 getTrackedHeadPosition() const { return _trackedHeadPosition; }
@@ -116,6 +99,7 @@ public:
     Q_INVOKABLE glm::vec3 getEyePosition() const { return getHead()->getEyePosition(); }
 
     Q_INVOKABLE glm::vec3 getTargetAvatarPosition() const { return _targetAvatarPosition; }
+
     AvatarWeakPointer getLookAtTargetAvatar() const { return _lookAtTargetAvatar; }
     void updateLookAtTargetAvatar();
     void clearLookAtTargetAvatar();
@@ -128,7 +112,8 @@ public:
     Q_INVOKABLE void useFullAvatarURL(const QUrl& fullAvatarURL, const QString& modelName = QString());
     Q_INVOKABLE void useHeadURL(const QUrl& headURL, const QString& modelName = QString());
     Q_INVOKABLE void useBodyURL(const QUrl& bodyURL, const QString& modelName = QString());
-    Q_INVOKABLE void useHeadAndBodyURLs(const QUrl& headURL, const QUrl& bodyURL, const QString& headName = QString(), const QString& bodyName = QString());
+    Q_INVOKABLE void useHeadAndBodyURLs(const QUrl& headURL, const QUrl& bodyURL,
+                                        const QString& headName = QString(), const QString& bodyName = QString());
 
     Q_INVOKABLE bool getUseFullAvatar() const { return _useFullAvatar; }
     Q_INVOKABLE const QUrl& getFullAvatarURLFromPreferences() const { return _fullAvatarURLFromPreferences; }
@@ -143,35 +128,17 @@ public:
 
     virtual void setAttachmentData(const QVector<AttachmentData>& attachmentData);
 
-    virtual glm::vec3 getSkeletonPosition() const;
-    void updateLocalAABox();
     DynamicCharacterController* getCharacterController() { return &_characterController; }
 
-    void clearJointAnimationPriorities();
-
-    glm::vec3 getScriptedMotorVelocity() const { return _scriptedMotorVelocity; }
-    float getScriptedMotorTimescale() const { return _scriptedMotorTimescale; }
-    QString getScriptedMotorFrame() const;
-
-    void setScriptedMotorVelocity(const glm::vec3& velocity);
-    void setScriptedMotorTimescale(float timescale);
-    void setScriptedMotorFrame(QString frame);
 
     const QString& getCollisionSoundURL() {return _collisionSoundURL; }
     void setCollisionSoundURL(const QString& url);
 
     void clearScriptableSettings();
 
-    virtual void attach(const QString& modelURL, const QString& jointName = QString(),
-        const glm::vec3& translation = glm::vec3(), const glm::quat& rotation = glm::quat(), float scale = 1.0f,
-        bool allowDuplicates = false, bool useSaved = true);
-        
     /// Renders a laser pointer for UI picking
-    void renderLaserPointers(gpu::Batch& batch);
-    glm::vec3 getLaserPointerTipPosition(const PalmData* palm);
 
-    const RecorderPointer getRecorder() const { return _recorder; }
-    const PlayerPointer getPlayer() const { return _player; }
+    glm::vec3 getLaserPointerTipPosition(const PalmData* palm);
 
     float getBoomLength() const { return _boomLength; }
     void setBoomLength(float boomLength) { _boomLength = boomLength; }
@@ -221,6 +188,33 @@ signals:
 
 private:
 
+    QByteArray toByteArray();
+    void simulate(float deltaTime);
+    void updateFromTrackers(float deltaTime);
+    virtual void render(RenderArgs* renderArgs, const glm::vec3& cameraPositio) override;
+    virtual void renderBody(RenderArgs* renderArgs, ViewFrustum* renderFrustum, float glowLevel = 0.0f) override;
+    virtual bool shouldRenderHead(const RenderArgs* renderArgs) const override;
+    void setShouldRenderLocally(bool shouldRender) { _shouldRender = shouldRender; }
+    bool getShouldRenderLocally() const { return _shouldRender; }
+    bool getDriveKeys(int key) { return _driveKeys[key] != 0.0f; };
+    bool isMyAvatar() const { return true; }
+    virtual int parseDataFromBuffer(const QByteArray& buffer);
+    virtual glm::vec3 getSkeletonPosition() const;
+
+    glm::vec3 getScriptedMotorVelocity() const { return _scriptedMotorVelocity; }
+    float getScriptedMotorTimescale() const { return _scriptedMotorTimescale; }
+    QString getScriptedMotorFrame() const;
+    void setScriptedMotorVelocity(const glm::vec3& velocity);
+    void setScriptedMotorTimescale(float timescale);
+    void setScriptedMotorFrame(QString frame);
+    virtual void attach(const QString& modelURL, const QString& jointName = QString(),
+                        const glm::vec3& translation = glm::vec3(), const glm::quat& rotation = glm::quat(), float scale = 1.0f,
+                        bool allowDuplicates = false, bool useSaved = true);
+
+    void renderLaserPointers(gpu::Batch& batch);
+    const RecorderPointer getRecorder() const { return _recorder; }
+    const PlayerPointer getPlayer() const { return _player; }
+
     bool cameraInsideHead() const;
 
     // These are made private for MyAvatar so that you will use the "use" methods instead

libraries/animation/src/Rig.cpp

@@ -337,13 +337,12 @@ glm::mat4 Rig::getJointVisibleTransform(int jointIndex) const {
 }
 
 void Rig::computeMotionAnimationState(float deltaTime, const glm::vec3& worldPosition, const glm::vec3& worldVelocity, const glm::quat& worldRotation) {
-    
     if (_enableRig) {
         glm::vec3 front = worldRotation * IDENTITY_FRONT;
         float forwardSpeed = glm::dot(worldVelocity, front);
         float rotationalSpeed = glm::angle(front, _lastFront) / deltaTime;
-        bool isWalking = std::abs(forwardSpeed) > 0.01;
-        bool isTurning = std::abs(rotationalSpeed) > 0.5;
+        bool isWalking = std::abs(forwardSpeed) > 0.01f;
+        bool isTurning = std::abs(rotationalSpeed) > 0.5f;
 
         // Crude, until we have blending:
         isTurning = isTurning && !isWalking; // Only one of walk/turn, walk wins.

libraries/entities/src/ParticleEffectEntityItem.cpp

@@ -155,9 +155,9 @@ void ParticleEffectEntityItem::computeAndUpdateDimensions() {
     float yMin = std::min(yApex, yEnd);
 
     // times 2 because dimensions are diameters not radii.
-    glm::vec3 dims(2.0f * std::max(fabs(xMin), fabs(xMax)),
-                   2.0f * std::max(fabs(yMin), fabs(yMax)),
-                   2.0f * std::max(fabs(zMin), fabs(zMax)));
+    glm::vec3 dims(2.0f * std::max(fabsf(xMin), fabsf(xMax)),
+                   2.0f * std::max(fabsf(yMin), fabsf(yMax)),
+                   2.0f * std::max(fabsf(zMin), fabsf(zMax)));
 
     EntityItem::setDimensions(dims);
 }

libraries/render-utils/src/Model.cpp

@@ -1048,10 +1048,6 @@ void Model::clearJointState(int index) {
     _rig->clearJointState(index);
 }
 
-void Model::clearJointAnimationPriority(int index) {
-    _rig->clearJointAnimationPriority(index);
-}
-
 void Model::setJointState(int index, bool valid, const glm::quat& rotation, float priority) {
     _rig->setJointState(index, valid, rotation, priority);
 }

libraries/render-utils/src/Model.h

@@ -22,7 +22,6 @@
 #include <functional>
 
 #include <AABox.h>
-#include <AnimationCache.h>
 #include <DependencyManager.h>
 #include <GeometryUtil.h>
 #include <gpu/Stream.h>
@@ -149,10 +148,6 @@ public:
     /// Sets the distance parameter used for LOD computations.
     void setLODDistance(float distance) { _lodDistance = distance; }
 
-    const QList<AnimationHandlePointer>& getRunningAnimations() const { return _rig->getRunningAnimations(); }
-    /// Clear the joint animation priority
-    void clearJointAnimationPriority(int index);
-
     void setScaleToFit(bool scaleToFit, float largestDimension = 0.0f, bool forceRescale = false);
     bool getScaleToFit() const { return _scaleToFit; } /// is scale to fit enabled