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

libraries/entities/src/EntityItem.h

@@ -49,6 +49,7 @@ public:
         DIRTY_MOTION_TYPE = 0x0010,
         DIRTY_SHAPE = 0x0020,
         DIRTY_LIFETIME = 0x0040,
+        DIRTY_UPDATEABLE = 0x0080,
         // add new simulation-relevant flags above
         // all other flags below
         DIRTY_SCRIPT = 0x8000
@@ -130,7 +131,7 @@ public:
     // perform linear extrapolation for SimpleEntitySimulation
     void simulate(const quint64& now);
     
-    bool needsToCallUpdate() const { return false; }
+    virtual bool needsToCallUpdate() const { return false; }
 
     virtual void debugDump() const;
     

libraries/entities/src/ModelEntityItem.cpp

@@ -397,6 +397,11 @@ void ModelEntityItem::debugDump() const {
     qDebug() << "    model URL:" << getModelURL();
 }
 
+void ModelEntityItem::setAnimationURL(const QString& url) { 
+    _dirtyFlags |= EntityItem::DIRTY_UPDATEABLE;
+    _animationURL = url; 
+}
+
 void ModelEntityItem::setAnimationSettings(const QString& value) { 
     // the animations setting is a JSON string that may contain various animation settings.
     // if it includes fps, frameIndex, or running, those values will be parsed out and
@@ -448,6 +453,17 @@ void ModelEntityItem::setAnimationSettings(const QString& value) {
     }
 
     _animationSettings = value; 
+    _dirtyFlags |= EntityItem::DIRTY_UPDATEABLE;
+}
+
+void ModelEntityItem::setAnimationIsPlaying(bool value) {
+    _dirtyFlags |= EntityItem::DIRTY_UPDATEABLE;
+    _animationLoop.setRunning(value); 
+}
+
+void ModelEntityItem::setAnimationFPS(float value) {
+    _dirtyFlags |= EntityItem::DIRTY_UPDATEABLE;
+    _animationLoop.setFPS(value); 
 }
 
 QString ModelEntityItem::getAnimationSettings() const { 

libraries/entities/src/ModelEntityItem.h

@@ -73,16 +73,16 @@ public:
     
     // model related properties
     void setModelURL(const QString& url) { _modelURL = url; }
-    void setAnimationURL(const QString& url) { _animationURL = url; }
+    void setAnimationURL(const QString& url);
     static const float DEFAULT_ANIMATION_FRAME_INDEX;
     void setAnimationFrameIndex(float value) { _animationLoop.setFrameIndex(value); }
     void setAnimationSettings(const QString& value);
 
     static const bool DEFAULT_ANIMATION_IS_PLAYING;
-    void setAnimationIsPlaying(bool value) { _animationLoop.setRunning(value); }
+    void setAnimationIsPlaying(bool value);
 
     static const float DEFAULT_ANIMATION_FPS;
-    void setAnimationFPS(float value) { _animationLoop.setFPS(value); }
+    void setAnimationFPS(float value);
 
     void setAnimationLoop(bool loop) { _animationLoop.setLoop(loop); }
     bool getAnimationLoop() const { return _animationLoop.getLoop(); }

libraries/entities/src/SimpleEntitySimulation.cpp

@@ -31,12 +31,10 @@ void SimpleEntitySimulation::updateEntitiesInternal(const quint64& now) {
 }
 
 void SimpleEntitySimulation::addEntityInternal(EntityItem* entity) {
-    if (entity->getCollisionsWillMove()) {
+    if (entity->isMoving()) {
-        if (entity->isMoving()) {
+        _movingEntities.insert(entity);
-            _movingEntities.insert(entity);
+    } else if (entity->getCollisionsWillMove()) {
-        } else {
+        _movableButStoppedEntities.insert(entity);
-            _movableButStoppedEntities.insert(entity);
-        }
     }
 }
 
@@ -50,14 +48,10 @@ const int SIMPLE_SIMULATION_DIRTY_FLAGS = EntityItem::DIRTY_VELOCITY | EntityIte
 void SimpleEntitySimulation::entityChangedInternal(EntityItem* entity) {
     int dirtyFlags = entity->getDirtyFlags();
     if (dirtyFlags & SIMPLE_SIMULATION_DIRTY_FLAGS) {
-        if (entity->getCollisionsWillMove()) {
+        if (entity->isMoving()) {
-            if (entity->isMoving()) {
+            _movingEntities.insert(entity);
-                _movingEntities.insert(entity);
+        } else if (entity->getCollisionsWillMove()) {
-                _movableButStoppedEntities.remove(entity);
+            _movableButStoppedEntities.remove(entity);
-            } else {
-                _movingEntities.remove(entity);
-                _movableButStoppedEntities.insert(entity);
-            }
         } else {
             _movingEntities.remove(entity);
             _movableButStoppedEntities.remove(entity);

libraries/metavoxels/src/DatagramSequencer.cpp

@@ -19,7 +19,7 @@
 #include "MetavoxelMessages.h"
 
 // in sequencer parlance, a "packet" may consist of multiple datagrams.  clarify when we refer to actual datagrams
-const int MAX_DATAGRAM_SIZE = MAX_PACKET_SIZE;
+const int MAX_DATAGRAM_SIZE = 1450;
 
 const int DEFAULT_MAX_PACKET_SIZE = 3000;