From 47a8ac62e12266ecae771d0b62811dafd2f7678e Mon Sep 17 00:00:00 2001
From: Thorsten Renk <thorsten@science-and-fiction.org>
Date: Sat, 4 Mar 2017 10:31:27 +0200
Subject: [PATCH] More ALS g-force effect work

---
 Effects/chute.eff                  | 10 ++++
 Effects/glass.eff                  | 13 +++++
 Effects/hud.eff                    | 11 ++++
 Effects/model-wingflex-organic.eff | 10 ++++
 Effects/planet-cloudlayer.eff      | 93 +++++++++++++++++-------------
 Effects/planet.eff                 | 22 +++++++
 6 files changed, 118 insertions(+), 41 deletions(-)

diff --git a/Effects/chute.eff b/Effects/chute.eff
index 2c44b6683..f991365d2 100644
--- a/Effects/chute.eff
+++ b/Effects/chute.eff
@@ -195,6 +195,16 @@
         <type>float</type>
         <value><use>delta_T</use></value>
       </uniform>
+      <uniform>
+        <name>fact_grey</name>
+        <type>float</type>
+        <value><use>fact_grey</use></value>
+      </uniform>
+      <uniform>
+        <name>fact_black</name>
+        <type>float</type>
+        <value><use>fact_black</use></value>
+      </uniform>
       <uniform>
         <name>view_pitch_offset</name>
         <type>float</type>
diff --git a/Effects/glass.eff b/Effects/glass.eff
index 8daa2e0a3..dbe2751c4 100644
--- a/Effects/glass.eff
+++ b/Effects/glass.eff
@@ -90,6 +90,9 @@
     </predicate>
     <pass>
       <lighting>true</lighting>
+      <depth>
+	<write-mask type="bool">false</write-mask>
+      </depth>
       <material>
         <active><use>material/active</use></active>
         <ambient><use>material/ambient</use></ambient>
@@ -341,6 +344,16 @@
         <type>float</type>
         <value><use>delta_T</use></value>
       </uniform>
+      <uniform>
+        <name>fact_grey</name>
+        <type>float</type>
+        <value><use>fact_grey</use></value>
+      </uniform>
+      <uniform>
+        <name>fact_black</name>
+        <type>float</type>
+        <value><use>fact_black</use></value>
+      </uniform>
 
       <uniform>
         <name>texture</name>
diff --git a/Effects/hud.eff b/Effects/hud.eff
index 0be8fc649..c65a24191 100644
--- a/Effects/hud.eff
+++ b/Effects/hud.eff
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
 	<name>Effects/hud</name>
 	<inherits-from>Effects/model-default</inherits-from>
@@ -365,6 +366,16 @@
         <type>float</type>
         <value><use>delta_T</use></value>
       </uniform>
+      <uniform>
+        <name>fact_grey</name>
+        <type>float</type>
+        <value><use>fact_grey</use></value>
+      </uniform>
+      <uniform>
+        <name>fact_black</name>
+        <type>float</type>
+        <value><use>fact_black</use></value>
+      </uniform>
 
       <uniform>
         <name>texture</name>
diff --git a/Effects/model-wingflex-organic.eff b/Effects/model-wingflex-organic.eff
index eeac94698..5c2d0f108 100644
--- a/Effects/model-wingflex-organic.eff
+++ b/Effects/model-wingflex-organic.eff
@@ -969,6 +969,16 @@
         			<type>float</type>
         			<value><use>delta_T</use></value>
       			</uniform>	
+			<uniform>
+				<name>fact_grey</name>
+				<type>float</type>
+				<value><use>fact_grey</use></value>
+			</uniform>
+			<uniform>
+				<name>fact_black</name>
+				<type>float</type>
+				<value><use>fact_black</use></value>
+			</uniform>
 			<!-- cloud shadows -->
  			   <uniform>
        				  <name>cloudpos1_x</name>
diff --git a/Effects/planet-cloudlayer.eff b/Effects/planet-cloudlayer.eff
index fb045a5b1..91debda5c 100644
--- a/Effects/planet-cloudlayer.eff
+++ b/Effects/planet-cloudlayer.eff
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
 	<name>Effects/planet-cloudlayer</name>
-	<!-- 	<inherits-from>Effects/shadow</inherits-from> -->
 	<parameters>
 		<texture n ="0">
 			<type>white</type>
@@ -29,6 +28,8 @@
     		<gamma><use>/sim/rendering/als-filters/gamma</use></gamma>
     		<brightness><use>/sim/rendering/als-filters/brightness</use></brightness>
     		<delta_T><use>/environment/surface/delta-T-cloud</use></delta_T>
+		<fact_grey><use>/sim/rendering/als-filters/grey-factor</use></fact_grey>
+    	        <fact_black><use>/sim/rendering/als-filters/black-factor</use></fact_black>
     		<use_night_vision><use>/sim/rendering/als-filters/use-night-vision</use></use_night_vision>
     		<use_IR_vision><use>/sim/rendering/als-filters/use-IR-vision</use></use_IR_vision>
     		<display_xsize><use>/sim/startup/xsize</use></display_xsize>
@@ -194,46 +195,56 @@
 					<use>sun-angle</use>
 				</value>
 			</uniform>
-<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_filtering</name>
-        <type>bool</type>
-        <value><use>use_filtering</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>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>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_filtering</name>
+				<type>bool</type>
+				<value><use>use_filtering</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>delta_T</name>
+				<type>float</type>
+				<value><use>delta_T</use></value>
+			</uniform>
+	      		<uniform>
+				<name>fact_grey</name>
+				<type>float</type>
+				<value><use>fact_grey</use></value>
+			</uniform>
+			<uniform>
+				<name>fact_black</name>
+				<type>float</type>
+				<value><use>fact_black</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>  
 		</pass>
 	</technique>
 
diff --git a/Effects/planet.eff b/Effects/planet.eff
index b14246811..1197b8437 100644
--- a/Effects/planet.eff
+++ b/Effects/planet.eff
@@ -43,6 +43,8 @@
     		<gamma><use>/sim/rendering/als-filters/gamma</use></gamma>
     		<brightness><use>/sim/rendering/als-filters/brightness</use></brightness>
     		<delta_T><use>/environment/surface/delta-T-cloud</use></delta_T>
+		<fact_grey><use>/sim/rendering/als-filters/grey-factor</use></fact_grey>
+    	        <fact_black><use>/sim/rendering/als-filters/black-factor</use></fact_black>
     		<use_night_vision><use>/sim/rendering/als-filters/use-night-vision</use></use_night_vision>
     		<use_IR_vision><use>/sim/rendering/als-filters/use-IR-vision</use></use_IR_vision>
     		<display_xsize><use>/sim/startup/xsize</use></display_xsize>
@@ -252,6 +254,16 @@
 				<type>float</type>
 				<value><use>delta_T</use></value>
 			      </uniform>
+			      <uniform>
+				<name>fact_grey</name>
+				<type>float</type>
+				<value><use>fact_grey</use></value>
+			      </uniform>
+			      <uniform>
+				<name>fact_black</name>
+				<type>float</type>
+				<value><use>fact_black</use></value>
+			      </uniform>
 			      <uniform>
 				<name>display_xsize</name>
 				<type>int</type>
@@ -456,6 +468,16 @@
 				<type>float</type>
 				<value><use>delta_T</use></value>
 			 </uniform>
+			 <uniform>
+				<name>fact_grey</name>
+				<type>float</type>
+				<value><use>fact_grey</use></value>
+			 </uniform>
+			 <uniform>
+				<name>fact_black</name>
+				<type>float</type>
+				<value><use>fact_black</use></value>
+			 </uniform>
 			 <uniform>
 				<name>display_xsize</name>
 				<type>int</type>