History

Merge pull request #111 from huffman/atp-manager-name

Add atp filename to entities added to world

Clément Brisset committed 10 years ago

Commit 17e5b442 parents 47f18e5 78238823 files · +10 −8Browse files

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

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+2−1
@@ -182,9 +182,10 @@ QUuid EntityScriptingInterface::addEntity(const EntityItemProperties& properties · 181 unmodified lines
182 return id;182 return id;
183}183}
184 184
185QUuid EntityScriptingInterface::addModelEntity(const QString& modelUrl, const glm::vec3& position) {185QUuid EntityScriptingInterface::addModelEntity(const QString& name, const QString& modelUrl, const glm::vec3& position) {
186 EntityItemProperties properties;186 EntityItemProperties properties;
187 properties.setType(EntityTypes::Model);187 properties.setType(EntityTypes::Model);
188 properties.setName(name);
188 properties.setModelURL(modelUrl);189 properties.setModelURL(modelUrl);
189 properties.setPosition(position);190 properties.setPosition(position);
190 return addEntity(properties);191 return addEntity(properties);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t