History

first cut at wiring up devices and inputs to JS

Brad Hefta-Gaub committed 11 years ago

Commit 37f530f1 parent a5f0b755 files · +38 −6Browse files

Showing the changes to libraries/script-engine/src/AbstractControllerScriptingInterface.h (1 of 5 files). Show all

Unified · Split

libraries/script-engine/src/AbstractControllerScriptingInterface.h+3−1
@@ -24,6 +24,8 @@ · 23 unmodified lines
24#include "TouchEvent.h"24#include "TouchEvent.h"
25#include "WheelEvent.h"25#include "WheelEvent.h"
26 26
27class ScriptEngine;
28
27class AbstractInputController : public QObject {29class AbstractInputController : public QObject {
28 Q_OBJECT30 Q_OBJECT
29 31
@@ -52,7 +54,7 @@ class AbstractControllerScriptingInterface : public QObject { · 22 unmodified lines
52 Q_OBJECT54 Q_OBJECT
53 55
54public slots:56public slots:
55 virtual void registerControllerTypes(QScriptEngine* engine) = 0;57 virtual void registerControllerTypes(ScriptEngine* engine) = 0;
56 58
57 virtual bool isPrimaryButtonPressed() const = 0;59 virtual bool isPrimaryButtonPressed() const = 0;
58 virtual glm::vec2 getPrimaryJoystickPosition() const = 0;60 virtual glm::vec2 getPrimaryJoystickPosition() const = 0;