Make sure pu.h doesn't include glut by accident.

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

diff --git a/src/Scenery/scenery.cxx b/src/Scenery/scenery.cxx
index 50a8303d82eec44b2d022995e3b36484d8a02892..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>
 
@@ -78,11 +72,18 @@ void FGScenery::init() {
     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" );
+
+    // 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() );
 }