History

Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains

Seth Alves committed 8 years ago

Commit 2d374582 parents 33065fb d888e7f14 files · +167 −248Browse files

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

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+4−2
@@ -304,8 +304,9 @@ QUuid EntityScriptingInterface::addEntity(const EntityItemProperties& properties · 303 unmodified lines
304 }304 }
305}305}
306 306
307QUuid EntityScriptingInterface::addModelEntity(const QString& name, const QString& modelUrl, const QString& textures, const QString& shapeType,307QUuid EntityScriptingInterface::addModelEntity(const QString& name, const QString& modelUrl, const QString& textures,
308 bool dynamic, const glm::vec3& position, const glm::vec3& gravity) {308 const QString& shapeType, bool dynamic, bool collisionless,
309 const glm::vec3& position, const glm::vec3& gravity) {
309 _activityTracking.addedEntityCount++;310 _activityTracking.addedEntityCount++;
310 311
311 EntityItemProperties properties;312 EntityItemProperties properties;
@@ -314,6 +315,7 @@ QUuid EntityScriptingInterface::addModelEntity(const QString& name, const QStrin · 2 unmodified lines
314 properties.setModelURL(modelUrl);315 properties.setModelURL(modelUrl);
315 properties.setShapeTypeFromString(shapeType);316 properties.setShapeTypeFromString(shapeType);
316 properties.setDynamic(dynamic);317 properties.setDynamic(dynamic);
318 properties.setCollisionless(collisionless);
317 properties.setPosition(position);319 properties.setPosition(position);
318 properties.setGravity(gravity);320 properties.setGravity(gravity);
319 if (!textures.isEmpty()) {321 if (!textures.isEmpty()) {