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 libraries/script-engine/src/AbstractControllerScriptingInterface.h (1 of 14 files). Show all

Unified · Split

libraries/script-engine/src/AbstractControllerScriptingInterface.h+5−0
@@ -83,6 +83,9 @@ public slots: · 82 unmodified lines
83 83
84 virtual void captureWheelEvents() = 0;84 virtual void captureWheelEvents() = 0;
85 virtual void releaseWheelEvents() = 0;85 virtual void releaseWheelEvents() = 0;
86
87 virtual void captureActionEvents() = 0;
88 virtual void releaseActionEvents() = 0;
86 89
87 virtual void captureJoystick(int joystickIndex) = 0;90 virtual void captureJoystick(int joystickIndex) = 0;
88 virtual void releaseJoystick(int joystickIndex) = 0;91 virtual void releaseJoystick(int joystickIndex) = 0;
@@ -112,6 +115,8 @@ signals: · 23 unmodified lines
112 void touchUpdateEvent(const TouchEvent& event);115 void touchUpdateEvent(const TouchEvent& event);
113 116
114 void wheelEvent(const WheelEvent& event);117 void wheelEvent(const WheelEvent& event);
118
119 void actionEvent(int action, float state);
115 120
116};121};
117 122