From 7efcc135e4b99350782f72dda741f25bbe8dd361 Mon Sep 17 00:00:00 2001 From: Liv Erickson Date: Tue, 22 May 2018 11:03:41 -0700 Subject: [PATCH] reorder flags --- libraries/entities/src/EntityItem.cpp | 8 ++++---- libraries/entities/src/EntityItem.h | 4 ++-- libraries/entities/src/EntityPropertyFlags.h | 14 +++++++------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp index 9bad6f2519..645c310062 100644 --- a/libraries/entities/src/EntityItem.cpp +++ b/libraries/entities/src/EntityItem.cpp @@ -300,7 +300,7 @@ OctreeElement::AppendState EntityItem::appendEntityData(OctreePacketData* packet APPEND_ENTITY_PROPERTY(PROP_CLONE_LIMIT, getCloneLimit()); APPEND_ENTITY_PROPERTY(PROP_CLONE_DYNAMIC, getCloneDynamic()); APPEND_ENTITY_PROPERTY(PROP_CLONE_AVATAR_ENTITY, getCloneAvatarEntity()); - APPEND_ENTITY_PROPERTY(PROP_CLONE_ORIGIN_ID, getCloneOriginID()); + APPEND_ENTITY_PROPERTY(PROP_CLONE_ORIGIN_ID, getCloneOriginID()); appendSubclassData(packetData, params, entityTreeElementExtraEncodeData, requestedProperties, @@ -867,7 +867,7 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef READ_ENTITY_PROPERTY(PROP_CLONE_LIMIT, float, setCloneLimit); READ_ENTITY_PROPERTY(PROP_CLONE_DYNAMIC, bool, setCloneDynamic); READ_ENTITY_PROPERTY(PROP_CLONE_AVATAR_ENTITY, bool, setCloneAvatarEntity); - READ_ENTITY_PROPERTY(PROP_CLONE_ORIGIN_ID, QUuid, setCloneOriginID); + READ_ENTITY_PROPERTY(PROP_CLONE_ORIGIN_ID, QUuid, setCloneOriginID); bytesRead += readEntitySubclassDataFromBuffer(dataAt, (bytesLeftToRead - bytesRead), args, propertyFlags, overwriteLocalData, somethingChanged); @@ -3061,7 +3061,7 @@ bool EntityItem::getCloneDynamic() const { return result; } -void EntityItem::setCloneDynamic(const bool value) { +void EntityItem::setCloneDynamic(bool value) { withWriteLock([&] { _cloneDynamic = value; }); @@ -3075,7 +3075,7 @@ bool EntityItem::getCloneAvatarEntity() const { return result; } -void EntityItem::setCloneAvatarEntity(const bool value) { +void EntityItem::setCloneAvatarEntity(bool value) { withWriteLock([&] { _cloneAvatarEntity = value; }); diff --git a/libraries/entities/src/EntityItem.h b/libraries/entities/src/EntityItem.h index 42c4605e44..edd4dcbd34 100644 --- a/libraries/entities/src/EntityItem.h +++ b/libraries/entities/src/EntityItem.h @@ -348,9 +348,9 @@ public: float getCloneLimit() const; void setCloneLimit(float value); bool getCloneDynamic() const; - void setCloneDynamic(const bool value); + void setCloneDynamic(bool value); bool getCloneAvatarEntity() const; - void setCloneAvatarEntity(const bool value); + void setCloneAvatarEntity(bool value); const QUuid getCloneOriginID() const; void setCloneOriginID(const QUuid& value); diff --git a/libraries/entities/src/EntityPropertyFlags.h b/libraries/entities/src/EntityPropertyFlags.h index 85ab28afdc..2fdcd62949 100644 --- a/libraries/entities/src/EntityPropertyFlags.h +++ b/libraries/entities/src/EntityPropertyFlags.h @@ -204,6 +204,13 @@ enum EntityPropertyList { PROP_CERTIFICATE_ID, PROP_STATIC_CERTIFICATE_VERSION, + PROP_CLONEABLE, + PROP_CLONE_LIFETIME, + PROP_CLONE_LIMIT, + PROP_CLONE_DYNAMIC, + PROP_CLONE_AVATAR_ENTITY, + PROP_CLONE_ORIGIN_ID, + PROP_HAZE_MODE, PROP_KEYLIGHT_COLOR, @@ -242,13 +249,6 @@ enum EntityPropertyList { PROP_MATERIAL_MAPPING_ROT, PROP_MATERIAL_DATA, - PROP_CLONEABLE, - PROP_CLONE_LIFETIME, - PROP_CLONE_LIMIT, - PROP_CLONE_DYNAMIC, - PROP_CLONE_AVATAR_ENTITY, - PROP_CLONE_ORIGIN_ID, - //////////////////////////////////////////////////////////////////////////////////////////////////// // ATTENTION: add new properties to end of list just ABOVE this line PROP_AFTER_LAST_ITEM,