Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 00:36:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Update entity edit tracking to track count rather than bool

Browse source
This commit is contained in:
Ryan Huffman 2016-08-17 16:54:04 -07:00
parent fbe971e730
commit 25b9d756ca
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/Application.cpp
View file

@ -1203,9 +1203,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>(); auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
auto entityActivityTracking = entityScriptingInterface->getActivityTracking(); auto entityActivityTracking = entityScriptingInterface->getActivityTracking();
entityScriptingInterface->resetActivityTracking(); entityScriptingInterface->resetActivityTracking();
properties["added_entity"] = entityActivityTracking.hasAddedEntity; properties["added_entity_cnt"] = entityActivityTracking.addedEntityCount;
properties["deleted_entity"] = entityActivityTracking.hasDeletedEntity; properties["deleted_entity_cnt"] = entityActivityTracking.deletedEntityCount;
properties["edited_entity"] = entityActivityTracking.hasEditedEntity; properties["edited_entity_cnt"] = entityActivityTracking.editedEntityCount;
auto hmdHeadPose = getHMDSensorPose(); auto hmdHeadPose = getHMDSensorPose();
properties["hmd_head_pose_changed"] = isHMDMode() && (hmdHeadPose != lastHMDHeadPose); properties["hmd_head_pose_changed"] = isHMDMode() && (hmdHeadPose != lastHMDHeadPose);

14
libraries/entities/src/EntityScriptingInterface.cpp
View file

@ -41,9 +41,9 @@ void EntityScriptingInterface::queueEntityMessage(PacketType packetType,
} }
void EntityScriptingInterface::resetActivityTracking() { void EntityScriptingInterface::resetActivityTracking() {
_activityTracking.hasAddedEntity = false; _activityTracking.addedEntityCount = 0;
_activityTracking.hasDeletedEntity = false; _activityTracking.deletedEntityCount = 0;
_activityTracking.hasEditedEntity = false; _activityTracking.editedEntityCount = 0;
} }
bool EntityScriptingInterface::canAdjustLocks() { bool EntityScriptingInterface::canAdjustLocks() {
@ -136,7 +136,7 @@ EntityItemProperties convertLocationFromScriptSemantics(const EntityItemProperti
QUuid EntityScriptingInterface::addEntity(const EntityItemProperties& properties, bool clientOnly) { QUuid EntityScriptingInterface::addEntity(const EntityItemProperties& properties, bool clientOnly) {
_activityTracking.hasAddedEntity = true; _activityTracking.addedEntityCount++;
EntityItemProperties propertiesWithSimID = convertLocationFromScriptSemantics(properties); EntityItemProperties propertiesWithSimID = convertLocationFromScriptSemantics(properties);
propertiesWithSimID.setDimensionsInitialized(properties.dimensionsChanged()); 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, QUuid EntityScriptingInterface::addModelEntity(const QString& name, const QString& modelUrl, const QString& shapeType,
bool dynamic, const glm::vec3& position, const glm::vec3& gravity) { bool dynamic, const glm::vec3& position, const glm::vec3& gravity) {
_activityTracking.hasAddedEntity = true; _activityTracking.addedEntityCount++;
EntityItemProperties properties; EntityItemProperties properties;
properties.setType(EntityTypes::Model); properties.setType(EntityTypes::Model);
@ -273,7 +273,7 @@ EntityItemProperties EntityScriptingInterface::getEntityProperties(QUuid identit
} }
QUuid EntityScriptingInterface::editEntity(QUuid id, const EntityItemProperties& scriptSideProperties) { QUuid EntityScriptingInterface::editEntity(QUuid id, const EntityItemProperties& scriptSideProperties) {
_activityTracking.hasEditedEntity = true; _activityTracking.editedEntityCount++;
EntityItemProperties properties = scriptSideProperties; EntityItemProperties properties = scriptSideProperties;
@ -418,7 +418,7 @@ QUuid EntityScriptingInterface::editEntity(QUuid id, const EntityItemProperties&
} }
void EntityScriptingInterface::deleteEntity(QUuid id) { void EntityScriptingInterface::deleteEntity(QUuid id) {
_activityTracking.hasDeletedEntity = true; _activityTracking.deletedEntity++;
EntityItemID entityID(id); EntityItemID entityID(id);
bool shouldDelete = true; bool shouldDelete = true;

6
libraries/entities/src/EntityScriptingInterface.h
View file

@ -67,9 +67,9 @@ public:
class ActivityTracking { class ActivityTracking {
public: public:
bool hasAddedEntity { false }; int addedEntityCount { 0 };
bool hasDeletedEntity { false }; int deletedEntityCount { 0 };
bool hasEditedEntity { false }; int editedEntityCount { 0 };
}; };
EntityEditPacketSender* getEntityPacketSender() const { return (EntityEditPacketSender*)getPacketSender(); } EntityEditPacketSender* getEntityPacketSender() const { return (EntityEditPacketSender*)getPacketSender(); }