From 3595d0d719d22819b4361e8e1a5b75052d6c5ca4 Mon Sep 17 00:00:00 2001 From: Sam Cake Date: Mon, 7 Dec 2015 01:15:10 -0800 Subject: [PATCH] less commented stuff --- libraries/model/src/model/Skybox.slf | 4 +--- libraries/render-utils/src/DeferredLightingEffect.cpp | 4 ---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/libraries/model/src/model/Skybox.slf b/libraries/model/src/model/Skybox.slf index 9b642f138e..f8a568bcf9 100755 --- a/libraries/model/src/model/Skybox.slf +++ b/libraries/model/src/model/Skybox.slf @@ -52,9 +52,7 @@ void main(void) { } } - // vec3 pixel = pow(color, vec3(1.0/2.2)); // manual Gamma correction - vec3 pixel = color; - _fragColor = vec4(pixel, 0.0); + _fragColor = vec4(color, 0.0); #endif diff --git a/libraries/render-utils/src/DeferredLightingEffect.cpp b/libraries/render-utils/src/DeferredLightingEffect.cpp index 40f6d4c5eb..92009ebf07 100644 --- a/libraries/render-utils/src/DeferredLightingEffect.cpp +++ b/libraries/render-utils/src/DeferredLightingEffect.cpp @@ -151,9 +151,6 @@ void DeferredLightingEffect::init(AbstractViewStateInterface* viewState) { //auto blitProgram = gpu::StandardShaderLib::getProgram(gpu::StandardShaderLib::getDrawViewportQuadTransformTexcoordVS, gpu::StandardShaderLib::getDrawTexturePS); gpu::Shader::makeProgram(*blitProgram); auto blitState = std::make_shared(); - /* blitState->setBlendFunction(true, - gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::INV_SRC_ALPHA, - gpu::State::FACTOR_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::ONE);*/ blitState->setColorWriteMask(true, true, true, true); _blitLightBuffer = gpu::PipelinePointer(gpu::Pipeline::create(blitProgram, blitState)); } @@ -347,7 +344,6 @@ void DeferredLightingEffect::addSpotLight(const glm::vec3& position, float radiu void DeferredLightingEffect::prepare(RenderArgs* args) { gpu::doInBatch(args->_context, [=](gpu::Batch& batch) { batch.enableStereo(false); - // batch.setStateScissorRect(args->_viewport); batch.setViewportTransform(args->_viewport); batch.setStateScissorRect(args->_viewport);