History

Merge pull request #1131 from stojce/19443

Code Review for Job #19443

Andrzej Kapolka committed 13 years ago

Commit 47719822 parents 0840fc6 4fe99645 files · +190 −59Browse files

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

Unified · Split

interface/src/Application.cpp+40−58
@@ -89,8 +89,6 @@ const int MIRROR_VIEW_TOP_PADDING = 5; · 88 unmodified lines
8989 const int MIRROR_VIEW_LEFT_PADDING = 10;
9090 const int MIRROR_VIEW_WIDTH = 265;
9191 const int MIRROR_VIEW_HEIGHT = 215;
92−const int MIRROR_ICON_SIZE = 16;
93−const int MIRROR_CLOSE_ICON_PADDING = 5;
9492
9593 void messageHandler(QtMsgType type, const QMessageLogContext& context, const QString &message) {
9694 fprintf(stdout, "%s", message.toLocal8Bit().constData());
@@ -109,6 +107,7 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 12 unmodified lines
109107 _wantToKillLocalVoxels(false),
110108 _audioScope(256, 200, true),
111109 _profile(QString()),
110+ _mirrorViewRect(QRect(MIRROR_VIEW_LEFT_PADDING, MIRROR_VIEW_TOP_PADDING, MIRROR_VIEW_WIDTH, MIRROR_VIEW_HEIGHT)),
112111 _mouseX(0),
113112 _mouseY(0),
114113 _lastMouseMove(usecTimestampNow()),
@@ -454,16 +453,14 @@ void Application::paintGL() { · 339 unmodified lines
454453 displaySide(_mirrorCamera, selfAvatarOnly);
455454 glPopMatrix();
456455
457− // render rear view tools if mouse is in the bounds
458− QPoint mousePosition = _glWidget->mapFromGlobal(QCursor::pos());
459− if (_mirrorViewRect.contains(mousePosition.x(), mousePosition.y())) {
460− displayRearMirrorTools();
461− }
456+ _rearMirrorTools->render(false);
462457
463458 // reset Viewport and projection matrix
464459 glViewport(0, 0, _glWidget->width(), _glWidget->height());
465460 glDisable(GL_SCISSOR_TEST);
466461 updateProjectionMatrix(_myCamera, updateViewFrustum);
462+ } else if (Menu::getInstance()->isOptionChecked(MenuOption::FullscreenMirror)) {
463+ _rearMirrorTools->render(true);
467464 }
468465
469466 displayOverlay();
@@ -489,8 +486,6 @@ void Application::resizeGL(int width, int height) { · 19 unmodified lines
489486 resetCamerasOnResizeGL(_viewFrustumOffsetCamera, width, height);
490487 resetCamerasOnResizeGL(_myCamera, width, height);
491488
492− _mirrorViewRect = QRect(MIRROR_VIEW_LEFT_PADDING, MIRROR_VIEW_TOP_PADDING, MIRROR_VIEW_WIDTH, MIRROR_VIEW_HEIGHT);
493−
494489 glViewport(0, 0, width, height); // shouldn't this account for the menu???
495490
496491 updateProjectionMatrix();
@@ -690,7 +685,6 @@ void Application::keyPressEvent(QKeyEvent* event) { · 193 unmodified lines
690685
691686 case Qt::Key_Space:
692687 resetSensors();
693− _audio.reset();
694688 break;
695689
696690 case Qt::Key_G:
@@ -1085,12 +1079,9 @@ void Application::mousePressEvent(QMouseEvent* event) { · 388 unmodified lines
10851079 return;
10861080 }
10871081
1088− if (Menu::getInstance()->isOptionChecked(MenuOption::Mirror)) {
1089− QRect closeIconRect = QRect(MIRROR_CLOSE_ICON_PADDING + _mirrorViewRect.left(), MIRROR_CLOSE_ICON_PADDING + _mirrorViewRect.top(), MIRROR_ICON_SIZE, MIRROR_ICON_SIZE);
1090−
1091− if (closeIconRect.contains(_mouseX, _mouseY)) {
1092− Menu::getInstance()->triggerOption(MenuOption::Mirror);
1093− }
1082+ if (_rearMirrorTools->mousePressEvent(_mouseX, _mouseY)) {
1083+ // stop propagation
1084+ return;
10941085 }
10951086
10961087 if (!_palette.isActive() && (!_isHoverVoxel || _lookatTargetAvatar)) {
@@ -1675,10 +1666,6 @@ void Application::init() { · 578 unmodified lines
16751666 _mirrorCamera.setMode(CAMERA_MODE_MIRROR);
16761667 _mirrorCamera.setAspectRatio((float)MIRROR_VIEW_WIDTH / (float)MIRROR_VIEW_HEIGHT);
16771668 _mirrorCamera.setFieldOfView(30);
1678− _mirrorViewRect = QRect(MIRROR_VIEW_LEFT_PADDING, MIRROR_VIEW_TOP_PADDING, MIRROR_VIEW_WIDTH, MIRROR_VIEW_HEIGHT);
1679−
1680− switchToResourcesParentIfRequired();
1681− _closeTextureId = _glWidget->bindTexture(QImage("./resources/images/close.png"));
16821669
16831670 OculusManager::connect();
16841671 if (OculusManager::isConnected()) {
@@ -1731,8 +1718,39 @@ void Application::init() { · 46 unmodified lines
17311718 _pieMenu.addAction(_followMode);
17321719
17331720 _audio.init(_glWidget);
1721+
1722+ _rearMirrorTools = new RearMirrorTools(_glWidget, _mirrorViewRect);
1723+ connect(_rearMirrorTools, SIGNAL(closeView()), SLOT(closeMirrorView()));
1724+ connect(_rearMirrorTools, SIGNAL(restoreView()), SLOT(restoreMirrorView()));
1725+ connect(_rearMirrorTools, SIGNAL(shrinkView()), SLOT(shrinkMirrorView()));
1726+ connect(_rearMirrorTools, SIGNAL(resetView()), SLOT(resetSensors()));
17341727 }
17351728
1729+void Application::closeMirrorView() {
1730+ if (Menu::getInstance()->isOptionChecked(MenuOption::Mirror)) {
1731+ Menu::getInstance()->triggerOption(MenuOption::Mirror);;
1732+ }
1733+}
1734+
1735+void Application::restoreMirrorView() {
1736+ if (Menu::getInstance()->isOptionChecked(MenuOption::Mirror)) {
1737+ Menu::getInstance()->triggerOption(MenuOption::Mirror);;
1738+ }
1739+
1740+ if (!Menu::getInstance()->isOptionChecked(MenuOption::FullscreenMirror)) {
1741+ Menu::getInstance()->triggerOption(MenuOption::FullscreenMirror);
1742+ }
1743+}
1744+
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+}
17361754
17371755 const float MAX_AVATAR_EDIT_VELOCITY = 1.0f;
17381756 const float MAX_VOXEL_EDIT_DISTANCE = 20.0f;
@@ -3758,6 +3776,8 @@ void Application::resetSensors() { · 2019 unmodified lines
37583776 _myTransmitter.resetLevels();
37593777 _myAvatar.setVelocity(glm::vec3(0,0,0));
37603778 _myAvatar.setThrust(glm::vec3(0,0,0));
3779+
3780+ _audio.reset();
37613781 }
37623782
37633783 static void setShortcutsEnabled(QWidget* widget, bool enabled) {
@@ -3957,41 +3977,3 @@ void Application::packetSentNotification(ssize_t length) { · 193 unmodified lines
39573977 _bandwidthMeter.outputStream(BandwidthMeter::VOXELS).updateValue(length);
39583978 }
39593979
3960−void Application::displayRearMirrorTools() {
3961−
3962− glMatrixMode(GL_PROJECTION);
3963− glPushMatrix();
3964− glLoadIdentity();
3965− gluOrtho2D(_mirrorViewRect.left(), _mirrorViewRect.right(), _mirrorViewRect.bottom(), _mirrorViewRect.top());
3966− glDisable(GL_DEPTH_TEST);
3967− glDisable(GL_LIGHTING);
3968−
3969− glEnable(GL_TEXTURE_2D);
3970− glBindTexture(GL_TEXTURE_2D, _closeTextureId);
3971−
3972− glColor3f(1, 1, 1);
3973− glBegin(GL_QUADS);
3974−
3975− int lp = MIRROR_CLOSE_ICON_PADDING + _mirrorViewRect.left();
3976− int tp = MIRROR_CLOSE_ICON_PADDING + _mirrorViewRect.top();
3977− int lwp = MIRROR_ICON_SIZE + lp;
3978− int twp = MIRROR_ICON_SIZE + tp;
3979−
3980− glTexCoord2f(1, 1);
3981− glVertex2f(lp, tp);
3982−
3983− glTexCoord2f(0, 1);
3984− glVertex2f(lwp, tp);
3985−
3986− glTexCoord2f(0, 0);
3987− glVertex2f(lwp, twp);
3988−
3989− glTexCoord2f(1, 0);
3990− glVertex2f(lp, twp);
3991−
3992− glEnd();
3993−
3994− glPopMatrix();
3995−
3996− glDisable(GL_TEXTURE_2D);
3997−}

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