Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 5 files). Show all
Unified · Split
| @@ -38,6 +38,8 @@ · 37 unmodified lines | ||
| 38 | 38 | #include <EntityScriptClient.h> |
| 39 | 39 | #include <Profile.h> |
| 40 | 40 | |
| 41 | +const QString GRABBABLE_USER_DATA = "{\"grabbableKey\":{\"grabbable\":true}}"; | |
| 42 | +const QString NOT_GRABBABLE_USER_DATA = "{\"grabbableKey\":{\"grabbable\":false}}"; | |
| 41 | 43 | |
| 42 | 44 | EntityScriptingInterface::EntityScriptingInterface(bool bidOnSimulationOwnership) : |
| 43 | 45 | _entityTree(NULL), |
| @@ -303,7 +305,7 @@ bool EntityScriptingInterface::addLocalEntityCopy(EntityItemProperties& properti · 259 unmodified lines | ||
| 303 | 305 | } |
| 304 | 306 | |
| 305 | 307 | QUuid EntityScriptingInterface::addModelEntity(const QString& name, const QString& modelUrl, const QString& textures, |
| 306 | − const QString& shapeType, bool dynamic, bool collisionless, | |
| 308 | + const QString& shapeType, bool dynamic, bool collisionless, bool grabbable, | |
| 307 | 309 | const glm::vec3& position, const glm::vec3& gravity) { |
| 308 | 310 | _activityTracking.addedEntityCount++; |
| 309 | 311 | |
| @@ -314,6 +316,7 @@ QUuid EntityScriptingInterface::addModelEntity(const QString& name, const QStrin · 4 unmodified lines | ||
| 314 | 316 | properties.setShapeTypeFromString(shapeType); |
| 315 | 317 | properties.setDynamic(dynamic); |
| 316 | 318 | properties.setCollisionless(collisionless); |
| 319 | + properties.setUserData(grabbable ? GRABBABLE_USER_DATA : NOT_GRABBABLE_USER_DATA); | |
| 317 | 320 | properties.setPosition(position); |
| 318 | 321 | properties.setGravity(gravity); |
| 319 | 322 | if (!textures.isEmpty()) { |