From b229b5289cc7907c120b042fa0bc44085bb19a2c Mon Sep 17 00:00:00 2001 From: James Pollack Date: Thu, 5 Nov 2015 14:24:21 -0800 Subject: [PATCH] entity call params --- libraries/entities/src/EntityScriptingInterface.cpp | 8 +++++++- libraries/entities/src/EntityScriptingInterface.h | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp index 719b193dfd..a68f946173 100644 --- a/libraries/entities/src/EntityScriptingInterface.cpp +++ b/libraries/entities/src/EntityScriptingInterface.cpp @@ -217,6 +217,13 @@ void EntityScriptingInterface::deleteEntity(QUuid id) { } } +void EntityScriptingInterface::callEntityMethod(QUuid id, const QString& method) { + if (_entitiesScriptEngine) { + EntityItemID entityID{ id }; + _entitiesScriptEngine->callEntityScriptMethod(entityID, method); + } +} + void EntityScriptingInterface::callEntityMethod(QUuid id, const QString& method, const QStringList& params) { if (_entitiesScriptEngine) { EntityItemID entityID{ id }; @@ -224,7 +231,6 @@ void EntityScriptingInterface::callEntityMethod(QUuid id, const QString& method, } } - QUuid EntityScriptingInterface::findClosestEntity(const glm::vec3& center, float radius) const { EntityItemID result; if (_entityTree) { diff --git a/libraries/entities/src/EntityScriptingInterface.h b/libraries/entities/src/EntityScriptingInterface.h index 156f16cf46..05c48a8415 100644 --- a/libraries/entities/src/EntityScriptingInterface.h +++ b/libraries/entities/src/EntityScriptingInterface.h @@ -94,7 +94,7 @@ public slots: /// engine. If the entity does not have an entity script or the method does not exist, this call will have /// no effect. Q_INVOKABLE void callEntityMethod(QUuid entityID, const QString& method); - + Q_INVOKABLE void callEntityMethod(QUuid entityID, const QString& method, const QStringList& params); /// finds the closest model to the center point, within the radius /// will return a EntityItemID.isKnownID = false if no models are in the radius /// this function will not find any models in script engine contexts which don't have access to models