History

tuesday morning rendering poor performances networking issue

Sam Gateau committed 11 years ago

Commit ef2d8a01 parent cd7914a3 files · +28 −21Browse files

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

Unified · Split

interface/src/Application.cpp+20−19
@@ -3464,6 +3464,26 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se · 3463 unmodified lines
3464 });3464 });
3465 }3465 }
3466 3466
3467 if (!billboard) {
3468 DependencyManager::get<DeferredLightingEffect>()->setAmbientLightMode(getRenderAmbientLight());
3469 auto skyStage = DependencyManager::get<SceneScriptingInterface>()->getSkyStage();
3470 DependencyManager::get<DeferredLightingEffect>()->setGlobalLight(skyStage->getSunLight()->getDirection(), skyStage->getSunLight()->getColor(), skyStage->getSunLight()->getIntensity(), skyStage->getSunLight()->getAmbientIntensity());
3471 DependencyManager::get<DeferredLightingEffect>()->setGlobalAtmosphere(skyStage->getAtmosphere());
3472
3473 auto skybox = model::SkyboxPointer();
3474 if (skyStage->getBackgroundMode() == model::SunSkyStage::SKY_BOX) {
3475 skybox = skyStage->getSkybox();
3476 }
3477 DependencyManager::get<DeferredLightingEffect>()->setGlobalSkybox(skybox);
3478
3479 // Not needed anymore here, taken care off by the Engine
3480 /*
3481 PROFILE_RANGE("DeferredLighting");
3482 PerformanceTimer perfTimer("lighting");
3483 DependencyManager::get<DeferredLightingEffect>()->render();*/
3484
3485 }
3486
3467 {3487 {
3468 PerformanceTimer perfTimer("SceneProcessPendingChanges"); 3488 PerformanceTimer perfTimer("SceneProcessPendingChanges");
3469 _main3DScene->enqueuePendingChanges(pendingChanges);3489 _main3DScene->enqueuePendingChanges(pendingChanges);
@@ -3489,25 +3509,6 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se · 19 unmodified lines
3489 3509
3490 }3510 }
3491 3511
3492 if (!billboard) {
3493 DependencyManager::get<DeferredLightingEffect>()->setAmbientLightMode(getRenderAmbientLight());
3494 auto skyStage = DependencyManager::get<SceneScriptingInterface>()->getSkyStage();
3495 DependencyManager::get<DeferredLightingEffect>()->setGlobalLight(skyStage->getSunLight()->getDirection(), skyStage->getSunLight()->getColor(), skyStage->getSunLight()->getIntensity(), skyStage->getSunLight()->getAmbientIntensity());
3496 DependencyManager::get<DeferredLightingEffect>()->setGlobalAtmosphere(skyStage->getAtmosphere());
3497
3498 auto skybox = model::SkyboxPointer();
3499 if (skyStage->getBackgroundMode() == model::SunSkyStage::SKY_BOX) {
3500 skybox = skyStage->getSkybox();
3501 }
3502 DependencyManager::get<DeferredLightingEffect>()->setGlobalSkybox(skybox);
3503
3504 // Not needed anymore here, taken care off by the Engine
3505 /*
3506 PROFILE_RANGE("DeferredLighting");
3507 PerformanceTimer perfTimer("lighting");
3508 DependencyManager::get<DeferredLightingEffect>()->render();*/
3509
3510 }
3511 3512
3512 //Render the sixense lasers3513 //Render the sixense lasers
3513 if (Menu::getInstance()->isOptionChecked(MenuOption::SixenseLasers)) {3514 if (Menu::getInstance()->isOptionChecked(MenuOption::SixenseLasers)) {