Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-07 10:06:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #6629 from ZappoMan/resetSkyBoxOnDomainChange

Browse source 
reset skybox on changing domains
This commit is contained in:
Brad Davis 2015-12-11 15:48:20 -08:00
commit 1bcf42a799
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
interface/src/Application.cpp
View file

@ -3431,10 +3431,10 @@ namespace render {
// Background rendering decision // Background rendering decision
auto skyStage = DependencyManager::get<SceneScriptingInterface>()->getSkyStage(); auto skyStage = DependencyManager::get<SceneScriptingInterface>()->getSkyStage();
auto skybox = model::SkyboxPointer();
if (skyStage->getBackgroundMode() == model::SunSkyStage::NO_BACKGROUND) { if (skyStage->getBackgroundMode() == model::SunSkyStage::NO_BACKGROUND) {
// this line intentionally left blank
} else if (skyStage->getBackgroundMode() == model::SunSkyStage::SKY_DOME) { } else if (skyStage->getBackgroundMode() == model::SunSkyStage::SKY_DOME) {
if (/*!selfAvatarOnly &&*/ Menu::getInstance()->isOptionChecked(MenuOption::Stars)) { if (Menu::getInstance()->isOptionChecked(MenuOption::Stars)) {
PerformanceTimer perfTimer("stars"); PerformanceTimer perfTimer("stars");
PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
"Application::payloadRender<BackgroundRenderData>() ... stars..."); "Application::payloadRender<BackgroundRenderData>() ... stars...");
@ -3500,8 +3500,7 @@ namespace render {
} }
} else if (skyStage->getBackgroundMode() == model::SunSkyStage::SKY_BOX) { } else if (skyStage->getBackgroundMode() == model::SunSkyStage::SKY_BOX) {
PerformanceTimer perfTimer("skybox"); PerformanceTimer perfTimer("skybox");
auto skybox = skyStage->getSkybox();
skybox = skyStage->getSkybox();
if (skybox) { if (skybox) {
skybox->render(batch, *(qApp->getDisplayViewFrustum())); skybox->render(batch, *(qApp->getDisplayViewFrustum()));
} }
@ -3767,6 +3766,10 @@ void Application::clearDomainOctreeDetails() {
// reset the model renderer // reset the model renderer
getEntities()->clear(); getEntities()->clear();
auto skyStage = DependencyManager::get<SceneScriptingInterface>()->getSkyStage();
skyStage->setBackgroundMode(model::SunSkyStage::SKY_DOME);
} }
void Application::domainChanged(const QString& domainHostname) { void Application::domainChanged(const QString& domainHostname) {