From 25b9d756ca8965b1a0162f8edb92e41d0ac30955 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Wed, 17 Aug 2016 16:54:04 -0700 Subject: [PATCH] Update entity edit tracking to track count rather than bool --- interface/src/Application.cpp | 6 +++--- .../entities/src/EntityScriptingInterface.cpp | 14 +++++++------- libraries/entities/src/EntityScriptingInterface.h | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index e352b841b7..0876869554 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1203,9 +1203,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) : auto entityScriptingInterface = DependencyManager::get(); auto entityActivityTracking = entityScriptingInterface->getActivityTracking(); entityScriptingInterface->resetActivityTracking(); - properties["added_entity"] = entityActivityTracking.hasAddedEntity; - properties["deleted_entity"] = entityActivityTracking.hasDeletedEntity; - properties["edited_entity"] = entityActivityTracking.hasEditedEntity; + properties["added_entity_cnt"] = entityActivityTracking.addedEntityCount; + properties["deleted_entity_cnt"] = entityActivityTracking.deletedEntityCount; + properties["edited_entity_cnt"] = entityActivityTracking.editedEntityCount; auto hmdHeadPose = getHMDSensorPose(); properties["hmd_head_pose_changed"] = isHMDMode() && (hmdHeadPose != lastHMDHeadPose); diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp index 031847b3f3..c3dbd47600 100644 --- a/libraries/entities/src/EntityScriptingInterface.cpp +++ b/libraries/entities/src/EntityScriptingInterface.cpp @@ -41,9 +41,9 @@ void EntityScriptingInterface::queueEntityMessage(PacketType packetType, } void EntityScriptingInterface::resetActivityTracking() { - _activityTracking.hasAddedEntity = false; - _activityTracking.hasDeletedEntity = false; - _activityTracking.hasEditedEntity = false; + _activityTracking.addedEntityCount = 0; + _activityTracking.deletedEntityCount = 0; + _activityTracking.editedEntityCount = 0; } bool EntityScriptingInterface::canAdjustLocks() { @@ -136,7 +136,7 @@ EntityItemProperties convertLocationFromScriptSemantics(const EntityItemProperti QUuid EntityScriptingInterface::addEntity(const EntityItemProperties& properties, bool clientOnly) { - _activityTracking.hasAddedEntity = true; + _activityTracking.addedEntityCount++; EntityItemProperties propertiesWithSimID = convertLocationFromScriptSemantics(properties); propertiesWithSimID.setDimensionsInitialized(properties.dimensionsChanged()); @@ -208,7 +208,7 @@ QUuid EntityScriptingInterface::addEntity(const EntityItemProperties& properties QUuid EntityScriptingInterface::addModelEntity(const QString& name, const QString& modelUrl, const QString& shapeType, bool dynamic, const glm::vec3& position, const glm::vec3& gravity) { - _activityTracking.hasAddedEntity = true; + _activityTracking.addedEntityCount++; EntityItemProperties properties; properties.setType(EntityTypes::Model); @@ -273,7 +273,7 @@ EntityItemProperties EntityScriptingInterface::getEntityProperties(QUuid identit } QUuid EntityScriptingInterface::editEntity(QUuid id, const EntityItemProperties& scriptSideProperties) { - _activityTracking.hasEditedEntity = true; + _activityTracking.editedEntityCount++; EntityItemProperties properties = scriptSideProperties; @@ -418,7 +418,7 @@ QUuid EntityScriptingInterface::editEntity(QUuid id, const EntityItemProperties& } void EntityScriptingInterface::deleteEntity(QUuid id) { - _activityTracking.hasDeletedEntity = true; + _activityTracking.deletedEntity++; EntityItemID entityID(id); bool shouldDelete = true; diff --git a/libraries/entities/src/EntityScriptingInterface.h b/libraries/entities/src/EntityScriptingInterface.h index bde0974d7c..ce5b332b2a 100644 --- a/libraries/entities/src/EntityScriptingInterface.h +++ b/libraries/entities/src/EntityScriptingInterface.h @@ -67,9 +67,9 @@ public: class ActivityTracking { public: - bool hasAddedEntity { false }; - bool hasDeletedEntity { false }; - bool hasEditedEntity { false }; + int addedEntityCount { 0 }; + int deletedEntityCount { 0 }; + int editedEntityCount { 0 }; }; EntityEditPacketSender* getEntityPacketSender() const { return (EntityEditPacketSender*)getPacketSender(); }