Showing the changes to interface/src/Application.cpp (1 of 2 files). Show all
Unified · Split
| @@ -444,6 +444,8 @@ void Application::paintGL() { · 443 unmodified lines | ||
| 444 | 444 | glViewport(MIRROR_VIEW_LEFT_PADDING, _glWidget->height() - MIRROR_VIEW_HEIGHT - MIRROR_VIEW_TOP_PADDING, MIRROR_VIEW_WIDTH, MIRROR_VIEW_HEIGHT); |
| 445 | 445 | glScissor(MIRROR_VIEW_LEFT_PADDING, _glWidget->height() - MIRROR_VIEW_HEIGHT - MIRROR_VIEW_TOP_PADDING, MIRROR_VIEW_WIDTH, MIRROR_VIEW_HEIGHT); |
| 446 | 446 | |
| 447 | + updateProjectionMatrix(_mirrorCamera); | |
| 448 | + | |
| 447 | 449 | glEnable(GL_SCISSOR_TEST); |
| 448 | 450 | glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); |
| 449 | 451 | glPushMatrix(); |
| @@ -453,6 +455,8 @@ void Application::paintGL() { · 3 unmodified lines | ||
| 453 | 455 | // reset Viewport |
| 454 | 456 | glViewport(0, 0, _glWidget->width(), _glWidget->height()); |
| 455 | 457 | glDisable(GL_SCISSOR_TEST); |
| 458 | + | |
| 459 | + updateProjectionMatrix(); | |
| 456 | 460 | } |
| 457 | 461 | |
| 458 | 462 | displayOverlay(); |
| @@ -485,11 +489,15 @@ void Application::resizeGL(int width, int height) { · 26 unmodified lines | ||
| 485 | 489 | } |
| 486 | 490 | |
| 487 | 491 | void Application::updateProjectionMatrix() { |
| 492 | + updateProjectionMatrix(_myCamera); | |
| 493 | +} | |
| 494 | + | |
| 495 | +void Application::updateProjectionMatrix(Camera& camera) { | |
| 488 | 496 | glMatrixMode(GL_PROJECTION); |
| 489 | 497 | glLoadIdentity(); |
| 490 | 498 | |
| 491 | 499 | // Tell our viewFrustum about this change, using the application camera |
| 492 | − loadViewFrustum(_myCamera, _viewFrustum); | |
| 500 | + loadViewFrustum(camera, _viewFrustum); | |
| 493 | 501 | |
| 494 | 502 | float left, right, bottom, top, nearVal, farVal; |
| 495 | 503 | glm::vec4 nearClipPlane, farClipPlane; |
| @@ -1631,7 +1639,7 @@ void Application::init() { · 1135 unmodified lines | ||
| 1631 | 1639 | _myAvatar.setDisplayingLookatVectors(false); |
| 1632 | 1640 | _mirrorCamera.setMode(CAMERA_MODE_MIRROR); |
| 1633 | 1641 | _mirrorCamera.setModeShiftRate(1.0f); |
| 1634 | − _mirrorCamera.setAspectRatio(MIRROR_VIEW_WIDTH / MIRROR_VIEW_HEIGHT); | |
| 1642 | + _mirrorCamera.setAspectRatio((float)MIRROR_VIEW_WIDTH / (float)MIRROR_VIEW_HEIGHT); | |
| 1635 | 1643 | _mirrorCamera.setFieldOfView(DEFAULT_FIELD_OF_VIEW_DEGREES); |
| 1636 | 1644 | |
| 1637 | 1645 | OculusManager::connect(); |
| @@ -2601,7 +2609,7 @@ void Application::displaySide(Camera& whichCamera) { · 963 unmodified lines | ||
| 2601 | 2609 | glMaterialfv(GL_FRONT, GL_SPECULAR, WHITE_SPECULAR_COLOR); |
| 2602 | 2610 | |
| 2603 | 2611 | // indicate what we'll be adding/removing in mouse mode, if anything |
| 2604 | − if (_mouseVoxel.s != 0) { | |
| 2612 | + if (_mouseVoxel.s != 0 && whichCamera.getMode() != CAMERA_MODE_MIRROR) { | |
| 2605 | 2613 | PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), |
| 2606 | 2614 | "Application::displaySide() ... voxels TOOLS UX..."); |
| 2607 | 2615 | |
| @@ -2649,7 +2657,7 @@ void Application::displaySide(Camera& whichCamera) { · 41 unmodified lines | ||
| 2649 | 2657 | glEnable(GL_LIGHTING); |
| 2650 | 2658 | } |
| 2651 | 2659 | |
| 2652 | − if (Menu::getInstance()->isOptionChecked(MenuOption::VoxelSelectMode) && _pasteMode) { | |
| 2660 | + if (Menu::getInstance()->isOptionChecked(MenuOption::VoxelSelectMode) && _pasteMode && whichCamera.getMode() != CAMERA_MODE_MIRROR) { | |
| 2653 | 2661 | PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), |
| 2654 | 2662 | "Application::displaySide() ... PASTE Preview..."); |
| 2655 | 2663 | |