History

Use custom dialog for asset server add to world

Zander Otavka committed 10 years ago

Commit c25b87c1 parent 530e17a3 files · +76 −8Browse files

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

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+5−1
@@ -198,12 +198,16 @@ QUuid EntityScriptingInterface::addEntity(const EntityItemProperties& properties · 197 unmodified lines
198 }198 }
199}199}
200 200
201QUuid EntityScriptingInterface::addModelEntity(const QString& name, const QString& modelUrl, const glm::vec3& position) {201QUuid EntityScriptingInterface::addModelEntity(const QString& name, const QString& modelUrl, const QString& shapeType,
202 bool dynamic, const glm::vec3& position, const glm::vec3& gravity) {
202 EntityItemProperties properties;203 EntityItemProperties properties;
203 properties.setType(EntityTypes::Model);204 properties.setType(EntityTypes::Model);
204 properties.setName(name);205 properties.setName(name);
205 properties.setModelURL(modelUrl);206 properties.setModelURL(modelUrl);
207 properties.setShapeTypeFromString(shapeType);
208 properties.setDynamic(dynamic);
206 properties.setPosition(position);209 properties.setPosition(position);
210 properties.setGravity(gravity);
207 return addEntity(properties);211 return addEntity(properties);
208}212}
209 213