Showing the changes to interface/src/Application.cpp (1 of 78 files). Show all
Unified · Split
| @@ -1022,6 +1022,7 @@ void Application::paintGL() { · 1021 unmodified lines | |||
| 1022 | 1022 | ||
| 1023 | void Application::runTests() { | 1023 | void Application::runTests() { |
| 1024 | runTimingTests(); | 1024 | runTimingTests(); |
| 1025 | runUnitTests(); | ||
| 1025 | } | 1026 | } |
| 1026 | 1027 | ||
| 1027 | void Application::audioMuteToggled() { | 1028 | void Application::audioMuteToggled() { |
| @@ -1190,7 +1191,6 @@ bool Application::event(QEvent* event) { · 162 unmodified lines | |||
| 1190 | } | 1191 | } |
| 1191 | 1192 | ||
| 1192 | bool Application::eventFilter(QObject* object, QEvent* event) { | 1193 | bool Application::eventFilter(QObject* object, QEvent* event) { |
| 1193 | |||
| 1194 | if (event->type() == QEvent::ShortcutOverride) { | 1194 | if (event->type() == QEvent::ShortcutOverride) { |
| 1195 | if (DependencyManager::get<OffscreenUi>()->shouldSwallowShortcut(event)) { | 1195 | if (DependencyManager::get<OffscreenUi>()->shouldSwallowShortcut(event)) { |
| 1196 | event->accept(); | 1196 | event->accept(); |
| @@ -1795,6 +1795,7 @@ void Application::checkFPS() { · 598 unmodified lines | |||
| 1795 | } | 1795 | } |
| 1796 | 1796 | ||
| 1797 | void Application::idle() { | 1797 | void Application::idle() { |
| 1798 | PROFILE_RANGE(__FUNCTION__); | ||
| 1798 | static SimpleAverage<float> interIdleDurations; | 1799 | static SimpleAverage<float> interIdleDurations; |
| 1799 | static uint64_t lastIdleEnd{ 0 }; | 1800 | static uint64_t lastIdleEnd{ 0 }; |
| 1800 | 1801 | ||
| @@ -3403,14 +3404,6 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se · 1602 unmodified lines | |||
| 3403 | // load the view frustum | 3404 | // load the view frustum |
| 3404 | loadViewFrustum(theCamera, _displayViewFrustum); | 3405 | loadViewFrustum(theCamera, _displayViewFrustum); |
| 3405 | 3406 | ||
| 3406 | // flip x if in mirror mode (also requires reversing winding order for backface culling) | ||
| 3407 | if (theCamera.getMode() == CAMERA_MODE_MIRROR) { | ||
| 3408 | //glScalef(-1.0f, 1.0f, 1.0f); | ||
| 3409 | //glFrontFace(GL_CW); | ||
| 3410 | } else { | ||
| 3411 | glFrontFace(GL_CCW); | ||
| 3412 | } | ||
| 3413 | |||
| 3414 | // transform view according to theCamera | 3407 | // transform view according to theCamera |
| 3415 | // could be myCamera (if in normal mode) | 3408 | // could be myCamera (if in normal mode) |
| 3416 | // or could be viewFrustumOffsetCamera if in offset mode | 3409 | // or could be viewFrustumOffsetCamera if in offset mode |
| @@ -3428,9 +3421,6 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se · 11 unmodified lines | |||
| 3428 | Transform viewTransform; | 3421 | Transform viewTransform; |
| 3429 | viewTransform.setTranslation(theCamera.getPosition()); | 3422 | viewTransform.setTranslation(theCamera.getPosition()); |
| 3430 | viewTransform.setRotation(rotation); | 3423 | viewTransform.setRotation(rotation); |
| 3431 | if (theCamera.getMode() == CAMERA_MODE_MIRROR) { | ||
| 3432 | // viewTransform.setScale(Transform::Vec3(-1.0f, 1.0f, 1.0f)); | ||
| 3433 | } | ||
| 3434 | if (renderArgs->_renderSide != RenderArgs::MONO) { | 3424 | if (renderArgs->_renderSide != RenderArgs::MONO) { |
| 3435 | glm::mat4 invView = glm::inverse(_untranslatedViewMatrix); | 3425 | glm::mat4 invView = glm::inverse(_untranslatedViewMatrix); |
| 3436 | 3426 | ||