From ce77fcfac99b1813b7f3bb47953803db742657f6 Mon Sep 17 00:00:00 2001
From: Thorsten Renk <thorsten.i.renk@jyu.fi>
Date: Wed, 18 Feb 2015 10:35:00 +0200
Subject: [PATCH] European deciduous trees change autumn color in ALS

---
 Effects/tree-european-deciduous.eff |  8 ++++++
 Effects/tree-european-mixed.eff     |  8 ++++++
 Effects/tree.eff                    | 22 +++++++++++++++
 Materials/regions/europe.xml        | 43 +++++++++++++++++++++++++++++
 Materials/regions/global-summer.xml |  9 ++++++
 Shaders/tree-ALS.frag               | 16 +++++++++++
 Shaders/tree-ALS.vert               |  9 +++++-
 7 files changed, 114 insertions(+), 1 deletion(-)
 create mode 100644 Effects/tree-european-deciduous.eff
 create mode 100644 Effects/tree-european-mixed.eff

diff --git a/Effects/tree-european-deciduous.eff b/Effects/tree-european-deciduous.eff
new file mode 100644
index 000000000..02b03fa06
--- /dev/null
+++ b/Effects/tree-european-deciduous.eff
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PropertyList>
+  <name>Effects/tree-european-deciduous</name>
+  <inherits-from>Effects/tree</inherits-from>
+	<parameters>
+		<num_deciduous_trees>8</num_deciduous_trees>
+	</parameters>
+</PropertyList>
diff --git a/Effects/tree-european-mixed.eff b/Effects/tree-european-mixed.eff
new file mode 100644
index 000000000..da967fd86
--- /dev/null
+++ b/Effects/tree-european-mixed.eff
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PropertyList>
+  <name>Effects/tree-european-mixed</name>
+  <inherits-from>Effects/tree</inherits-from>
+	<parameters>
+		<num_deciduous_trees>4</num_deciduous_trees>
+	</parameters>
+</PropertyList>
diff --git a/Effects/tree.eff b/Effects/tree.eff
index 8b5226d06..c6fb62716 100644
--- a/Effects/tree.eff
+++ b/Effects/tree.eff
@@ -17,6 +17,7 @@
 		<texture n ="0">
 		</texture>
 		<!-- 	fog include -->
+		<num_deciduous_trees>0</num_deciduous_trees>
 		<visibility><use>/environment/ground-visibility-m</use></visibility>
 		<avisibility><use>/environment/visibility-m</use></avisibility>
 		<lthickness><use>/environment/ground-haze-thickness-m</use></lthickness>
@@ -29,6 +30,7 @@
 		<eye_alt><use>/sim/rendering/eye-altitude-m</use></eye_alt>
 		<snow_level><use>/environment/snow-level-m</use></snow_level>
 		<season><use>/environment/tree-season</use></season>
+		<cseason><use>/environment/season</use></cseason>
 		<dust_cover_factor><use>/environment/surface/dust-cover-factor</use></dust_cover_factor>
 		<fogtype><use>/sim/rendering/shaders/skydome</use></fogtype>
 		<fogstructure><use>/environment/fog-structure</use></fogstructure>
@@ -202,6 +204,11 @@
         <type>float</type>
         <value><use>season</use></value>
       </uniform>
+      <uniform>
+        <name>cseason</name>
+        <type>float</type>
+        <value><use>cseason</use></value>
+      </uniform>
       <uniform>
 	<name>WindE</name>
 	<type>float</type>
@@ -472,6 +479,11 @@
         <type>int</type>
         <value><use>display_ysize</use></value>
       </uniform>  
+      <uniform>
+        <name>num_deciduous_trees</name>
+        <type>int</type>
+        <value><use>num_deciduous_trees</use></value>
+      </uniform> 
       <uniform>
         <name>texture</name>
         <type>sampler-2d</type>
@@ -618,6 +630,11 @@
         <type>float</type>
         <value><use>season</use></value>
       </uniform>
+      <uniform>
+        <name>cseason</name>
+        <type>float</type>
+        <value><use>cseason</use></value>
+      </uniform>
      <uniform>
 	<name>WindE</name>
 	<type>float</type>
@@ -888,6 +905,11 @@
         <type>int</type>
         <value><use>display_ysize</use></value>
       </uniform>  
+      <uniform>
+        <name>num_deciduous_trees</name>
+        <type>int</type>
+        <value><use>num_deciduous_trees</use></value>
+      </uniform> 
       <uniform>
         <name>texture</name>
         <type>sampler-2d</type>
diff --git a/Materials/regions/europe.xml b/Materials/regions/europe.xml
index 254c6a91a..05e5fa037 100644
--- a/Materials/regions/europe.xml
+++ b/Materials/regions/europe.xml
@@ -60,6 +60,7 @@
 
   <material>
     <effect>Effects/cropgrass</effect>
+    <tree-effect>Effects/tree-european-mixed</tree-effect>
     <name>CropGrassCover</name>
     <name>CropGrass</name>
     <texture>Terrain/cropgrass-hires-autumn.png</texture>
@@ -97,6 +98,7 @@
   <material>
     <name>BuiltUpCover</name>
     <name>Urban</name>
+    <tree-effect>Effects/tree-european-deciduous</tree-effect>
     <texture>Terrain/18th_century_city.png</texture>
     <object-mask>Terrain/18th_century_city.mask.png</object-mask>
     <xsize>1000</xsize>
@@ -245,4 +247,45 @@
     <tree-width-m>12.0</tree-width-m>
   </material>
 
+    <material>
+    <effect>Effects/forest</effect>
+    <tree-effect>Effects/tree-european-deciduous</tree-effect>
+    <name>DeciduousBroadCover</name>
+    <name>DeciduousForest</name>
+    <name>Bog</name>
+    <name>Heath</name>
+    <texture>Terrain/deciduous-hires-autumn.png</texture>
+    <xsize>2000</xsize>
+    <ysize>2000</ysize>
+    <light-coverage>10000000.0</light-coverage>
+    <wood-coverage>4000.0</wood-coverage>
+    <tree-texture>Trees/deciduous-alt.png</tree-texture>
+    <tree-varieties>8</tree-varieties>
+    <tree-range-m alias="/params/forest/tree-range-m"/>
+    <tree-height-m>25.0</tree-height-m>
+    <tree-width-m>15.0</tree-width-m>
+    <rolling-friction>1</rolling-friction>
+    <bumpiness>0.85</bumpiness>
+  </material>
+
+  <material>
+    <effect>Effects/forest</effect>
+    <tree-effect>Effects/tree-european-mixed</tree-effect>
+    <name>MixedForestCover</name>
+    <name>MixedForest</name>
+    <name>RainForest</name>
+    <texture>Terrain/mixedforest-hires-autumn.png</texture>
+    <xsize>2000</xsize>
+    <ysize>2000</ysize>
+    <light-coverage>5000000.0</light-coverage>
+    <wood-coverage>4000.0</wood-coverage>
+    <tree-texture>Trees/mixed-alt.png</tree-texture>
+    <tree-varieties>8</tree-varieties>
+    <tree-range-m alias="/params/forest/tree-range-m"/>
+    <tree-height-m>25.0</tree-height-m>
+    <tree-width-m>15.0</tree-width-m>
+    <rolling-friction>1</rolling-friction>
+    <bumpiness>0.95</bumpiness>
+  </material>
+
 </PropertyList>
diff --git a/Materials/regions/global-summer.xml b/Materials/regions/global-summer.xml
index c329f0097..ba17e97d8 100644
--- a/Materials/regions/global-summer.xml
+++ b/Materials/regions/global-summer.xml
@@ -522,6 +522,15 @@
     <rolling-friction>0.1</rolling-friction>
     <bumpiness>0.1</bumpiness>
     <load-resistance>1e30</load-resistance>
+    <!-- uncomment this to get volumetric grass on airport keep
+
+    <wood-coverage>10.0</wood-coverage>
+    <tree-texture>Trees/grass_blades.png</tree-texture>
+    <tree-varieties>1</tree-varieties>
+    <tree-range-m>200.0</tree-range-m>
+    <tree-height-m>0.3</tree-height-m>
+    <tree-width-m>1.0</tree-width-m> 
+     -->
   </material>
 
   <!-- default mixed crop -->
diff --git a/Shaders/tree-ALS.frag b/Shaders/tree-ALS.frag
index e3988f332..9f48306dd 100644
--- a/Shaders/tree-ALS.frag
+++ b/Shaders/tree-ALS.frag
@@ -11,6 +11,7 @@ uniform sampler2D texture;
 
 
 varying float yprime_alt;
+varying float autumn_flag;
 
 uniform float visibility;
 uniform float avisibility;
@@ -26,6 +27,7 @@ uniform float dust_cover_factor;
 uniform float air_pollution;
 uniform float landing_light1_offset;
 uniform float landing_light2_offset;
+uniform float cseason;
 
 uniform int use_searchlight;
 uniform int use_landing_light;
@@ -135,10 +137,22 @@ void main()
 
   if (quality_level > 3)
 	{
+
+	//  seasonal color changes
+
+	if ((cseason < 1.5)&& (autumn_flag > 0.0))
+	{
+	texel.r = min(1.0, (1.0 + 5.0 *cseason * autumn_flag  ) * texel.r);
+	//texel.g = texel.g + 0.05 * (autumn_flag-0.5) * cseason;
+	texel.b = max(0.0, (1.0 - 8.0 * cseason) *  texel.b);
+	}
+
 	// mix dust
     	vec4 dust_color = vec4 (0.76, 0.71, 0.56, texel.a);
 
     	texel = mix(texel, dust_color, clamp(0.6 * dust_cover_factor ,0.0, 1.0) );
+
+	
 	}
 
 
@@ -346,6 +360,8 @@ fragColor.rgb = mix( hazeColor  + secondary_light * fog_backscatter(mvisibility)
 
 }
 
+//if (autumn_flag > 0.0) {fragColor = vec4 (0.0,0.0,0.0,1.0);}
+
 gl_FragColor = fragColor;
 }
 
diff --git a/Shaders/tree-ALS.vert b/Shaders/tree-ALS.vert
index 3ef742141..65c7e4136 100644
--- a/Shaders/tree-ALS.vert
+++ b/Shaders/tree-ALS.vert
@@ -22,10 +22,12 @@
 
 varying vec3 relPos;
 varying float yprime_alt;
+varying float autumn_flag;
 
 uniform int colorMode;
 uniform int wind_effects;
 uniform int forest_effects;
+uniform int num_deciduous_trees;
 uniform float hazeLayerAltitude;
 uniform float terminator;
 uniform float terrain_alt; 
@@ -66,7 +68,6 @@ return e / pow((1.0 + a * exp(-b * (x-c)) ),(1.0/d));
 void main()
 {
 
-  //vec4 light_diffuse;
   vec4 light_ambient;
 
   vec3 shadedFogColor = vec3(0.55, 0.67, 0.88);
@@ -81,6 +82,12 @@ void main()
 
   float numVarieties = gl_Normal.z;
   float texFract = floor(fract(gl_MultiTexCoord0.x) * numVarieties) / numVarieties;
+
+// determine whether the tree changes color in autumn
+  if (texFract <  (float) num_deciduous_trees/numVarieties) {autumn_flag = 0.5 + fract(gl_Color.x);}
+  else {autumn_flag = 0.0;}
+
+	
   texFract += floor(gl_MultiTexCoord0.x) / numVarieties;
   
   // Determine the rotation for the tree.  The Fog Coordinate provides rotation information