Showing the changes to interface/src/Application.cpp (1 of 15 files). Show all
Unified · Split
| @@ -1047,7 +1047,7 @@ void Application::keyPressEvent(QKeyEvent* event) { · 1046 unmodified lines | |||
| 1047 | if (isShifted) { | 1047 | if (isShifted) { |
| 1048 | _viewFrustum.setFocalLength(_viewFrustum.getFocalLength() - 0.1f); | 1048 | _viewFrustum.setFocalLength(_viewFrustum.getFocalLength() - 0.1f); |
| 1049 | if (TV3DManager::isConnected()) { | 1049 | if (TV3DManager::isConnected()) { |
| 1050 | QSharedPointer<GLCanvas> glCanvas = DependencyManager::get<GLCanvas>(); | 1050 | GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>(); |
| 1051 | TV3DManager::configureCamera(_myCamera, glCanvas->getDeviceWidth(), glCanvas->getDeviceHeight()); | 1051 | TV3DManager::configureCamera(_myCamera, glCanvas->getDeviceWidth(), glCanvas->getDeviceHeight()); |
| 1052 | } | 1052 | } |
| 1053 | } else { | 1053 | } else { |
| @@ -1060,7 +1060,7 @@ void Application::keyPressEvent(QKeyEvent* event) { · 6 unmodified lines | |||
| 1060 | if (isShifted) { | 1060 | if (isShifted) { |
| 1061 | _viewFrustum.setFocalLength(_viewFrustum.getFocalLength() + 0.1f); | 1061 | _viewFrustum.setFocalLength(_viewFrustum.getFocalLength() + 0.1f); |
| 1062 | if (TV3DManager::isConnected()) { | 1062 | if (TV3DManager::isConnected()) { |
| 1063 | QSharedPointer<GLCanvas> glCanvas = DependencyManager::get<GLCanvas>(); | 1063 | GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>(); |
| 1064 | TV3DManager::configureCamera(_myCamera, glCanvas->getDeviceWidth(), glCanvas->getDeviceHeight()); | 1064 | TV3DManager::configureCamera(_myCamera, glCanvas->getDeviceWidth(), glCanvas->getDeviceHeight()); |
| 1065 | } | 1065 | } |
| 1066 | 1066 | ||
| @@ -1533,7 +1533,7 @@ void Application::idle() { · 466 unmodified lines | |||
| 1533 | 1533 | ||
| 1534 | void Application::checkBandwidthMeterClick() { | 1534 | void Application::checkBandwidthMeterClick() { |
| 1535 | // ... to be called upon button release | 1535 | // ... to be called upon button release |
| 1536 | QSharedPointer<GLCanvas> glCanvas = DependencyManager::get<GLCanvas>(); | 1536 | GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>(); |
| 1537 | if (Menu::getInstance()->isOptionChecked(MenuOption::Bandwidth) && | 1537 | if (Menu::getInstance()->isOptionChecked(MenuOption::Bandwidth) && |
| 1538 | Menu::getInstance()->isOptionChecked(MenuOption::Stats) && | 1538 | Menu::getInstance()->isOptionChecked(MenuOption::Stats) && |
| 1539 | Menu::getInstance()->isOptionChecked(MenuOption::UserInterface) && | 1539 | Menu::getInstance()->isOptionChecked(MenuOption::UserInterface) && |
| @@ -1569,7 +1569,7 @@ void Application::setFullscreen(bool fullscreen) { · 29 unmodified lines | |||
| 1569 | } | 1569 | } |
| 1570 | 1570 | ||
| 1571 | void Application::setEnable3DTVMode(bool enable3DTVMode) { | 1571 | void Application::setEnable3DTVMode(bool enable3DTVMode) { |
| 1572 | QSharedPointer<GLCanvas> glCanvas = DependencyManager::get<GLCanvas>(); | 1572 | GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>(); |
| 1573 | resizeGL(glCanvas->getDeviceWidth(), glCanvas->getDeviceHeight()); | 1573 | resizeGL(glCanvas->getDeviceWidth(), glCanvas->getDeviceHeight()); |
| 1574 | } | 1574 | } |
| 1575 | 1575 | ||
| @@ -1595,7 +1595,7 @@ void Application::setEnableVRMode(bool enableVRMode) { · 19 unmodified lines | |||
| 1595 | _myCamera.setHmdRotation(glm::quat()); | 1595 | _myCamera.setHmdRotation(glm::quat()); |
| 1596 | } | 1596 | } |
| 1597 | 1597 | ||
| 1598 | QSharedPointer<GLCanvas> glCanvas = DependencyManager::get<GLCanvas>(); | 1598 | GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>(); |
| 1599 | resizeGL(glCanvas->getDeviceWidth(), glCanvas->getDeviceHeight()); | 1599 | resizeGL(glCanvas->getDeviceWidth(), glCanvas->getDeviceHeight()); |
| 1600 | } | 1600 | } |
| 1601 | 1601 | ||
| @@ -1658,7 +1658,7 @@ glm::vec3 Application::getMouseVoxelWorldCoordinates(const VoxelDetail& mouseVox · 56 unmodified lines | |||
| 1658 | 1658 | ||
| 1659 | bool Application::mouseOnScreen() const { | 1659 | bool Application::mouseOnScreen() const { |
| 1660 | if (OculusManager::isConnected()) { | 1660 | if (OculusManager::isConnected()) { |
| 1661 | QSharedPointer<GLCanvas> glCanvas = DependencyManager::get<GLCanvas>(); | 1661 | GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>(); |
| 1662 | return getMouseX() >= 0 && getMouseX() <= glCanvas->getDeviceWidth() && | 1662 | return getMouseX() >= 0 && getMouseX() <= glCanvas->getDeviceWidth() && |
| 1663 | getMouseY() >= 0 && getMouseY() <= glCanvas->getDeviceHeight(); | 1663 | getMouseY() >= 0 && getMouseY() <= glCanvas->getDeviceHeight(); |
| 1664 | } | 1664 | } |
| @@ -1700,9 +1700,9 @@ int Application::getMouseDragStartedY() const { · 35 unmodified lines | |||
| 1700 | } | 1700 | } |
| 1701 | 1701 | ||
| 1702 | FaceTracker* Application::getActiveFaceTracker() { | 1702 | FaceTracker* Application::getActiveFaceTracker() { |
| 1703 | QSharedPointer<Faceshift> faceshift = DependencyManager::get<Faceshift>(); | 1703 | Faceshift::SharedPointer faceshift = DependencyManager::get<Faceshift>(); |
| 1704 | QSharedPointer<Visage> visage = DependencyManager::get<Visage>(); | 1704 | Visage::SharedPointer visage = DependencyManager::get<Visage>(); |
| 1705 | QSharedPointer<DdeFaceTracker> dde = DependencyManager::get<DdeFaceTracker>(); | 1705 | DdeFaceTracker::SharedPointer dde = DependencyManager::get<DdeFaceTracker>(); |
| 1706 | 1706 | ||
| 1707 | return (dde->isActive() ? static_cast<FaceTracker*>(dde.data()) : | 1707 | return (dde->isActive() ? static_cast<FaceTracker*>(dde.data()) : |
| 1708 | (faceshift->isActive() ? static_cast<FaceTracker*>(faceshift.data()) : | 1708 | (faceshift->isActive() ? static_cast<FaceTracker*>(faceshift.data()) : |
| @@ -2035,7 +2035,7 @@ void Application::init() { · 326 unmodified lines | |||
| 2035 | 2035 | ||
| 2036 | _metavoxels.init(); | 2036 | _metavoxels.init(); |
| 2037 | 2037 | ||
| 2038 | QSharedPointer<GLCanvas> glCanvas = DependencyManager::get<GLCanvas>(); | 2038 | GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>(); |
| 2039 | _audio.init(glCanvas.data()); | 2039 | _audio.init(glCanvas.data()); |
| 2040 | _rearMirrorTools = new RearMirrorTools(glCanvas.data(), _mirrorViewRect, _settings); | 2040 | _rearMirrorTools = new RearMirrorTools(glCanvas.data(), _mirrorViewRect, _settings); |
| 2041 | 2041 | ||
| @@ -2116,7 +2116,7 @@ void Application::updateMouseRay() { · 74 unmodified lines | |||
| 2116 | void Application::updateFaceshift() { | 2116 | void Application::updateFaceshift() { |
| 2117 | bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings); | 2117 | bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings); |
| 2118 | PerformanceWarning warn(showWarnings, "Application::updateFaceshift()"); | 2118 | PerformanceWarning warn(showWarnings, "Application::updateFaceshift()"); |
| 2119 | Faceshift* faceshift = DependencyManager::get<Faceshift>().data(); | 2119 | Faceshift::SharedPointer faceshift = DependencyManager::get<Faceshift>(); |
| 2120 | // Update faceshift | 2120 | // Update faceshift |
| 2121 | faceshift->update(); | 2121 | faceshift->update(); |
| 2122 | 2122 | ||
| @@ -2920,7 +2920,7 @@ void Application::updateShadowMap() { · 797 unmodified lines | |||
| 2920 | 2920 | ||
| 2921 | fbo->release(); | 2921 | fbo->release(); |
| 2922 | 2922 | ||
| 2923 | QSharedPointer<GLCanvas> glCanvas = DependencyManager::get<GLCanvas>(); | 2923 | GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>(); |
| 2924 | glViewport(0, 0, glCanvas->getDeviceWidth(), glCanvas->getDeviceHeight()); | 2924 | glViewport(0, 0, glCanvas->getDeviceWidth(), glCanvas->getDeviceHeight()); |
| 2925 | } | 2925 | } |
| 2926 | 2926 | ||
| @@ -3248,7 +3248,7 @@ void Application::computeOffAxisFrustum(float& left, float& right, float& bottom · 321 unmodified lines | |||
| 3248 | } | 3248 | } |
| 3249 | 3249 | ||
| 3250 | glm::vec2 Application::getScaledScreenPoint(glm::vec2 projectedPoint) { | 3250 | glm::vec2 Application::getScaledScreenPoint(glm::vec2 projectedPoint) { |
| 3251 | QSharedPointer<GLCanvas> glCanvas = DependencyManager::get<GLCanvas>(); | 3251 | GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>(); |
| 3252 | float horizontalScale = glCanvas->getDeviceWidth() / 2.0f; | 3252 | float horizontalScale = glCanvas->getDeviceWidth() / 2.0f; |
| 3253 | float verticalScale = glCanvas->getDeviceHeight() / 2.0f; | 3253 | float verticalScale = glCanvas->getDeviceHeight() / 2.0f; |
| 3254 | 3254 | ||