Merge pull request #6919 from ctrlaltdavid/20790

Make entity properties be undefined after entity is unloaded

examples/libraries/entitySelectionTool.js

@@ -1515,7 +1515,6 @@ SelectionDisplay = (function() {
         }
 
         that.updateRotationHandles();
-        that.highlightSelectable();
 
         var rotation, dimensions, position, registrationPoint;
 

libraries/entities/src/EntityItemProperties.cpp

@@ -32,22 +32,7 @@ KeyLightPropertyGroup EntityItemProperties::_staticKeyLight;
 EntityPropertyList PROP_LAST_ITEM = (EntityPropertyList)(PROP_AFTER_LAST_ITEM - 1);
 
 EntityItemProperties::EntityItemProperties(EntityPropertyFlags desiredProperties) :
-
-_id(UNKNOWN_ENTITY_ID),
-_idSet(false),
-_lastEdited(0),
-_type(EntityTypes::Unknown),
-
-_glowLevel(0.0f),
-_localRenderAlpha(1.0f),
-
-_glowLevelChanged(false),
-_localRenderAlphaChanged(false),
-
-_defaultSettings(true),
-_naturalDimensions(1.0f, 1.0f, 1.0f),
-_naturalPosition(0.0f, 0.0f, 0.0f),
-_desiredProperties(desiredProperties)
+    _desiredProperties(desiredProperties) //,
 {
 }
 
@@ -321,6 +306,11 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine, bool
     QScriptValue properties = engine->newObject();
     EntityItemProperties defaultEntityProperties;
 
+    if (!_entityFound) {
+        // Return without setting any default property values so that properties are reported in JavaScript as undefined.
+        return properties;
+    }
+
     if (_idSet) {
         COPY_PROPERTY_TO_QSCRIPTVALUE_GETTER_ALWAYS(id, _id.toString());
     }

libraries/entities/src/EntityItemProperties.h

@@ -272,32 +272,36 @@ public:
     void setJointRotationsDirty() { _jointRotationsSetChanged = true; _jointRotationsChanged = true; }
     void setJointTranslationsDirty() { _jointTranslationsSetChanged = true; _jointTranslationsChanged = true; }
 
+    void setEntityFound() { _entityFound = true; }
+
 protected:
     QString getCollisionMaskAsString() const;
     void setCollisionMaskFromString(const QString& maskString);
 
 private:
-    QUuid _id;
-    bool _idSet;
-    quint64 _lastEdited;
-    EntityTypes::EntityType _type;
+    QUuid _id { UNKNOWN_ENTITY_ID };
+    bool _idSet { false };
+    quint64 _lastEdited { 0 };
+    EntityTypes::EntityType _type { EntityTypes::Unknown };
     void setType(const QString& typeName) { _type = EntityTypes::getEntityTypeFromName(typeName); }
 
-    float _glowLevel;
-    float _localRenderAlpha;
-    bool _glowLevelChanged;
-    bool _localRenderAlphaChanged;
-    bool _defaultSettings;
-    bool _dimensionsInitialized = true; // Only false if creating an entity localy with no dimensions properties
+    float _glowLevel { 0.0f };
+    float _localRenderAlpha { 1.0f };
+    bool _glowLevelChanged { false };
+    bool _localRenderAlphaChanged { false };
+    bool _defaultSettings { true };
+    bool _dimensionsInitialized { true }; // Only false if creating an entity locally with no dimensions properties
 
     // NOTE: The following are pseudo client only properties. They are only used in clients which can access
     // properties of model geometry. But these properties are not serialized like other properties.
     QVector<SittingPoint> _sittingPoints;
     QStringList _textureNames;
-    glm::vec3 _naturalDimensions;
-    glm::vec3 _naturalPosition;
+    glm::vec3 _naturalDimensions { 1.0f, 1.0f, 1.0f };
+    glm::vec3 _naturalPosition { 0.0f, 0.0f, 0.0f };
 
     EntityPropertyFlags _desiredProperties; // if set will narrow scopes of copy/to/from to just these properties
+
+    bool _entityFound { false };
 };
 
 Q_DECLARE_METATYPE(EntityItemProperties);

libraries/entities/src/EntityScriptingInterface.cpp

@@ -202,11 +202,13 @@ EntityItemProperties EntityScriptingInterface::getEntityProperties(QUuid identit
                     }
                 }
 
+                results = convertLocationToScriptSemantics(results);
+                results.setEntityFound();
             }
         });
     }
 
-    return convertLocationToScriptSemantics(results);
+    return results;
 }
 
 QUuid EntityScriptingInterface::editEntity(QUuid id, const EntityItemProperties& scriptSideProperties) {