Merge branch 'master' of git://gitorious.org/fg/fgdata

Effects/runway-dds.eff

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PropertyList>
+	<name>Effects/runway-dds</name>
+	<inherits-from>Effects/runway</inherits-from>
+	<parameters>
+		<texture n="4">
+			<image>Textures/Runway/rwy-normalmap.dds</image>
+		</texture>
+		<normalmap_dds>1.0</normalmap_dds>
+	</parameters>
+</PropertyList>

Effects/runway.eff

@@ -4,7 +4,7 @@
 	<inherits-from>Effects/terrain-default</inherits-from>
 	<parameters>
 		<texture n="4">
-			<image>Textures.high/Runway/rwy-normalmap.dds</image>
+			<image>Textures/Runway/rwy-normalmap.png</image>
 			<filter>linear-mipmap-linear</filter>
 			<wrap-s>repeat</wrap-s>
 			<wrap-t>repeat</wrap-t>
@@ -15,7 +15,7 @@
 			<!-- use this form for a cube cross -->
 			<!--<image>Aircraft/Generic/Effects/CubeCrosses/blue_sky_big.jpg</image>-->
 
-				<!-- use this form for a 6 image cube map -->
+			<!-- use this form for a 6 image cube map -->
 				<images>
 					<positive-x>Aircraft/Generic/Effects/CubeMaps/fair-sky/fair-sky_px.png</positive-x>
 					<negative-x>Aircraft/Generic/Effects/CubeMaps/fair-sky/fair-sky_nx.png</negative-x>
@@ -41,7 +41,7 @@
 			<internal-format>normalized</internal-format>
 		</texture>
 		<texture n="8">
-			<image>Textures.high/Runway/rwy-reflect.png</image>
+			<image>Textures/Runway/rwy-reflect.png</image>
 			<filter>linear-mipmap-linear</filter>
 			<wrap-s>repeat</wrap-s>
 			<wrap-t>repeat</wrap-t>
@@ -50,11 +50,10 @@
 		<rendering-hint>transparent</rendering-hint>
 		<shade-model>smooth</shade-model>
 		<rainbowiness type="float">0.01</rainbowiness>
-		<fresneliness>0.01</fresneliness>
+		<fresneliness type="float">0.01</fresneliness>
-		<noisiness>0.15</noisiness>
+		<noisiness type="float">0.15</noisiness>
-		<!-- 			<refl_correction>0.0</refl_correction> -->
+		<ambient_correction type="float">-0.15</ambient_correction>
-		<ambient_correction>-0.15</ambient_correction>
+		<normalmap_dds type="float">0.0</normalmap_dds>
-		<normalmap_dds>1</normalmap_dds>
 		<vertex-program-two-side type="bool">false</vertex-program-two-side>
 		<cull-face>back</cull-face>
 		<wetness>

Environment/environment.xml

@@ -330,7 +330,7 @@
 
   <sea>
     <config>
-      <wind-filter-time type="double">60.0</wind-filter-time>
+      <wind-filter-time type="double">0.05</wind-filter-time>
     </config>
   </sea>
 

Environment/interpolator.xml

@@ -26,9 +26,7 @@
   <filter>
     <name>EnvironmentInterpolator:temperature-sea-level-degc</name>
     <enable>
-      <condition>
+      <property>/environment/config/enabled</property>
-        <property>/environment/config/enabled</property>
-      </condition>
     </enable>
     <input>/environment/config/interpolated/temperature-sea-level-degc</input>
     <output>/environment/temperature-sea-level-degc</output>
@@ -39,9 +37,7 @@
   <filter>
     <name>EnvironmentInterpolator:dewpoint-sea-level-degc</name>
     <enable>
-      <condition>
+      <property>/environment/config/enabled</property>
-        <property>/environment/config/enabled</property>
-      </condition>
     </enable>
     <input>/environment/config/interpolated/dewpoint-sea-level-degc</input>
     <output>/environment/dewpoint-sea-level-degc</output>
@@ -58,9 +54,7 @@
     <type>noise-spike</type>
     <max-rate-of-change>0.03</max-rate-of-change>
     <enable>
-      <condition>
+      <property>/environment/config/enabled</property>
-        <property>/environment/config/enabled</property>
-      </condition>
     </enable>
     <input>/environment/config/interpolated/pressure-sea-level-inhg</input>
     <output>/environment/pressure-sea-level-inhg</output>
@@ -69,9 +63,7 @@
   <filter>
     <name>EnvironmentInterpolator:visibility-m</name>
     <enable>
-      <condition>
+      <property>/environment/config/enabled</property>
-        <property>/environment/config/enabled</property>
-      </condition>
     </enable>
     <input>
       <condition>
@@ -91,9 +83,7 @@
   <filter>
     <name>EnvironmentInterpolator:wind-from-north</name>
     <enable>
-      <condition>
+      <property>/environment/config/enabled</property>
-        <property>/environment/config/enabled</property>
-      </condition>
     </enable>
     <input>
       <condition>
@@ -103,16 +93,14 @@
     </input>
     <input>/environment/config/interpolated/wind-from-north-fps</input>
     <output>/environment/wind-from-north-fps</output>
-    <type>exponential</type>
+    <type>noise-spike</type>
-    <filter-time>5</filter-time>
+    <max-rate-of-change>0.5</max-rate-of-change>
   </filter>
 
   <filter>
     <name>EnvironmentInterpolator:wind-from-east</name>
     <enable>
-      <condition>
+      <property>/environment/config/enabled</property>
-        <property>/environment/config/enabled</property>
-      </condition>
     </enable>
     <input>
       <condition>
@@ -122,8 +110,8 @@
     </input>
     <input>/environment/config/interpolated/wind-from-east-fps</input>
     <output>/environment/wind-from-east-fps</output>
-    <type>exponential</type>
+    <type>noise-spike</type>
-    <filter-time>5</filter-time>
+    <max-rate-of-change>0.5</max-rate-of-change>
   </filter>
 
   <filter>
@@ -138,16 +126,14 @@
       </expression>
     </input>
     <output>/environment/wind-from-down-fps</output>
-    <type>exponential</type>
+    <type>noise-spike</type>
-    <filter-time>0.5</filter-time>
+    <max-rate-of-change>2.0</max-rate-of-change>
   </filter>
 
   <filter>
     <name>EnvironmentInterpolator:turbulence-raw-magnitude</name>
     <enable>
-      <condition>
+      <property>/environment/config/enabled</property>
-        <property>/environment/config/enabled</property>
-      </condition>
     </enable>
     <input>
       <condition>
@@ -159,16 +145,14 @@
       <property>/environment/config/interpolated/turbulence/magnitude-norm</property>
     </input>
     <output>/environment/turbulence/raw-magnitude-norm</output>
-    <type>exponential</type>
+    <type>noise-spike</type>
-    <filter-time>1</filter-time>
+    <max-rate-of-change>0.2</max-rate-of-change>
   </filter>
 
   <filter>
     <name>EnvironmentInterpolator:turbulence-magnitude</name>
     <enable>
-      <condition>
+      <property>/environment/config/enabled</property>
-        <property>/environment/config/enabled</property>
-      </condition>
     </enable>
     <input>
       <expression>
@@ -186,9 +170,7 @@
   <filter>
     <name>EnvironmentInterpolator:turbulence-rate</name>
     <enable>
-      <condition>
+      <property>/environment/config/enabled</property>
-        <property>/environment/config/enabled</property>
-      </condition>
     </enable>
     <input>/environment/config/interpolated/turbulence/rate-hz</input>
     <output>/environment/turbulence/rate-hz</output>
@@ -205,16 +187,16 @@
     <name>EnvironmentInterpolator:wave:wind-from-east-fps</name>
     <input>/environment/config/boundary/entry[0]/wind-from-east-fps</input>
     <output>/environment/sea/surface/wind-from-east-fps</output>
-    <type>exponential</type>
+    <type>noise-spike</type>
-    <filter-time>/environment/sea/config/wind-filter-time</filter-time>
+    <max-rate-of-change>/environment/sea/config/wind-filter-time</max-rate-of-change>
   </filter>
 
   <filter>
     <name>EnvironmentInterpolator:wave:wind-from-north-fps</name>
     <input>/environment/config/boundary/entry[0]/wind-from-north-fps</input>
     <output>/environment/sea/surface/wind-from-north-fps</output>
-    <type>exponential</type>
+    <type>noise-spike</type>
-    <filter-time>/environment/sea/config/wind-filter-time</filter-time>
+    <max-rate-of-change>/environment/sea/config/wind-filter-time</max-rate-of-change>
   </filter>
 
   <!--filter> unused?

Environment/metarinterpolator.xml

@@ -149,8 +149,8 @@
   <!-- interpolate the wind vector's components -->
   <filter>
     <name>MetarController:wind-from-north-fps</name>
-    <type>exponential</type>
+    <type>noise-spike</type>
-    <filter-time>30</filter-time>
+    <max-rate-of-change>1.0</max-rate-of-change>
     <enable>
       <condition>
         <property>/environment/metar/valid</property>
@@ -163,8 +163,8 @@
 
   <filter>
     <name>MetarController:wind-from-east-fps</name>
-    <type>exponential</type>
+    <type>noise-spike</type>
-    <filter-time>30</filter-time>
+    <max-rate-of-change>1.0</max-rate-of-change>
     <enable>
       <condition>
         <property>/environment/metar/valid</property>
@@ -396,8 +396,8 @@
   </filter>
   <filter>
     <name>MetarController:cloud-alpha</name>
-    <type>exponential</type>
+    <type>noise-spike</type>
-    <filter-time>5</filter-time>
+    <max-rate-of-change>0.2</max-rate-of-change>
     <enable>
       <condition>
         <property>/environment/metar/valid</property>

Shaders/bowwave.frag

@@ -54,8 +54,8 @@ void relWind(out float rel_wind_speed_kts, out float rel_wind_from_rad)
     float rel_wind_speed_from_north_kts = WindN*fps2kts + speed_north_kts;
 
     //combine relative speeds north and east to get relative windspeed in kts
-    rel_wind_speed_kts = sqrt(pow(abs(rel_wind_speed_from_east_kts), 2) 
+    rel_wind_speed_kts = sqrt(rel_wind_speed_from_east_kts*rel_wind_speed_from_east_kts
-        + pow(abs(rel_wind_speed_from_north_kts), 2));
+        + rel_wind_speed_from_north_kts*rel_wind_speed_from_north_kts);
 
     //calculate the relative wind direction
     float rel_wind_from_deg = degrees(atan(rel_wind_speed_from_east_kts, rel_wind_speed_from_north_kts));

Shaders/water.frag

@@ -72,7 +72,7 @@ void main(void)
     //bool Status = true;
 
 
-    float windEffect = sqrt(pow(abs(WindE),2)+pow(abs(WindN),2)) * 0.6; 				//wind speed in kt
+    float windEffect = sqrt( WindE*WindE + WindN*WindN ) * 0.6; 				//wind speed in kt
     float windScale = 15.0/(3.0 + windEffect);											//wave scale
     float windEffect_low = 0.3 + 0.7 * smoothstep(0.0, 5.0, windEffect);				//low windspeed wave filter
     float waveRoughness = 0.05 + smoothstep(0.0, 20.0, windEffect);						//wave roughness filter

Shaders/water_sine.frag

@@ -143,7 +143,7 @@ void main(void)
 	float cover = 0.0;
 	//bool Status = true;
 
-	float windEffect = sqrt(pow(abs(WindE),2)+pow(abs(WindN),2)) * 0.6; 				//wind speed in kt
+	float windEffect = sqrt( WindE*WindE + WindN*WindN ) * 0.6; 				//wind speed in kt
 	float windScale =  15.0/(3.0 + windEffect);             											//wave scale
 	float windEffect_low = 0.3 + 0.7 * smoothstep(0.0, 5.0, windEffect);    				//low windspeed wave filter
 	float waveRoughness = 0.01 + smoothstep(0.0, 40.0, windEffect);						//wave roughness filter