Turn back to default lighting when specular-highlight gets disabled

[flightgear.git] / src / Main / globals.hxx

diff --git a/src/Main/globals.hxx b/src/Main/globals.hxx
index c9bcf3b30c16df0b576f1642892bbc5045ad3474..827debbcabcdc841c9405a7d6aa9c9eb5b242b78 100644 (file)
--- a/src/Main/globals.hxx
+++ b/src/Main/globals.hxx
@@ -52,20 +52,22 @@ class SGEphemeris;
 
 class SGCommandMgr;
 class SGMagVar;
+class SGMaterialLib;
+class SGModelLib;
 class SGPropertyNode;
 class SGRoute;
 class SGTime;
+class SGSoundMgr;
 
+class FGAirportList;
+class FGRunwayList;
 class FGAIMgr;
 class FGATCMgr;
 class FGATCDisplay;
 class FGAircraftModel;
 class FGAutopilot;
 class FGControls;
-class FGEnvironment;
-class FGEnvironmentMgr;
 class FGIO;
-class FGModelLoader;
 class FGModelMgr;
 class FGScenery;
 #ifdef FG_MPLAYER_AS
@@ -73,7 +75,6 @@ class FGMultiplayRxMgr;
 class FGMultiplayTxMgr;
 #endif
 class FGPanel;
-class FGSoundMgr;
 class FGTileMgr;
 class FGViewMgr;
 class FGViewer;
@@ -120,6 +121,9 @@ private:
     // Magnetic Variation
     SGMagVar *mag;
 
+    // Material properties library
+    SGMaterialLib *matlib;
+
     // Current autopilot
     FGAutopilot *autopilot;
 
@@ -130,10 +134,13 @@ private:
     FGPanel *current_panel;
 
     // sound manager
-    FGSoundMgr *soundmgr;
+    SGSoundMgr *soundmgr;
+
+    // Simple Airport List
+    FGAirportList *airports;
 
-    // environment information
-    FGEnvironmentMgr * environment_mgr;
+    // Runway List
+    FGRunwayList *runways;
 
     // ATC manager
     FGATCMgr *ATC_mgr;
@@ -159,7 +166,7 @@ private:
 
     SGCommandMgr *commands;
 
-    FGModelLoader * model_loader;
+    SGModelLib *model_lib;
 
     FGAircraftModel *acmodel;
 
@@ -232,18 +239,20 @@ public:
     inline SGMagVar *get_mag() const { return mag; }
     inline void set_mag( SGMagVar *m ) { mag = m; }
 
+    inline SGMaterialLib *get_matlib() const { return matlib; }
+    inline void set_matlib( SGMaterialLib *m ) { matlib = m; }
+
     inline FGAutopilot *get_autopilot() const { return autopilot; }
     inline void set_autopilot( FGAutopilot *ap) { autopilot = ap; }
 
     inline SGRoute *get_route() const { return route; }
     inline void set_route( SGRoute *r ) { route = r; }
 
-    inline FGEnvironmentMgr * get_environment_mgr() {
-      return environment_mgr;
-    }
-    inline void set_environment_mgr(FGEnvironmentMgr * mgr) {
-      environment_mgr = mgr;
-    }
+    inline FGAirportList *get_airports() const { return airports; }
+    inline void set_airports( FGAirportList *a ) {airports = a; }
+
+    inline FGRunwayList *get_runways() const { return runways; }
+    inline void set_runways( FGRunwayList *r ) {runways = r; }
 
     inline FGATCMgr *get_ATC_mgr() const { return ATC_mgr; }
     inline void set_ATC_mgr( FGATCMgr *a ) {ATC_mgr = a; }
@@ -257,8 +266,8 @@ public:
     inline FGPanel *get_current_panel() const { return current_panel; }
     inline void set_current_panel( FGPanel *cp ) { current_panel = cp; }
 
-    inline FGSoundMgr *get_soundmgr() const { return soundmgr; }
-    inline void set_soundmgr( FGSoundMgr *sm ) { soundmgr = sm; }
+    inline SGSoundMgr *get_soundmgr() const { return soundmgr; }
+    inline void set_soundmgr( SGSoundMgr *sm ) { soundmgr = sm; }
 
     inline FGControls *get_controls() const { return controls; }
     inline void set_controls( FGControls *c ) { controls = c; }
@@ -275,10 +284,10 @@ public:
 
     inline SGCommandMgr *get_commands () { return commands; }
 
-    inline FGModelLoader * get_model_loader () { return model_loader; }
+    inline SGModelLib * get_model_lib () { return model_lib; }
 
-    inline void set_model_loader (FGModelLoader * loader) {
-        model_loader = loader;
+    inline void set_model_lib (SGModelLib *m) {
+        model_lib = m;
     }
 
     inline FGAircraftModel *get_aircraft_model () { return acmodel; }