From 9847ae8ea9c514ba1d41fd2bd5d7f116b659ab27 Mon Sep 17 00:00:00 2001
From: Colin Geniet <colin.geniet@gmail.com>
Date: Mon, 16 Mar 2020 12:33:58 +0100
Subject: [PATCH] Improve rain drops on windshield effect

---
 Systems/glass-effect.xml | 64 +++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 33 deletions(-)

diff --git a/Systems/glass-effect.xml b/Systems/glass-effect.xml
index f253bff9..62accb79 100644
--- a/Systems/glass-effect.xml
+++ b/Systems/glass-effect.xml
@@ -3,56 +3,54 @@
 <!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
 
 <system name="glass-effect">
-
     <channel name="rain">
-
-        <fcs_function name="glass-effects/airspeed-clamped-sqrt">
-            <function>
-                <sqrt>
-                    <quotient>
-                        <min>
-                            <property>/velocities/airspeed-kt</property>
-                            <value>40</value>
-                        </min>
-                        <value>40</value>
-                    </quotient>
-                </sqrt>
-            </function>
-        </fcs_function>
-
         <fcs_function name="glass-effects/splashx">
             <function>
-                <difference>
-                    <value>-0.1</value>
-                    <product>
-                        <value>2.0</value>
-                        <property>/fdm/jsbsim/glass-effects/airspeed-clamped-sqrt</property>
-                    </product>
-                </difference>
+                <table>
+                    <independentVar>velocities/u-aero-fps</independentVar>
+                    <tableData>
+                        0   0.01
+                        7   0.01
+                        8   -0.01
+                        25  -0.5
+                        50  -1.2
+                        120 -2
+                    </tableData>
+                </table>
             </function>
             <output>/environment/aircraft-effects/splash-vector-x</output>
         </fcs_function>
 
         <fcs_function name="glass-effects/splashy">
             <function>
-               <value>0.0</value>
+                <table>
+                    <independentVar>velocities/v-aero-fps</independentVar>
+                    <tableData>
+                        -25 -0.5
+                        -8  0
+                        8   0
+                        25  0.5
+                    </tableData>
+                </table>
             </function>
             <output>/environment/aircraft-effects/splash-vector-y</output>
         </fcs_function>
 
         <fcs_function name="glass-effects/splashz">
             <function>
-                <difference>
-                    <value>1.0</value>
-                    <product>
-                        <value>1.35</value>
-                        <property>/fdm/jsbsim/glass-effects/airspeed-clamped-sqrt</property>
-                    </product>
-                </difference>
+                <table>
+                    <independentVar>velocities/u-aero-fps</independentVar>
+                    <tableData>
+                        0   1.2
+                        7   1.2
+                        8   0.9
+                        25  0.9
+                        50  -0.2
+                        120 -0.5
+                    </tableData>
+                </table>
             </function>
             <output>/environment/aircraft-effects/splash-vector-z</output>
         </fcs_function>
-
     </channel>
-
 </system>