From 31c231273232c11094ac452978ed0e11febdb68a Mon Sep 17 00:00:00 2001
From: Thorsten Renk <thorsten@science-and-fiction.org>
Date: Mon, 28 Mar 2016 13:25:47 +0300
Subject: [PATCH] Prepare rock and base terrain effect for ALS filtering

---
 Effects/rock.eff              | 33 +++++++++++++++++++++++++++
 Effects/terrain-default.eff   | 43 +++++++++++++++++++++++++++++++++++
 Shaders/rock-ALS.frag         |  3 +++
 Shaders/terrain-ALS-base.frag |  2 ++
 4 files changed, 81 insertions(+)

diff --git a/Effects/rock.eff b/Effects/rock.eff
index 94984178a..1cfbb5ec4 100644
--- a/Effects/rock.eff
+++ b/Effects/rock.eff
@@ -93,6 +93,7 @@
 	<fragment-shader>Shaders/noise.frag</fragment-shader>
 	<fragment-shader>Shaders/hazes.frag</fragment-shader>
 	<fragment-shader>Shaders/secondary_lights.frag</fragment-shader>
+	<fragment-shader>Shaders/filters-ALS.frag</fragment-shader>
       </program>
 	  <uniform>
         <name>intrinsic_wetness</name>
@@ -294,6 +295,38 @@
         <type>float</type>
         <value><use>landing_light3_offset</use></value>
       </uniform>
+	<!-- filtering -->
+      <uniform>
+        <name>gamma</name>
+        <type>float</type>
+        <value><use>gamma</use></value>
+      </uniform>
+      <uniform>
+        <name>brightness</name>
+        <type>float</type>
+        <value><use>brightness</use></value>
+      </uniform>
+      <uniform>
+        <name>use_night_vision</name>
+        <type>bool</type>
+        <value><use>use_night_vision</use></value>
+      </uniform>
+      <uniform>
+        <name>use_IR_vision</name>
+        <type>bool</type>
+        <value><use>use_IR_vision</use></value>
+      </uniform>
+      <uniform>
+        <name>use_filtering</name>
+        <type>bool</type>
+        <value><use>use_filtering</use></value>
+      </uniform>
+      <uniform>
+        <name>delta_T</name>
+        <type>float</type>
+        <value><use>delta_T</use></value>
+      </uniform>
+	<!-- cloud shadows -->
       <uniform>
         <name>cloudpos1_x</name>
         <type>float</type>
diff --git a/Effects/terrain-default.eff b/Effects/terrain-default.eff
index 0c45b20d1..64fe4d57e 100644
--- a/Effects/terrain-default.eff
+++ b/Effects/terrain-default.eff
@@ -1198,6 +1198,8 @@
         <vertex-shader>Shaders/generic-ALS-base.vert</vertex-shader>
         <fragment-shader>Shaders/terrain-ALS-base.frag</fragment-shader>
         <fragment-shader>Shaders/hazes.frag</fragment-shader>
+	<fragment-shader>Shaders/noise.frag</fragment-shader>
+	<fragment-shader>Shaders/filters-ALS.frag</fragment-shader>
       </program>
       <uniform>
         <name>visibility</name>
@@ -1259,6 +1261,47 @@
         <type>float</type>
         <value><use>air_pollution</use></value>
       </uniform>
+	<!-- filtering -->
+      <uniform>
+        <name>gamma</name>
+        <type>float</type>
+        <value><use>gamma</use></value>
+      </uniform>
+      <uniform>
+        <name>brightness</name>
+        <type>float</type>
+        <value><use>brightness</use></value>
+      </uniform>
+      <uniform>
+        <name>use_night_vision</name>
+        <type>bool</type>
+        <value><use>use_night_vision</use></value>
+      </uniform>
+      <uniform>
+        <name>use_IR_vision</name>
+        <type>bool</type>
+        <value><use>use_IR_vision</use></value>
+      </uniform>
+      <uniform>
+        <name>use_filtering</name>
+        <type>bool</type>
+        <value><use>use_filtering</use></value>
+      </uniform>
+      <uniform>
+        <name>delta_T</name>
+        <type>float</type>
+        <value><use>delta_T</use></value>
+      </uniform>
+      <uniform>
+        <name>display_xsize</name>
+        <type>int</type>
+        <value><use>display_xsize</use></value>
+      </uniform>
+      <uniform>
+        <name>display_ysize</name>
+        <type>int</type>
+        <value><use>display_ysize</use></value>
+      </uniform>  
       <uniform>
         <name>texture</name>
         <type>sampler-2d</type>
diff --git a/Shaders/rock-ALS.frag b/Shaders/rock-ALS.frag
index a23dd1f59..a94fcfc3a 100644
--- a/Shaders/rock-ALS.frag
+++ b/Shaders/rock-ALS.frag
@@ -81,6 +81,7 @@ vec3 rayleigh_out_shift(in vec3 color, in float outscatter);
 vec3 get_hazeColor(in float light_arg);
 vec3 searchlight();
 vec3 landing_light(in float offset, in float offsetv);
+vec3 filter_combined (in vec3 color) ;
 
 float light_func (in float x, in float a, in float b, in float c, in float d, in float e)
 {
@@ -665,6 +666,8 @@ fragColor.rgb = mix(hazeColor + secondary_light * fog_backscatter(mvisibility),
 
 }
 
+fragColor.rgb = filter_combined(fragColor.rgb);
+
 gl_FragColor = fragColor;
 
 
diff --git a/Shaders/terrain-ALS-base.frag b/Shaders/terrain-ALS-base.frag
index 8b3522fc6..6154e4700 100644
--- a/Shaders/terrain-ALS-base.frag
+++ b/Shaders/terrain-ALS-base.frag
@@ -32,6 +32,7 @@ float eShade;
 
 float fog_func (in float targ, in float alt);
 vec3 get_hazeColor(in float light_arg);
+vec3 filter_combined (in vec3 color) ;
 
 float luminance(vec3 color)
 {
@@ -236,6 +237,7 @@ hazeColor.rgb = max(hazeColor.rgb, minLight.rgb);
 fragColor.rgb = mix(hazeColor, fragColor.rgb,transmission);
 }
 
+fragColor.rgb = filter_combined(fragColor.rgb);
 
 gl_FragColor = fragColor;