History

reset skybox on changing domains

Brad Hefta-Gaub committed 10 years ago

Commit d918eca1 parent a7a92411 file · +7 −4Browse files

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

Unified · Split

interface/src/Application.cpp+7−4
@@ -3429,10 +3429,10 @@ namespace render { · 3428 unmodified lines
34293429
34303430 // Background rendering decision
34313431 auto skyStage = DependencyManager::get<SceneScriptingInterface>()->getSkyStage();
3432− auto skybox = model::SkyboxPointer();
34333432 if (skyStage->getBackgroundMode() == model::SunSkyStage::NO_BACKGROUND) {
3433+ // this line intentionally left blank
34343434 } else if (skyStage->getBackgroundMode() == model::SunSkyStage::SKY_DOME) {
3435− if (/*!selfAvatarOnly &&*/ Menu::getInstance()->isOptionChecked(MenuOption::Stars)) {
3435+ if (Menu::getInstance()->isOptionChecked(MenuOption::Stars)) {
34363436 PerformanceTimer perfTimer("stars");
34373437 PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
34383438 "Application::payloadRender<BackgroundRenderData>() ... stars...");
@@ -3498,8 +3498,7 @@ namespace render { · 59 unmodified lines
34983498 }
34993499 } else if (skyStage->getBackgroundMode() == model::SunSkyStage::SKY_BOX) {
35003500 PerformanceTimer perfTimer("skybox");
3501−
3502− skybox = skyStage->getSkybox();
3501+ auto skybox = skyStage->getSkybox();
35033502 if (skybox) {
35043503 skybox->render(batch, *(qApp->getDisplayViewFrustum()));
35053504 }
@@ -3765,6 +3764,10 @@ void Application::clearDomainOctreeDetails() { · 259 unmodified lines
37653764
37663765 // reset the model renderer
37673766 getEntities()->clear();
3767+
3768+ auto skyStage = DependencyManager::get<SceneScriptingInterface>()->getSkyStage();
3769+ skyStage->setBackgroundMode(model::SunSkyStage::SKY_DOME);
3770+
37683771 }
37693772
37703773 void Application::domainChanged(const QString& domainHostname) {