Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 16:36:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

simplified hand index constants

Browse source
This commit is contained in:
Andrew Meadows 2014-05-27 16:32:29 -07:00
parent 9f72d6ca3f
commit d1a8c18d10
3 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/devices/PrioVR.cpp
View file

@ -63,7 +63,7 @@ static void setPalm(float deltaTime, int index) {
if (!Application::getInstance()->getJoystickManager()->getJoystickStates().isEmpty()) { if (!Application::getInstance()->getJoystickManager()->getJoystickStates().isEmpty()) {
const JoystickState& state = Application::getInstance()->getJoystickManager()->getJoystickStates().at(0); const JoystickState& state = Application::getInstance()->getJoystickManager()->getJoystickStates().at(0);
if (state.axes.size() >= 4 && state.buttons.size() >= 4) { if (state.axes.size() >= 4 && state.buttons.size() >= 4) {
if (index == SIXENSE_CONTROLLER_ID_LEFT_HAND) { if (index == LEFT_HAND_INDEX) {
palm->setControllerButtons(state.buttons.at(1) ? BUTTON_FWD : 0); palm->setControllerButtons(state.buttons.at(1) ? BUTTON_FWD : 0);
palm->setTrigger(state.buttons.at(0) ? 1.0f : 0.0f); palm->setTrigger(state.buttons.at(0) ? 1.0f : 0.0f);
palm->setJoystick(state.axes.at(0), -state.axes.at(1)); palm->setJoystick(state.axes.at(0), -state.axes.at(1));
@ -82,7 +82,7 @@ static void setPalm(float deltaTime, int index) {
Model* skeletonModel = &Application::getInstance()->getAvatar()->getSkeletonModel(); Model* skeletonModel = &Application::getInstance()->getAvatar()->getSkeletonModel();
int jointIndex; int jointIndex;
glm::quat inverseRotation = glm::inverse(Application::getInstance()->getAvatar()->getOrientation()); glm::quat inverseRotation = glm::inverse(Application::getInstance()->getAvatar()->getOrientation());
if (index == SIXENSE_CONTROLLER_ID_LEFT_HAND) { if (index == LEFT_HAND_INDEX) {
jointIndex = skeletonModel->getLeftHandJointIndex(); jointIndex = skeletonModel->getLeftHandJointIndex();
skeletonModel->getJointRotation(jointIndex, rotation, true); skeletonModel->getJointRotation(jointIndex, rotation, true);
rotation = inverseRotation * rotation * glm::quat(glm::vec3(0.0f, PI_OVER_TWO, 0.0f)); rotation = inverseRotation * rotation * glm::quat(glm::vec3(0.0f, PI_OVER_TWO, 0.0f));
@ -180,8 +180,8 @@ void PrioVR::update(float deltaTime) {
} }
// convert the joysticks into palm data // convert the joysticks into palm data
setPalm(deltaTime, SIXENSE_CONTROLLER_ID_LEFT_HAND); setPalm(deltaTime, LEFT_HAND_INDEX);
setPalm(deltaTime, SIXENSE_CONTROLLER_ID_RIGHT_HAND); setPalm(deltaTime, RIGHT_HAND_INDEX);
#endif #endif
} }

4
libraries/avatars/src/HandData.cpp
View file

@ -53,10 +53,10 @@ void HandData::getLeftRightPalmIndices(int& leftPalmIndex, int& rightPalmIndex)
for (size_t i = 0; i < _palms.size(); i++) { for (size_t i = 0; i < _palms.size(); i++) {
const PalmData& palm = _palms[i]; const PalmData& palm = _palms[i];
if (palm.isActive()) { if (palm.isActive()) {
if (palm.getSixenseID() == SIXENSE_CONTROLLER_ID_LEFT_HAND) { if (palm.getSixenseID() == LEFT_HAND_INDEX) {
leftPalmIndex = i; leftPalmIndex = i;
} }
if (palm.getSixenseID() == SIXENSE_CONTROLLER_ID_RIGHT_HAND) { if (palm.getSixenseID() == RIGHT_HAND_INDEX) {
rightPalmIndex = i; rightPalmIndex = i;
} }
} }

8
libraries/avatars/src/HandData.h
View file

@ -23,16 +23,12 @@
class AvatarData; class AvatarData;
class PalmData; class PalmData;
const int LEFT_HAND_INDEX = 0;
const int RIGHT_HAND_INDEX = 1;
const int NUM_HANDS = 2; const int NUM_HANDS = 2;
const int NUM_FINGERS_PER_HAND = 5;
const int NUM_FINGERS = NUM_HANDS * NUM_FINGERS_PER_HAND;
const int LEAPID_INVALID = -1;
const int SIXENSEID_INVALID = -1; const int SIXENSEID_INVALID = -1;
const int SIXENSE_CONTROLLER_ID_LEFT_HAND = 0;
const int SIXENSE_CONTROLLER_ID_RIGHT_HAND = 1;
class HandData { class HandData {
public: public:
HandData(AvatarData* owningAvatar); HandData(AvatarData* owningAvatar);