Use a pointer to a structure instead of a large number of variables when calling...

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

diff --git a/src/Main/globals.hxx b/src/Main/globals.hxx
index 2b64fcdb8286740266ae34c7f13b242d4448796c..2621fe2db033c5c1fc422d3acd6af76260f8b260 100644 (file)
--- a/src/Main/globals.hxx
+++ b/src/Main/globals.hxx
@@ -52,9 +52,12 @@ class SGEphemeris;
 
 class SGCommandMgr;
 class SGMagVar;
+class SGMaterialLib;
+class SGModelLib;
 class SGPropertyNode;
 class SGRoute;
 class SGTime;
+class SGSoundMgr;
 
 class FGAIMgr;
 class FGATCMgr;
@@ -62,10 +65,7 @@ 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,8 +73,6 @@ class FGMultiplayRxMgr;
 class FGMultiplayTxMgr;
 #endif
 class FGPanel;
-class FGSoundMgr;
-class FGTextureLoader;
 class FGTileMgr;
 class FGViewMgr;
 class FGViewer;
@@ -121,6 +119,9 @@ private:
     // Magnetic Variation
     SGMagVar *mag;
 
+    // Material properties library
+    SGMaterialLib *matlib;
+
     // Current autopilot
     FGAutopilot *autopilot;
 
@@ -131,10 +132,7 @@ private:
     FGPanel *current_panel;
 
     // sound manager
-    FGSoundMgr *soundmgr;
-
-    // environment information
-    FGEnvironmentMgr * environment_mgr;
+    SGSoundMgr *soundmgr;
 
     // ATC manager
     FGATCMgr *ATC_mgr;
@@ -160,9 +158,7 @@ private:
 
     SGCommandMgr *commands;
 
-    FGModelLoader * model_loader;
-
-    FGTextureLoader * texture_loader;
+    SGModelLib *model_lib;
 
     FGAircraftModel *acmodel;
 
@@ -206,7 +202,7 @@ public:
     inline void set_sim_time_sec (double t) { sim_time_sec = t; }
 
     inline const string &get_fg_root () const { return fg_root; }
-    inline void set_fg_root (const string &root) { fg_root = root; }
+    void set_fg_root (const string &root);
 
     inline const string &get_fg_scenery () const { return fg_scenery; }
     inline void set_fg_scenery (const string &scenery) {
@@ -235,19 +231,15 @@ 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 FGATCMgr *get_ATC_mgr() const { return ATC_mgr; }
     inline void set_ATC_mgr( FGATCMgr *a ) {ATC_mgr = a; }
 
@@ -260,8 +252,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; }
@@ -278,16 +270,10 @@ public:
 
     inline SGCommandMgr *get_commands () { return commands; }
 
-    inline FGModelLoader * get_model_loader () { return model_loader; }
-
-    inline void set_model_loader (FGModelLoader * loader) {
-        model_loader = loader;
-    }
-
-    inline FGTextureLoader * get_texture_loader () { return texture_loader; }
+    inline SGModelLib * get_model_lib () { return model_lib; }
 
-    inline void set_texture_loader (FGTextureLoader * loader) {
-        texture_loader = loader;
+    inline void set_model_lib (SGModelLib *m) {
+        model_lib = m;
     }
 
     inline FGAircraftModel *get_aircraft_model () { return acmodel; }