Showing the changes to interface/src/Application.cpp (1 of 1 file). Show all
Unified · Split
| @@ -3429,10 +3429,10 @@ namespace render { · 3428 unmodified lines | |||
| 3429 | 3429 | ||
| 3430 | // Background rendering decision | 3430 | // Background rendering decision |
| 3431 | auto skyStage = DependencyManager::get<SceneScriptingInterface>()->getSkyStage(); | 3431 | auto skyStage = DependencyManager::get<SceneScriptingInterface>()->getSkyStage(); |
| 3432 | auto skybox = model::SkyboxPointer(); | ||
| 3433 | if (skyStage->getBackgroundMode() == model::SunSkyStage::NO_BACKGROUND) { | 3432 | if (skyStage->getBackgroundMode() == model::SunSkyStage::NO_BACKGROUND) { |
| 3433 | // this line intentionally left blank | ||
| 3434 | } else if (skyStage->getBackgroundMode() == model::SunSkyStage::SKY_DOME) { | 3434 | } else if (skyStage->getBackgroundMode() == model::SunSkyStage::SKY_DOME) { |
| 3435 | if (/*!selfAvatarOnly &&*/ Menu::getInstance()->isOptionChecked(MenuOption::Stars)) { | 3435 | if (Menu::getInstance()->isOptionChecked(MenuOption::Stars)) { |
| 3436 | PerformanceTimer perfTimer("stars"); | 3436 | PerformanceTimer perfTimer("stars"); |
| 3437 | PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), | 3437 | PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), |
| 3438 | "Application::payloadRender<BackgroundRenderData>() ... stars..."); | 3438 | "Application::payloadRender<BackgroundRenderData>() ... stars..."); |
| @@ -3498,8 +3498,7 @@ namespace render { · 59 unmodified lines | |||
| 3498 | } | 3498 | } |
| 3499 | } else if (skyStage->getBackgroundMode() == model::SunSkyStage::SKY_BOX) { | 3499 | } else if (skyStage->getBackgroundMode() == model::SunSkyStage::SKY_BOX) { |
| 3500 | PerformanceTimer perfTimer("skybox"); | 3500 | PerformanceTimer perfTimer("skybox"); |
| 3501 | 3501 | auto skybox = skyStage->getSkybox(); | |
| 3502 | skybox = skyStage->getSkybox(); | ||
| 3503 | if (skybox) { | 3502 | if (skybox) { |
| 3504 | skybox->render(batch, *(qApp->getDisplayViewFrustum())); | 3503 | skybox->render(batch, *(qApp->getDisplayViewFrustum())); |
| 3505 | } | 3504 | } |
| @@ -3765,6 +3764,10 @@ void Application::clearDomainOctreeDetails() { · 259 unmodified lines | |||
| 3765 | 3764 | ||
| 3766 | // reset the model renderer | 3765 | // reset the model renderer |
| 3767 | getEntities()->clear(); | 3766 | getEntities()->clear(); |
| 3767 | |||
| 3768 | auto skyStage = DependencyManager::get<SceneScriptingInterface>()->getSkyStage(); | ||
| 3769 | skyStage->setBackgroundMode(model::SunSkyStage::SKY_DOME); | ||
| 3770 | |||
| 3768 | } | 3771 | } |
| 3769 | 3772 | ||
| 3770 | void Application::domainChanged(const QString& domainHostname) { | 3773 | void Application::domainChanged(const QString& domainHostname) { |