From dd2a29aace35ac6a30c9be6a9ba854a7e5839dae Mon Sep 17 00:00:00 2001
From: Seth Alves <seth@highfidelity.io>
Date: Thu, 12 May 2016 18:05:28 -0700
Subject: [PATCH 1/2] when a ModelEntityItem moves, also update its
 meta-render-item

---
 .../src/RenderableModelEntityItem.cpp                  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index c4ac9b09e5..e13c2eac98 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -807,6 +807,16 @@ void RenderableModelEntityItem::locationChanged(bool tellPhysics) {
     if (_model && _model->isActive()) {
         _model->setRotation(getRotation());
         _model->setTranslation(getPosition());
+
+        auto myMetaItemCopy = _myMetaItem;
+
+        void* key = (void*)this;
+        AbstractViewStateInterface::instance()->pushPostUpdateLambda(key, [_myMetaItem]() {
+            render::ScenePointer scene = AbstractViewStateInterface::instance()->getMain3DScene();
+            render::PendingChanges pendingChanges;
+            pendingChanges.updateItem<RenderableModelEntityItemMeta>(myMetaItemCopy, [](RenderableModelEntityItemMeta& data){});
+            scene->enqueuePendingChanges(pendingChanges);
+        });
     }
 }
 

From 79141e38698f38226ae266337f4700292ed87958 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Thu, 12 May 2016 17:52:40 -0700
Subject: [PATCH 2/2] dry up some code

---
 .../src/RenderableModelEntityItem.cpp         | 43 ++++++++-----------
 .../src/RenderableModelEntityItem.h           |  2 +
 2 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index e13c2eac98..d6f8eb23c8 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -162,6 +162,19 @@ void RenderableModelEntityItem::remapTextures() {
     }
 }
 
+void RenderableModelEntityItem::doInitialModelSimulation() {
+    _model->setScaleToFit(true, getDimensions());
+    _model->setSnapModelToRegistrationPoint(true, getRegistrationPoint());
+    _model->setRotation(getRotation());
+    _model->setTranslation(getPosition());
+    {
+        PerformanceTimer perfTimer("_model->simulate");
+        _model->simulate(0.0f);
+    }
+    _needsInitialSimulation = false;
+}
+
+
 // TODO: we need a solution for changes to the postion/rotation/etc of a model...
 // this current code path only addresses that in this setup case... not the changing/moving case
 bool RenderableModelEntityItem::readyToAddToScene(RenderArgs* renderArgs) {
@@ -172,22 +185,12 @@ bool RenderableModelEntityItem::readyToAddToScene(RenderArgs* renderArgs) {
         getModel(renderer);
     }
     if (renderArgs && _model && _needsInitialSimulation && _model->isActive() && _model->isLoaded()) {
-        _model->setScaleToFit(true, getDimensions());
-        _model->setSnapModelToRegistrationPoint(true, getRegistrationPoint());
-        _model->setRotation(getRotation());
-        _model->setTranslation(getPosition());
-    
         // make sure to simulate so everything gets set up correctly for rendering
-        {
-            PerformanceTimer perfTimer("_model->simulate");
-            _model->simulate(0.0f);
-        }
-        _needsInitialSimulation = false;
-
+        doInitialModelSimulation();
         _model->renderSetup(renderArgs);
     }
     bool ready = !_needsInitialSimulation && _model && _model->readyToAddToScene(renderArgs);
-    return ready; 
+    return ready;
 }
 
 class RenderableModelEntityItemMeta {
@@ -348,18 +351,7 @@ void RenderableModelEntityItem::updateModelBounds() {
          _model->getRotation() != getRotation() ||
          _model->getRegistrationPoint() != getRegistrationPoint())
         && _model->isActive() && _dimensionsInitialized) {
-        _model->setScaleToFit(true, dimensions);
-        _model->setSnapModelToRegistrationPoint(true, getRegistrationPoint());
-        _model->setRotation(getRotation());
-        _model->setTranslation(getPosition());
-
-        // make sure to simulate so everything gets set up correctly for rendering
-        {
-            PerformanceTimer perfTimer("_model->simulate");
-            _model->simulate(0.0f);
-        }
-
-        _needsInitialSimulation = false;
+        doInitialModelSimulation();
         _needsJointSimulation = false;
     }
 }
@@ -592,8 +584,7 @@ bool RenderableModelEntityItem::isReadyToComputeShape() {
             if (_needsInitialSimulation) {
                 // the _model's offset will be wrong until _needsInitialSimulation is false
                 PerformanceTimer perfTimer("_model->simulate");
-                _model->simulate(0.0f);
-                _needsInitialSimulation = false;
+                doInitialModelSimulation();
             }
 
             return true;
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.h b/libraries/entities-renderer/src/RenderableModelEntityItem.h
index 59208d209d..5fd767c6ee 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.h
@@ -38,6 +38,8 @@ public:
                                                 EntityPropertyFlags& propertyFlags, bool overwriteLocalData,
                                                 bool& somethingChanged) override;
 
+    void doInitialModelSimulation();
+
     virtual bool readyToAddToScene(RenderArgs* renderArgs = nullptr);
     virtual bool addToScene(EntityItemPointer self, std::shared_ptr<render::Scene> scene, render::PendingChanges& pendingChanges) override;
     virtual void removeFromScene(EntityItemPointer self, std::shared_ptr<render::Scene> scene, render::PendingChanges& pendingChanges) override;