History

click mirror behaviour

- shrink function - restore mirror window view and set forward fullscreen view

stojce committed 13 years ago

Commit b09e6571 parent f675b194 files · +78 −61Browse files

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

Unified · Split

interface/src/Application.cpp+21−3
@@ -453,12 +453,14 @@ void Application::paintGL() { · 452 unmodified lines
453453 displaySide(_mirrorCamera, selfAvatarOnly);
454454 glPopMatrix();
455455
456− _rearMirrorTools->render();
456+ _rearMirrorTools->render(false);
457457
458458 // reset Viewport and projection matrix
459459 glViewport(0, 0, _glWidget->width(), _glWidget->height());
460460 glDisable(GL_SCISSOR_TEST);
461461 updateProjectionMatrix(_myCamera, updateViewFrustum);
462+ } else if (Menu::getInstance()->isOptionChecked(MenuOption::FullscreenMirror)) {
463+ _rearMirrorTools->render(true);
462464 }
463465
464466 displayOverlay();
@@ -1721,19 +1723,35 @@ void Application::init() { · 1256 unmodified lines
17211723 _rearMirrorTools = new RearMirrorTools(_glWidget, _mirrorViewRect);
17221724 connect(_rearMirrorTools, SIGNAL(closeView()), SLOT(closeMirrorView()));
17231725 connect(_rearMirrorTools, SIGNAL(restoreView()), SLOT(restoreMirrorView()));
1726+ connect(_rearMirrorTools, SIGNAL(shrinkView()), SLOT(shrinkMirrorView()));
17241727 }
17251728
17261729 void Application::closeMirrorView() {
1727− Menu::getInstance()->triggerOption(MenuOption::Mirror);
1730+ if (Menu::getInstance()->isOptionChecked(MenuOption::Mirror)) {
1731+ Menu::getInstance()->triggerOption(MenuOption::Mirror);;
1732+ }
17281733 }
17291734
17301735 void Application::restoreMirrorView() {
1731− Menu::getInstance()->triggerOption(MenuOption::Mirror);
1736+ if (Menu::getInstance()->isOptionChecked(MenuOption::Mirror)) {
1737+ Menu::getInstance()->triggerOption(MenuOption::Mirror);;
1738+ }
1739+
17321740 if (!Menu::getInstance()->isOptionChecked(MenuOption::FullscreenMirror)) {
17331741 Menu::getInstance()->triggerOption(MenuOption::FullscreenMirror);
17341742 }
17351743 }
17361744
1745+void Application::shrinkMirrorView() {
1746+ if (!Menu::getInstance()->isOptionChecked(MenuOption::Mirror)) {
1747+ Menu::getInstance()->triggerOption(MenuOption::Mirror);;
1748+ }
1749+
1750+ if (Menu::getInstance()->isOptionChecked(MenuOption::FullscreenMirror)) {
1751+ Menu::getInstance()->triggerOption(MenuOption::FullscreenMirror);
1752+ }
1753+}
1754+
17371755 const float MAX_AVATAR_EDIT_VELOCITY = 1.0f;
17381756 const float MAX_VOXEL_EDIT_DISTANCE = 20.0f;
17391757 const float HEAD_SPHERE_RADIUS = 0.07;

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