History

hack in mappings to interface

Ryan Huffman committed 11 years ago

Commit 9a9bdbb1 parent f860ca94 files · +33 −2Browse files

Showing the changes to interface/src/scripting/ControllerScriptingInterface.h (1 of 4 files). Show all

Unified · Split

interface/src/scripting/ControllerScriptingInterface.h+6−1
@@ -18,6 +18,9 @@ · 17 unmodified lines
1818
1919 #include <AbstractControllerScriptingInterface.h>
2020 class PalmData;
21+namespace controller {
22+ class NewControllerScriptingInterface;
23+}
2124
2225 class InputController : public AbstractInputController {
2326 Q_OBJECT
@@ -55,7 +58,8 @@ class ControllerScriptingInterface : public AbstractControllerScriptingInterface · 31 unmodified lines
5558
5659 public:
5760 ControllerScriptingInterface();
58−
61+ ~ControllerScriptingInterface();
62+
5963 virtual void registerControllerTypes(ScriptEngine* engine);
6064
6165 void emitKeyPressEvent(QKeyEvent* event) { emit keyPressEvent(KeyEvent(*event)); }
@@ -169,6 +173,7 @@ private: · 107 unmodified lines
169173
170174 void wireUpControllers(ScriptEngine* engine);
171175
176+ controller::NewControllerScriptingInterface* _newControllerScriptingInterface = nullptr;
172177 };
173178
174179 const int NUMBER_OF_SPATIALCONTROLS_PER_PALM = 2; // the hand and the tip