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

Materials/base/materials-base.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<!-- 
-  FlightGear Materials File. See Docs/README.materials for details. 
-  
+<!--
+  FlightGear Materials File. See Docs/README.materials for details.
+
   This file contains material definitions and settings shared across
   all material definition file. It is intended to be included within
   materials.xml etc. using an include="Materials/materials-base.xml"
@@ -20,9 +20,9 @@ Shared parameters for various materials.
    <tree-range-m>8000</tree-range-m>
   </forest>
  </params>
- 
+
  <!-- Signage -->
- 
+
 <material n="1000">
   <name>lf_sng_solid_yellow</name>
   <effect>Effects/lfeat</effect>
@@ -349,7 +349,7 @@ Shared parameters for various materials.
 </material>
 
 <!-- Shared material definitions -->
- 
+
 <material n="2001">
   <name>Unknown</name>
   <texture>Terrain/unknown.png</texture>
@@ -574,5 +574,27 @@ Shared parameters for various materials.
   <bumpiness>0.5</bumpiness>
   <load-resistance>1e10</load-resistance>
 </material>
- 
+
+<!-- Taxiway signs -->
+    <material n="2100">
+        <name>signcase</name>
+        <texture>Signs/signs_case.png</texture>
+        <effect>Effects/terrain-default</effect>
+        <ambient>
+            <r>1.0</r>
+            <g>1.0</g>
+            <b>1.0</b>
+        </ambient>
+        <glyph>
+            <name>cover1</name>
+            <left>0.000</left>
+            <right>0.625</right>
+        </glyph>
+        <glyph>
+            <name>cover2</name>
+            <left>0.625</left>
+            <right>0.000</right>
+        </glyph>
+    </material>
+
 </PropertyList>

Materials/default/materials.xml

@@ -2195,17 +2195,6 @@
 
  <!-- runway and taxiway signs -->
 
-<material>
-  <name>signcase</name>
-  <texture>Signs/signs_case.png</texture>
-   <emissive>
-     <r>0.1</r>
-     <g>0.1</g>
-     <b>0.1</b>
-   </emissive>
-  <glyph> <name>cover</name> <left>0.00000</left> <right>0.625</right> </glyph>
-</material>
-
 <material>
   <name>YellowSign.unlighted</name>
   <texture>Signs/yellow.png</texture>

Materials/regions/materials.xml

@@ -994,6 +994,7 @@
   <name>Town</name>
   <name>SubUrban</name>
   <texture>Terrain/town-europe.png</texture>   
+  <object-mask>Terrain/town-europe.mask.png</object-mask>      
   <xsize>1024</xsize>
   <ysize>1024</ysize>
   <light-coverage>100000.0</light-coverage>
@@ -1009,7 +1010,7 @@
   <building-medium-ratio>0.1</building-medium-ratio>
   <building-large-ratio>0.0</building-large-ratio>
   <building-medium-max-floors>4</building-medium-max-floors>
-  <wood-coverage>5000.0</wood-coverage>
+  <wood-coverage>1000.0</wood-coverage>
   <tree-texture>Trees/mixed-summer.png</tree-texture>
   <tree-varieties>8</tree-varieties>
   <tree-range-m alias="/params/forest/tree-range-m"/>
@@ -1017,7 +1018,6 @@
   <tree-width-m>15.0</tree-width-m>
 </material>
 
-
 <!-- default town US style -->