Merge branch 'master' of https://github.com/highfidelity/hifi into fixMainTextContainerQML

libraries/entities-renderer/src/RenderableModelEntityItem.cpp

@@ -1322,6 +1322,8 @@ void ModelEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& sce
             emit DependencyManager::get<scriptable::ModelProviderFactory>()->
                 modelRemovedFromScene(entity->getEntityItemID(), NestableType::Entity, _model);
         }
+        setKey(false);
+        _didLastVisualGeometryRequestSucceed = false;
         return;
     }
 
@@ -1347,6 +1349,7 @@ void ModelEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& sce
     if (_parsedModelURL != model->getURL()) {
         withWriteLock([&] {
             _texturesLoaded = false;
+            _jointMappingCompleted = false;
             model->setURL(_parsedModelURL);
         });
     }
@@ -1457,7 +1460,6 @@ void ModelEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& sce
             mapJoints(entity, model->getJointNames());
         //else the joint have been mapped before but we have a new animation to load
         } else if (_animation && (_animation->getURL().toString() != entity->getAnimationURL())) {
-            _animation = DependencyManager::get<AnimationCache>()->getAnimation(entity->getAnimationURL());
             _jointMappingCompleted = false;
             mapJoints(entity, model->getJointNames());
         }

libraries/entities-renderer/src/RenderableModelEntityItem.h

@@ -187,7 +187,7 @@ private:
     const void* _collisionMeshKey { nullptr };
 
     // used on client side
-    bool _jointMappingCompleted{ false };
+    bool _jointMappingCompleted { false };
     QVector<int> _jointMapping; // domain is index into model-joints, range is index into animation-joints
     AnimationPointer _animation;
     QUrl _parsedModelURL;

libraries/entities/src/ModelEntityItem.cpp

@@ -66,7 +66,9 @@ EntityItemProperties ModelEntityItem::getProperties(EntityPropertyFlags desiredP
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(jointTranslationsSet, getJointTranslationsSet);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(jointTranslations, getJointTranslations);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(relayParentJoints, getRelayParentJoints);
+    withReadLock([&] {
         _animationProperties.getProperties(properties);
+    });
     return properties;
 }
 
@@ -123,15 +125,18 @@ int ModelEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data,
 
     // grab a local copy of _animationProperties to avoid multiple locks
     int bytesFromAnimation;
+    AnimationPropertyGroup animationProperties;
     withReadLock([&] {
-        AnimationPropertyGroup animationProperties = _animationProperties;
+        animationProperties = _animationProperties;
         bytesFromAnimation = animationProperties.readEntitySubclassDataFromBuffer(dataAt, (bytesLeftToRead - bytesRead), args,
             propertyFlags, overwriteLocalData, animationPropertiesChanged);
+    });
     if (animationPropertiesChanged) {
+        withWriteLock([&] {
             applyNewAnimationProperties(animationProperties);
+        });
         somethingChanged = true;
     }
-    });
 
     bytesRead += bytesFromAnimation;
     dataAt += bytesFromAnimation;
@@ -305,8 +310,10 @@ void ModelEntityItem::setAnimationURL(const QString& url) {
 void ModelEntityItem::setAnimationSettings(const QString& value) {
     // NOTE: this method only called for old bitstream format
 
-    withWriteLock([&] {
+    AnimationPropertyGroup animationProperties;
-        auto animationProperties = _animationProperties;
+    withReadLock([&] {
+        animationProperties = _animationProperties;
+    });
 
     // the animations setting is a JSON string that may contain various animation settings.
     // if it includes fps, currentFrame, or running, those values will be parsed out and
@@ -356,18 +363,24 @@ void ModelEntityItem::setAnimationSettings(const QString& value) {
         bool allowTranslation = settingsMap["allowTranslation"].toBool();
         animationProperties.setAllowTranslation(allowTranslation);
     }
+
+    withWriteLock([&] {
         applyNewAnimationProperties(animationProperties);
     });
 }
 
 void ModelEntityItem::setAnimationIsPlaying(bool value) {
     _flags |= Simulation::DIRTY_UPDATEABLE;
+    withWriteLock([&] {
         _animationProperties.setRunning(value);
+    });
 }
 
 void ModelEntityItem::setAnimationFPS(float value) {
     _flags |= Simulation::DIRTY_UPDATEABLE;
+    withWriteLock([&] {
         _animationProperties.setFPS(value);
+    });
 }
 
 // virtual
@@ -557,11 +570,9 @@ void ModelEntityItem::setColor(const xColor& value) {
 
 // Animation related items...
 AnimationPropertyGroup ModelEntityItem::getAnimationProperties() const { 
-    AnimationPropertyGroup result;
+    return resultWithReadLock<AnimationPropertyGroup>([&] {
-    withReadLock([&] {
+        return _animationProperties;
-        result = _animationProperties;
     });
-    return result; 
 }
 
 bool ModelEntityItem::hasAnimation() const { 
@@ -582,6 +593,18 @@ void ModelEntityItem::setAnimationCurrentFrame(float value) {
     });
 }
 
+void ModelEntityItem::setAnimationAllowTranslation(bool value) {
+    withWriteLock([&] {
+        _animationProperties.setAllowTranslation(value);
+    });
+}
+
+bool ModelEntityItem::getAnimationAllowTranslation() const {
+    return resultWithReadLock<bool>([&] {
+        return _animationProperties.getAllowTranslation();
+    });
+}
+
 void ModelEntityItem::setAnimationLoop(bool loop) { 
     withWriteLock([&] {
         _animationProperties.setLoop(loop);

libraries/entities/src/ModelEntityItem.h

@@ -88,8 +88,8 @@ public:
     void setAnimationIsPlaying(bool value);
     void setAnimationFPS(float value); 
 
-    void setAnimationAllowTranslation(bool value) { _animationProperties.setAllowTranslation(value); };
+    void setAnimationAllowTranslation(bool value);
-    bool getAnimationAllowTranslation() const { return _animationProperties.getAllowTranslation(); };
+    bool getAnimationAllowTranslation() const;
 
     void setAnimationLoop(bool loop);
     bool getAnimationLoop() const;