Showing the changes to interface/src/Application.cpp (1 of 12 files). Show all
Unified · Split
| @@ -723,7 +723,7 @@ void Application::paintGL() { · 722 unmodified lines | ||
| 723 | 723 | glMatrixMode(GL_MODELVIEW); |
| 724 | 724 | glPushMatrix(); |
| 725 | 725 | glLoadIdentity(); |
| 726 | − displaySide(*whichCamera); | |
| 726 | + displaySide(RenderContext(*whichCamera)); | |
| 727 | 727 | glPopMatrix(); |
| 728 | 728 | |
| 729 | 729 | if (Menu::getInstance()->isOptionChecked(MenuOption::FullscreenMirror)) { |
| @@ -2873,12 +2873,16 @@ QImage Application::renderAvatarBillboard() { · 2143 unmodified lines | ||
| 2873 | 2873 | return image; |
| 2874 | 2874 | } |
| 2875 | 2875 | |
| 2876 | −void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { | |
| 2876 | +//void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { | |
| 2877 | +void Application::displaySide(RenderContext& renderContext) { | |
| 2877 | 2878 | PROFILE_RANGE(__FUNCTION__); |
| 2878 | 2879 | PerformanceTimer perfTimer("display"); |
| 2879 | 2880 | PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), "Application::displaySide()"); |
| 2880 | 2881 | // transform by eye offset |
| 2881 | 2882 | |
| 2883 | + Camera& whichCamera = renderContext._whichCamera; | |
| 2884 | + bool selfAvatarOnly = renderContext._selfAvatarOnly; | |
| 2885 | + | |
| 2882 | 2886 | // load the view frustum |
| 2883 | 2887 | loadViewFrustum(whichCamera, _displayViewFrustum); |
| 2884 | 2888 | |
| @@ -3020,7 +3024,7 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { · 135 unmodified lines | ||
| 3020 | 3024 | PerformanceTimer perfTimer("entities"); |
| 3021 | 3025 | PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), |
| 3022 | 3026 | "Application::displaySide() ... entities..."); |
| 3023 | − _entities.render(); | |
| 3027 | + _entities.render(RenderArgs::DEFAULT_RENDER_MODE, renderContext._renderSide); | |
| 3024 | 3028 | } |
| 3025 | 3029 | |
| 3026 | 3030 | // render JS/scriptable overlays |
| @@ -3265,7 +3269,7 @@ void Application::renderRearViewMirror(const QRect& region, bool billboard) { · 238 unmodified lines | ||
| 3265 | 3269 | _shadowMatrices[i] = glm::transpose(glm::transpose(_shadowMatrices[i]) * glm::translate(-delta)); |
| 3266 | 3270 | } |
| 3267 | 3271 | |
| 3268 | − displaySide(_mirrorCamera, true); | |
| 3272 | + displaySide(RenderContext(_mirrorCamera, true)); | |
| 3269 | 3273 | |
| 3270 | 3274 | // restore absolute translations |
| 3271 | 3275 | _myAvatar->getSkeletonModel().setTranslation(absoluteSkeletonTranslation); |
| @@ -3279,7 +3283,7 @@ void Application::renderRearViewMirror(const QRect& region, bool billboard) { · 7 unmodified lines | ||
| 3279 | 3283 | _shadowMatrices[i] = savedShadowMatrices[i]; |
| 3280 | 3284 | } |
| 3281 | 3285 | } else { |
| 3282 | − displaySide(_mirrorCamera, true); | |
| 3286 | + displaySide(RenderContext(_mirrorCamera, true)); | |
| 3283 | 3287 | } |
| 3284 | 3288 | glPopMatrix(); |
| 3285 | 3289 | |