Reflectance not working correctly yet.

modules/atmosphere/shaders/deferred_test_fs.glsl

@@ -493,7 +493,7 @@ vec3 groundColor(const vec3 x, const float t, const vec3 v, const vec3 s, const
   float r0 = length(x0);
   // Normal of intersection point.
   vec3  n  = normalReflectance.xyz;
-  vec4 reflectance = groundColor * vec4(0.4);
+  vec4 groundReflectance = groundColor * vec4(0.4);
   //reflectance.w = 1.0;
             
   // L0 is not included in the irradiance texture.
@@ -507,11 +507,11 @@ vec3 groundColor(const vec3 x, const float t, const vec3 v, const vec3 s, const
   vec3 irradianceReflected = irradiance(irradianceTexture, r0, muSun) * irradianceFactor;
     
   // R[L0] + R[L*]
-  vec3 groundRadiance = reflectance.rgb * (muSun * transmittanceL0 + irradianceReflected)
+  vec3 groundRadiance = groundReflectance.rgb * (muSun * transmittanceL0 + irradianceReflected)
     * sunRadiance / M_PI;
     
   // Specular reflection from sun on oceans and rivers  
-  if (reflectance.w > 0.0) {
+  if (normalReflectance.w > 0.0) {
     vec3  h         = normalize(s - v);
     // Fresnell Schlick's approximation
     float fresnel   = 0.02f + 0.98f * pow(1.0f - dot(-v, h), 5.0f);
@@ -519,7 +519,7 @@ vec3 groundColor(const vec3 x, const float t, const vec3 v, const vec3 s, const
     float waterBrdf = fresnel * pow(max(dot(h, n), 0.0f), 150.0f);
     // Adding Fresnell and Water BRDFs approximation to the final surface color
     // (After adding the sunRadiance and the attenuation of the Sun through atmosphere)
-    groundRadiance += reflectance.w * max(waterBrdf, 0.0) * transmittanceL0 * sunRadiance;
+    groundRadiance += normalReflectance.w * max(waterBrdf, 0.0) * transmittanceL0 * sunRadiance;
   }
   
   // Finally, we attenuate the surface Radiance from the the point x0 to the camera location.
@@ -788,6 +788,7 @@ void main() {
           
           renderTarget = finalRadiance;
           //renderTarget = vec4(1.0 - HDR(vec3(pixelDepth/100)),1.0);
+          //renderTarget = vec4(vec3(meanNormal.a),1.0);
         }
       } else {
         renderTarget = vec4(HDR(meanColor.xyz), meanColor.a);        

modules/globebrowsing/shaders/globalchunkedlodpatch_fs.glsl

@@ -37,7 +37,7 @@ Fragment getFragment() {
     frag.gColor             = frag.color;
     // Normal is written in Camera Rig (OS Eye) Space
     //frag.gNormalReflectance = vec4(ellipsoidNormalCameraSpace, 1.0); 
-    frag.gNormalReflectance = vec4(fs_normal, 1.0);//reflectance); // adding 1.0 to reflectance by now
+    frag.gNormalReflectance = vec4(fs_normal, reflectance); 
     frag.gPosition          = vec4(positionCameraSpace, 1.0); // in Camera Rig Space
 
     frag.depth = fs_position.w;

modules/globebrowsing/shaders/localchunkedlodpatch_fs.glsl

@@ -37,7 +37,7 @@ Fragment getFragment() {
     // TODO: Change the color for the new deferred system (JCC)
     frag.gColor             = frag.color;
     // Normal is written in Camera Rig (OS Eye) Space
-    frag.gNormalReflectance = vec4(ellipsoidNormalCameraSpace, 1.0);//reflectance);
+    frag.gNormalReflectance = vec4(ellipsoidNormalCameraSpace, reflectance);
     //frag.gNormalReflectance = vec4(fs_normal, 1.0); // adding 1.0 to reflectance by now
     frag.gPosition          = vec4(positionCameraSpace, 1.0); // in Camera Rig Space
 

modules/globebrowsing/shaders/texturetilemapping.hglsl

@@ -352,8 +352,8 @@ vec4 calculateWater(
 	const Layer WaterMasks[NUMLAYERS_WATERMASK],
 	const vec3 ellipsoidNormalCameraSpace,
 	const vec3 lightDirectionCameraSpace,
-	const vec3 positionCameraSpace){//,
-    //out float reflectance) {
+	const vec3 positionCameraSpace,
+    out float reflectance) {
 
 	vec4 waterColor = vec4(0,0,0,0);
 
@@ -383,7 +383,7 @@ vec4 calculateWater(
 
 	vec3 specularTotal = specularColor * cosineFactor * specularIntensity * waterColor.a;
 
-    //reflectance = waterColor.a;
+    reflectance = 1.0;//waterColor.a;
     
 	//return blendOver(currentColor, waterColor);
 	return currentColor + vec4(specularTotal, 1);

modules/globebrowsing/shaders/tilefragcolor.hglsl

@@ -156,8 +156,8 @@ vec4 getTileFragColor(){
 		WaterMasks,
 		normalize(ellipsoidNormalCameraSpace),
 		lightDirectionCameraSpace, // Should already be normalized
-		positionCameraSpace);//,
-    //        reflectance);
+		positionCameraSpace,
+        reflectance);
 
 #endif // USE_WATERMASK