CVS: data/Effects urban.eff,1.4,1.5

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

Modified Files:
	urban.eff 
Log Message:
Use new materials.xml format to declare a second city texture with its own relief map provided by Yves/hb-gral

Index: urban.eff
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Effects/urban.eff,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- urban.eff	28 Mar 2010 17:20:04 -0000	1.4
+++ urban.eff	10 Apr 2010 09:42:15 -0000	1.5
@@ -3,13 +3,9 @@
   <name>Effects/urban</name>
   <inherits-from>Effects/terrain-default</inherits-from>
   <parameters>
-    <texture n="2">
-      <image>Textures.high/Terrain/city1-relief-light.png</image>
-      <filter>linear-mipmap-linear</filter>
-      <wrap-s>repeat</wrap-s>
-      <wrap-t>repeat</wrap-t>
-      <internal-format>normalized</internal-format>
-    </texture>
+    <depth-factor type="float">0.008</depth-factor>
+    <tile-size type="float">2000.0</tile-size>
+    <night-color type="vec3d">0.75 0.59 0.05</night-color>
   </parameters>
   <generate>
     <normal type="int">15</normal>
@@ -100,17 +96,17 @@
       <uniform>
         <name>depth_factor</name>
         <type>float</type>
-        <value type="float">0.008</value>
+        <value><use>depth-factor</use></value>
       </uniform>
       <uniform>
         <name>tile_size</name>
         <type>float</type>
-        <value type="float">2000.0</value>
+        <value><use>tile-size</use></value>
       </uniform>
       <uniform>
         <name>night_color</name>
         <type>float-vec3</type>
-        <value type="vec3d">0.75 0.59 0.05</value>
+        <value><use>night-color</use></value>
       </uniform>
     </pass>
   </technique>


------------------------------------------------------------------------------
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