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

cleaning code and removing cruft

Browse source
This commit is contained in:
Sam Cake 2015-12-07 01:03:14 -08:00
parent a018c51945
commit 01d48b29aa
2 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/render-utils/src/DeferredLightingEffect.cpp
View file

@ -355,9 +355,7 @@ void DeferredLightingEffect::prepare(RenderArgs* args) {
auto lightingFbo = DependencyManager::get<FramebufferCache>()->getLightingFramebuffer(); auto lightingFbo = DependencyManager::get<FramebufferCache>()->getLightingFramebuffer();
batch.setFramebuffer(lightingFbo); batch.setFramebuffer(lightingFbo);
batch.clearFramebuffer( batch.clearColorFramebuffer(gpu::Framebuffer::BUFFER_COLOR0, vec4(vec3(0), 0), true);
gpu::Framebuffer::BUFFER_COLOR0,
vec4(vec3(0), 0), 1.0, 0.0, true);
// Clear deferred // Clear deferred
auto deferredFbo = DependencyManager::get<FramebufferCache>()->getDeferredFramebuffer(); auto deferredFbo = DependencyManager::get<FramebufferCache>()->getDeferredFramebuffer();
@ -400,10 +398,8 @@ void DeferredLightingEffect::render(RenderArgs* args) {
auto lightingFBO = framebufferCache->getLightingFramebuffer(); auto lightingFBO = framebufferCache->getLightingFramebuffer();
batch.setFramebuffer(lightingFBO); batch.setFramebuffer(lightingFBO);
// Clearing it
batch.setViewportTransform(args->_viewport); batch.setViewportTransform(args->_viewport);
batch.setStateScissorRect(args->_viewport); batch.setStateScissorRect(args->_viewport);
// batch.clearColorFramebuffer(lightingFBO->getBufferMask(), glm::vec4(0.0f, 0.0f, 0.0f, 0.0f), true);
// BInd the G-Buffer surfaces // BInd the G-Buffer surfaces
batch.setResourceTexture(0, framebufferCache->getDeferredColorTexture()); batch.setResourceTexture(0, framebufferCache->getDeferredColorTexture());

8
libraries/render-utils/src/RenderDeferredTask.cpp
View file

@ -355,13 +355,11 @@ void DrawBackgroundDeferred::run(const SceneContextPointer& sceneContext, const
doInBatch(args->_context, [=](gpu::Batch& batch) { doInBatch(args->_context, [=](gpu::Batch& batch) {
args->_batch = &batch; args->_batch = &batch;
// auto deferredFboColorDepthStencil = DependencyManager::get<FramebufferCache>()->getDeferredFramebufferDepthColor(); auto lightingFBO = DependencyManager::get<FramebufferCache>()->getLightingFramebuffer();
auto deferredFboColorDepthStencil = DependencyManager::get<FramebufferCache>()->getLightingFramebuffer();
auto deferredFboFull = DependencyManager::get<FramebufferCache>()->getDeferredFramebuffer();
batch.enableSkybox(true); batch.enableSkybox(true);
batch.setFramebuffer(deferredFboColorDepthStencil); batch.setFramebuffer(lightingFBO);
batch.setViewportTransform(args->_viewport); batch.setViewportTransform(args->_viewport);
batch.setStateScissorRect(args->_viewport); batch.setStateScissorRect(args->_viewport);
@ -376,8 +374,6 @@ void DrawBackgroundDeferred::run(const SceneContextPointer& sceneContext, const
renderItems(sceneContext, renderContext, inItems); renderItems(sceneContext, renderContext, inItems);
// batch.setFramebuffer(deferredFboFull);
}); });
args->_batch = nullptr; args->_batch = nullptr;
} }