Merge branch 'master' of \New Git\fgdata

Effects/material-diffuse.eff

@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
   <name>Effects/material-diffuse</name>
+  <parameters>
+    <material>
+      <color-mode-uniform>1</color-mode-uniform> <!-- DIFFUSE -->
+    </material>
+  </parameters>
   <inherits-from>Effects/model-default</inherits-from>
-  <technique n="10">
-    <pass>
-      <program>
-        <vertex-shader>Shaders/default.vert</vertex-shader>
-        <fragment-shader>Shaders/default.frag</fragment-shader>
-      </program>
-      <uniform>
-        <name>colorMode</name>
-        <type>int</type>
-        <value>1</value> <!-- DIFFUSE -->
-      </uniform>
-    </pass>
-  </technique>
 </PropertyList>

Effects/material-off.eff

@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
   <name>Effects/material-off</name>
+  <parameters>
+    <material>
+      <color-mode-uniform>0</color-mode-uniform> <!-- OFF -->
+    </material>
+  </parameters>
   <inherits-from>Effects/model-default</inherits-from>
-  <technique n="10">
-    <pass>
-      <uniform>
-        <name>colorMode</name>
-        <type>int</type>
-        <value>0</value> <!-- OFF -->
-      </uniform>
-    </pass>
-  </technique>
 </PropertyList>

Effects/model-default.eff

@@ -6,6 +6,9 @@
       <type>white</type>
     </texture>
     <vertex-program-two-side type="bool">false</vertex-program-two-side>
+    <material>
+      <color-mode-uniform>1</color-mode-uniform> <!-- DIFFUSE -->
+    </material>
   </parameters>
   <technique n="10">
     <predicate>
@@ -76,7 +79,7 @@
       <uniform>
         <name>colorMode</name>
         <type>int</type>
-        <value>1</value> <!-- DIFFUSE -->
+        <value><use>material/color-mode-uniform</use></value>
       </uniform>
     </pass>
   </technique>

Environment/metarinterpolator.xml

@@ -112,6 +112,40 @@
     <output>/environment/config/aloft/entry[0]/visibility-m</output>
   </filter>
 
+  <filter>
+    <!-- 
+      transfer the rain intensity to the target environment
+    -->
+    <name>MetarController:rain-norm</name>
+    <type>noise-spike</type>
+    <max-rate-of-change>1.0</max-rate-of-change>
+    <enable>
+      <condition>
+        <property>/environment/metar/valid</property>
+        <property>/environment/params/metar-updates-environment</property>
+      </condition>
+    </enable>
+    <input>/environment/metar/rain-norm</input>
+    <output>/environment/rain-norm</output>
+  </filter>
+
+  <filter>
+    <!-- 
+      transfer the snow intensity to the target environment
+    -->
+    <name>MetarController:snow-norm</name>
+    <type>noise-spike</type>
+    <max-rate-of-change>1.0</max-rate-of-change>
+    <enable>
+      <condition>
+        <property>/environment/metar/valid</property>
+        <property>/environment/params/metar-updates-environment</property>
+      </condition>
+    </enable>
+    <input>/environment/metar/snow-norm</input>
+    <output>/environment/snow-norm</output>
+  </filter>
+
   <!-- interpolate the wind vector's components -->
   <filter>
     <name>MetarController:wind-from-north-fps</name>

gui/dialogs/weather.xml

@@ -442,7 +442,7 @@
               <col>0</col>
               <live>true</live>
               <halign>fill</halign>
-              <property>/environment/metar/rain-norm</property>
+              <property>/environment/rain-norm</property>
               <binding>
                 <command>dialog-apply</command>
               </binding>
@@ -459,7 +459,7 @@
               <row>1</row>
               <col>1</col>
               <halign>fill</halign>
-              <property>/environment/metar/snow-norm</property>
+              <property>/environment/snow-norm</property>
               <live>true</live>
               <pref-height>30</pref-height>
               <binding>