Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 23:17:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

REmoving comments

Browse source
This commit is contained in:
Sam Gateau 2017-07-07 11:38:25 +02:00
parent 156c20d01e
commit 4c1bf6af47
3 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libraries/render-utils/src/ZoneRenderer.cpp
View file

@ -136,14 +136,13 @@ void DebugZoneLighting::run(const render::RenderContextPointer& context, const I
auto deferredTransform = inputs; auto deferredTransform = inputs;
auto lightStage = context->_scene->getStage<LightStage>("LIGHT_STAGE"); auto lightStage = context->_scene->getStage<LightStage>(LightStage::getName());
std::vector<model::LightPointer> keyLightStack; std::vector<model::LightPointer> keyLightStack;
if (lightStage && lightStage->_currentFrame._sunLights.size()) { if (lightStage && lightStage->_currentFrame._sunLights.size()) {
for (auto index : lightStage->_currentFrame._sunLights) { for (auto index : lightStage->_currentFrame._sunLights) {
keyLightStack.push_back(lightStage->getLight(index)); keyLightStack.push_back(lightStage->getLight(index));
} }
} }
// keyLightStack.push_back(lightStage->getLight(0));
std::vector<model::LightPointer> ambientLightStack; std::vector<model::LightPointer> ambientLightStack;
if (lightStage && lightStage->_currentFrame._ambientLights.size()) { if (lightStage && lightStage->_currentFrame._ambientLights.size()) {
@ -151,9 +150,8 @@ void DebugZoneLighting::run(const render::RenderContextPointer& context, const I
ambientLightStack.push_back(lightStage->getLight(index)); ambientLightStack.push_back(lightStage->getLight(index));
} }
} }
// ambientLightStack.push_back(lightStage->getLight(0));
auto backgroundStage = context->_scene->getStage<BackgroundStage>("BACKGROUND_STAGE"); auto backgroundStage = context->_scene->getStage<BackgroundStage>(BackgroundStage::getName());
std::vector<model::SkyboxPointer> skyboxStack; std::vector<model::SkyboxPointer> skyboxStack;
if (backgroundStage && backgroundStage->_currentFrame._backgrounds.size()) { if (backgroundStage && backgroundStage->_currentFrame._backgrounds.size()) {
for (auto index : backgroundStage->_currentFrame._backgrounds) { for (auto index : backgroundStage->_currentFrame._backgrounds) {
@ -162,8 +160,7 @@ void DebugZoneLighting::run(const render::RenderContextPointer& context, const I
skyboxStack.push_back(background->getSkybox()); skyboxStack.push_back(background->getSkybox());
} }
} }
} }
// skyboxStack.push_back(backgroundStage->getBackground(0)->getSkybox());
gpu::doInBatch(args->_context, [=](gpu::Batch& batch) { gpu::doInBatch(args->_context, [=](gpu::Batch& batch) {

1
tests/gpu-test/src/TestWindow.cpp
View file

@ -77,7 +77,6 @@ void TestWindow::initGl() {
#ifdef DEFERRED_LIGHTING #ifdef DEFERRED_LIGHTING
auto deferredLightingEffect = DependencyManager::get<DeferredLightingEffect>(); auto deferredLightingEffect = DependencyManager::get<DeferredLightingEffect>();
deferredLightingEffect->init(); deferredLightingEffect->init();
// deferredLightingEffect->setGlobalLight(_light);
initDeferredPipelines(*_shapePlumber); initDeferredPipelines(*_shapePlumber);
#endif #endif
} }

7
tests/render-perf/src/main.cpp
View file

@ -889,11 +889,6 @@ private:
BackgroundRenderData::_item = _main3DScene->allocateID(); BackgroundRenderData::_item = _main3DScene->allocateID();
transaction.resetItem(BackgroundRenderData::_item, backgroundRenderPayload); transaction.resetItem(BackgroundRenderData::_item, backgroundRenderPayload);
} }
// Setup the current Zone Entity lighting
{
auto stage = DependencyManager::get<SceneScriptingInterface>()->getSkyStage();
// DependencyManager::get<DeferredLightingEffect>()->setGlobalLight(stage->getSunLight());
}
{ {
PerformanceTimer perfTimer("SceneProcessTransaction"); PerformanceTimer perfTimer("SceneProcessTransaction");
@ -914,8 +909,6 @@ private:
PerformanceTimer perfTimer("draw"); PerformanceTimer perfTimer("draw");
// The pending changes collecting the changes here // The pending changes collecting the changes here
render::Transaction transaction; render::Transaction transaction;
// Setup the current Zone Entity lighting
// DependencyManager::get<DeferredLightingEffect>()->setGlobalLight(_sunSkyStage.getSunLight());
{ {
PerformanceTimer perfTimer("SceneProcessTransaction"); PerformanceTimer perfTimer("SceneProcessTransaction");
_main3DScene->enqueueTransaction(transaction); _main3DScene->enqueueTransaction(transaction);