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

hook the DataServerScriptingInterface to the ScriptEngine

Browse source
This commit is contained in:
Stephen Birarda 2014-01-21 13:21:03 -08:00
parent e08f4d2eba
commit aa9f7ff31d
3 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/script-engine/src/DataServerScriptingInterface.h
View file

@ -17,6 +17,8 @@ class DataServerScriptingInterface : public QObject {
Q_OBJECT
public:
DataServerScriptingInterface();
void refreshUUID() { _uuid = QUuid::createUuid(); }
public slots:
void setValueForKey(const QString& key, const QString& value);
private:

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

@ -119,6 +119,8 @@ void ScriptEngine::init() {
QScriptValue audioScriptingInterfaceValue = _engine.newQObject(&_audioScriptingInterface);
_engine.globalObject().setProperty("Audio", audioScriptingInterfaceValue);
registerGlobalObject("Data", &_dataServerScriptingInterface);
if (_controllerScriptingInterface) {
QScriptValue controllerScripterValue = _engine.newQObject(_controllerScriptingInterface);
@ -140,6 +142,10 @@ void ScriptEngine::registerGlobalObject(const QString& name, QObject* object) {
_engine.globalObject().setProperty(name, value);
}
void ScriptEngine::preEvaluateReset() {
_dataServerScriptingInterface.refreshUUID();
}
void ScriptEngine::evaluate() {
if (!_isInitialized) {
init();

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

@ -22,6 +22,7 @@
class ParticlesScriptingInterface;
#include "AbstractControllerScriptingInterface.h"
#include "DataServerScriptingInterface.h"
const QString NO_SCRIPT("");
@ -61,6 +62,8 @@ signals:
void finished();
protected:
void preEvaluateReset();
QString _scriptContents;
bool _isFinished;
bool _isRunning;
@ -72,6 +75,7 @@ private:
static ParticlesScriptingInterface _particlesScriptingInterface;
AbstractControllerScriptingInterface* _controllerScriptingInterface;
AudioScriptingInterface _audioScriptingInterface;
DataServerScriptingInterface _dataServerScriptingInterface;
bool _wantMenuItems;
QString _scriptMenuName;
AbstractMenuInterface* _menu;