History

Merge pull request #5167 from SamGondelman/hmdControls

hmdControls.js for movement when wearing an HMD

Ryan Huffman committed 11 years ago

Commit 4df1bea2 parents 584ecf7 a0d4b7e14 files · +350 −43Browse files

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

Unified · Split

interface/src/scripting/ControllerScriptingInterface.h+5−0
@@ -79,6 +79,7 @@ public: · 78 unmodified lines
79 bool isMouseCaptured() const { return _mouseCaptured; }79 bool isMouseCaptured() const { return _mouseCaptured; }
80 bool isTouchCaptured() const { return _touchCaptured; }80 bool isTouchCaptured() const { return _touchCaptured; }
81 bool isWheelCaptured() const { return _wheelCaptured; }81 bool isWheelCaptured() const { return _wheelCaptured; }
82 bool areActionsCaptured() const { return _actionsCaptured; }
82 bool isJoystickCaptured(int joystickIndex) const;83 bool isJoystickCaptured(int joystickIndex) const;
83 84
84 void updateInputControllers();85 void updateInputControllers();
@@ -123,6 +124,9 @@ public slots: · 38 unmodified lines
123 124
124 virtual void captureWheelEvents() { _wheelCaptured = true; }125 virtual void captureWheelEvents() { _wheelCaptured = true; }
125 virtual void releaseWheelEvents() { _wheelCaptured = false; }126 virtual void releaseWheelEvents() { _wheelCaptured = false; }
127
128 virtual void captureActionEvents() { _actionsCaptured = true; }
129 virtual void releaseActionEvents() { _actionsCaptured = false; }
126 130
127 virtual void captureJoystick(int joystickIndex);131 virtual void captureJoystick(int joystickIndex);
128 virtual void releaseJoystick(int joystickIndex);132 virtual void releaseJoystick(int joystickIndex);
@@ -143,6 +147,7 @@ private: · 14 unmodified lines
143 bool _mouseCaptured;147 bool _mouseCaptured;
144 bool _touchCaptured;148 bool _touchCaptured;
145 bool _wheelCaptured;149 bool _wheelCaptured;
150 bool _actionsCaptured;
146 QMultiMap<int,KeyEvent> _capturedKeys;151 QMultiMap<int,KeyEvent> _capturedKeys;
147 QSet<int> _capturedJoysticks;152 QSet<int> _capturedJoysticks;
148 153