History

Merge branch 'master' of https://github.com/highfidelity/hifi into baseball

Atlante45 committed 11 years ago

Commit b15054c2 parents 6a53021 4cb5e719 files · +101 −11Browse files

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

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+2−3
@@ -217,14 +217,13 @@ void EntityScriptingInterface::deleteEntity(QUuid id) { · 216 unmodified lines
217 }217 }
218}218}
219 219
220void EntityScriptingInterface::callEntityMethod(QUuid id, const QString& method) {220void EntityScriptingInterface::callEntityMethod(QUuid id, const QString& method, const QStringList& params) {
221 if (_entitiesScriptEngine) {221 if (_entitiesScriptEngine) {
222 EntityItemID entityID{ id };222 EntityItemID entityID{ id };
223 _entitiesScriptEngine->callEntityScriptMethod(entityID, method);223 _entitiesScriptEngine->callEntityScriptMethod(entityID, method, params);
224 }224 }
225}225}
226 226
227
228QUuid EntityScriptingInterface::findClosestEntity(const glm::vec3& center, float radius) const {227QUuid EntityScriptingInterface::findClosestEntity(const glm::vec3& center, float radius) const {
229 EntityItemID result;228 EntityItemID result;
230 if (_entityTree) {229 if (_entityTree) {