CVS: data/Effects landmass.eff, 1.7, 1.8 urban.eff, 1.6, 1.7

Update of /var/cvs/FlightGear-0.9/data/Effects
In directory baron.flightgear.org:/tmp/cvs-serv17738/Effects

Modified Files:
	landmass.eff urban.eff 
Log Message:
Use new "/sim/rendering/quality-level" property

Index: landmass.eff
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Effects/landmass.eff,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- landmass.eff	2 Apr 2010 07:06:39 -0000	1.7
+++ landmass.eff	10 Apr 2010 13:59:24 -0000	1.8
@@ -11,6 +11,8 @@
       <internal-format>normalized</internal-format>
     </texture>
     <snow-level><use>/sim/rendering/snow-level-m</use></snow-level>
+    <depth-factor type="float">0.01</depth-factor>
+    <canopy-height type="float">15.0</canopy-height>
   </parameters>
   <generate>
     <tangent type="int">6</tangent>
@@ -21,6 +23,10 @@
       <and>
         <property>/sim/rendering/landmass-shader</property>
         <property>/sim/rendering/shader-effects</property>
+	<less-equal>
+	  <value type="float">4.0</value>
+	  <float-property>/sim/rendering/quality-level</float-property>
+	</less-equal>
         <or>
           <less-equal>
             <value type="float">2.0</value>
@@ -110,19 +116,17 @@
       <uniform>
         <name>depth_factor</name>
         <type>float</type>
-        <value type="float">0.01</value>
+        <value><use>depth-factor</use></value>
       </uniform>
       <uniform>
-        <name>canopy_height</name>
+        <name>snowlevel</name>
         <type>float</type>
-        <value type="float">10.0</value>
+        <value><use>snow-level</use></value>
       </uniform>
       <uniform>
-        <name>snowlevel</name>
+        <name>canopy_height</name>
         <type>float</type>
-        <value type="float">
-          <use>snow-level</use>
-        </value>
+        <value><use>canopy-height</use></value>
       </uniform>
     </pass>
   </technique>
@@ -131,6 +135,10 @@
       <and>
         <property>/sim/rendering/landmass-shader</property>
         <property>/sim/rendering/shader-effects</property>
+	<less-equal>
+	  <value type="float">2.0</value>
+	  <float-property>/sim/rendering/quality-level</float-property>
+	</less-equal>
         <or>
           <less-equal>
             <value type="float">2.0</value>
@@ -215,14 +223,12 @@
       <uniform>
         <name>depth_factor</name>
         <type>float</type>
-        <value type="float">0.01</value>
+        <value><use>depth-factor</use></value>
       </uniform>
       <uniform>
         <name>snowlevel</name>
         <type>float</type>
-        <value type="float">
-          <use>snow-level</use>
-        </value>
+        <value><use>snow-level</use></value>
       </uniform>
     </pass>
   </technique>

Index: urban.eff
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Effects/urban.eff,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- urban.eff	10 Apr 2010 10:08:27 -0000	1.6
+++ urban.eff	10 Apr 2010 14:01:00 -0000	1.7
@@ -16,6 +16,10 @@
       <and>
         <property>/sim/rendering/urban-shader</property>
         <property>/sim/rendering/shader-effects</property>
+	<less-equal>
+	  <value type="float">2.0</value>
+	  <float-property>/sim/rendering/quality-level</float-property>
+	</less-equal>
         <or>
           <less-equal>
             <value type="float">2.0</value>


------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev