Some small fixes

[simgear.git] / simgear / scene / material / matlib.cxx

diff --git a/simgear/scene/material/matlib.cxx b/simgear/scene/material/matlib.cxx
index 225fcb79e0a987b9239127553681a4d3f3b110ad..2165153d584d1c9ba625ab1a191fdd2678ada42f 100644 (file)
--- a/simgear/scene/material/matlib.cxx
+++ b/simgear/scene/material/matlib.cxx
@@ -37,7 +37,7 @@
 
 #include <simgear/compiler.h>
 #include <simgear/constants.h>
-#include <simgear/misc/exception.hxx>
+#include <simgear/structure/exception.hxx>
 
 #include <string.h>
 #include STL_STRING
@@ -175,10 +175,11 @@ static int gen_taxiway_dir_light_map( int r, int g, int b, int alpha ) {
 
 
 // generate the directional vasi light environment texture map
-static int gen_vasi_light_map() {
+static int gen_vasi_light_map_old() {
     const int env_tex_res = 256;
     int half_res = env_tex_res / 2;
-    unsigned char env_map[env_tex_res][env_tex_res][4];
+
+    static unsigned char env_map[env_tex_res][env_tex_res][4];
     GLuint tex_name;
 
     for ( int i = 0; i < env_tex_res; ++i ) {
@@ -253,7 +254,7 @@ bool SGMaterialLib::load( const string &fg_root, const string& mpath ) {
                         << names[j]->getStringValue() );
             }
         } else {
-            SG_LOG(SG_INPUT, SG_ALERT,
+            SG_LOG(SG_INPUT, SG_WARN,
                    "Skipping bad material entry " << node->getName());
         }
     }
@@ -491,6 +492,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 );
@@ -511,6 +514,7 @@ bool SGMaterialLib::load( const string &fg_root, const string& mpath ) {
         = new SGMaterial( taxiway_blue_low_lights );
 
     // hard coded runway vasi light state
+    tex_name = gen_standard_dir_light_map( 235, 235, 195, 255 );
     ssgSimpleState *rwy_vasi_lights = new ssgSimpleState();
     rwy_vasi_lights->ref();
     rwy_vasi_lights->disable( GL_LIGHTING );
@@ -523,7 +527,8 @@ bool SGMaterialLib::load( const string &fg_root, const string& mpath ) {
     rwy_vasi_lights->setMaterial ( GL_DIFFUSE, 1.0, 1.0, 1.0, 1.0 );
     rwy_vasi_lights->setMaterial ( GL_SPECULAR, 0.0, 0.0, 0.0, 0.0 );
     rwy_vasi_lights->setMaterial ( GL_EMISSION, 0.0, 0.0, 0.0, 0.0 );
-    rwy_vasi_lights->setTexture( gen_vasi_light_map() );
+    // rwy_vasi_lights->setTexture( gen_vasi_light_map_old() );
+    rwy_vasi_lights->setTexture( tex_name );
     matlib["RWY_VASI_LIGHTS"] = new SGMaterial( rwy_vasi_lights );
 
     return true;