Showing the changes to interface/src/ControllerScriptingInterface.h (1 of 3 files). Show all
Unified · Split
| @@ -32,6 +32,8 @@ public slots: · 31 unmodified lines | |||
| 32 | 32 | ||
| 33 | virtual int getNumberOfSpatialControls() const; | 33 | virtual int getNumberOfSpatialControls() const; |
| 34 | virtual glm::vec3 getSpatialControlPosition(int controlIndex) const; | 34 | virtual glm::vec3 getSpatialControlPosition(int controlIndex) const; |
| 35 | virtual glm::vec3 getSpatialControlVelocity(int controlIndex) const; | ||
| 36 | virtual glm::vec3 getSpatialControlNormal(int controlIndex) const; | ||
| 35 | 37 | ||
| 36 | private: | 38 | private: |
| 37 | const PalmData* getPrimaryPalm() const; | 39 | const PalmData* getPrimaryPalm() const; |
| @@ -39,7 +41,8 @@ private: · 1 unmodified line | |||
| 39 | int getNumberOfActivePalms() const; | 41 | int getNumberOfActivePalms() const; |
| 40 | const PalmData* getActivePalm(int palmIndex) const; | 42 | const PalmData* getActivePalm(int palmIndex) const; |
| 41 | 43 | ||
| 42 | const int NUMBER_OF_SPATIALCONTROLS_PER_PALM = 0; | 44 | const int NUMBER_OF_SPATIALCONTROLS_PER_PALM = 2; // the hand and the tip |
| 45 | |||
| 43 | const int NUMBER_OF_JOYSTICKS_PER_PALM = 1; | 46 | const int NUMBER_OF_JOYSTICKS_PER_PALM = 1; |
| 44 | const int NUMBER_OF_TRIGGERS_PER_PALM = 1; | 47 | const int NUMBER_OF_TRIGGERS_PER_PALM = 1; |
| 45 | const int NUMBER_OF_BUTTONS_PER_PALM = 6; | 48 | const int NUMBER_OF_BUTTONS_PER_PALM = 6; |