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

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

Keyboard shortcuts