Moved random ground cover object management code (userdata.[ch]xx) over

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

diff --git a/src/Main/globals.hxx b/src/Main/globals.hxx
index e4ac10732b42d4fc39960e52a969378b25e65fb0..38fb0f4c55eeb2edc96c5c7cafc0885a21ec31d6 100644 (file)
--- a/src/Main/globals.hxx
+++ b/src/Main/globals.hxx
@@ -52,10 +52,12 @@ class SGEphemeris;
 
 class SGCommandMgr;
 class SGMagVar;
+class SGMaterialLib;
+class SGModelLib;
 class SGPropertyNode;
 class SGRoute;
 class SGTime;
-class SoundMgr;
+class SGSoundMgr;
 
 class FGAIMgr;
 class FGATCMgr;
@@ -66,7 +68,6 @@ class FGControls;
 class FGEnvironment;
 class FGEnvironmentMgr;
 class FGIO;
-class FGModelLoader;
 class FGModelMgr;
 class FGScenery;
 #ifdef FG_MPLAYER_AS
@@ -120,6 +121,9 @@ private:
     // Magnetic Variation
     SGMagVar *mag;
 
+    // Material properties library
+    SGMaterialLib *matlib;
+
     // Current autopilot
     FGAutopilot *autopilot;
 
@@ -130,7 +134,7 @@ private:
     FGPanel *current_panel;
 
     // sound manager
-    SoundMgr *soundmgr;
+    SGSoundMgr *soundmgr;
 
     // environment information
     FGEnvironmentMgr * environment_mgr;
@@ -159,7 +163,7 @@ private:
 
     SGCommandMgr *commands;
 
-    FGModelLoader * model_loader;
+    SGModelLib *model_lib;
 
     FGAircraftModel *acmodel;
 
@@ -232,6 +236,9 @@ 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; }
 
@@ -257,8 +264,8 @@ public:
     inline FGPanel *get_current_panel() const { return current_panel; }
     inline void set_current_panel( FGPanel *cp ) { current_panel = cp; }
 
-    inline SoundMgr *get_soundmgr() const { return soundmgr; }
-    inline void set_soundmgr( SoundMgr *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 +282,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; }