From 4419dfe622fa8e8513e954c7c94a4eaac61dceb9 Mon Sep 17 00:00:00 2001 From: samcake Date: Fri, 9 Feb 2018 10:02:16 -0800 Subject: [PATCH] Addressing review comments --- .../src/display-plugins/OpenGLDisplayPlugin.cpp | 1 - libraries/render-utils/src/ForwardGlobalLight.slh | 2 ++ libraries/render-utils/src/MeshPartPayload.cpp | 3 --- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp index ce3721b76b..40dcf1b8c7 100644 --- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp +++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp @@ -64,7 +64,6 @@ vec3 colorToLinearRGB(vec3 srgb) { void main(void) { outFragColor.a = 1.0; outFragColor.rgb = colorToLinearRGB(texture(colorMap, varTexCoord0).rgb); - // outFragColor.rgb = texture(colorMap, varTexCoord0).rgb; } )SCRIBE"; diff --git a/libraries/render-utils/src/ForwardGlobalLight.slh b/libraries/render-utils/src/ForwardGlobalLight.slh index c0aebfd087..a945acb8c4 100644 --- a/libraries/render-utils/src/ForwardGlobalLight.slh +++ b/libraries/render-utils/src/ForwardGlobalLight.slh @@ -134,6 +134,7 @@ vec3 evalSkyboxGlobalColor(mat4 invViewMat, float shadowAttenuation, float obscu color += directionalDiffuse; color += directionalSpecular; + // FIXME - temporarily removed until we support it for forward... // Attenuate the light if haze effect selected // if ((hazeParams.hazeMode & HAZE_MODE_IS_KEYLIGHT_ATTENUATED) == HAZE_MODE_IS_KEYLIGHT_ATTENUATED) { // color = computeHazeColorKeyLightAttenuation(color, lightDirection, position); @@ -227,6 +228,7 @@ vec3 evalGlobalLightingAlphaBlendedWithHaze( color += directionalSpecular / opacity; // Haze + // FIXME - temporarily removed until we support it for forward... /* if ((hazeParams.hazeMode & HAZE_MODE_IS_ACTIVE) == HAZE_MODE_IS_ACTIVE) { vec4 colorV4 = computeHazeColor( vec4(color, 1.0), // fragment original color diff --git a/libraries/render-utils/src/MeshPartPayload.cpp b/libraries/render-utils/src/MeshPartPayload.cpp index 372803f329..39773c66db 100644 --- a/libraries/render-utils/src/MeshPartPayload.cpp +++ b/libraries/render-utils/src/MeshPartPayload.cpp @@ -104,9 +104,6 @@ ShapeKey MeshPartPayload::getShapeKey() const { if (drawMaterialKey.isNormalMap()) { builder.withTangents(); } - /* if (drawMaterialKey.isMetallicMap()) { - builder.withSpecular(); - }*/ if (drawMaterialKey.isLightmapMap()) { builder.withLightmap(); }