History

more camera fixes

stojce committed 13 years ago

Commit b7286891 parent 1cea3b41 file · +3 −4Browse files

Unified · Split

interface/src/Application.cpp+3−4
@@ -433,8 +433,8 @@ void Application::paintGL() { · 432 unmodified lines
433 _glowEffect.render();433 _glowEffect.render();
434 434
435 if (Menu::getInstance()->isOptionChecked(MenuOption::Mirror)) {435 if (Menu::getInstance()->isOptionChecked(MenuOption::Mirror)) {
436 glm::vec3 targetPosition = _myAvatar.getHeadJointPosition();436 glm::vec3 targetPosition = _myAvatar.getUprightHeadPosition();
437 _mirrorCamera.setDistance(0.3f);437 _mirrorCamera.setDistance(0.2f);
438 _mirrorCamera.setTargetPosition(targetPosition);438 _mirrorCamera.setTargetPosition(targetPosition);
439 _mirrorCamera.setTargetRotation(_myAvatar.getWorldAlignedOrientation() * glm::quat(glm::vec3(0.0f, PIf, 0.0f)));439 _mirrorCamera.setTargetRotation(_myAvatar.getWorldAlignedOrientation() * glm::quat(glm::vec3(0.0f, PIf, 0.0f)));
440 _mirrorCamera.update(1.0f/_fps);440 _mirrorCamera.update(1.0f/_fps);
@@ -1655,8 +1655,7 @@ void Application::init() { · 1214 unmodified lines
1655 1655
1656 _mirrorCamera.setMode(CAMERA_MODE_MIRROR);1656 _mirrorCamera.setMode(CAMERA_MODE_MIRROR);
1657 _mirrorCamera.setAspectRatio((float)MIRROR_VIEW_WIDTH / (float)MIRROR_VIEW_HEIGHT);1657 _mirrorCamera.setAspectRatio((float)MIRROR_VIEW_WIDTH / (float)MIRROR_VIEW_HEIGHT);
1658 _mirrorCamera.setFieldOfView(45);1658 _mirrorCamera.setFieldOfView(70);
1659 _mirrorCamera.setDistance(3.3f);
1660 _mirrorViewRect = QRect(MIRROR_VIEW_LEFT_PADDING, MIRROR_VIEW_TOP_PADDING, MIRROR_VIEW_WIDTH, MIRROR_VIEW_HEIGHT);1659 _mirrorViewRect = QRect(MIRROR_VIEW_LEFT_PADDING, MIRROR_VIEW_TOP_PADDING, MIRROR_VIEW_WIDTH, MIRROR_VIEW_HEIGHT);
1661 1660
1662 switchToResourcesParentIfRequired();1661 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