History

hook the DataServerScriptingInterface to the ScriptEngine

Stephen Birarda committed 12 years ago

Commit aa9f7ff1 parent e08f4d23 files · +12 −0Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.h (1 of 3 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.h+4−0
@@ -22,6 +22,7 @@ · 21 unmodified lines
22class ParticlesScriptingInterface;22class ParticlesScriptingInterface;
23 23
24#include "AbstractControllerScriptingInterface.h"24#include "AbstractControllerScriptingInterface.h"
25#include "DataServerScriptingInterface.h"
25 26
26const QString NO_SCRIPT("");27const QString NO_SCRIPT("");
27 28
@@ -61,6 +62,8 @@ signals: · 33 unmodified lines
61 void finished();62 void finished();
62 63
63protected:64protected:
65 void preEvaluateReset();
66
64 QString _scriptContents;67 QString _scriptContents;
65 bool _isFinished;68 bool _isFinished;
66 bool _isRunning;69 bool _isRunning;
@@ -72,6 +75,7 @@ private: · 5 unmodified lines
72 static ParticlesScriptingInterface _particlesScriptingInterface;75 static ParticlesScriptingInterface _particlesScriptingInterface;
73 AbstractControllerScriptingInterface* _controllerScriptingInterface;76 AbstractControllerScriptingInterface* _controllerScriptingInterface;
74 AudioScriptingInterface _audioScriptingInterface;77 AudioScriptingInterface _audioScriptingInterface;
78 DataServerScriptingInterface _dataServerScriptingInterface;
75 bool _wantMenuItems;79 bool _wantMenuItems;
76 QString _scriptMenuName;80 QString _scriptMenuName;
77 AbstractMenuInterface* _menu;81 AbstractMenuInterface* _menu;