Showing the changes to libraries/script-engine/src/ScriptEngine.h (1 of 43 files). Show all
Unified · Split
| @@ -26,8 +26,10 @@ · 25 unmodified lines | |||
| 26 | #include <LimitedNodeList.h> | 26 | #include <LimitedNodeList.h> |
| 27 | #include <EntityItemID.h> | 27 | #include <EntityItemID.h> |
| 28 | #include <EntitiesScriptEngineProvider.h> | 28 | #include <EntitiesScriptEngineProvider.h> |
| 29 | #include <controllers/ScriptingInterface.h> | ||
| 29 | 30 | ||
| 30 | #include "AbstractControllerScriptingInterface.h" | 31 | |
| 32 | #include "MouseEvent.h" | ||
| 31 | #include "ArrayBufferClass.h" | 33 | #include "ArrayBufferClass.h" |
| 32 | #include "AudioScriptingInterface.h" | 34 | #include "AudioScriptingInterface.h" |
| 33 | #include "Quat.h" | 35 | #include "Quat.h" |
| @@ -53,7 +55,7 @@ class ScriptEngine : public QScriptEngine, public ScriptUser, public EntitiesScr · 19 unmodified lines | |||
| 53 | public: | 55 | public: |
| 54 | ScriptEngine(const QString& scriptContents = NO_SCRIPT, | 56 | ScriptEngine(const QString& scriptContents = NO_SCRIPT, |
| 55 | const QString& fileNameString = QString(""), | 57 | const QString& fileNameString = QString(""), |
| 56 | AbstractControllerScriptingInterface* controllerScriptingInterface = NULL, | 58 | controller::ScriptingInterface* controllerScriptingInterface = nullptr, |
| 57 | bool wantSignals = true); | 59 | bool wantSignals = true); |
| 58 | 60 | ||
| 59 | ~ScriptEngine(); | 61 | ~ScriptEngine(); |
| @@ -182,7 +184,6 @@ private: · 122 unmodified lines | |||
| 182 | QObject* setupTimerWithInterval(const QScriptValue& function, int intervalMS, bool isSingleShot); | 184 | QObject* setupTimerWithInterval(const QScriptValue& function, int intervalMS, bool isSingleShot); |
| 183 | void stopTimer(QTimer* timer); | 185 | void stopTimer(QTimer* timer); |
| 184 | 186 | ||
| 185 | AbstractControllerScriptingInterface* _controllerScriptingInterface; | ||
| 186 | QString _fileNameString; | 187 | QString _fileNameString; |
| 187 | Quat _quatLibrary; | 188 | Quat _quatLibrary; |
| 188 | Vec3 _vec3Library; | 189 | Vec3 _vec3Library; |