Various tweaks to handling taxiway lighting.

diff --git a/simgear/scene/material/matlib.cxx b/simgear/scene/material/matlib.cxx
index 225fcb79e0a987b9239127553681a4d3f3b110ad..d6ba03823d97329626b35f9b700c5145ee5ed803 100644 (file)
--- a/simgear/scene/material/matlib.cxx
+++ b/simgear/scene/material/matlib.cxx
@@ -491,6 +491,8 @@ bool SGMaterialLib::load( const string &fg_root, const string& mpath ) {
     rwy_green_low_lights->setTexture( tex_name );
     matlib["RWY_GREEN_LOW_LIGHTS"]
         = new SGMaterial( rwy_green_low_lights );
+    matlib["RWY_GREEN_TAXIWAY_LIGHTS"]
+        = new SGMaterial( rwy_green_low_lights );
 
     // hard coded low intensity taxiway blue light state
     tex_name = gen_taxiway_dir_light_map( 90, 90, 235, 205 );

diff --git a/simgear/scene/tgdb/obj.cxx b/simgear/scene/tgdb/obj.cxx
index 02873d8ca7e19c3c558a713782926979727fd8c2..57c8e90cf610fe8c7aff93a515595dcf26c9ebf5 100644 (file)
--- a/simgear/scene/tgdb/obj.cxx
+++ b/simgear/scene/tgdb/obj.cxx
@@ -359,7 +359,11 @@ bool sgBinObjLoad( const string& path, const bool is_base,
                                                          pts_v[i], pts_n[i],
                                                          matlib,
                                                          pt_materials[i], up );
-            if ( pt_materials[i].substr(0, 16) == "RWY_BLUE_TAXIWAY" ) {
+            if ( pt_materials[i].substr(0, 16) == "RWY_BLUE_TAXIWAY_LIGHTS" ) {
+                taxi_lights->addKid( branch );
+            } else if ( pt_materials[i].substr(0, 16)
+                        == "RWY_GREEN_TAXIWAY_LIGHTS" )
+            {
                 taxi_lights->addKid( branch );
             } else {
                 rwy_lights->addKid( branch );

diff --git a/simgear/scene/tgdb/pt_lights.hxx b/simgear/scene/tgdb/pt_lights.hxx
index 4531784be762074c5929741696908a4e39981e5b..9bf2606ed42562900c4c655ac88ed64702bdba55 100644 (file)
--- a/simgear/scene/tgdb/pt_lights.hxx
+++ b/simgear/scene/tgdb/pt_lights.hxx
@@ -49,20 +49,6 @@ typedef int_list::iterator int_list_iterator;
 typedef int_list::const_iterator int_point_list_iterator;
 
 
-// Define the various supported light types
-typedef enum {
-    SG_RWYLIGHT_TAXI = 0,
-    SG_RWYLIGHT_VASI,
-    SG_RWYLIGHT_EDGE,
-    SG_RWYLIGHT_TOUCHDOWN,
-    SG_RWYLIGHT_THRESHOLD,
-    SG_RWYLIGHT_WHITE,
-    SG_RWYLIGHT_RED,
-    SG_RWYLIGHT_GREEN,
-    SG_RWYLIGHT_YELLOW
-} sgPointLightType;
-
-
 // Generate a directional light.  This routines creates a
 // 'directional' light that can only be viewed from within 90 degrees
 // of the specified dir vector.