CVS: data materials.xml,1.120,1.121

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

Modified Files:
	materials.xml 
Log Message:
Create effects for shrub type landmass with no or little height. Add a new shrub texture contributed by Yves

Index: materials.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/materials.xml,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- materials.xml	10 Apr 2010 10:10:58 -0000	1.120
+++ materials.xml	11 Apr 2010 08:36:29 -0000	1.121
@@ -680,10 +680,34 @@
   </condition>
   <name>Landmass</name>
   <name>SomeSort</name>
-  <name>EvergreenBroadCover</name>
-  <name>EvergreenForest</name>
   <name>Island</name>
   <name>Default</name>
+  <effect>Effects/landmass-nowood</effect>
+  <texture>Terrain/forest1a.png</texture>
+  <texture>Terrain/forest1b.png</texture>
+  <texture>Terrain/forest1c.png</texture>
+  <xsize>2000</xsize>
+  <ysize>2000</ysize>
+  <light-coverage>10000000.0</light-coverage>
+  <wood-coverage>4000.0</wood-coverage>
+  <tree-texture>Textures/Trees/coniferous-summer.png</tree-texture>
+  <tree-varieties>8</tree-varieties>
+  <tree-range-m alias="/params/forest/tree-range-m"/>
+  <tree-height-m>25.0</tree-height-m>
+  <tree-width-m>15.0</tree-width-m>
+  <rolling-friction>1</rolling-friction>
+  <bumpiness>1</bumpiness>
+ </material>
+
+ <material>
+  <condition>
+   <equals>
+    <property>sim/startup/season</property>
+    <value>summer</value>
+   </equals>
+  </condition>
+  <name>EvergreenBroadCover</name>
+  <name>EvergreenForest</name>
   <effect>Effects/landmass</effect>
   <texture>Terrain/forest1a.png</texture>
   <texture>Terrain/forest1b.png</texture>
@@ -829,13 +853,16 @@
     <value>summer</value>
    </equals>
   </condition>
-  <effect>Effects/landmass</effect>
+  <effect>Effects/landmass-scrub</effect>
   <name>ShrubCover</name>
   <name>ShrubGrassCover</name>
   <name>ScrubCover</name>
+  <texture>Terrain/shrub1.png</texture>
+<!--
   <texture>Terrain/shrub.png</texture>
   <texture>Terrain/shrub2.png</texture>
   <texture>Terrain/shrub3.png</texture>
+-->
   <xsize>2000</xsize>
   <ysize>2000</ysize>
   <diffuse>
@@ -1173,7 +1200,7 @@
    </equals>
   </condition>
   <name>HerbTundraCover</name>
-  <effect>Effects/landmass</effect>
+  <effect>Effects/landmass-nowood</effect>
   <texture>Terrain/herbtundra.png</texture>
   <texture>Terrain/herbtundra2.png</texture>
   <texture>Terrain/herbtundra3.png</texture>


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