From 3ad7bdc79e145f0dc447b75adcb8211c112e7445 Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Wed, 20 May 2015 14:34:02 -0700 Subject: [PATCH] maybe ready for master --- interface/src/Application.cpp | 2 +- libraries/render-utils/src/DeferredBufferWrite.slh | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 37ee116f40..fd64054a7e 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -3302,7 +3302,7 @@ void Application::displaySide(Camera& theCamera, bool selfAvatarOnly, RenderArgs skybox = skyStage->getSkybox(); if (skybox) { gpu::Batch batch; - model::Skybox::render(batch, _viewFrustum, *skybox); + model::Skybox::render(batch, *getDisplayViewFrustum(), *skybox); gpu::GLBackend::renderBatch(batch); glUseProgram(0); diff --git a/libraries/render-utils/src/DeferredBufferWrite.slh b/libraries/render-utils/src/DeferredBufferWrite.slh index ea14830de2..0538b01fac 100755 --- a/libraries/render-utils/src/DeferredBufferWrite.slh +++ b/libraries/render-utils/src/DeferredBufferWrite.slh @@ -43,12 +43,8 @@ void packDeferredFragment(vec3 normal, float alpha, vec3 diffuse, vec3 specular, discard; } gl_FragData[0] = vec4(diffuse.rgb, alpha); - if ( gl_FragCoord.x > 1024) { - gl_FragData[1] = vec4(normal * 0.5 + vec3(0.5), 1.0); - } else { - gl_FragData[1] = vec4(bestFitNormal(normal), 1.0); - } - gl_FragData[2] = vec4(specular, shininess / 100.0); + gl_FragData[1] = vec4(bestFitNormal(normal), 1.0); + gl_FragData[2] = vec4(specular, shininess / 128.0); } void packDeferredFragmentLightmap(vec3 normal, float alpha, vec3 diffuse, vec3 specular, float shininess, vec3 emissive) {