]> git.mxchange.org Git - flightgear.git/blobdiff - src/Scenery/tileentry.cxx
Modified Files:
[flightgear.git] / src / Scenery / tileentry.cxx
index 45c8bf440e4149dedbaa7c697dab6cac0241b809..2d7e44f2e29c37e1d9e05fd7698f03576754b95f 100644 (file)
@@ -51,6 +51,7 @@
 #include <simgear/scene/tgdb/apt_signs.hxx>
 #include <simgear/scene/tgdb/obj.hxx>
 #include <simgear/scene/model/placementtrans.hxx>
+#include <simgear/scene/util/SGUpdateVisitor.hxx>
 
 #include <Aircraft/aircraft.hxx>
 #include <Include/general.hxx>
 
 SG_USING_STD(string);
 
+// FIXME: investigate what huge update flood is clamped away here ...
+class FGTileUpdateCallback : public osg::NodeCallback {
+public:
+  virtual void operator()(osg::Node* node, osg::NodeVisitor* nv)
+  {
+    assert(dynamic_cast<SGUpdateVisitor*>(nv));
+    SGUpdateVisitor* updateVisitor = static_cast<SGUpdateVisitor*>(nv);
+
+    osg::Vec3 center = node->getBound().center();
+    double distance = dist(updateVisitor->getGlobalEyePos(),
+                           SGVec3d(center[0], center[1], center[2]));
+    if (updateVisitor->getVisibility() + node->getBound().radius() < distance)
+      return;
+
+    traverse(node, nv);
+  }
+};
 
 // Constructor
 FGTileEntry::FGTileEntry ( const SGBucket& b )
-    : center( Point3D( 0.0 ) ),
-      tile_bucket( b ),
-      terra_transform( new SGPlacementTransform ),
-      vasi_lights_transform( new SGPlacementTransform ),
-      rwy_lights_transform( new SGPlacementTransform ),
-      taxi_lights_transform( new SGPlacementTransform ),
+    : tile_bucket( b ),
+      terra_transform( new osg::Group ),
       terra_range( new osg::LOD ),
-      vasi_lights_selector( new osg::Switch ),
-      rwy_lights_selector( new osg::Switch ),
-      taxi_lights_selector( new osg::Switch ),
       loaded(false),
       pending_models(0),
       is_inner_ring(false),
       free_tracker(0)
 {
-    // update the contents
-    // if ( vec3_ptrs.size() || vec2_ptrs.size() || index_ptrs.size() ) {
-    //     SG_LOG( SG_TERRAIN, SG_ALERT, 
-    //             "Attempting to overwrite existing or"
-    //             << " not properly freed leaf data." );
-    //     exit(-1);
-    // }
+    terra_transform->setUpdateCallback(new FGTileUpdateCallback);
 }
 
 
 // Destructor
 FGTileEntry::~FGTileEntry () {
-    // cout << "nodes = " << nodes.size() << endl;;
-    // delete[] nodes;
 }
 
-static void WorldCoordinate( osg::Matrix& obj_pos, Point3D center, double lat,
+static void WorldCoordinate( osg::Matrix& obj_pos, double lat,
                              double lon, double elev, double hdg )
 {
     double lon_rad = lon * SGD_DEGREES_TO_RADIANS;
@@ -110,30 +113,30 @@ static void WorldCoordinate( osg::Matrix& obj_pos, Point3D center, double lat,
     Point3D geod( lon_rad, lat_rad, elev );
         
     Point3D world_pos = sgGeodToCart( geod );
-    Point3D offset = world_pos - center;
+    Point3D offset = world_pos;
 
-    sgMat4 mat;
+    sgdMat4 mat;
 
-    SGfloat sin_lat = (SGfloat)sin( lat_rad );
-    SGfloat cos_lat = (SGfloat)cos( lat_rad );
-    SGfloat cos_lon = (SGfloat)cos( lon_rad );
-    SGfloat sin_lon = (SGfloat)sin( lon_rad );
-    SGfloat sin_hdg = (SGfloat)sin( hdg_rad ) ;
-    SGfloat cos_hdg = (SGfloat)cos( hdg_rad ) ;
+    double sin_lat = sin( lat_rad );
+    double cos_lat = cos( lat_rad );
+    double cos_lon = cos( lon_rad );
+    double sin_lon = sin( lon_rad );
+    double sin_hdg = sin( hdg_rad ) ;
+    double cos_hdg = cos( hdg_rad ) ;
 
-    mat[0][0] =  cos_hdg * (SGfloat)sin_lat * (SGfloat)cos_lon - sin_hdg * (SGfloat)sin_lon;
-    mat[0][1] =  cos_hdg * (SGfloat)sin_lat * (SGfloat)sin_lon + sin_hdg * (SGfloat)cos_lon;
-    mat[0][2] = -cos_hdg * (SGfloat)cos_lat;
+    mat[0][0] =  cos_hdg * sin_lat * cos_lon - sin_hdg * sin_lon;
+    mat[0][1] =  cos_hdg * sin_lat * sin_lon + sin_hdg * cos_lon;
+    mat[0][2] = -cos_hdg * cos_lat;
     mat[0][3] =  SG_ZERO;
 
-    mat[1][0] = -sin_hdg * (SGfloat)sin_lat * (SGfloat)cos_lon - cos_hdg * (SGfloat)sin_lon;
-    mat[1][1] = -sin_hdg * (SGfloat)sin_lat * (SGfloat)sin_lon + cos_hdg * (SGfloat)cos_lon;
-    mat[1][2] =  sin_hdg * (SGfloat)cos_lat;
+    mat[1][0] = -sin_hdg * sin_lat * cos_lon - cos_hdg * sin_lon;
+    mat[1][1] = -sin_hdg * sin_lat * sin_lon + cos_hdg * cos_lon;
+    mat[1][2] =  sin_hdg * cos_lat;
     mat[1][3] =  SG_ZERO;
 
-    mat[2][0] = (SGfloat)cos_lat * (SGfloat)cos_lon;
-    mat[2][1] = (SGfloat)cos_lat * (SGfloat)sin_lon;
-    mat[2][2] = (SGfloat)sin_lat;
+    mat[2][0] = cos_lat * cos_lon;
+    mat[2][1] = cos_lat * sin_lon;
+    mat[2][2] = sin_lat;
     mat[2][3] =  SG_ZERO;
 
     mat[3][0] = offset.x();
@@ -147,52 +150,15 @@ static void WorldCoordinate( osg::Matrix& obj_pos, Point3D center, double lat,
 }
 
 
-// recurse an ssg tree and call removeChild() on every node from the
-// bottom up.  Leaves the original branch in existance, but empty so
-// it can be removed by the calling routine.
-// static void my_remove_branch( osg::Group * branch ) {
-//     branch->removeChildren(0, branch->getNumChildren());
-// }
-
-
 // Free "n" leaf elements of an ssg tree.  returns the number of
 // elements freed.  An empty branch node is considered a leaf.  This
 // is intended to spread the load of freeing a complex tile out over
 // several frames.
 static int fgPartialFreeSSGtree( osg::Group *b, int n ) {
-    int num_deletes = 0;
+    int num_deletes = b->getNumChildren();
 
     b->removeChildren(0, b->getNumChildren());
 
-//     if ( n > 0 ) {
-//         // we still have some delete budget left
-//         // if ( b->getNumChilds() > 100 ) {
-//         //     cout << "large family = " << b->getNumChilds() << endl;
-//         // }
-//         // deleting in reverse would help if my plib patch get's
-//         // applied, but for now it will make things slower.
-//         // for ( int i = b->getNumChilds() - 1; i >= 0 ; --i ) {
-//         for ( int i = 0; i < b->getNumChildren(); ++i ) {
-//             ssgEntity *kid = b->getChild(i);
-//             if ( kid->isAKindOf( ssgTypeBranch() ) && kid->getRef() <= 1 ) {
-//                 int result = fgPartialFreeSSGtree( (osg::Group *)kid, n );
-//                 num_deletes += result;
-//                 n -= result;
-//                 if ( n < 0 ) {
-//                     break;
-//                 }
-//             }
-//             // remove the kid if (a) it is now empty -or- (b) it's ref
-//             // count is > zero at which point we don't care if it's
-//             // empty, we don't want to touch it's contents.
-//             if ( kid->getNumChildren() == 0 || kid->getRef() > 1 ) {
-//                 b->removeChild( kid );
-//                 num_deletes++;
-//                 n--;
-//             }
-//         }
-//     }
-
     return num_deletes;
 }
 
@@ -218,38 +184,6 @@ bool FGTileEntry::free_tile() {
             terra_transform = 0;
             free_tracker |= TERRA_NODE;
         }
-    } else if ( !(free_tracker & GROUND_LIGHTS) && gnd_lights_transform.get() ) {
-        // delete the terrain lighting branch (this should already have been
-        // disconnected from the scene graph)
-        SG_LOG( SG_TERRAIN, SG_DEBUG, "FREEING gnd_lights_transform" );
-        if ( fgPartialFreeSSGtree( gnd_lights_transform.get(), delete_size ) == 0 ) {
-            gnd_lights_transform = 0;
-            free_tracker |= GROUND_LIGHTS;
-        }
-    } else if ( !(free_tracker & VASI_LIGHTS) && vasi_lights_selector.get() ) {
-        // delete the runway lighting branch (this should already have
-        // been disconnected from the scene graph)
-        SG_LOG( SG_TERRAIN, SG_DEBUG, "FREEING vasi_lights_selector" );
-        if ( fgPartialFreeSSGtree( vasi_lights_selector.get(), delete_size ) == 0 ) {
-            vasi_lights_selector = 0;
-            free_tracker |= VASI_LIGHTS;
-        }
-    } else if ( !(free_tracker & RWY_LIGHTS) && rwy_lights_selector.get() ) {
-        // delete the runway lighting branch (this should already have
-        // been disconnected from the scene graph)
-        SG_LOG( SG_TERRAIN, SG_DEBUG, "FREEING rwy_lights_selector" );
-        if ( fgPartialFreeSSGtree( rwy_lights_selector.get(), delete_size ) == 0 ) {
-            rwy_lights_selector = 0;
-            free_tracker |= RWY_LIGHTS;
-        }
-    } else if ( !(free_tracker & TAXI_LIGHTS) && taxi_lights_selector.get() ) {
-        // delete the taxi lighting branch (this should already have been
-        // disconnected from the scene graph)
-        SG_LOG( SG_TERRAIN, SG_DEBUG, "FREEING taxi_lights_selector" );
-        if ( fgPartialFreeSSGtree( taxi_lights_selector.get(), delete_size ) == 0 ) {
-            taxi_lights_selector = 0;
-            free_tracker |= TAXI_LIGHTS;
-        }
     } else if ( !(free_tracker & LIGHTMAPS) ) {
         free_tracker |= LIGHTMAPS;
     } else {
@@ -265,167 +199,27 @@ bool FGTileEntry::free_tile() {
 
 // Update the ssg transform node for this tile so it can be
 // properly drawn relative to our (0,0,0) point
-void FGTileEntry::prep_ssg_node( const Point3D& p, sgVec3 up, float vis) {
+void FGTileEntry::prep_ssg_node(float vis) {
     if ( !loaded ) return;
 
     // visibility can change from frame to frame so we update the
     // range selector cutoff's each time.
+    float bounding_radius = terra_range->getChild(0)->getBound().radius();
     terra_range->setRange( 0, 0, vis + bounding_radius );
-
-    if ( gnd_lights_range.get() ) {
-        gnd_lights_range->setRange( 0, 0, vis * 1.5 + bounding_radius );
-    }
-
-    SGVec3d lt_trans(center.x(), center.y(), center.z());
-
-    FGLight *l = (FGLight *)(globals->get_subsystem("lighting"));
-    if ( gnd_lights_transform.get() ) {
-        // we need to lift the lights above the terrain to avoid
-        // z-buffer fighting.  We do this based on our altitude and
-        // the distance this tile is away from scenery center.
-
-        // we expect 'up' to be a unit vector coming in, but since we
-        // modify the value of lift_vec, we need to create a local
-        // copy.
-        SGVec3f lift_vec(up);
-  
-        double agl;
-        agl = globals->get_current_view()->getAltitudeASL_ft()*SG_FEET_TO_METER
-          - globals->get_current_view()->getSGLocation()->get_cur_elev_m();
-
-        // Compute the distance of the scenery center from the view position.
-        double dist = center.distance3D(p);
-
-        if ( general.get_glDepthBits() > 16 ) {
-            lift_vec *= 10.0 + agl / 100.0 + dist / 10000;
-        } else {
-            lift_vec *= 10.0 + agl / 20.0 + dist / 5000;
-        }
-
-        gnd_lights_transform->setTransform( lt_trans + toVec3d(lift_vec) );
-
-        // select which set of lights based on sun angle
-        float sun_angle = l->get_sun_angle() * SGD_RADIANS_TO_DEGREES;
-        if ( sun_angle > 95 ) {
-            gnd_lights_brightness->setSingleChildOn(2);
-        } else if ( sun_angle > 92 ) {
-            gnd_lights_brightness->setSingleChildOn(1);
-        } else if ( sun_angle > 89 ) {
-            gnd_lights_brightness->setSingleChildOn(0);
-        } else {
-            gnd_lights_brightness->setAllChildrenOff();
-        }
-    }
-
-    if ( rwy_lights_transform.get() ) {
-        // turn runway lights on/off based on sun angle and visibility
-        float sun_angle = l->get_sun_angle() * SGD_RADIANS_TO_DEGREES;
-        if ( sun_angle > 85 ||
-             (fgGetDouble("/environment/visibility-m") < 5000.0) ) {
-            rwy_lights_selector->setAllChildrenOn();
-        } else {
-            rwy_lights_selector->setAllChildrenOff();
-        }
-    }
-
-    if ( taxi_lights_transform.get() ) {
-        // turn taxi lights on/off based on sun angle and visibility
-        float sun_angle = l->get_sun_angle() * SGD_RADIANS_TO_DEGREES;
-        if ( sun_angle > 85 ||
-             (fgGetDouble("/environment/visibility-m") < 5000.0) ) {
-            taxi_lights_selector->setAllChildrenOn();
-        } else {
-            taxi_lights_selector->setAllChildrenOff();
-        }
-    }
 }
 
-
-osg::Node*
-FGTileEntry::gen_lights( SGMaterialLib *matlib, osg::Vec3Array *lights,
-                         int inc, float bright )
-{
-    // generate a repeatable random seed
-    sg_srandom( (unsigned)(*lights)[0][0] );
-
-    // Allocate ssg structure
-    osg::Vec3Array *vl = new osg::Vec3Array;
-    osg::Vec4Array *cl = new osg::Vec4Array;
-
-    for ( unsigned i = 0; i < lights->size(); ++i ) {
-        // this loop is slightly less efficient than it otherwise
-        // could be, but we want a red light to always be red, and a
-        // yellow light to always be yellow, etc. so we are trying to
-        // preserve the random sequence.
-        float zombie = sg_random();
-        if ( i % inc == 0 ) {
-            vl->push_back( (*lights)[i] );
-
-            // factor = sg_random() ^ 2, range = 0 .. 1 concentrated towards 0
-            float factor = sg_random();
-            factor *= factor;
-
-            osg::Vec4 color;
-            if ( zombie > 0.5 ) {
-                // 50% chance of yellowish
-                color = osg::Vec4( 0.9, 0.9, 0.3, bright - factor * 0.2 );
-            } else if ( zombie > 0.15 ) {
-                // 35% chance of whitish
-                color = osg::Vec4( 0.9, 0.9, 0.8, bright - factor * 0.2 );
-            } else if ( zombie > 0.05 ) {
-                // 10% chance of orangish
-                color = osg::Vec4( 0.9, 0.6, 0.2, bright - factor * 0.2 );
-            } else {
-                // 5% chance of redish
-                color = osg::Vec4( 0.9, 0.2, 0.2, bright - factor * 0.2 );
-            }
-            cl->push_back( color );
-        }
-    }
-
-    // create ssg leaf
-    osg::Geometry* geometry = new osg::Geometry;
-    geometry->setVertexArray(vl);
-    geometry->setColorArray(cl);
-    geometry->setColorBinding(osg::Geometry::BIND_PER_VERTEX);
-    geometry->addPrimitiveSet(new osg::DrawArrays(GL_POINTS, 0, vl->size()));
-    osg::Geode* geode = new osg::Geode;
-    geode->addDrawable(geometry);
-
-    // assign state
-    SGMaterial *mat = matlib->find( "GROUND_LIGHTS" );
-    geode->setStateSet(mat->get_state());
-
-    return geode;
-}
-
-
 bool FGTileEntry::obj_load( const string& path,
-                            osg::Group *geometry,
-                            osg::Group *vasi_lights,
-                            osg::Group *rwy_lights,
-                            osg::Group *taxi_lights,
-                            osg::Vec3Array *ground_lights, bool is_base )
+                            osg::Group *geometry, bool is_base )
 {
-    Point3D c;                  // returned center point
-    double br;                  // returned bounding radius
-
     bool use_random_objects =
         fgGetBool("/sim/rendering/random-objects", true);
 
     // try loading binary format
-    if ( SGBinObjLoad( path, is_base,
-                       &c, &br, globals->get_matlib(), use_random_objects,
-                       geometry, vasi_lights, rwy_lights, taxi_lights,
-                       ground_lights ) )
-    {
-        if ( is_base ) {
-            center = c;
-            bounding_radius = br;
-        }
-    }
+    osg::Node* node = SGLoadBTG(path, globals->get_matlib(), is_base, use_random_objects);
+    if (node)
+      geometry->addChild(node);
 
-    return (geometry != NULL);
+    return node;
 }
 
 
@@ -508,7 +302,7 @@ FGTileEntry::load( const string_list &path_list, bool is_base )
             string token;
             in >> token;
 
-            if ( token[0] == '#' ) {
+            if ( token.empty() || token[0] == '#' ) {
                in >> ::skipeol;
                continue;
             }
@@ -562,30 +356,17 @@ FGTileEntry::load( const string_list &path_list, bool is_base )
 
 
     // obj_load() will generate ground lighting for us ...
-    osg::ref_ptr<osg::Vec3Array> light_pts = new osg::Vec3Array;
     osg::Group* new_tile = new osg::Group;
 
-
     if (found_tile_base) {
         // load tile if found ...
-        osg::ref_ptr<osg::Group> geometry = new osg::Group;
-        if ( obj_load( object_base.str(), geometry.get(),
-                       NULL, NULL, NULL, light_pts.get(), true ) ) {
-            new_tile -> addChild( geometry.get() );
-        }
+        obj_load( object_base.str(), new_tile, true );
 
     } else {
         // ... or generate an ocean tile on the fly
         SG_LOG(SG_TERRAIN, SG_INFO, "  Generating ocean tile");
-        osg::ref_ptr<osg::Group> geometry = new osg::Group;
-        Point3D c;
-        double br;
-        if ( SGGenTile( path_list[0], tile_bucket, &c, &br,
-                        globals->get_matlib(), geometry.get() ) ) {
-            center = c;
-            bounding_radius = br;
-            new_tile -> addChild( geometry.get() );
-        } else {
+        if ( !SGGenTile( path_list[0], tile_bucket,
+                        globals->get_matlib(), new_tile ) ) {
             SG_LOG( SG_TERRAIN, SG_ALERT,
                     "Warning: failed to generate ocean tile!" );
         }
@@ -599,30 +380,7 @@ FGTileEntry::load( const string_list &path_list, bool is_base )
         if (obj->type == OBJECT) {
             SGPath custom_path = obj->path;
             custom_path.append( obj->name );
-
-            osg::ref_ptr<osg::Group> geometry = new osg::Group;
-            osg::ref_ptr<osg::Group> vasi_lights = new osg::Group;
-            osg::ref_ptr<osg::Group> rwy_lights = new osg::Group;
-            osg::ref_ptr<osg::Group> taxi_lights = new osg::Group;
-
-            if ( obj_load( custom_path.str(),
-                           geometry.get(), vasi_lights.get(), rwy_lights.get(),
-                           taxi_lights.get(), NULL, false ) ) {
-
-                if ( geometry -> getNumChildren() > 0 ) {
-                    new_tile -> addChild( geometry.get() );
-                }
-
-                if ( vasi_lights -> getNumChildren() > 0 )
-                    vasi_lights_transform -> addChild( vasi_lights.get() );
-
-                if ( rwy_lights -> getNumChildren() > 0 )
-                    rwy_lights_transform -> addChild( rwy_lights.get() );
-
-                if ( taxi_lights -> getNumChildren() > 0 )
-                    taxi_lights_transform -> addChild( taxi_lights.get() );
-            }
-
+            obj_load( custom_path.str(), new_tile, false );
 
         } else if (obj->type == OBJECT_SHARED || obj->type == OBJECT_STATIC) {
             // object loading is deferred to main render thread,
@@ -636,7 +394,7 @@ FGTileEntry::load( const string_list &path_list, bool is_base )
             custom_path.append( obj->name );
 
             osg::Matrix obj_pos;
-            WorldCoordinate( obj_pos, center, obj->lat, obj->lon, obj->elev, obj->hdg );
+            WorldCoordinate( obj_pos, obj->lat, obj->lon, obj->elev, obj->hdg );
 
             osg::MatrixTransform *obj_trans = new osg::MatrixTransform;
             obj_trans->setMatrix( obj_pos );
@@ -661,7 +419,7 @@ FGTileEntry::load( const string_list &path_list, bool is_base )
             custom_path.append( obj->name );
 
             osg::Matrix obj_pos;
-            WorldCoordinate( obj_pos, center, obj->lat, obj->lon, obj->elev, obj->hdg );
+            WorldCoordinate( obj_pos, obj->lat, obj->lon, obj->elev, obj->hdg );
 
             osg::MatrixTransform *obj_trans = new osg::MatrixTransform;
             obj_trans->setMatrix( obj_pos );
@@ -682,63 +440,12 @@ FGTileEntry::load( const string_list &path_list, bool is_base )
         delete obj;
     }
 
-
-    if ( new_tile != NULL ) {
-        terra_range->addChild( new_tile );
-    }
-
+    terra_range->addChild( new_tile );
     terra_transform->addChild( terra_range.get() );
-
-    // calculate initial tile offset
-    SGVec3d sgdTrans(center.x(), center.y(), center.z());
-    terra_transform->setTransform( sgdTrans );
-
-    // Add ground lights to scene graph if any exist
-    gnd_lights_transform = NULL;
-    gnd_lights_range = NULL;
-    if ( light_pts->size() ) {
-        SG_LOG( SG_TERRAIN, SG_DEBUG, "generating lights" );
-        gnd_lights_transform = new SGPlacementTransform;
-        gnd_lights_range = new osg::LOD;
-        gnd_lights_brightness = new osg::Switch;
-        osg::Node *lights;
-
-        lights = gen_lights( globals->get_matlib(), light_pts.get(), 4, 0.7 );
-        gnd_lights_brightness->addChild( lights );
-
-        lights = gen_lights( globals->get_matlib(), light_pts.get(), 2, 0.85 );
-        gnd_lights_brightness->addChild( lights );
-
-        lights = gen_lights( globals->get_matlib(), light_pts.get(), 1, 1.0 );
-        gnd_lights_brightness->addChild( lights );
-
-        gnd_lights_range->addChild( gnd_lights_brightness.get() );
-        gnd_lights_transform->addChild( gnd_lights_range.get() );
-        gnd_lights_transform->setTransform( sgdTrans );
-    }
-
-    // Update vasi lights transform
-    if ( vasi_lights_transform->getNumChildren() > 0 ) {
-        vasi_lights_transform->setTransform( sgdTrans );
-    }
-
-    // Update runway lights transform
-    if ( rwy_lights_transform->getNumChildren() > 0 ) {
-        rwy_lights_transform->setTransform( sgdTrans );
-    }
-
-     // Update taxi lights transform
-    if ( taxi_lights_transform->getNumChildren() > 0 ) {
-        taxi_lights_transform->setTransform( sgdTrans );
-    }
 }
 
 void
-FGTileEntry::add_ssg_nodes( osg::Group *terrain_branch,
-                            osg::Group *gnd_lights_branch,
-                            osg::Group *vasi_lights_branch,
-                            osg::Group *rwy_lights_branch,
-                            osg::Group *taxi_lights_branch )
+FGTileEntry::add_ssg_nodes( osg::Group *terrain_branch )
 {
     // bump up the ref count so we can remove this later without
     // having ssg try to free the memory.
@@ -750,33 +457,6 @@ FGTileEntry::add_ssg_nodes( osg::Group *terrain_branch,
     SG_LOG( SG_TERRAIN, SG_DEBUG, "num parents now = "
             << terra_transform->getNumParents() );
 
-    if ( gnd_lights_transform.get() != NULL ) {
-        // bump up the ref count so we can remove this later without
-        // having ssg try to free the memory.
-        gnd_lights_branch->addChild( gnd_lights_transform.get() );
-    }
-
-    if ( vasi_lights_transform.get() != NULL ) {
-        // bump up the ref count so we can remove this later without
-        // having ssg try to free the memory.
-        vasi_lights_selector->addChild( vasi_lights_transform.get() );
-        vasi_lights_branch->addChild( vasi_lights_selector.get() );
-    }
-
-    if ( rwy_lights_transform.get() != NULL ) {
-        // bump up the ref count so we can remove this later without
-        // having ssg try to free the memory.
-        rwy_lights_selector->addChild( rwy_lights_transform.get() );
-        rwy_lights_branch->addChild( rwy_lights_selector.get() );
-    }
-
-    if ( taxi_lights_transform.get() != NULL ) {
-        // bump up the ref count so we can remove this later without
-        // having ssg try to free the memory.
-        taxi_lights_selector->addChild( taxi_lights_transform.get() );
-        taxi_lights_branch->addChild( taxi_lights_selector.get() );
-    }
-
     loaded = true;
 }
 
@@ -811,92 +491,4 @@ FGTileEntry::disconnect_ssg_nodes()
                 "Parent count is zero for an ssg tile!  Dying" );
         exit(-1);
     }
-
-    // find the ground lighting branch
-    if ( gnd_lights_transform.get() ) {
-        pcount = gnd_lights_transform->getNumParents();
-        if ( pcount > 0 ) {
-            // find the first parent (should only be one)
-            osg::Group *parent = gnd_lights_transform->getParent( 0 ) ;
-            if( parent ) {
-                // disconnect the light branch (we previously ref()'d
-                // it so it won't get freed now)
-                parent->removeChild( gnd_lights_transform.get() );
-            } else {
-                SG_LOG( SG_TERRAIN, SG_ALERT,
-                        "parent pointer is NULL!  Dying" );
-                exit(-1);
-            }
-        } else {
-            SG_LOG( SG_TERRAIN, SG_ALERT,
-                    "Parent count is zero for an ssg light tile!  Dying" );
-            exit(-1);
-        }
-    }
-
-    // find the vasi lighting branch
-    if ( vasi_lights_transform.get() ) {
-        pcount = vasi_lights_transform->getNumParents();
-        if ( pcount > 0 ) {
-            // find the first parent (should only be one)
-            osg::Group *parent = vasi_lights_transform->getParent( 0 ) ;
-            if( parent ) {
-                // disconnect the light branch (we previously ref()'d
-                // it so it won't get freed now)
-                parent->removeChild( vasi_lights_transform.get() );
-            } else {
-                SG_LOG( SG_TERRAIN, SG_ALERT,
-                        "parent pointer is NULL!  Dying" );
-                exit(-1);
-            }
-        } else {
-            SG_LOG( SG_TERRAIN, SG_ALERT,
-                    "Parent count is zero for an ssg light tile!  Dying" );
-            exit(-1);
-        }
-    }
-
-    // find the runway lighting branch
-    if ( rwy_lights_transform.get() ) {
-        pcount = rwy_lights_transform->getNumParents();
-        if ( pcount > 0 ) {
-            // find the first parent (should only be one)
-            osg::Group *parent = rwy_lights_transform->getParent( 0 ) ;
-            if( parent ) {
-                // disconnect the light branch (we previously ref()'d
-                // it so it won't get freed now)
-                parent->removeChild( rwy_lights_transform.get() );
-            } else {
-                SG_LOG( SG_TERRAIN, SG_ALERT,
-                        "parent pointer is NULL!  Dying" );
-                exit(-1);
-            }
-        } else {
-            SG_LOG( SG_TERRAIN, SG_ALERT,
-                    "Parent count is zero for an ssg light tile!  Dying" );
-            exit(-1);
-        }
-    }
-
-    // find the taxi lighting branch
-    if ( taxi_lights_transform.get() ) {
-        pcount = taxi_lights_transform->getNumParents();
-        if ( pcount > 0 ) {
-            // find the first parent (should only be one)
-            osg::Group *parent = taxi_lights_transform->getParent( 0 ) ;
-            if( parent ) {
-                // disconnect the light branch (we previously ref()'d
-                // it so it won't get freed now)
-                parent->removeChild( taxi_lights_transform.get() );
-            } else {
-                SG_LOG( SG_TERRAIN, SG_ALERT,
-                        "parent pointer is NULL!  Dying" );
-                exit(-1);
-            }
-        } else {
-            SG_LOG( SG_TERRAIN, SG_ALERT,
-                    "Parent count is zero for an ssg light tile!  Dying" );
-            exit(-1);
-        }
-    }
 }