History

exposed input key bindings to js to enable key remapping

Sam Gondelman committed 11 years ago

Commit 984d4491 parent a12fd5c8 files · +289 −16Browse files

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

Unified · Split

interface/src/scripting/ControllerScriptingInterface.h+13−1
@@ -14,10 +14,11 @@ · 13 unmodified lines
1414
1515 #include <QtCore/QObject>
1616
17+#include "ui/UserInputMapper.h"
18+
1719 #include <AbstractControllerScriptingInterface.h>
1820 class PalmData;
1921
20−
2122 class InputController : public AbstractInputController {
2223 Q_OBJECT
2324
@@ -54,6 +55,9 @@ class ControllerScriptingInterface : public AbstractControllerScriptingInterface · 30 unmodified lines
5455
5556 public:
5657 ControllerScriptingInterface();
58+
59+ virtual void registerControllerTypes(QScriptEngine* engine);
60+
5761 void emitKeyPressEvent(QKeyEvent* event) { emit keyPressEvent(KeyEvent(*event)); }
5862 void emitKeyReleaseEvent(QKeyEvent* event) { emit keyReleaseEvent(KeyEvent(*event)); }
5963
@@ -79,6 +83,14 @@ public: · 19 unmodified lines
7983 void updateInputControllers();
8084
8185 public slots:
86+ Q_INVOKABLE virtual QVector<UserInputMapper::Action> getAllActions();
87+ Q_INVOKABLE virtual QVector<UserInputMapper::InputChannel> getInputChannelsForAction(UserInputMapper::Action action);
88+ Q_INVOKABLE virtual QString getDeviceName(unsigned int device);
89+ Q_INVOKABLE virtual QVector<UserInputMapper::InputChannel> getAllInputsForDevice(unsigned int device);
90+ Q_INVOKABLE virtual bool addInputChannel(UserInputMapper::InputChannel inputChannel);
91+ Q_INVOKABLE virtual bool removeInputChannel(UserInputMapper::InputChannel inputChannel);
92+ Q_INVOKABLE virtual QVector<UserInputMapper::InputPair> getAvailableInputs(unsigned int device);
93+ Q_INVOKABLE virtual void resetAllDeviceBindings();
8294 virtual bool isPrimaryButtonPressed() const;
8395 virtual glm::vec2 getPrimaryJoystickPosition() const;
8496