Showing the changes to interface/src/scripting/ControllerScriptingInterface.h (1 of 4 files). Show all
Unified · Split
| @@ -18,6 +18,9 @@ · 17 unmodified lines | |||
| 18 | 18 | ||
| 19 | #include <AbstractControllerScriptingInterface.h> | 19 | #include <AbstractControllerScriptingInterface.h> |
| 20 | class PalmData; | 20 | class PalmData; |
| 21 | namespace controller { | ||
| 22 | class NewControllerScriptingInterface; | ||
| 23 | } | ||
| 21 | 24 | ||
| 22 | class InputController : public AbstractInputController { | 25 | class InputController : public AbstractInputController { |
| 23 | Q_OBJECT | 26 | Q_OBJECT |
| @@ -55,7 +58,8 @@ class ControllerScriptingInterface : public AbstractControllerScriptingInterface · 31 unmodified lines | |||
| 55 | 58 | ||
| 56 | public: | 59 | public: |
| 57 | ControllerScriptingInterface(); | 60 | ControllerScriptingInterface(); |
| 58 | 61 | ~ControllerScriptingInterface(); | |
| 62 | |||
| 59 | virtual void registerControllerTypes(ScriptEngine* engine); | 63 | virtual void registerControllerTypes(ScriptEngine* engine); |
| 60 | 64 | ||
| 61 | void emitKeyPressEvent(QKeyEvent* event) { emit keyPressEvent(KeyEvent(*event)); } | 65 | void emitKeyPressEvent(QKeyEvent* event) { emit keyPressEvent(KeyEvent(*event)); } |
| @@ -169,6 +173,7 @@ private: · 107 unmodified lines | |||
| 169 | 173 | ||
| 170 | void wireUpControllers(ScriptEngine* engine); | 174 | void wireUpControllers(ScriptEngine* engine); |
| 171 | 175 | ||
| 176 | controller::NewControllerScriptingInterface* _newControllerScriptingInterface = nullptr; | ||
| 172 | }; | 177 | }; |
| 173 | 178 | ||
| 174 | const int NUMBER_OF_SPATIALCONTROLS_PER_PALM = 2; // the hand and the tip | 179 | const int NUMBER_OF_SPATIALCONTROLS_PER_PALM = 2; // the hand and the tip |