Begin stubbing in some wrapper code in preparation for runway lighting.

diff --git a/src/Scenery/tileentry.cxx b/src/Scenery/tileentry.cxx
index 3a9720eb152f8724de57f5fc94c0a9a9b81cbf92..8149e09c02b087c4850e614d2272f6f3e237becf 100644 (file)
--- a/src/Scenery/tileentry.cxx
+++ b/src/Scenery/tileentry.cxx
@@ -38,6 +38,7 @@
 #include <Main/globals.hxx>
 #include <Scenery/scenery.hxx>
 #include <Time/light.hxx>
+#include <Objects/apt_signs.hxx>
 #include <Objects/matlib.hxx>
 #include <Objects/newmat.hxx>
 #include <Objects/obj.hxx>
@@ -530,6 +531,17 @@ FGTileEntry::load( const SGPath& base, bool is_base )
                    obj_trans -> addKid( custom_obj );
                }
                new_tile->addKid( obj_trans );
+           } else if ( token == "RWY_LIGHTS" ) {
+               double lon, lat, hdg, len, width;
+               string common, end1, end2;
+               in >> lon >> lat >> hdg >> len >> width
+                  >> common >> end1 >> end2;
+               SG_LOG( SG_TERRAIN, SG_INFO, "token = " << token
+                       << " pos = " << lon << ", " << lat
+                       << " hdg = " << hdg
+                       << " size = " << len << ", " << width
+                       << " codes = " << common << " "
+                       << end1 << " " << end2 );
            } else {
                SG_LOG( SG_TERRAIN, SG_ALERT,
                        "Unknown token " << token << " in "

diff --git a/src/Scenery/tilemgr.cxx b/src/Scenery/tilemgr.cxx
index d162a00e42c35211700f796f277bd6c2bc5f251c..5119a830779a1c62dcebefd59f21c2760123bf75 100644 (file)
--- a/src/Scenery/tilemgr.cxx
+++ b/src/Scenery/tilemgr.cxx
@@ -334,9 +334,8 @@ int FGTileMgr::update( double lon, double lat ) {
 
     if ( scenery.center == Point3D(0.0) ) {
        // initializing
-       cout << "initializing scenery current elevation  ... " << endl;
+       cout << "initializing scenery current elevation ... " << endl;
        sgdVec3 tmp_abs_view_pos;
-       sgVec3 tmp_view_pos;
 
        Point3D geod_pos = Point3D( longitude * SGD_DEGREES_TO_RADIANS,
                                    latitude * SGD_DEGREES_TO_RADIANS,
@@ -347,7 +346,7 @@ int FGTileMgr::update( double lon, double lat ) {
 
        // cout << "abs_view_pos = " << tmp_abs_view_pos << endl;
        prep_ssg_nodes();
-       sgSetVec3( tmp_view_pos, 0.0, 0.0, 0.0 );
+
        double tmp_elev;
        if ( fgCurrentElev(tmp_abs_view_pos, sc, &hit_list,
                           &tmp_elev, &scenery.cur_radius, scenery.cur_normal) )