Only update the full set of joints when we've received new data from the

mixer.  Closes #2274.

interface/src/avatar/Avatar.cpp

@@ -56,7 +56,8 @@ Avatar::Avatar() :
     _owningAvatarMixer(),
     _collisionFlags(0),
     _initialized(false),
-    _shouldRenderBillboard(true)
+    _shouldRenderBillboard(true),
+    _modelsDirty(true)
 {
     // we may have been created in the network thread, but we live in the main thread
     moveToThread(Application::getInstance()->thread());
@@ -119,7 +120,8 @@ void Avatar::simulate(float deltaTime) {
     }
     glm::vec3 headPosition = _position;
     if (!_shouldRenderBillboard) {
-        _skeletonModel.simulate(deltaTime);
+        _skeletonModel.simulate(deltaTime, _modelsDirty);
+        _modelsDirty = false;
         _skeletonModel.getHeadPosition(headPosition);
     }
     Head* head = getHead();
@@ -618,6 +620,9 @@ int Avatar::parseData(const QByteArray& packet) {
     const float MOVE_DISTANCE_THRESHOLD = 0.001f;
     _moving = glm::distance(oldPosition, _position) > MOVE_DISTANCE_THRESHOLD;
     
+    // note that we need to update our models
+    _modelsDirty = true;
+    
     return bytesRead;
 }
 

interface/src/avatar/Avatar.h

@@ -187,6 +187,7 @@ private:
     bool _initialized;
     QScopedPointer<Texture> _billboardTexture;
     bool _shouldRenderBillboard;
+    bool _modelsDirty;
 
     void renderBody();
     void renderBillboard();

interface/src/avatar/FaceModel.cpp

@@ -18,9 +18,9 @@ FaceModel::FaceModel(Head* owningHead) :
 {
 }
 
-void FaceModel::simulate(float deltaTime, bool delayLoad) {
+void FaceModel::simulate(float deltaTime) {
     if (!isActive()) {
-        Model::simulate(deltaTime, delayLoad);
+        Model::simulate(deltaTime);
         return;
     }
     Avatar* owningAvatar = static_cast<Avatar*>(_owningHead->_owningAvatar);
@@ -41,7 +41,7 @@ void FaceModel::simulate(float deltaTime, bool delayLoad) {
     setPupilDilation(_owningHead->getPupilDilation());
     setBlendshapeCoefficients(_owningHead->getBlendshapeCoefficients());
     
-    Model::simulate(deltaTime, delayLoad);
+    Model::simulate(deltaTime);
 }
 
 bool FaceModel::render(float alpha) {

interface/src/avatar/FaceModel.h

@@ -21,7 +21,7 @@ public:
 
     FaceModel(Head* owningHead);
 
-    void simulate(float deltaTime, bool delayLoad = false);
+    void simulate(float deltaTime);
     bool render(float alpha);
     
 protected:

interface/src/avatar/SkeletonModel.cpp

@@ -18,13 +18,13 @@ SkeletonModel::SkeletonModel(Avatar* owningAvatar) :
     _owningAvatar(owningAvatar) {
 }
 
-void SkeletonModel::simulate(float deltaTime, bool delayLoad) {
+void SkeletonModel::simulate(float deltaTime, bool fullUpdate) {
     setTranslation(_owningAvatar->getPosition());
     setRotation(_owningAvatar->getOrientation() * glm::angleAxis(PI, glm::vec3(0.0f, 1.0f, 0.0f)));
     const float MODEL_SCALE = 0.0006f;
     setScale(glm::vec3(1.0f, 1.0f, 1.0f) * _owningAvatar->getScale() * MODEL_SCALE);
     
-    Model::simulate(deltaTime, delayLoad);
+    Model::simulate(deltaTime, fullUpdate);
     
     if (!(isActive() && _owningAvatar->isMyAvatar())) {
         return; // only simulate for own avatar

interface/src/avatar/SkeletonModel.h

@@ -22,7 +22,7 @@ public:
 
     SkeletonModel(Avatar* owningAvatar);
     
-    void simulate(float deltaTime, bool delayLoad = false);
+    void simulate(float deltaTime, bool fullUpdate = true);
     bool render(float alpha);
 
     /// \param jointIndex index of hand joint

interface/src/renderer/Model.cpp

@@ -156,9 +156,9 @@ void Model::updateShapePositions() {
     }
 }
 
-void Model::simulate(float deltaTime, bool delayLoad) {
+void Model::simulate(float deltaTime, bool fullUpdate) {
     // update our LOD
-    QVector<JointState> newJointStates = updateGeometry(delayLoad);
+    QVector<JointState> newJointStates = updateGeometry();
     if (!isActive()) {
         return;
     }
@@ -183,10 +183,15 @@ void Model::simulate(float deltaTime, bool delayLoad) {
             model->setURL(attachment.url);
             _attachments.append(model);
         }
-        _resetStates = true;
+        _resetStates = fullUpdate = true;
         createCollisionShapes();
     }
     
+    // exit early if we don't have to perform a full update
+    if (!(fullUpdate || _resetStates)) {
+        return;
+    }
+    
     // update the world space transforms for all joints
     for (int i = 0; i < _jointStates.size(); i++) {
         updateJointState(i);
@@ -868,14 +873,12 @@ void Model::applyCollision(CollisionInfo& collision) {
     }
 }
 
-QVector<Model::JointState> Model::updateGeometry(bool delayLoad) {
+QVector<Model::JointState> Model::updateGeometry() {
     QVector<JointState> newJointStates;
     if (_nextGeometry) {
-        _nextGeometry = _nextGeometry->getLODOrFallback(_lodDistance, _nextLODHysteresis, delayLoad);
-        if (!delayLoad) {
-            _nextGeometry->setLoadPriority(this, -_lodDistance);
-            _nextGeometry->ensureLoading();
-        }
+        _nextGeometry = _nextGeometry->getLODOrFallback(_lodDistance, _nextLODHysteresis);
+        _nextGeometry->setLoadPriority(this, -_lodDistance);
+        _nextGeometry->ensureLoading();
         if (_nextGeometry->isLoaded()) {
             applyNextGeometry();
             return newJointStates;
@@ -884,7 +887,7 @@ QVector<Model::JointState> Model::updateGeometry(bool delayLoad) {
     if (!_geometry) {
         return newJointStates;
     }
-    QSharedPointer<NetworkGeometry> geometry = _geometry->getLODOrFallback(_lodDistance, _lodHysteresis, delayLoad);
+    QSharedPointer<NetworkGeometry> geometry = _geometry->getLODOrFallback(_lodDistance, _lodHysteresis);
     if (_geometry != geometry) {
         if (!_jointStates.isEmpty()) {
             // copy the existing joint states
@@ -904,10 +907,8 @@ QVector<Model::JointState> Model::updateGeometry(bool delayLoad) {
         _dilatedTextures.clear();
         _geometry = geometry;
     }
-    if (!delayLoad) {
-        _geometry->setLoadPriority(this, -_lodDistance);
-        _geometry->ensureLoading();
-    }
+    _geometry->setLoadPriority(this, -_lodDistance);
+    _geometry->ensureLoading();
     return newJointStates;
 }
 

interface/src/renderer/Model.h

@@ -57,7 +57,7 @@ public:
     void clearShapes();
     void createCollisionShapes();
     void updateShapePositions();
-    void simulate(float deltaTime, bool delayLoad = false);
+    void simulate(float deltaTime, bool fullUpdate = true);
     bool render(float alpha);
     
     /// Sets the URL of the model to render.
@@ -256,7 +256,7 @@ protected:
     
 private:
     
-    QVector<JointState> updateGeometry(bool delayLoad);
+    QVector<JointState> updateGeometry();
     void applyNextGeometry();
     void deleteGeometry();
     void renderMeshes(float alpha, bool translucent);