Fix up the lighting/environment combining - use mix().

1 files changed, 3 insertions, 6 deletions

diff --git a/src/phong.frag b/src/phong.frag
index c44ebf5..e816877 100755
--- a/src/phong.frag
+++ b/src/phong.frag
@@ -64,10 +64,7 @@ void main(void)
 	float F = schlick(n, l);
 
 	vec4 envir = textureCube(sampler, reflect(normalize(eye_direction_ws), normal_ws));
-	gl_FragColor = (1 - F) * envir + F * vec4(spec);
-	//gl_FragColor = step(0.0, dot(n, l)) * vec4(diff + vec3(spec), 1.0) + F * envir;
-}
+	vec4 light = step(0.0, dot(n, l)) * vec4(diff + vec3(spec), 1.0);
 
-	//gl_FragColor = vec4((1 - F) * diff + F * vec3(spec), 1.0);
-	//gl_FragColor = step(0.0, dot(n, l)) * vec4(diff + vec3(spec), 1.0);
-	//gl_FragColor = textureCube(sampler, reflect(eye_direction_ws, normal_ws));
+	gl_FragColor = mix(light, envir, F);
+}