History

add support for palm and tip spatial data to JS interface

ZappoMan committed 12 years ago

Commit 85498941 parent efdef1a3 files · +51 −2Browse files

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

Unified · Split

interface/src/ControllerScriptingInterface.h+4−1
@@ -32,6 +32,8 @@ public slots: · 31 unmodified lines
3232
3333 virtual int getNumberOfSpatialControls() const;
3434 virtual glm::vec3 getSpatialControlPosition(int controlIndex) const;
35+ virtual glm::vec3 getSpatialControlVelocity(int controlIndex) const;
36+ virtual glm::vec3 getSpatialControlNormal(int controlIndex) const;
3537
3638 private:
3739 const PalmData* getPrimaryPalm() const;
@@ -39,7 +41,8 @@ private: · 1 unmodified line
3941 int getNumberOfActivePalms() const;
4042 const PalmData* getActivePalm(int palmIndex) const;
4143
42− const int NUMBER_OF_SPATIALCONTROLS_PER_PALM = 0;
44+ const int NUMBER_OF_SPATIALCONTROLS_PER_PALM = 2; // the hand and the tip
45+
4346 const int NUMBER_OF_JOYSTICKS_PER_PALM = 1;
4447 const int NUMBER_OF_TRIGGERS_PER_PALM = 1;
4548 const int NUMBER_OF_BUTTONS_PER_PALM = 6;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t