Separate directional shaders with(out) shadowmaps

libraries/render-utils/src/DeferredLightingEffect.cpp

@@ -31,6 +31,10 @@
 #include "directional_ambient_light_frag.h"
 #include "directional_skybox_light_frag.h"
 
+#include "directional_light_shadow_frag.h"
+#include "directional_ambient_light_shadow_frag.h"
+#include "directional_skybox_light_shadow_frag.h"
+
 #include "point_light_frag.h"
 #include "spot_light_frag.h"
 
@@ -47,14 +51,15 @@ struct LightLocations {
 
 static void loadLightProgram(const char* vertSource, const char* fragSource, bool lightVolume, gpu::PipelinePointer& program, LightLocationsPtr& locations);
 
-
 void DeferredLightingEffect::init() {
     _directionalLightLocations = std::make_shared<LightLocations>();
     _directionalAmbientSphereLightLocations = std::make_shared<LightLocations>();
     _directionalSkyboxLightLocations = std::make_shared<LightLocations>();
+
     _pointLightLocations = std::make_shared<LightLocations>();
     _spotLightLocations = std::make_shared<LightLocations>();
 
+    // TODO: To use shadowmaps, replace directional_*_light_frag with directional_*_light_shadow_frag shaders.
     loadLightProgram(deferred_light_vert, directional_light_frag, false, _directionalLight, _directionalLightLocations);
     loadLightProgram(deferred_light_vert, directional_ambient_light_frag, false, _directionalAmbientSphereLight, _directionalAmbientSphereLightLocations);
     loadLightProgram(deferred_light_vert, directional_skybox_light_frag, false, _directionalSkyboxLight, _directionalSkyboxLightLocations);

libraries/render-utils/src/directional_ambient_light.slf

@@ -6,13 +6,12 @@
 //  fragment shader
 //
 //  Created by Andrzej Kapolka on 9/3/14.
-//  Copyright 2014 High Fidelity, Inc.
+//  Copyright 2016 High Fidelity, Inc.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-<@include Shadow.slh@>
 <@include DeferredBuffer.slh@>
 <@include DeferredGlobalLight.slh@>
 
@@ -26,8 +25,7 @@ void main(void) {
     DeferredTransform deferredTransform = getDeferredTransform();
     DeferredFragment frag = unpackDeferredFragment(deferredTransform, _texCoord0);
 
-    vec4 worldPos = deferredTransform.viewInverse * vec4(frag.position.xyz, 1.0);
-	float shadowAttenuation = evalShadowAttenuation(worldPos);
+	float shadowAttenuation = 1.0;
 
     if ((frag.normalVal.a >= 0.45) && (frag.normalVal.a <= 0.55)) {
         vec3 color = evalLightmappedColor(

libraries/render-utils/src/directional_ambient_light_shadow.slf

@@ -0,0 +1,51 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  directional_light_shadow.frag
+//  fragment shader
+//
+//  Created by Zach Pomerantz on 1/18/2016.
+//  Copyright 2016 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+<@include Shadow.slh@>
+<@include DeferredBuffer.slh@>
+<@include DeferredGlobalLight.slh@>
+
+<$declareEvalLightmappedColor()$>
+<$declareEvalAmbientSphereGlobalColor()$>
+
+in vec2 _texCoord0;
+out vec4 _fragColor;
+
+void main(void) {
+    DeferredTransform deferredTransform = getDeferredTransform();
+    DeferredFragment frag = unpackDeferredFragment(deferredTransform, _texCoord0);
+
+    vec4 worldPos = deferredTransform.viewInverse * vec4(frag.position.xyz, 1.0);
+	float shadowAttenuation = evalShadowAttenuation(worldPos);
+
+    if ((frag.normalVal.a >= 0.45) && (frag.normalVal.a <= 0.55)) {
+        vec3 color = evalLightmappedColor(
+                        deferredTransform.viewInverse,
+                        shadowAttenuation,
+                        frag.normal,
+                        frag.diffuse,
+                        frag.specularVal.xyz);
+        _fragColor = vec4(color, 1.0);
+    } else {
+        vec3 color =  evalAmbientSphereGlobalColor(
+                        deferredTransform.viewInverse,
+                        shadowAttenuation,
+                        frag.position.xyz,
+                        frag.normal,
+                        frag.diffuse,
+                        frag.specular,
+                        frag.gloss);
+        _fragColor = vec4(color, frag.normalVal.a);
+    }
+}

libraries/render-utils/src/directional_light.slf

@@ -6,13 +6,12 @@
 //  fragment shader
 //
 //  Created by Andrzej Kapolka on 9/3/14.
-//  Copyright 2014 High Fidelity, Inc.
+//  Copyright 2016 High Fidelity, Inc.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-<@include Shadow.slh@>
 <@include DeferredBuffer.slh@>
 <@include DeferredGlobalLight.slh@>
 
@@ -26,8 +25,7 @@ void main(void) {
     DeferredTransform deferredTransform = getDeferredTransform();
     DeferredFragment frag = unpackDeferredFragment(deferredTransform, _texCoord0);
 
-    vec4 worldPos = deferredTransform.viewInverse * vec4(frag.position.xyz, 1.0);
-	float shadowAttenuation = evalShadowAttenuation(worldPos);
+	float shadowAttenuation = 1.0;
 
     // Light mapped or not ?
     if ((frag.normalVal.a >= 0.45) && (frag.normalVal.a <= 0.55)) {

libraries/render-utils/src/directional_light_shadow.slf

@@ -0,0 +1,52 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  directional_light_shadow.frag
+//  fragment shader
+//
+//  Created by Zach Pomerantz on 1/18/2016.
+//  Copyright 2016 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+<@include Shadow.slh@>
+<@include DeferredBuffer.slh@>
+<@include DeferredGlobalLight.slh@>
+
+<$declareEvalLightmappedColor()$>
+<$declareEvalAmbientGlobalColor()$>
+
+in vec2 _texCoord0;
+out vec4 _fragColor;
+
+void main(void) {
+    DeferredTransform deferredTransform = getDeferredTransform();
+    DeferredFragment frag = unpackDeferredFragment(deferredTransform, _texCoord0);
+
+    vec4 worldPos = deferredTransform.viewInverse * vec4(frag.position.xyz, 1.0);
+	float shadowAttenuation = evalShadowAttenuation(worldPos);
+
+    // Light mapped or not ?
+    if ((frag.normalVal.a >= 0.45) && (frag.normalVal.a <= 0.55)) {
+         vec3 color = evalLightmappedColor(
+                        deferredTransform.viewInverse,
+                        shadowAttenuation,
+                        frag.normal,
+                        frag.diffuse,
+                        frag.specularVal.xyz);
+        _fragColor = vec4(color, 1.0);
+    } else {
+        vec3 color =  evalAmbientGlobalColor(
+                        deferredTransform.viewInverse,
+						shadowAttenuation,
+                        frag.position.xyz,
+                        frag.normal,
+                        frag.diffuse,
+                        frag.specular,
+                        frag.gloss);
+        _fragColor = vec4(color, frag.normalVal.a);
+    }
+}

libraries/render-utils/src/directional_skybox_light.slf

@@ -3,16 +3,15 @@
 //  Generated on <$_SCRIBE_DATE$>
 //
 //  directional_light.frag
-<!//  fragment shader
+//  fragment shader
 //
 //  Created by Sam Gateau on 5/8/2015.
-//  Copyright 2014 High Fidelity, Inc.
+//  Copyright 2016 High Fidelity, Inc.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//!>
+//
 
-<@include Shadow.slh@>
 <@include DeferredBuffer.slh@>
 <@include DeferredGlobalLight.slh@>
 
@@ -26,8 +25,7 @@ void main(void) {
     DeferredTransform deferredTransform = getDeferredTransform();
     DeferredFragment frag = unpackDeferredFragment(deferredTransform, _texCoord0);
 
-    vec4 worldPos = deferredTransform.viewInverse * vec4(frag.position.xyz, 1.0);
-	float shadowAttenuation = evalShadowAttenuation(worldPos);
+	float shadowAttenuation = 1.0;
 
     // Light mapped or not ?
     if ((frag.normalVal.a >= 0.45) && (frag.normalVal.a <= 0.55)) {

libraries/render-utils/src/directional_skybox_light_shadow.slf

@@ -0,0 +1,53 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  directional_light_shadow.frag
+//  fragment shader
+//
+//  Created by Zach Pomerantz on 1/18/2016.
+//  Copyright 2016 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//!>
+
+<@include Shadow.slh@>
+<@include DeferredBuffer.slh@>
+<@include DeferredGlobalLight.slh@>
+
+<$declareEvalLightmappedColor()$>
+<$declareEvalSkyboxGlobalColor()$>
+
+in vec2 _texCoord0;
+out vec4 _fragColor;
+
+void main(void) {
+    DeferredTransform deferredTransform = getDeferredTransform();
+    DeferredFragment frag = unpackDeferredFragment(deferredTransform, _texCoord0);
+
+    vec4 worldPos = deferredTransform.viewInverse * vec4(frag.position.xyz, 1.0);
+	float shadowAttenuation = evalShadowAttenuation(worldPos);
+
+    // Light mapped or not ?
+    if ((frag.normalVal.a >= 0.45) && (frag.normalVal.a <= 0.55)) {
+        vec3 color = evalLightmappedColor(
+                        deferredTransform.viewInverse,
+                        shadowAttenuation,
+                        frag.normal,
+                        frag.diffuse,
+                        frag.specularVal.xyz);
+        _fragColor = vec4(color, 1.0);
+    } else {
+        vec3 color =  evalSkyboxGlobalColor(
+                        deferredTransform.viewInverse,
+                        shadowAttenuation,
+                        frag.position.xyz,
+                        frag.normal,
+                        frag.diffuse,
+                        frag.specular,
+                        frag.gloss);
+
+        _fragColor = vec4(color, frag.normalVal.a);
+    }
+}