History

Pull the mirror camera back and narrow its field of view to reduce distortion. Also, have it point at the avatar's eyes like the full screen mirror.

Andrzej Kapolka committed 13 years ago

Commit b6f24981 parent 09240db1 file · +3 −4Browse files

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

Unified · Split

interface/src/Application.cpp+3−4
@@ -435,9 +435,8 @@ void Application::paintGL() { · 434 unmodified lines
435 _glowEffect.render();435 _glowEffect.render();
436 436
437 if (Menu::getInstance()->isOptionChecked(MenuOption::Mirror)) {437 if (Menu::getInstance()->isOptionChecked(MenuOption::Mirror)) {
438 glm::vec3 targetPosition = _myAvatar.getUprightHeadPosition();438 _mirrorCamera.setDistance(0.3f);
439 _mirrorCamera.setDistance(0.2f);439 _mirrorCamera.setTargetPosition(_myAvatar.getHead().calculateAverageEyePosition());
440 _mirrorCamera.setTargetPosition(targetPosition);
441 _mirrorCamera.setTargetRotation(_myAvatar.getWorldAlignedOrientation() * glm::quat(glm::vec3(0.0f, PIf, 0.0f)));440 _mirrorCamera.setTargetRotation(_myAvatar.getWorldAlignedOrientation() * glm::quat(glm::vec3(0.0f, PIf, 0.0f)));
442 _mirrorCamera.update(1.0f/_fps);441 _mirrorCamera.update(1.0f/_fps);
443 442
@@ -1674,7 +1673,7 @@ void Application::init() { · 1230 unmodified lines
1674 1673
1675 _mirrorCamera.setMode(CAMERA_MODE_MIRROR);1674 _mirrorCamera.setMode(CAMERA_MODE_MIRROR);
1676 _mirrorCamera.setAspectRatio((float)MIRROR_VIEW_WIDTH / (float)MIRROR_VIEW_HEIGHT);1675 _mirrorCamera.setAspectRatio((float)MIRROR_VIEW_WIDTH / (float)MIRROR_VIEW_HEIGHT);
1677 _mirrorCamera.setFieldOfView(70);1676 _mirrorCamera.setFieldOfView(30);
1678 _mirrorViewRect = QRect(MIRROR_VIEW_LEFT_PADDING, MIRROR_VIEW_TOP_PADDING, MIRROR_VIEW_WIDTH, MIRROR_VIEW_HEIGHT);1677 _mirrorViewRect = QRect(MIRROR_VIEW_LEFT_PADDING, MIRROR_VIEW_TOP_PADDING, MIRROR_VIEW_WIDTH, MIRROR_VIEW_HEIGHT);
1679 1678
1680 switchToResourcesParentIfRequired();1679 switchToResourcesParentIfRequired();

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