From 866b3dbb6315850b07647a9ef2ac1e3dc5a1ffcf Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 18 Feb 2014 16:47:50 -0800 Subject: [PATCH] scripting additions --- .../script-engine/src/AbstractControllerScriptingInterface.h | 4 ++++ libraries/script-engine/src/EventTypes.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/libraries/script-engine/src/AbstractControllerScriptingInterface.h b/libraries/script-engine/src/AbstractControllerScriptingInterface.h index d9878d0b71..1878edd4d6 100644 --- a/libraries/script-engine/src/AbstractControllerScriptingInterface.h +++ b/libraries/script-engine/src/AbstractControllerScriptingInterface.h @@ -52,6 +52,10 @@ public slots: virtual void captureWheelEvents() = 0; virtual void releaseWheelEvents() = 0; + virtual void captureJoystick(int joystickIndex) = 0; + virtual void releaseJoystick(int joystickIndex) = 0; + + virtual glm::vec2 getViewportDimensions() const = 0; signals: void keyPressEvent(const KeyEvent& event); diff --git a/libraries/script-engine/src/EventTypes.cpp b/libraries/script-engine/src/EventTypes.cpp index 963912fd34..8fac2bcd2a 100644 --- a/libraries/script-engine/src/EventTypes.cpp +++ b/libraries/script-engine/src/EventTypes.cpp @@ -102,6 +102,8 @@ KeyEvent::KeyEvent(const QKeyEvent& event) { text = "END"; } else if (key == Qt::Key_Help) { text = "HELP"; + } else if (key == Qt::Key_CapsLock) { + text = "CAPS LOCK"; } } @@ -208,6 +210,8 @@ void keyEventFromScriptValue(const QScriptValue& object, KeyEvent& event) { event.key = Qt::Key_End; } else if (event.text.toUpper() == "HELP") { event.key = Qt::Key_Help; + } else if (event.text.toUpper() == "CAPS LOCK") { + event.key = Qt::Key_CapsLock; } else { event.key = event.text.at(0).unicode(); }