From 06da90b993ce3fc627dcb029b6349b8af3117551 Mon Sep 17 00:00:00 2001
From: Christian Schmitt <chris@ilovelinux.de>
Date: Fri, 11 May 2012 11:38:20 +0200
Subject: [PATCH] Add special taxiway signs and remove old unlighted signs
 materials

---
 .../{glyphs-runway.xml => glyphs-special.xml} |  1 +
 Materials/dds/materials.xml                   | 61 +-----------------
 Materials/default/materials.xml               | 61 +-----------------
 Materials/regions/materials.xml               | 62 +------------------
 4 files changed, 10 insertions(+), 175 deletions(-)
 rename Materials/base/{glyphs-runway.xml => glyphs-special.xml} (77%)

diff --git a/Materials/base/glyphs-runway.xml b/Materials/base/glyphs-special.xml
similarity index 77%
rename from Materials/base/glyphs-runway.xml
rename to Materials/base/glyphs-special.xml
index faa7fc1bd..63c92d91a 100644
--- a/Materials/base/glyphs-runway.xml
+++ b/Materials/base/glyphs-special.xml
@@ -3,4 +3,5 @@
 <PropertyList>
   <glyph> <name>critical</name>   <left>0.00000</left> <right>0.23633</right> </glyph>
   <glyph> <name>safety</name>     <left>0.24512</left> <right>0.73340</right> </glyph>
+  <glyph> <name>hazard</name>     <left>0.76367</left> <right>1.00000</right> </glyph>
 </PropertyList>
diff --git a/Materials/dds/materials.xml b/Materials/dds/materials.xml
index 1fc6a5d33..26349f6c7 100644
--- a/Materials/dds/materials.xml
+++ b/Materials/dds/materials.xml
@@ -2373,19 +2373,8 @@
 
  <!-- runway and taxiway signs -->
 
-<material>
-  <name>YellowSign.unlighted</name>
-  <texture>Signs/yellow.dds</texture>
-  <emissive>
-    <r>0.4</r>
-    <g>0.4</g>
-    <b>0.4</b>
-  </emissive>
-</material>
-
 <material include="Materials/base/glyphs-yellow.xml">
   <name>YellowSign</name>
-  <name>YellowSign.lighted</name>
   <texture>Signs/yellow.dds</texture>
   <emissive>
     <r>0.9</r>
@@ -2396,19 +2385,8 @@
   <ysize>128</ysize>
 </material>
 
-<material>
-  <name>RedSign.unlighted</name>
-  <texture>Signs/red.dds</texture>
-  <emissive>
-    <r>0.4</r>
-    <g>0.4</g>
-    <b>0.4</b>
-  </emissive>
-</material>
-
 <material include="Materials/base/glyphs-red.xml">
   <name>RedSign</name>
-  <name>RedSign.lighted</name>
   <texture>Signs/red.dds</texture>
   <emissive>
     <r>0.9</r>
@@ -2419,19 +2397,8 @@
   <ysize>128</ysize>
 </material>
 
-<material>
-  <name>BlackSign.unlighted</name>
-  <texture>Signs/black.dds</texture>
-  <emissive>
-    <r>0.4</r>
-    <g>0.4</g>
-    <b>0.4</b>
-  </emissive>
-</material>
-
 <material include="Materials/base/glyphs-black.xml">
   <name>BlackSign</name>
-  <name>BlackSign.lighted</name>
   <texture>Signs/black.dds</texture>
   <emissive>
     <r>0.9</r>
@@ -2442,19 +2409,8 @@
   <ysize>128</ysize>
 </material>
 
-<material>
-  <name>FramedSign.unlighted</name>
-  <texture>Signs/framed.dds</texture>
-  <emissive>
-    <r>0.4</r>
-    <g>0.4</g>
-    <b>0.4</b>
-  </emissive>
-</material>
-
 <material include="Materials/base/glyphs-framed.xml">
   <name>FramedSign</name>
-  <name>FramedSign.lighted</name>
   <texture>Signs/framed.dds</texture>
   <emissive>
     <r>0.9</r>
@@ -2465,20 +2421,9 @@
   <ysize>128</ysize>
 </material>
 
-<material>
-  <name>RunwaySign.unlighted</name>
-  <texture>Signs/yellow_rwy.dds</texture>
-  <emissive>
-    <r>0.4</r>
-    <g>0.4</g>
-    <b>0.4</b>
-  </emissive>
-</material>
-
-<material include="Materials/base/glyphs-runway.xml">
-  <name>RunwaySign</name>
-  <name>RunwaySign.lighted</name>
-  <texture>Signs/yellow_rwy.dds</texture>
+<material include="Materials/base/glyphs-special.xml">
+  <name>SpecialSign</name>
+  <texture>Signs/special.dds</texture>
   <emissive>
     <r>0.9</r>
     <g>0.9</g>
diff --git a/Materials/default/materials.xml b/Materials/default/materials.xml
index 44d218d99..0b45341b2 100644
--- a/Materials/default/materials.xml
+++ b/Materials/default/materials.xml
@@ -2195,19 +2195,8 @@
 
  <!-- runway and taxiway signs -->
 
-<material>
-  <name>YellowSign.unlighted</name>
-  <texture>Signs/yellow.png</texture>
-  <emissive>
-   <r>0.4</r>
-   <g>0.4</g>
-   <b>0.4</b>
-  </emissive>
-</material>
-
 <material include="Materials/base/glyphs-yellow.xml">
   <name>YellowSign</name>
-  <name>YellowSign.lighted</name>
   <texture>Signs/yellow.png</texture>
   <emissive>
    <r>0.9</r>
@@ -2218,19 +2207,8 @@
   <ysize>128</ysize>
 </material>
 
-<material>
-  <name>RedSign.unlighted</name>
-  <texture>Signs/red.png</texture>
-  <emissive>
-   <r>0.4</r>
-   <g>0.4</g>
-   <b>0.4</b>
-  </emissive>
-</material>
-
 <material include="Materials/base/glyphs-red.xml">
   <name>RedSign</name>
-  <name>RedSign.lighted</name>
   <texture>Signs/red.png</texture>
   <emissive>
    <r>0.9</r>
@@ -2241,19 +2219,8 @@
   <ysize>128</ysize>
 </material>
 
-<material>
-  <name>BlackSign.unlighted</name>
-  <texture>Signs/black.png</texture>
-  <emissive>
-   <r>0.4</r>
-   <g>0.4</g>
-   <b>0.4</b>
-  </emissive>
-</material>
-
 <material include="Materials/base/glyphs-black.xml">
   <name>BlackSign</name>
-  <name>BlackSign.lighted</name>
   <texture>Signs/black.png</texture>
   <emissive>
    <r>0.9</r>
@@ -2264,19 +2231,8 @@
   <ysize>128</ysize>
 </material>
 
-<material>
-  <name>FramedSign.unlighted</name>
-  <texture>Signs/framed.png</texture>
-  <emissive>
-   <r>0.4</r>
-   <g>0.4</g>
-   <b>0.4</b>
-  </emissive>
-</material>
-
 <material include="Materials/base/glyphs-framed.xml">
   <name>FramedSign</name>
-  <name>FramedSign.lighted</name>
   <texture>Signs/framed.png</texture>
   <emissive>
    <r>0.9</r>
@@ -2287,20 +2243,9 @@
   <ysize>128</ysize>
 </material>
 
-<material>
-  <name>RunwaySign.unlighted</name>
-  <texture>Signs/yellow_rwy.png</texture>
-  <emissive>
-   <r>0.4</r>
-   <g>0.4</g>
-   <b>0.4</b>
-  </emissive>
-</material>
-
-<material include="Materials/base/glyphs-runway.xml">
-  <name>RunwaySign</name>
-  <name>RunwaySign.lighted</name>
-  <texture>Signs/yellow_rwy.png</texture>
+<material include="Materials/base/glyphs-special.xml">
+  <name>SpecialSign</name>
+  <texture>Signs/special.png</texture>
   <emissive>
    <r>0.9</r>
    <g>0.9</g>
diff --git a/Materials/regions/materials.xml b/Materials/regions/materials.xml
index 4686eb061..f72a35027 100644
--- a/Materials/regions/materials.xml
+++ b/Materials/regions/materials.xml
@@ -3029,20 +3029,8 @@
 
  <!-- runway and taxiway signs -->
 
-
-<material>
-  <name>YellowSign.unlighted</name>
-  <texture>Signs/yellow.png</texture>
-  <emissive>
-   <r>0.4</r>
-   <g>0.4</g>
-   <b>0.4</b>
-  </emissive>
-</material>
-
 <material include="Materials/base/glyphs-yellow.xml">
   <name>YellowSign</name>
-  <name>YellowSign.lighted</name>
   <texture>Signs/yellow.png</texture>
   <emissive>
    <r>0.9</r>
@@ -3053,19 +3041,8 @@
   <ysize>128</ysize>
 </material>
 
-<material>
-  <name>RedSign.unlighted</name>
-  <texture>Signs/red.png</texture>
-  <emissive>
-   <r>0.4</r>
-   <g>0.4</g>
-   <b>0.4</b>
-  </emissive>
-</material>
-
 <material include="Materials/base/glyphs-red.xml">
   <name>RedSign</name>
-  <name>RedSign.lighted</name>
   <texture>Signs/red.png</texture>
   <emissive>
    <r>0.9</r>
@@ -3076,19 +3053,8 @@
   <ysize>128</ysize>
 </material>
 
-<material>
-  <name>BlackSign.unlighted</name>
-  <texture>Signs/black.png</texture>
-  <emissive>
-   <r>0.4</r>
-   <g>0.4</g>
-   <b>0.4</b>
-  </emissive>
-</material>
-
 <material include="Materials/base/glyphs-black.xml">
   <name>BlackSign</name>
-  <name>BlackSign.lighted</name>
   <texture>Signs/black.png</texture>
   <emissive>
    <r>0.9</r>
@@ -3099,19 +3065,8 @@
   <ysize>128</ysize>
 </material>
 
-<material>
-  <name>FramedSign.unlighted</name>
-  <texture>Signs/framed.png</texture>
-  <emissive>
-   <r>0.4</r>
-   <g>0.4</g>
-   <b>0.4</b>
-  </emissive>
-</material>
-
 <material include="Materials/base/glyphs-framed.xml">
   <name>FramedSign</name>
-  <name>FramedSign.lighted</name>
   <texture>Signs/framed.png</texture>
   <emissive>
    <r>0.9</r>
@@ -3122,20 +3077,9 @@
   <ysize>128</ysize>
 </material>
 
-<material>
-  <name>RunwaySign.unlighted</name>
-  <texture>Signs/yellow_rwy.png</texture>
-  <emissive>
-   <r>0.4</r>
-   <g>0.4</g>
-   <b>0.4</b>
-  </emissive>
-</material>
-
-<material include="Materials/base/glyphs-runway.xml">
-  <name>RunwaySign</name>
-  <name>RunwaySign.lighted</name>
-  <texture>Signs/yellow_rwy.png</texture>
+<material include="Materials/base/glyphs-special.xml">
+  <name>SpecialSign</name>
+  <texture>Signs/special.png</texture>
   <emissive>
    <r>0.9</r>
    <g>0.9</g>