Check for the plib version when using display lists, just to be sure.

[flightgear.git] / src / Scenery / scenery.cxx

diff --git a/src/Scenery/scenery.cxx b/src/Scenery/scenery.cxx
index b319cefe8a29352f90e0590d2e77726eef0677ff..88435c10cd7dc72a6677c388232e3a841f95e970 100644 (file)
--- a/src/Scenery/scenery.cxx
+++ b/src/Scenery/scenery.cxx
@@ -25,17 +25,11 @@
 #  include <config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
-#include <GL/glut.h>
-#include <GL/gl.h>
-
 #include <stdio.h>
 #include <string.h>
 
 #include <simgear/debug/logstream.hxx>
+#include <simgear/scene/tgdb/userdata.hxx>
 
 #include <Main/fg_props.hxx>
 
@@ -61,9 +55,6 @@ void FGScenery::init() {
     scene_graph = new ssgRoot;
     scene_graph->setName( "Scene" );
 
-    lighting = new ssgRoot;
-    lighting->setName( "Lighting" );
-
     // Terrain branch
     terrain_branch = new ssgBranch;
     terrain_branch->setName( "Terrain" );
@@ -78,13 +69,21 @@ void FGScenery::init() {
     scene_graph->addKid( aircraft_branch );
 
     // Lighting
-    gnd_lights_branch = new ssgBranch;
-    gnd_lights_branch->setName( "Ground Lighting" );
-    lighting->addKid( gnd_lights_branch );
+    gnd_lights_root = new ssgRoot;
+    gnd_lights_root->setName( "Ground Lighting Root" );
+
+    vasi_lights_root = new ssgRoot;
+    vasi_lights_root->setName( "VASI/PAPI Lighting Root" );
+
+    rwy_lights_root = new ssgRoot;
+    rwy_lights_root->setName( "Runway Lighting Root" );
+
+    taxi_lights_root = new ssgRoot;
+    taxi_lights_root->setName( "Taxi Lighting Root" );
 
-    rwy_lights_branch = new ssgBranch;
-    rwy_lights_branch->setName( "Runway Lighting" );
-    lighting->addKid( rwy_lights_branch );
+    // Initials values needed by the draw-time object loader
+    sgUserDataInit( globals->get_model_lib(), globals->get_fg_root(),
+                    globals->get_props(), globals->get_sim_time_sec() );
 }