Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-07 15:10:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Check palms' active state, apply rotations.

Browse source
This commit is contained in:
Andrzej Kapolka 2013-11-06 16:57:30 -08:00
parent 2b4db0ea0e
commit 2e9625ebd5
1 changed files with 36 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -27,27 +27,43 @@ void SkeletonModel::simulate(float deltaTime) {
setScale(glm::vec3(1.0f, 1.0f, 1.0f) * _owningAvatar->getScale() * MODEL_SCALE);
Model::simulate(deltaTime);
// find the active Leap palms, if any
int firstActivePalmIndex = -1;
int secondActivePalmIndex = -1;
for (int i = 0; i < _owningAvatar->getHand().getNumPalms(); i++) {
if (_owningAvatar->getHand().getPalms()[i].isActive()) {
if (firstActivePalmIndex == -1) {
firstActivePalmIndex = i;
} else {
secondActivePalmIndex = i;
break;
}
}
}
const float HAND_RESTORATION_RATE = 0.25f;
switch (_owningAvatar->getHand().getNumPalms()) {
case 0: // no Leap data; set hands from mouse
if (_owningAvatar->getHandState() == HAND_STATE_NULL) {
restoreRightHandPosition(HAND_RESTORATION_RATE);
} else {
setRightHandPosition(_owningAvatar->getHandPosition());
}
restoreLeftHandPosition(HAND_RESTORATION_RATE);
break;
case 1: // right hand only
applyPalmData(_geometry->getFBXGeometry().rightHandJointIndex, _owningAvatar->getHand().getPalms()[0]);
restoreLeftHandPosition(HAND_RESTORATION_RATE);
break;
default: // both hands
applyPalmData(_geometry->getFBXGeometry().leftHandJointIndex, _owningAvatar->getHand().getPalms()[0]);
applyPalmData(_geometry->getFBXGeometry().rightHandJointIndex, _owningAvatar->getHand().getPalms()[1]);
break;
if (firstActivePalmIndex == -1) {
// no Leap data; set hands from mouse
if (_owningAvatar->getHandState() == HAND_STATE_NULL) {
restoreRightHandPosition(HAND_RESTORATION_RATE);
} else {
setRightHandPosition(_owningAvatar->getHandPosition());
}
restoreLeftHandPosition(HAND_RESTORATION_RATE);
} else if (secondActivePalmIndex == -1) {
// right hand only
applyPalmData(_geometry->getFBXGeometry().rightHandJointIndex,
_owningAvatar->getHand().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]);
}
}
@ -103,6 +119,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()));
}
void SkeletonModel::updateJointState(int index) {