Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 3 files). Show all
Unified · Split
| @@ -40,6 +40,12 @@ void EntityScriptingInterface::queueEntityMessage(PacketType packetType, · 39 unmodified lines | |||
| 40 | getEntityPacketSender()->queueEditEntityMessage(packetType, _entityTree, entityID, properties); | 40 | getEntityPacketSender()->queueEditEntityMessage(packetType, _entityTree, entityID, properties); |
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | void EntityScriptingInterface::resetActivityTracking() { | ||
| 44 | _activityTracking.hasAddedEntity = false; | ||
| 45 | _activityTracking.hasDeletedEntity = false; | ||
| 46 | _activityTracking.hasEditedEntity = false; | ||
| 47 | } | ||
| 48 | |||
| 43 | bool EntityScriptingInterface::canAdjustLocks() { | 49 | bool EntityScriptingInterface::canAdjustLocks() { |
| 44 | auto nodeList = DependencyManager::get<NodeList>(); | 50 | auto nodeList = DependencyManager::get<NodeList>(); |
| 45 | return nodeList->isAllowedEditor(); | 51 | return nodeList->isAllowedEditor(); |
| @@ -130,6 +136,8 @@ EntityItemProperties convertLocationFromScriptSemantics(const EntityItemProperti · 84 unmodified lines | |||
| 130 | 136 | ||
| 131 | 137 | ||
| 132 | QUuid EntityScriptingInterface::addEntity(const EntityItemProperties& properties, bool clientOnly) { | 138 | QUuid EntityScriptingInterface::addEntity(const EntityItemProperties& properties, bool clientOnly) { |
| 139 | _activityTracking.hasAddedEntity = true; | ||
| 140 | |||
| 133 | EntityItemProperties propertiesWithSimID = convertLocationFromScriptSemantics(properties); | 141 | EntityItemProperties propertiesWithSimID = convertLocationFromScriptSemantics(properties); |
| 134 | propertiesWithSimID.setDimensionsInitialized(properties.dimensionsChanged()); | 142 | propertiesWithSimID.setDimensionsInitialized(properties.dimensionsChanged()); |
| 135 | 143 | ||
| @@ -200,6 +208,8 @@ QUuid EntityScriptingInterface::addEntity(const EntityItemProperties& properties · 64 unmodified lines | |||
| 200 | 208 | ||
| 201 | QUuid EntityScriptingInterface::addModelEntity(const QString& name, const QString& modelUrl, const QString& shapeType, | 209 | QUuid EntityScriptingInterface::addModelEntity(const QString& name, const QString& modelUrl, const QString& shapeType, |
| 202 | bool dynamic, const glm::vec3& position, const glm::vec3& gravity) { | 210 | bool dynamic, const glm::vec3& position, const glm::vec3& gravity) { |
| 211 | _activityTracking.hasAddedEntity = true; | ||
| 212 | |||
| 203 | EntityItemProperties properties; | 213 | EntityItemProperties properties; |
| 204 | properties.setType(EntityTypes::Model); | 214 | properties.setType(EntityTypes::Model); |
| 205 | properties.setName(name); | 215 | properties.setName(name); |
| @@ -263,6 +273,8 @@ EntityItemProperties EntityScriptingInterface::getEntityProperties(QUuid identit · 57 unmodified lines | |||
| 263 | } | 273 | } |
| 264 | 274 | ||
| 265 | QUuid EntityScriptingInterface::editEntity(QUuid id, const EntityItemProperties& scriptSideProperties) { | 275 | QUuid EntityScriptingInterface::editEntity(QUuid id, const EntityItemProperties& scriptSideProperties) { |
| 276 | _activityTracking.hasEditedEntity = true; | ||
| 277 | |||
| 266 | EntityItemProperties properties = scriptSideProperties; | 278 | EntityItemProperties properties = scriptSideProperties; |
| 267 | 279 | ||
| 268 | auto dimensions = properties.getDimensions(); | 280 | auto dimensions = properties.getDimensions(); |
| @@ -406,6 +418,8 @@ QUuid EntityScriptingInterface::editEntity(QUuid id, const EntityItemProperties& · 137 unmodified lines | |||
| 406 | } | 418 | } |
| 407 | 419 | ||
| 408 | void EntityScriptingInterface::deleteEntity(QUuid id) { | 420 | void EntityScriptingInterface::deleteEntity(QUuid id) { |
| 421 | _activityTracking.hasDeletedEntity = true; | ||
| 422 | |||
| 409 | EntityItemID entityID(id); | 423 | EntityItemID entityID(id); |
| 410 | bool shouldDelete = true; | 424 | bool shouldDelete = true; |
| 411 | 425 | ||