Merge pull request #5353 from AndrewMeadows/beryllium

cleanup of EntityItem ctors and friends

libraries/entities/src/BoxEntityItem.cpp

@@ -29,7 +29,6 @@ BoxEntityItem::BoxEntityItem(const EntityItemID& entityItemID, const EntityItemP
         EntityItem(entityItemID) 
 {
     _type = EntityTypes::Box;
-    _created = properties.getCreated();
     setProperties(properties);
 }
 

libraries/entities/src/EntityItem.cpp

@@ -45,9 +45,7 @@ EntityItem::EntityItem(const EntityItemID& entityItemID) :
     _lastEditedFromRemoteInRemoteTime(0),
     _created(UNKNOWN_CREATED_TIME),
     _changedOnServer(0),
-    _transform(ENTITY_ITEM_DEFAULT_ROTATION,
+    _transform(),
-               ENTITY_ITEM_DEFAULT_DIMENSIONS,
-               ENTITY_ITEM_DEFAULT_POSITION),
     _glowLevel(ENTITY_ITEM_DEFAULT_GLOW_LEVEL),
     _localRenderAlpha(ENTITY_ITEM_DEFAULT_LOCAL_RENDER_ALPHA),
     _density(ENTITY_ITEM_DEFAULT_DENSITY),
@@ -80,16 +78,15 @@ EntityItem::EntityItem(const EntityItemID& entityItemID) :
     _physicsInfo(nullptr),
     _simulated(false)
 {
+    // explicitly set transform parts to set dirty flags used by batch rendering
+    _transform.setTranslation(ENTITY_ITEM_DEFAULT_POSITION);
+    _transform.setRotation(ENTITY_ITEM_DEFAULT_ROTATION);
+    _transform.setScale(ENTITY_ITEM_DEFAULT_DIMENSIONS);
     quint64 now = usecTimestampNow();
     _lastSimulated = now;
     _lastUpdated = now;
 }
 
-EntityItem::EntityItem(const EntityItemID& entityItemID, const EntityItemProperties& properties) : EntityItem(entityItemID)
-{
-    setProperties(properties);
-}
-
 EntityItem::~EntityItem() {
     // clear out any left-over actions
     EntityTree* entityTree = _element ? _element->getTree() : nullptr;

libraries/entities/src/EntityItem.h

@@ -119,7 +119,6 @@ public:
     DONT_ALLOW_INSTANTIATION // This class can not be instantiated directly
 
     EntityItem(const EntityItemID& entityItemID);
-    EntityItem(const EntityItemID& entityItemID, const EntityItemProperties& properties);
     virtual ~EntityItem();
 
     // ID and EntityItemID related methods

libraries/entities/src/EntityTreeElement.cpp

@@ -772,6 +772,9 @@ int EntityTreeElement::readElementDataFromBuffer(const unsigned char* data, int
                         entityItemID = entityItem->getEntityItemID();
                         _myTree->setContainingElement(entityItemID, this);
                         _myTree->postAddEntity(entityItem);
+                        if (entityItem->getCreated() == UNKNOWN_CREATED_TIME) {
+                            entityItem->recordCreationTime();
+                        }
                     }
                 }
                 // Move the buffer forward to read more entities

libraries/entities/src/LightEntityItem.cpp

@@ -29,7 +29,7 @@ EntityItemPointer LightEntityItem::factory(const EntityItemID& entityID, const E
 
 // our non-pure virtual subclass for now...
 LightEntityItem::LightEntityItem(const EntityItemID& entityItemID, const EntityItemProperties& properties) :
-        EntityItem(entityItemID, properties) 
+        EntityItem(entityItemID) 
 {
     _type = EntityTypes::Light;
     

libraries/entities/src/LineEntityItem.cpp

@@ -38,7 +38,6 @@ LineEntityItem::LineEntityItem(const EntityItemID& entityItemID, const EntityIte
     _points(QVector<glm::vec3>(0))
 {
     _type = EntityTypes::Line;
-    _created = properties.getCreated();
     setProperties(properties);
     
     

libraries/entities/src/ModelEntityItem.cpp

@@ -33,7 +33,7 @@ EntityItemPointer ModelEntityItem::factory(const EntityItemID& entityID, const E
 }
 
 ModelEntityItem::ModelEntityItem(const EntityItemID& entityItemID, const EntityItemProperties& properties) :
-        EntityItem(entityItemID, properties)
+        EntityItem(entityItemID)
 {
     _type = EntityTypes::Model;
     setProperties(properties);

libraries/entities/src/ParticleEffectEntityItem.cpp

@@ -61,7 +61,7 @@ EntityItemPointer ParticleEffectEntityItem::factory(const EntityItemID& entityID
 
 // our non-pure virtual subclass for now...
 ParticleEffectEntityItem::ParticleEffectEntityItem(const EntityItemID& entityItemID, const EntityItemProperties& properties) :
-    EntityItem(entityItemID, properties),
+    EntityItem(entityItemID),
     _maxParticles(DEFAULT_MAX_PARTICLES),
     _lifespan(DEFAULT_LIFESPAN),
     _emitRate(DEFAULT_EMIT_RATE),

libraries/entities/src/PolyVoxEntityItem.cpp

@@ -57,7 +57,6 @@ PolyVoxEntityItem::PolyVoxEntityItem(const EntityItemID& entityItemID, const Ent
     _voxelSurfaceStyle(PolyVoxEntityItem::DEFAULT_VOXEL_SURFACE_STYLE)
 {
     _type = EntityTypes::PolyVox;
-    _created = properties.getCreated();
     setProperties(properties);
 }
 

libraries/entities/src/SphereEntityItem.cpp

@@ -30,7 +30,7 @@ EntityItemPointer SphereEntityItem::factory(const EntityItemID& entityID, const
 
 // our non-pure virtual subclass for now...
 SphereEntityItem::SphereEntityItem(const EntityItemID& entityItemID, const EntityItemProperties& properties) :
-        EntityItem(entityItemID, properties) 
+        EntityItem(entityItemID) 
 { 
     _type = EntityTypes::Sphere;
     setProperties(properties);

libraries/entities/src/TextEntityItem.cpp

@@ -37,7 +37,6 @@ TextEntityItem::TextEntityItem(const EntityItemID& entityItemID, const EntityIte
         EntityItem(entityItemID) 
 {
     _type = EntityTypes::Text;
-    _created = properties.getCreated();
     setProperties(properties);
 }
 

libraries/entities/src/WebEntityItem.cpp

@@ -30,7 +30,6 @@ WebEntityItem::WebEntityItem(const EntityItemID& entityItemID, const EntityItemP
         EntityItem(entityItemID) 
 {
     _type = EntityTypes::Web;
-    _created = properties.getCreated();
     setProperties(properties);
 }
 
@@ -149,4 +148,4 @@ void WebEntityItem::setSourceUrl(const QString& value) {
     }
 }
 
-const QString& WebEntityItem::getSourceUrl() const { return _sourceUrl; }
+const QString& WebEntityItem::getSourceUrl() const { return _sourceUrl; }

libraries/entities/src/ZoneEntityItem.cpp

@@ -37,7 +37,6 @@ ZoneEntityItem::ZoneEntityItem(const EntityItemID& entityItemID, const EntityIte
         EntityItem(entityItemID) 
 {
     _type = EntityTypes::Zone;
-    _created = properties.getCreated();
 
     _keyLightColor[RED_INDEX] = DEFAULT_KEYLIGHT_COLOR.red;
     _keyLightColor[GREEN_INDEX] = DEFAULT_KEYLIGHT_COLOR.green;