History

merged from master

Jose Carlos committed 12 years ago

Commit 828508b2 parents ba0b01d 2f5a02138 files · +948 −295Browse files

Showing the changes to interface/src/Application.cpp (1 of 38 files). Show all

Unified · Split

interface/src/Application.cpp+48−25
@@ -450,22 +450,22 @@ void Application::paintGL() { · 449 unmodified lines
450450 _myCamera.setUpShift(0.0f);
451451 _myCamera.setDistance(0.0f);
452452 _myCamera.setTightness(0.0f); // Camera is directly connected to head without smoothing
453− _myCamera.setTargetPosition(_myAvatar->getHead().calculateAverageEyePosition());
454− _myCamera.setTargetRotation(_myAvatar->getHead().getOrientation());
453+ _myCamera.setTargetPosition(_myAvatar->getHead()->calculateAverageEyePosition());
454+ _myCamera.setTargetRotation(_myAvatar->getHead()->getOrientation());
455455
456456 } else if (_myCamera.getMode() == CAMERA_MODE_FIRST_PERSON) {
457457 _myCamera.setTightness(0.0f); // In first person, camera follows (untweaked) head exactly without delay
458− _myCamera.setTargetPosition(_myAvatar->getHead().calculateAverageEyePosition());
459− _myCamera.setTargetRotation(_myAvatar->getHead().getCameraOrientation());
458+ _myCamera.setTargetPosition(_myAvatar->getHead()->calculateAverageEyePosition());
459+ _myCamera.setTargetRotation(_myAvatar->getHead()->getCameraOrientation());
460460
461461 } else if (_myCamera.getMode() == CAMERA_MODE_THIRD_PERSON) {
462462 _myCamera.setTightness(0.0f); // Camera is directly connected to head without smoothing
463463 _myCamera.setTargetPosition(_myAvatar->getUprightHeadPosition());
464− _myCamera.setTargetRotation(_myAvatar->getHead().getCameraOrientation());
464+ _myCamera.setTargetRotation(_myAvatar->getHead()->getCameraOrientation());
465465
466466 } else if (_myCamera.getMode() == CAMERA_MODE_MIRROR) {
467467 _myCamera.setTightness(0.0f);
468− float headHeight = _myAvatar->getHead().calculateAverageEyePosition().y - _myAvatar->getPosition().y;
468+ float headHeight = _myAvatar->getHead()->calculateAverageEyePosition().y - _myAvatar->getPosition().y;
469469 _myCamera.setDistance(MIRROR_FULLSCREEN_DISTANCE * _myAvatar->getScale());
470470 _myCamera.setTargetPosition(_myAvatar->getPosition() + glm::vec3(0, headHeight, 0));
471471 _myCamera.setTargetRotation(_myAvatar->getWorldAlignedOrientation() * glm::quat(glm::vec3(0.0f, PIf, 0.0f)));
@@ -529,14 +529,14 @@ void Application::paintGL() { · 57 unmodified lines
529529 _mirrorCamera.setTargetPosition(_myAvatar->getChestPosition());
530530 } else { // HEAD zoom level
531531 _mirrorCamera.setDistance(MIRROR_REARVIEW_DISTANCE * _myAvatar->getScale());
532− if (_myAvatar->getSkeletonModel().isActive() && _myAvatar->getHead().getFaceModel().isActive()) {
532+ if (_myAvatar->getSkeletonModel().isActive() && _myAvatar->getHead()->getFaceModel().isActive()) {
533533 // as a hack until we have a better way of dealing with coordinate precision issues, reposition the
534534 // face/body so that the average eye position lies at the origin
535535 eyeRelativeCamera = true;
536536 _mirrorCamera.setTargetPosition(glm::vec3());
537537
538538 } else {
539− _mirrorCamera.setTargetPosition(_myAvatar->getHead().calculateAverageEyePosition());
539+ _mirrorCamera.setTargetPosition(_myAvatar->getHead()->calculateAverageEyePosition());
540540 }
541541 }
542542
@@ -558,26 +558,26 @@ void Application::paintGL() { · 15 unmodified lines
558558 if (eyeRelativeCamera) {
559559 // save absolute translations
560560 glm::vec3 absoluteSkeletonTranslation = _myAvatar->getSkeletonModel().getTranslation();
561− glm::vec3 absoluteFaceTranslation = _myAvatar->getHead().getFaceModel().getTranslation();
561+ glm::vec3 absoluteFaceTranslation = _myAvatar->getHead()->getFaceModel().getTranslation();
562562
563563 // get the eye positions relative to the neck and use them to set the face translation
564564 glm::vec3 leftEyePosition, rightEyePosition;
565− _myAvatar->getHead().getFaceModel().setTranslation(glm::vec3());
566− _myAvatar->getHead().getFaceModel().getEyePositions(leftEyePosition, rightEyePosition);
567− _myAvatar->getHead().getFaceModel().setTranslation((leftEyePosition + rightEyePosition) * -0.5f);
565+ _myAvatar->getHead()->getFaceModel().setTranslation(glm::vec3());
566+ _myAvatar->getHead()->getFaceModel().getEyePositions(leftEyePosition, rightEyePosition);
567+ _myAvatar->getHead()->getFaceModel().setTranslation((leftEyePosition + rightEyePosition) * -0.5f);
568568
569569 // get the neck position relative to the body and use it to set the skeleton translation
570570 glm::vec3 neckPosition;
571571 _myAvatar->getSkeletonModel().setTranslation(glm::vec3());
572572 _myAvatar->getSkeletonModel().getNeckPosition(neckPosition);
573− _myAvatar->getSkeletonModel().setTranslation(_myAvatar->getHead().getFaceModel().getTranslation() -
573+ _myAvatar->getSkeletonModel().setTranslation(_myAvatar->getHead()->getFaceModel().getTranslation() -
574574 neckPosition);
575575
576576 displaySide(_mirrorCamera, true);
577577
578578 // restore absolute translations
579579 _myAvatar->getSkeletonModel().setTranslation(absoluteSkeletonTranslation);
580− _myAvatar->getHead().getFaceModel().setTranslation(absoluteFaceTranslation);
580+ _myAvatar->getHead()->getFaceModel().setTranslation(absoluteFaceTranslation);
581581 } else {
582582 displaySide(_mirrorCamera, true);
583583 }
@@ -1867,7 +1867,7 @@ void Application::init() { · 1283 unmodified lines
18671867 // TODO: move _myAvatar out of Application. Move relevant code to MyAvataar or AvatarManager
18681868 _avatarManager.init();
18691869 _myCamera.setMode(CAMERA_MODE_FIRST_PERSON);
1870− _myCamera.setModeShiftRate(1.0f);
1870+ _myCamera.setModeShiftPeriod(1.0f);
18711871
18721872 _mirrorCamera.setMode(CAMERA_MODE_MIRROR);
18731873 _mirrorCamera.setAspectRatio((float)MIRROR_VIEW_WIDTH / (float)MIRROR_VIEW_HEIGHT);
@@ -1978,8 +1978,8 @@ const float MAX_VOXEL_EDIT_DISTANCE = 50.0f; · 104 unmodified lines
19781978 const float HEAD_SPHERE_RADIUS = 0.07f;
19791979
19801980 bool Application::isLookingAtMyAvatar(Avatar* avatar) {
1981− glm::vec3 theirLookat = avatar->getHead().getLookAtPosition();
1982− glm::vec3 myHeadPosition = _myAvatar->getHead().getPosition();
1981+ glm::vec3 theirLookat = avatar->getHead()->getLookAtPosition();
1982+ glm::vec3 myHeadPosition = _myAvatar->getHead()->getPosition();
19831983
19841984 if (pointInSphere(theirLookat, myHeadPosition, HEAD_SPHERE_RADIUS * _myAvatar->getScale())) {
19851985 return true;
@@ -2040,10 +2040,19 @@ void Application::updateFaceshift() { · 54 unmodified lines
20402040
20412041 // Copy angular velocity if measured by faceshift, to the head
20422042 if (_faceshift.isActive()) {
2043− _myAvatar->getHead().setAngularVelocity(_faceshift.getHeadAngularVelocity());
2043+ _myAvatar->getHead()->setAngularVelocity(_faceshift.getHeadAngularVelocity());
20442044 }
20452045 }
20462046
2047+void Application::updateVisage() {
2048+
2049+ bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
2050+ PerformanceWarning warn(showWarnings, "Application::updateVisage()");
2051+
2052+ // Update Visage
2053+ _visage.update();
2054+}
2055+
20472056 void Application::updateMyAvatarLookAtPosition(glm::vec3& lookAtSpot) {
20482057
20492058 bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
@@ -2057,23 +2066,35 @@ void Application::updateMyAvatarLookAtPosition(glm::vec3& lookAtSpot) { · 7 unmodified lines
20572066 float distance = TREE_SCALE;
20582067 if (_myAvatar->getLookAtTargetAvatar()) {
20592068 distance = glm::distance(_mouseRayOrigin,
2060− static_cast<Avatar*>(_myAvatar->getLookAtTargetAvatar())->getHead().calculateAverageEyePosition());
2069+ static_cast<Avatar*>(_myAvatar->getLookAtTargetAvatar())->getHead()->calculateAverageEyePosition());
20612070
20622071 } else if (_isHoverVoxel) {
20632072 distance = glm::distance(_mouseRayOrigin, getMouseVoxelWorldCoordinates(_hoverVoxel));
20642073 }
20652074 lookAtSpot = _mouseRayOrigin + _mouseRayDirection * distance;
20662075 }
2076+ bool trackerActive = false;
2077+ float eyePitch, eyeYaw;
20672078 if (_faceshift.isActive()) {
2079+ eyePitch = _faceshift.getEstimatedEyePitch();
2080+ eyeYaw = _faceshift.getEstimatedEyeYaw();
2081+ trackerActive = true;
2082+
2083+ } else if (_visage.isActive()) {
2084+ eyePitch = _visage.getEstimatedEyePitch();
2085+ eyeYaw = _visage.getEstimatedEyeYaw();
2086+ trackerActive = true;
2087+ }
2088+ if (trackerActive) {
20682089 // deflect using Faceshift gaze data
2069− glm::vec3 origin = _myAvatar->getHead().calculateAverageEyePosition();
2090+ glm::vec3 origin = _myAvatar->getHead()->calculateAverageEyePosition();
20702091 float pitchSign = (_myCamera.getMode() == CAMERA_MODE_MIRROR) ? -1.0f : 1.0f;
20712092 float deflection = Menu::getInstance()->getFaceshiftEyeDeflection();
20722093 lookAtSpot = origin + _myCamera.getRotation() * glm::quat(glm::radians(glm::vec3(
2073− _faceshift.getEstimatedEyePitch() * pitchSign * deflection, _faceshift.getEstimatedEyeYaw() * deflection, 0.0f))) *
2094+ eyePitch * pitchSign * deflection, eyeYaw * deflection, 0.0f))) *
20742095 glm::inverse(_myCamera.getRotation()) * (lookAtSpot - origin);
20752096 }
2076− _myAvatar->getHead().setLookAtPosition(lookAtSpot);
2097+ _myAvatar->getHead()->setLookAtPosition(lookAtSpot);
20772098 }
20782099
20792100 void Application::updateHoverVoxels(float deltaTime, float& distance, BoxFace& face) {
@@ -2229,17 +2250,17 @@ void Application::cameraMenuChanged() { · 149 unmodified lines
22292250 if (Menu::getInstance()->isOptionChecked(MenuOption::FullscreenMirror)) {
22302251 if (_myCamera.getMode() != CAMERA_MODE_MIRROR) {
22312252 _myCamera.setMode(CAMERA_MODE_MIRROR);
2232− _myCamera.setModeShiftRate(100.0f);
2253+ _myCamera.setModeShiftPeriod(0.00f);
22332254 }
22342255 } else if (Menu::getInstance()->isOptionChecked(MenuOption::FirstPerson)) {
22352256 if (_myCamera.getMode() != CAMERA_MODE_FIRST_PERSON) {
22362257 _myCamera.setMode(CAMERA_MODE_FIRST_PERSON);
2237− _myCamera.setModeShiftRate(1.0f);
2258+ _myCamera.setModeShiftPeriod(1.0f);
22382259 }
22392260 } else {
22402261 if (_myCamera.getMode() != CAMERA_MODE_THIRD_PERSON) {
22412262 _myCamera.setMode(CAMERA_MODE_THIRD_PERSON);
2242− _myCamera.setModeShiftRate(1.0f);
2263+ _myCamera.setModeShiftPeriod(1.0f);
22432264 }
22442265 }
22452266 }
@@ -2321,6 +2342,7 @@ void Application::update(float deltaTime) { · 75 unmodified lines
23212342 glm::vec3 lookAtSpot;
23222343
23232344 updateFaceshift();
2345+ updateVisage();
23242346 _myAvatar->updateLookAtTargetAvatar(lookAtSpot);
23252347 updateMyAvatarLookAtPosition(lookAtSpot);
23262348
@@ -3833,6 +3855,7 @@ void Application::resetSensors() { · 1506 unmodified lines
38333855 _mouseY = _glWidget->height() / 2;
38343856
38353857 _faceshift.reset();
3858+ _visage.reset();
38363859
38373860 if (OculusManager::isConnected()) {
38383861 OculusManager::reset();

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