ModelEntities spawned with no dimension autoresize

examples/edit.js

@@ -296,37 +296,12 @@ var toolBar = (function () {
     function addModel(url) {
         var entityID = createNewEntity({
             type: "Model",
-            dimensions: DEFAULT_DIMENSIONS,
             modelURL: url
         }, false);
 
         if (entityID) {
             print("Model added: " + url);
-
-            var checkCount = 0;
-            function resize() {
-                var entityProperties = Entities.getEntityProperties(entityID);
-                var naturalDimensions = entityProperties.naturalDimensions;
-
-                checkCount++;
-
-                if (naturalDimensions.x == 0 && naturalDimensions.y == 0 && naturalDimensions.z == 0) {
-                    if (checkCount < RESIZE_MAX_CHECKS) {
-                        Script.setTimeout(resize, RESIZE_INTERVAL);
-                    } else {
-                        print("Resize failed: timed out waiting for model (" + url + ") to load");
-                    }
-                } else {
-                    Entities.editEntity(entityID, { dimensions: naturalDimensions });
-
-                    // Reset selection so that the selection overlays will be updated
-                    selectionManager.setSelections([entityID]);
-                }
-            }
-
             selectionManager.setSelections([entityID]);
-
-            Script.setTimeout(resize, RESIZE_INTERVAL);
         }
     }
 

examples/libraries/entitySelectionTool.js

@@ -2325,9 +2325,14 @@ SelectionDisplay = (function () {
     });
 
     that.checkMove = function() {
-        if (SelectionManager.hasSelection() &&
+        if (SelectionManager.hasSelection()) {
-            (!Vec3.equal(Camera.getPosition(), lastCameraPosition) || !Quat.equal(Camera.getOrientation(), lastCameraOrientation))){
+            SelectionManager._update();
-            that.updateRotationHandles();
+            
+            if (!Vec3.equal(Camera.getPosition(), lastCameraPosition) ||
+                !Quat.equal(Camera.getOrientation(), lastCameraOrientation)) {
+                    
+                that.updateRotationHandles();
+            }
         }
     };
 

libraries/entities-renderer/src/RenderableModelEntityItem.cpp

@@ -26,6 +26,12 @@
 EntityItemPointer RenderableModelEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
     return std::make_shared<RenderableModelEntityItem>(entityID, properties);
 }
+RenderableModelEntityItem::RenderableModelEntityItem(const EntityItemID& entityItemID,
+                                                     const EntityItemProperties& properties) :
+    ModelEntityItem(entityItemID, properties),
+    _dimensionsInitialized { properties.dimensionsChanged() }
+{
+}
 
 RenderableModelEntityItem::~RenderableModelEntityItem() {
     assert(_myRenderer || !_model); // if we have a model, we need to know our renderer
@@ -35,6 +41,11 @@ RenderableModelEntityItem::~RenderableModelEntityItem() {
     }
 }
 
+void RenderableModelEntityItem::setDimensions(const glm::vec3& value) {
+    _dimensionsInitialized = true;
+    ModelEntityItem::setDimensions(value);
+}
+
 bool RenderableModelEntityItem::setProperties(const EntityItemProperties& properties) {
     QString oldModelURL = getModelURL();
     bool somethingChanged = ModelEntityItem::setProperties(properties);
@@ -189,7 +200,6 @@ void makeEntityItemStatusGetters(RenderableModelEntityItem* entity, render::Item
 
 bool RenderableModelEntityItem::addToScene(EntityItemPointer self, std::shared_ptr<render::Scene> scene, 
                                             render::PendingChanges& pendingChanges) {
-
     _myMetaItem = scene->allocateID();
     
     auto renderData = std::make_shared<RenderableModelEntityItemMeta>(self);
@@ -223,9 +233,6 @@ void RenderableModelEntityItem::removeFromScene(EntityItemPointer self, std::sha
 void RenderableModelEntityItem::render(RenderArgs* args) {
     PerformanceTimer perfTimer("RMEIrender");
     assert(getType() == EntityTypes::Model);
-    
-    glm::vec3 position = getPosition();
-    glm::vec3 dimensions = getDimensions();
 
     if (hasModel()) {
         if (_model) {
@@ -290,19 +297,28 @@ void RenderableModelEntityItem::render(RenderArgs* args) {
                     }
                 }
 
-                glm::quat rotation = getRotation();
                 bool movingOrAnimating = isMoving() || isAnimatingSomething();
                 if ((movingOrAnimating || _needsInitialSimulation) && _model->isActive()) {
-                    _model->setScaleToFit(true, dimensions);
+                    if (!_dimensionsInitialized) {
+                        EntityItemProperties properties;
+                        auto extents = _model->getMeshExtents();
+                        properties.setDimensions(extents.maximum - extents.minimum);
+                        
+                        qCDebug(entitiesrenderer) << "Autoresizing:" << (!getName().isEmpty() ? getName() : getModelURL());
+                        DependencyManager::get<EntityScriptingInterface>()->editEntity(getEntityItemID(), properties);
+                    }
+                    
+                    _model->setScaleToFit(true, getDimensions());
                     _model->setSnapModelToRegistrationPoint(true, getRegistrationPoint());
-                    _model->setRotation(rotation);
+                    _model->setRotation(getRotation());
-                    _model->setTranslation(position);
+                    _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;
                 }
             }

libraries/entities-renderer/src/RenderableModelEntityItem.h

@@ -25,16 +25,12 @@ class RenderableModelEntityItem : public ModelEntityItem {
 public:
     static EntityItemPointer factory(const EntityItemID& entityID, const EntityItemProperties& properties);
 
-    RenderableModelEntityItem(const EntityItemID& entityItemID, const EntityItemProperties& properties) :
+    RenderableModelEntityItem(const EntityItemID& entityItemID, const EntityItemProperties& properties);
-        ModelEntityItem(entityItemID, properties),
-        _model(NULL),
-        _needsInitialSimulation(true),
-        _needsModelReload(true),
-        _myRenderer(NULL),
-        _originalTexturesRead(false) { }
 
     virtual ~RenderableModelEntityItem();
 
+    virtual void setDimensions(const glm::vec3& value) override;
+    
     virtual EntityItemProperties getProperties(EntityPropertyFlags desiredProperties = EntityPropertyFlags()) const;
     virtual bool setProperties(const EntityItemProperties& properties);
     virtual int readEntitySubclassDataFromBuffer(const unsigned char* data, int bytesLeftToRead, 
@@ -74,14 +70,15 @@ public:
 private:
     void remapTextures();
     
-    Model* _model;
+    Model* _model = nullptr;
-    bool _needsInitialSimulation;
+    bool _needsInitialSimulation = true;
-    bool _needsModelReload;
+    bool _needsModelReload = true;
-    EntityTreeRenderer* _myRenderer;
+    EntityTreeRenderer* _myRenderer = nullptr;
     QString _currentTextures;
     QStringList _originalTextures;
-    bool _originalTexturesRead;
+    bool _originalTexturesRead = false;
     QVector<QVector<glm::vec3>> _points;
+    bool _dimensionsInitialized = false;
     
     render::ItemID _myMetaItem;
 };

libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp

@@ -263,8 +263,8 @@ void RenderableParticleEffectEntityItem::updateRenderItem() {
         }
 
         // update transform
-        glm::quat rot = _transform.getRotation();
+        glm::quat rot = getRotation();
-        glm::vec3 pos = _transform.getTranslation();
+        glm::vec3 pos = getPosition();
         Transform t;
         t.setRotation(rot);
         payload.setModelTransform(t);

libraries/entities/src/EntityTypes.cpp

@@ -88,9 +88,7 @@ EntityItemPointer EntityTypes::constructEntityItem(EntityType entityType, const
         factory = _factories[entityType];
     }
     if (factory) {
-        EntityItemProperties mutableProperties = properties;
+        newEntityItem = factory(entityID, properties);
-        mutableProperties.markAllChanged();
-        newEntityItem = factory(entityID, mutableProperties);
     }
     return newEntityItem;
 }