Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 21:05:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

pass parameters to entities

Browse source
This commit is contained in:
James B. Pollack 2015-11-05 16:57:39 -08:00
parent b229b5289c
commit 3cee569bae
4 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/entities/src/EntitiesScriptEngineProvider.h
View file

@ -20,6 +20,7 @@
class EntitiesScriptEngineProvider { class EntitiesScriptEngineProvider {
public: public:
virtual void callEntityScriptMethod(const EntityItemID& entityID, const QString& methodName) = 0; virtual void callEntityScriptMethod(const EntityItemID& entityID, const QString& methodName) = 0;
virtual void callEntityScriptMethod(const EntityItemID& entityID, const QString& methodName, const QStringList& params) = 0;
}; };
#endif // hifi_EntitiesScriptEngineProvider_h #endif // hifi_EntitiesScriptEngineProvider_h

1
libraries/entities/src/EntityScriptingInterface.h
View file

@ -15,6 +15,7 @@
#define hifi_EntityScriptingInterface_h #define hifi_EntityScriptingInterface_h
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QtCore/QStringList>
#include <DependencyManager.h> #include <DependencyManager.h>
#include <Octree.h> #include <Octree.h>

2
libraries/script-engine/src/ScriptEngine.cpp
View file

@ -18,6 +18,7 @@
#include <QtNetwork/QNetworkReply> #include <QtNetwork/QNetworkReply>
#include <QtScript/QScriptEngine> #include <QtScript/QScriptEngine>
#include <QtScript/QScriptValue> #include <QtScript/QScriptValue>
#include <QtCore/QStringList>
#include <AudioConstants.h> #include <AudioConstants.h>
#include <AudioEffectOptions.h> #include <AudioEffectOptions.h>
@ -1225,6 +1226,7 @@ void ScriptEngine::callEntityScriptMethod(const EntityItemID& entityID, const QS
if (entityScript.property(methodName).isFunction()) { if (entityScript.property(methodName).isFunction()) {
QScriptValueList args; QScriptValueList args;
args << entityID.toScriptValue(this); args << entityID.toScriptValue(this);
args << qScriptValueFromSequence(this, params);
entityScript.property(methodName).call(entityScript, args); entityScript.property(methodName).call(entityScript, args);
} }

1
libraries/script-engine/src/ScriptEngine.h
View file

@ -19,6 +19,7 @@
#include <QtCore/QSet> #include <QtCore/QSet>
#include <QtCore/QWaitCondition> #include <QtCore/QWaitCondition>
#include <QtScript/QScriptEngine> #include <QtScript/QScriptEngine>
#include <QtCore/QStringList>
#include <AnimationCache.h> #include <AnimationCache.h>
#include <AnimVariant.h> #include <AnimVariant.h>