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

Swap the palms if they're in the wrong order.

Browse source
This commit is contained in:
Andrzej Kapolka 2013-11-06 17:34:40 -08:00
parent afd3f6937c
commit 1ae8a211bb
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
interface/src/avatar/SkeletonModel.cpp
View file

@ -29,10 +29,11 @@ void SkeletonModel::simulate(float deltaTime) {
Model::simulate(deltaTime);
// find the active Leap palms, if any
HandData& hand = _owningAvatar->getHand();
int firstActivePalmIndex = -1;
int secondActivePalmIndex = -1;
for (int i = 0; i < _owningAvatar->getHand().getNumPalms(); i++) {
if (_owningAvatar->getHand().getPalms()[i].isActive()) {
for (int i = 0; i < hand.getNumPalms(); i++) {
if (hand.getPalms()[i].isActive()) {
if (firstActivePalmIndex == -1) {
firstActivePalmIndex = i;
} else {
@ -43,6 +44,7 @@ void SkeletonModel::simulate(float deltaTime) {
}
const float HAND_RESTORATION_RATE = 0.25f;
if (firstActivePalmIndex == -1) {
// no Leap data; set hands from mouse
if (_owningAvatar->getHandState() == HAND_STATE_NULL) {
@ -54,16 +56,17 @@ void SkeletonModel::simulate(float deltaTime) {
} else if (secondActivePalmIndex == -1) {
// right hand only
applyPalmData(_geometry->getFBXGeometry().rightHandJointIndex,
_owningAvatar->getHand().getPalms()[firstActivePalmIndex]);
applyPalmData(_geometry->getFBXGeometry().rightHandJointIndex, hand.getPalms()[firstActivePalmIndex]);
restoreLeftHandPosition(HAND_RESTORATION_RATE);
} else {
// both hands
applyPalmData(_geometry->getFBXGeometry().leftHandJointIndex,
_owningAvatar->getHand().getPalms()[firstActivePalmIndex]);
applyPalmData(_geometry->getFBXGeometry().rightHandJointIndex,
_owningAvatar->getHand().getPalms()[secondActivePalmIndex]);
// both hands; make sure left is first
if (hand.getPalms()[firstActivePalmIndex].getRawPosition().x >
hand.getPalms()[secondActivePalmIndex].getRawPosition().x) {
qSwap(firstActivePalmIndex, secondActivePalmIndex);
}
applyPalmData(_geometry->getFBXGeometry().leftHandJointIndex, hand.getPalms()[firstActivePalmIndex]);
applyPalmData(_geometry->getFBXGeometry().rightHandJointIndex, hand.getPalms()[secondActivePalmIndex]);
}
}
@ -119,7 +122,7 @@ bool SkeletonModel::render(float alpha) {
void SkeletonModel::applyPalmData(int jointIndex, const PalmData& palm) {
setJointPosition(jointIndex, palm.getPosition());
setJointRotation(jointIndex, rotationBetween(IDENTITY_UP, palm.getNormal()));
setJointRotation(jointIndex, rotationBetween(_rotation * IDENTITY_UP, -palm.getNormal()));
}
void SkeletonModel::updateJointState(int index) {