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