From 8584d80bb8540ba25e923127e17b06fac9adb278 Mon Sep 17 00:00:00 2001
From: Sam Cake <Sam Cake>
Date: Sun, 19 Mar 2017 17:00:42 -0700
Subject: [PATCH] KEep exploring the ambient lighting

---
 libraries/render-utils/src/LightAmbient.slh    | 13 ++++---------
 libraries/render-utils/src/RenderPipelines.cpp |  2 +-
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/libraries/render-utils/src/LightAmbient.slh b/libraries/render-utils/src/LightAmbient.slh
index a4e3764830..37df768924 100644
--- a/libraries/render-utils/src/LightAmbient.slh
+++ b/libraries/render-utils/src/LightAmbient.slh
@@ -77,18 +77,13 @@ void evalLightingAmbient(out vec3 diffuse, out vec3 specular, LightAmbient ambie
     // Diffuse from ambient
     diffuse = (1.0 - metallic) * sphericalHarmonics_evalSphericalLight(getLightAmbientSphere(ambient), normal).xyz;
 
-    if (gl_FragCoord.x > 1000) {
-        vec3 ambientFresnel = vec3 (1.0) - fresnelSchlickAmbient(fresnel, eyeDir, normal, 1.0 - roughness);
-        diffuse *= ambientFresnel * (1.0 / 3.14);
-
-
-        if (gl_FragCoord.x > 2000) {
-            diffuse *= obscurance;
-        }
+    if (gl_FragCoord.x > 300) {
+        vec3 ambientFresnelDiffuse = vec3 (1.0) - fresnelSchlickAmbient(fresnel, eyeDir, normal, 1.0 - roughness);
+        diffuse *= ambientFresnelDiffuse;
     }
 
     // Specular highlight from ambient
-    specular = evalAmbientSpecularIrradiance(ambient, eyeDir, normal, roughness, fresnel) * obscurance * getLightAmbientIntensity(ambient);
+    specular = evalAmbientSpecularIrradiance(ambient, eyeDir, normal, roughness, fresnel);
 
 
 <@if supportScattering@>
diff --git a/libraries/render-utils/src/RenderPipelines.cpp b/libraries/render-utils/src/RenderPipelines.cpp
index 4fbac4170e..414bcf0d63 100644
--- a/libraries/render-utils/src/RenderPipelines.cpp
+++ b/libraries/render-utils/src/RenderPipelines.cpp
@@ -307,7 +307,7 @@ void initForwardPipelines(render::ShapePlumber& plumber) {
 void addPlumberPipeline(ShapePlumber& plumber,
         const ShapeKey& key, const gpu::ShaderPointer& vertex, const gpu::ShaderPointer& pixel) {
     // These key-values' pipelines are added by this functor in addition to the key passed
-    assert(!key.isWireFrame());
+    assert(!key.isWireframe());
     assert(!key.isDepthBiased());
     assert(key.isCullFace());