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

increase hand restoration rate, improve function name clarity

Browse source
This commit is contained in:
Philip Rosedale 2014-05-08 00:28:02 -07:00
parent 2797d0ab3b
commit 2c6c57eec2
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/avatar/MyAvatar.cpp
View file

@ -109,7 +109,7 @@ void MyAvatar::reset() {
void MyAvatar::update(float deltaTime) { void MyAvatar::update(float deltaTime) {
Head* head = getHead(); Head* head = getHead();
head->relaxLean(deltaTime); head->relaxLean(deltaTime);
updateFromGyros(deltaTime); updateFromFaceTracker(deltaTime);
if (Menu::getInstance()->isOptionChecked(MenuOption::MoveWithLean)) { if (Menu::getInstance()->isOptionChecked(MenuOption::MoveWithLean)) {
// Faceshift drive is enabled, set the avatar drive based on the head position // Faceshift drive is enabled, set the avatar drive based on the head position
moveWithLean(); moveWithLean();
@ -239,7 +239,7 @@ void MyAvatar::simulate(float deltaTime) {
} }
// Update avatar head rotation with sensor data // Update avatar head rotation with sensor data
void MyAvatar::updateFromGyros(float deltaTime) { void MyAvatar::updateFromFaceTracker(float deltaTime) {
glm::vec3 estimatedPosition, estimatedRotation; glm::vec3 estimatedPosition, estimatedRotation;
FaceTracker* tracker = Application::getInstance()->getActiveFaceTracker(); FaceTracker* tracker = Application::getInstance()->getActiveFaceTracker();

2
interface/src/avatar/MyAvatar.h
View file

@ -38,7 +38,7 @@ public:
void reset(); void reset();
void update(float deltaTime); void update(float deltaTime);
void simulate(float deltaTime); void simulate(float deltaTime);
void updateFromGyros(float deltaTime); void updateFromFaceTracker(float deltaTime);
void moveWithLean(); void moveWithLean();
void render(const glm::vec3& cameraPosition, RenderMode renderMode = NORMAL_RENDER_MODE); void render(const glm::vec3& cameraPosition, RenderMode renderMode = NORMAL_RENDER_MODE);

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

@ -38,24 +38,23 @@ void SkeletonModel::simulate(float deltaTime, bool fullUpdate) {
Hand* hand = _owningAvatar->getHand(); Hand* hand = _owningAvatar->getHand();
hand->getLeftRightPalmIndices(leftPalmIndex, rightPalmIndex); hand->getLeftRightPalmIndices(leftPalmIndex, rightPalmIndex);
const float HAND_RESTORATION_PERIOD = 1.f; // seconds const float HAND_RESTORATION_RATE = 0.25f;
float handRestorePercent = glm::clamp(deltaTime / HAND_RESTORATION_PERIOD, 0.f, 1.f);
const FBXGeometry& geometry = _geometry->getFBXGeometry(); const FBXGeometry& geometry = _geometry->getFBXGeometry();
if (leftPalmIndex == -1) { if (leftPalmIndex == -1) {
// no Leap data; set hands from mouse // no Leap data; set hands from mouse
if (_owningAvatar->getHandState() == HAND_STATE_NULL) { if (_owningAvatar->getHandState() == HAND_STATE_NULL) {
restoreRightHandPosition(handRestorePercent); restoreRightHandPosition(HAND_RESTORATION_RATE);
} else { } else {
applyHandPosition(geometry.rightHandJointIndex, _owningAvatar->getHandPosition()); applyHandPosition(geometry.rightHandJointIndex, _owningAvatar->getHandPosition());
} }
restoreLeftHandPosition(handRestorePercent); restoreLeftHandPosition(HAND_RESTORATION_RATE);
} else if (leftPalmIndex == rightPalmIndex) { } else if (leftPalmIndex == rightPalmIndex) {
// right hand only // right hand only
applyPalmData(geometry.rightHandJointIndex, geometry.rightFingerJointIndices, geometry.rightFingertipJointIndices, applyPalmData(geometry.rightHandJointIndex, geometry.rightFingerJointIndices, geometry.rightFingertipJointIndices,
hand->getPalms()[leftPalmIndex]); hand->getPalms()[leftPalmIndex]);
restoreLeftHandPosition(handRestorePercent); restoreLeftHandPosition(HAND_RESTORATION_RATE);
} else { } else {
applyPalmData(geometry.leftHandJointIndex, geometry.leftFingerJointIndices, geometry.leftFingertipJointIndices, applyPalmData(geometry.leftHandJointIndex, geometry.leftFingerJointIndices, geometry.leftFingertipJointIndices,