History

first draft of factorizing the rendering traversal for both sides in stereo

Sam Gateau committed 12 years ago

Commit 642f4361 parent c3f764012 files · +160 −134Browse files

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

Unified · Split

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

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