History

set grabbable user data in addModelEntity, pass grabbable from asset browser

David Back committed 8 years ago

Commit 8db07111 parent 544a6505 files · +16 −7Browse files

Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 5 files). Show all

Unified · Split

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