entityInstanceNumber

libraries/entities/src/EntityItem.cpp

@@ -104,6 +104,7 @@ EntityPropertyFlags EntityItem::getEntityProperties(EncodeBitstreamParams& param
     requestedProperties += PROP_LIMITED_RUN;
     requestedProperties += PROP_MARKETPLACE_ID;
     requestedProperties += PROP_EDITION_NUMBER;
+    requestedProperties += PROP_ENTITY_INSTANCE_NUMBER;
     requestedProperties += PROP_CERTIFICATE_ID;
 
     requestedProperties += PROP_NAME;
@@ -260,6 +261,7 @@ OctreeElement::AppendState EntityItem::appendEntityData(OctreePacketData* packet
         APPEND_ENTITY_PROPERTY(PROP_ITEM_LICENSE, getItemLicense());
         APPEND_ENTITY_PROPERTY(PROP_LIMITED_RUN, getLimitedRun());
         APPEND_ENTITY_PROPERTY(PROP_EDITION_NUMBER, getEditionNumber());
+        APPEND_ENTITY_PROPERTY(PROP_ENTITY_INSTANCE_NUMBER, getEntityInstanceNumber());
         APPEND_ENTITY_PROPERTY(PROP_CERTIFICATE_ID, getCertificateID());
 
         APPEND_ENTITY_PROPERTY(PROP_NAME, getName());
@@ -820,6 +822,7 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
         READ_ENTITY_PROPERTY(PROP_ITEM_LICENSE, QString, setItemLicense);
         READ_ENTITY_PROPERTY(PROP_LIMITED_RUN, quint32, setLimitedRun);
         READ_ENTITY_PROPERTY(PROP_EDITION_NUMBER, quint32, setEditionNumber);
+        READ_ENTITY_PROPERTY(PROP_ENTITY_INSTANCE_NUMBER, quint32, setEntityInstanceNumber);
         READ_ENTITY_PROPERTY(PROP_CERTIFICATE_ID, QString, setCertificateID);
     }
 
@@ -1249,6 +1252,7 @@ EntityItemProperties EntityItem::getProperties(EntityPropertyFlags desiredProper
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(limitedRun, getLimitedRun);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(marketplaceID, getMarketplaceID);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(editionNumber, getEditionNumber);
+    COPY_ENTITY_PROPERTY_TO_PROPERTIES(entityInstanceNumber, getEntityInstanceNumber);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(certificateID, getCertificateID);
 
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(name, getName);
@@ -1355,6 +1359,7 @@ bool EntityItem::setProperties(const EntityItemProperties& properties) {
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(limitedRun, setLimitedRun);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(marketplaceID, setMarketplaceID);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(editionNumber, setEditionNumber);
+    SET_ENTITY_PROPERTY_FROM_PROPERTIES(entityInstanceNumber, setEntityInstanceNumber);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(certificateID, setCertificateID);
 
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(name, setName);
@@ -2836,6 +2841,7 @@ DEFINE_PROPERTY_ACCESSOR(QString, ItemLicense, itemLicense)
 DEFINE_PROPERTY_ACCESSOR(quint32, LimitedRun, limitedRun)
 DEFINE_PROPERTY_ACCESSOR(QString, MarketplaceID, marketplaceID)
 DEFINE_PROPERTY_ACCESSOR(quint32, EditionNumber, editionNumber)
+DEFINE_PROPERTY_ACCESSOR(quint32, EntityInstanceNumber, entityInstanceNumber)
 DEFINE_PROPERTY_ACCESSOR(QString, CertificateID, certificateID)
 
 uint32_t EntityItem::getDirtyFlags() const { 

libraries/entities/src/EntityItem.h

@@ -320,6 +320,8 @@ public:
     void setMarketplaceID(const QString& value);
     quint32 getEditionNumber() const;
     void setEditionNumber(const quint32&);
+    quint32 getEntityInstanceNumber() const;
+    void setEntityInstanceNumber(const quint32&);
     QString getCertificateID() const;
     void setCertificateID(const QString& value);
     QString getStaticCertificateJSON() const;
@@ -561,6 +563,7 @@ protected:
     quint32 _limitedRun { ENTITY_ITEM_DEFAULT_LIMITED_RUN };
     QString _certificateID { ENTITY_ITEM_DEFAULT_CERTIFICATE_ID };
     quint32 _editionNumber { ENTITY_ITEM_DEFAULT_EDITION_NUMBER };
+    quint32 _entityInstanceNumber { ENTITY_ITEM_DEFAULT_ENTITY_INSTANCE_NUMBER };
     QString _marketplaceID { ENTITY_ITEM_DEFAULT_MARKETPLACE_ID };
 
 

libraries/entities/src/EntityItemProperties.cpp

@@ -298,6 +298,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
     CHECK_PROPERTY_CHANGE(PROP_LIMITED_RUN, limitedRun);
     CHECK_PROPERTY_CHANGE(PROP_MARKETPLACE_ID, marketplaceID);
     CHECK_PROPERTY_CHANGE(PROP_EDITION_NUMBER, editionNumber);
+    CHECK_PROPERTY_CHANGE(PROP_ENTITY_INSTANCE_NUMBER, entityInstanceNumber);
     CHECK_PROPERTY_CHANGE(PROP_CERTIFICATE_ID, certificateID);
 
     CHECK_PROPERTY_CHANGE(PROP_NAME, name);
@@ -426,6 +427,7 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine, bool
     COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_LIMITED_RUN, limitedRun);
     COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_MARKETPLACE_ID, marketplaceID);
     COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_EDITION_NUMBER, editionNumber);
+    COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_ENTITY_INSTANCE_NUMBER, entityInstanceNumber);
     COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_CERTIFICATE_ID, certificateID);
 
     COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_NAME, name);
@@ -703,6 +705,7 @@ void EntityItemProperties::copyFromScriptValue(const QScriptValue& object, bool
     COPY_PROPERTY_FROM_QSCRIPTVALUE(limitedRun, quint32, setLimitedRun);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(marketplaceID, QString, setMarketplaceID);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(editionNumber, quint32, setEditionNumber);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE(entityInstanceNumber, quint32, setEntityInstanceNumber);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(certificateID, QString, setCertificateID);
 
     COPY_PROPERTY_FROM_QSCRIPTVALUE(name, QString, setName);
@@ -852,6 +855,7 @@ void EntityItemProperties::merge(const EntityItemProperties& other) {
     COPY_PROPERTY_IF_CHANGED(limitedRun);
     COPY_PROPERTY_IF_CHANGED(marketplaceID);
     COPY_PROPERTY_IF_CHANGED(editionNumber);
+    COPY_PROPERTY_IF_CHANGED(entityInstanceNumber);
     COPY_PROPERTY_IF_CHANGED(certificateID);
 
     COPY_PROPERTY_IF_CHANGED(name);
@@ -1035,6 +1039,7 @@ void EntityItemProperties::entityPropertyFlagsFromScriptValue(const QScriptValue
         ADD_PROPERTY_TO_MAP(PROP_LIMITED_RUN, LimitedRun, limitedRun, quint32);
         ADD_PROPERTY_TO_MAP(PROP_MARKETPLACE_ID, MarketplaceID, marketplaceID, QString);
         ADD_PROPERTY_TO_MAP(PROP_EDITION_NUMBER, EditionNumber, editionNumber, quint32);
+        ADD_PROPERTY_TO_MAP(PROP_ENTITY_INSTANCE_NUMBER, EntityInstanceNumber, entityInstanceNumber, quint32);
         ADD_PROPERTY_TO_MAP(PROP_CERTIFICATE_ID, CertificateID, certificateID, QString);
 
         ADD_PROPERTY_TO_MAP(PROP_KEYLIGHT_COLOR, KeyLightColor, keyLightColor, xColor);
@@ -1398,6 +1403,7 @@ bool EntityItemProperties::encodeEntityEditPacket(PacketType command, EntityItem
             APPEND_ENTITY_PROPERTY(PROP_LIMITED_RUN, properties.getLimitedRun());
             APPEND_ENTITY_PROPERTY(PROP_MARKETPLACE_ID, properties.getMarketplaceID());
             APPEND_ENTITY_PROPERTY(PROP_EDITION_NUMBER, properties.getEditionNumber());
+            APPEND_ENTITY_PROPERTY(PROP_ENTITY_INSTANCE_NUMBER, properties.getEntityInstanceNumber());
             APPEND_ENTITY_PROPERTY(PROP_CERTIFICATE_ID, properties.getCertificateID());
 
             APPEND_ENTITY_PROPERTY(PROP_NAME, properties.getName());
@@ -1706,6 +1712,7 @@ bool EntityItemProperties::decodeEntityEditPacket(const unsigned char* data, int
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_LIMITED_RUN, quint32, setLimitedRun);
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_MARKETPLACE_ID, QString, setMarketplaceID);
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_EDITION_NUMBER, quint32, setEditionNumber);
+    READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_ENTITY_INSTANCE_NUMBER, quint32, setEntityInstanceNumber);
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_CERTIFICATE_ID, QString, setCertificateID);
 
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_NAME, QString, setName);
@@ -1830,6 +1837,7 @@ void EntityItemProperties::markAllChanged() {
     _limitedRunChanged = true;
     _marketplaceIDChanged = true;
     _editionNumberChanged = true;
+    _entityInstanceNumberChanged = true;
     _certificateIDChanged = true;
 
     _keyLight.markAllChanged();
@@ -2163,6 +2171,9 @@ QList<QString> EntityItemProperties::listChangedProperties() {
     if (editionNumberChanged()) {
         out += "editionNumber";
     }
+    if (entityInstanceNumberChanged()) {
+        out += "entityInstanceNumber";
+    }
     if (certificateIDChanged()) {
         out += "certificateID";
     }

libraries/entities/src/EntityItemProperties.h

@@ -211,6 +211,7 @@ public:
     DEFINE_PROPERTY_REF(PROP_LIMITED_RUN, LimitedRun, limitedRun, quint32, ENTITY_ITEM_DEFAULT_LIMITED_RUN);
     DEFINE_PROPERTY_REF(PROP_MARKETPLACE_ID, MarketplaceID, marketplaceID, QString, ENTITY_ITEM_DEFAULT_MARKETPLACE_ID);
     DEFINE_PROPERTY_REF(PROP_EDITION_NUMBER, EditionNumber, editionNumber, quint32, ENTITY_ITEM_DEFAULT_EDITION_NUMBER);
+    DEFINE_PROPERTY_REF(PROP_ENTITY_INSTANCE_NUMBER, EntityInstanceNumber, entityInstanceNumber, quint32, ENTITY_ITEM_DEFAULT_ENTITY_INSTANCE_NUMBER);
     DEFINE_PROPERTY_REF(PROP_CERTIFICATE_ID, CertificateID, certificateID, QString, ENTITY_ITEM_DEFAULT_CERTIFICATE_ID);
 
     // these are used when bouncing location data into and out of scripts
@@ -446,6 +447,7 @@ inline QDebug operator<<(QDebug debug, const EntityItemProperties& properties) {
     DEBUG_PROPERTY_IF_CHANGED(debug, properties, LimitedRun, limitedRun, "");
     DEBUG_PROPERTY_IF_CHANGED(debug, properties, MarketplaceID, marketplaceID, "");
     DEBUG_PROPERTY_IF_CHANGED(debug, properties, EditionNumber, editionNumber, "");
+    DEBUG_PROPERTY_IF_CHANGED(debug, properties, EntityInstanceNumber, entityInstanceNumber, "");
     DEBUG_PROPERTY_IF_CHANGED(debug, properties, CertificateID, certificateID, "");
 
     DEBUG_PROPERTY_IF_CHANGED(debug, properties, BackgroundMode, backgroundMode, "");

libraries/entities/src/EntityItemPropertiesDefaults.h

@@ -36,7 +36,8 @@ const QString ENTITY_ITEM_DEFAULT_ITEM_ARTIST = QString("");
 const QString ENTITY_ITEM_DEFAULT_ITEM_LICENSE = QString("");
 const quint32 ENTITY_ITEM_DEFAULT_LIMITED_RUN = -1;
 const QString ENTITY_ITEM_DEFAULT_MARKETPLACE_ID = QString("");
-const quint32 ENTITY_ITEM_DEFAULT_EDITION_NUMBER = -1;
+const quint32 ENTITY_ITEM_DEFAULT_EDITION_NUMBER = 0;
+const quint32 ENTITY_ITEM_DEFAULT_ENTITY_INSTANCE_NUMBER = 0;
 const QString ENTITY_ITEM_DEFAULT_CERTIFICATE_ID = QString("");
 
 const float ENTITY_ITEM_DEFAULT_ALPHA = 1.0f;

libraries/entities/src/EntityPropertyFlags.h

@@ -197,6 +197,7 @@ enum EntityPropertyList {
     PROP_LIMITED_RUN,
     // PROP_MARKETPLACE_ID is above
     PROP_EDITION_NUMBER,
+    PROP_ENTITY_INSTANCE_NUMBER,
     PROP_CERTIFICATE_ID,
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////