Showing the changes to interface/src/ControllerScriptingInterface.h (1 of 3 files). Show all
Unified · Split
| @@ -6,8 +6,8 @@ · 5 unmodified lines | ||
| 6 | 6 | // Copyright (c) 2013 HighFidelity, Inc. All rights reserved. |
| 7 | 7 | // |
| 8 | 8 | |
| 9 | −#ifndef __hifi__InterfaceControllerScriptingInterface__ | |
| 10 | −#define __hifi__InterfaceControllerScriptingInterface__ | |
| 9 | +#ifndef __hifi__ControllerScriptingInterface__ | |
| 10 | +#define __hifi__ControllerScriptingInterface__ | |
| 11 | 11 | |
| 12 | 12 | #include <QtCore/QObject> |
| 13 | 13 | |
| @@ -21,8 +21,28 @@ public slots: · 7 unmodified lines | ||
| 21 | 21 | virtual bool isPrimaryButtonPressed() const; |
| 22 | 22 | virtual glm::vec2 getPrimaryJoystickPosition() const; |
| 23 | 23 | |
| 24 | + virtual int getNumberOfButtons() const; | |
| 25 | + virtual bool isButtonPressed(int buttonIndex) const; | |
| 26 | + | |
| 27 | + virtual int getNumberOfTriggers() const; | |
| 28 | + virtual float getTriggerValue(int triggerIndex) const; | |
| 29 | + | |
| 30 | + virtual int getNumberOfJoysticks() const; | |
| 31 | + virtual glm::vec2 getJoystickPosition(int joystickIndex) const; | |
| 32 | + | |
| 33 | + virtual int getNumberOfSpatialControls() const; | |
| 34 | + virtual glm::vec3 getSpatialControlPosition(int controlIndex) const; | |
| 35 | + | |
| 24 | 36 | private: |
| 25 | 37 | const PalmData* getPrimaryPalm() const; |
| 38 | + const PalmData* getPalm(int palmIndex) const; | |
| 39 | + int getNumberOfActivePalms() const; | |
| 40 | + const PalmData* getActivePalm(int palmIndex) const; | |
| 41 | + | |
| 42 | + const int NUMBER_OF_SPATIALCONTROLS_PER_PALM = 0; | |
| 43 | + const int NUMBER_OF_JOYSTICKS_PER_PALM = 1; | |
| 44 | + const int NUMBER_OF_TRIGGERS_PER_PALM = 1; | |
| 45 | + const int NUMBER_OF_BUTTONS_PER_PALM = 6; | |
| 26 | 46 | }; |
| 27 | 47 | |
| 28 | −#endif /* defined(__hifi__InterfaceControllerScriptingInterface__) */ | |
| 48 | +#endif /* defined(__hifi__ControllerScriptingInterface__) */ | |