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

.cvsignore

@@ -1,4 +0,0 @@
-bin
-man
-sbin
-.project

Input/Joysticks/CH/pro-pedals-usb.xml

@@ -46,6 +46,7 @@ $Id$
    <command>property-scale</command>
    <property>/controls/flight/rudder</property>
    <factor>1.0</factor>
+   <power>2</power>
    <offset>0.0</offset>
   </binding>
  </axis>

Shaders/3dcloud.vert

@@ -34,13 +34,11 @@ void main(void)
   gl_Position.xyz += gl_Vertex.z * w  * hScale;
   gl_Position.xyz += gl_Color.xyz;
   
+  // Apply Z scaling to allow sprites to be squashed in the z-axis
+  gl_Position.z = gl_Position.z * gl_Color.w;
+
   // Determine a lighting normal based on the vertex position from the
   // center of the cloud, so that sprite on the opposite side of the cloud to the sun are darker.
-
-// fix flickering of 3d clouds on some macs
-// http://code.google.com/p/flightgear-bugs/issues/detail?id=123
-//  float n = dot(normalize(-gl_LightSource[0].position.xyz),
-//                normalize(mat3x3(gl_ModelViewMatrix) * (- gl_Position.xyz)));;
   float n = dot(normalize(-gl_LightSource[0].position.xyz),
                 normalize(vec3(gl_ModelViewMatrix * vec4(- gl_Position.xyz,0.0))));
 

gui/dialogs/rendering.xml

@@ -326,8 +326,8 @@
 							<property>/sim/rendering/clouds3d-enable</property>
 						</and>
 					</enable>
-					<min>100.0</min>
+					<min>1000.0</min>
-					<max>20000.0</max>
+					<max>45000.0</max>
 					<property>/sim/rendering/clouds3d-vis-range</property>
 					<binding>
 						<command>dialog-apply</command>