Get rid of RG16 buffer made possible by a different way to encode normals

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

diff --git a/src/Main/globals.hxx b/src/Main/globals.hxx
index 3828a9326482f4e87271cb131d03f7965b3970f3..9be19ff66d5157e20ea67959ff066786a129a627 100644 (file)
--- a/src/Main/globals.hxx
+++ b/src/Main/globals.hxx
@@ -55,19 +55,15 @@ class SGSubsystemMgr;
 class SGSubsystem;
 class SGSoundMgr;
 
-class FGAIMgr;
 class FGATCMgr;
 class FGAircraftModel;
 class FGControls;
 class FGFlightPlanDispatcher;
 class FGNavList;
-class FGAirwayNetwork;
 class FGTACANList;
-class FGLight;
 class FGModelMgr;
 class FGRouteMgr;
 class FGScenery;
-class FGMultiplayMgr;
 class FGPanel;
 class FGTileMgr;
 class FGViewMgr;
@@ -95,7 +91,6 @@ private:
     FGRenderer *renderer;
     SGSubsystemMgr *subsystem_mgr;
     SGEventMgr *event_mgr;
-    SGSoundMgr *soundmgr;
 
     // Number of milliseconds elapsed since the start of the program.
     double sim_time_sec;
@@ -108,14 +103,6 @@ private:
 
     std::string browser;
 
-    // An offset in seconds from the true time.  Allows us to adjust
-    // the effective time of day.
-    long int warp;
-
-    // How much to change the value of warp each iteration.  Allows us
-    // to make time progress faster than normal (or even run in reverse.)
-    long int warp_delta;
-
     // Time structure
     SGTime *time_params;
 
@@ -132,14 +119,11 @@ private:
     FGRouteMgr *route_mgr;
 
     // 2D panel
-    FGPanel *current_panel;
+    SGSharedPtr<FGPanel> current_panel;
 
     // ATC manager
     FGATCMgr *ATC_mgr;
 
-    // AI manager
-    FGAIMgr *AI_mgr;
-
     // control input state
     FGControls *controls;
 
@@ -177,13 +161,12 @@ private:
     FGNavList *tacanlist;
     FGNavList *carrierlist;
     FGTACANList *channellist;
-    FGAirwayNetwork *airwaynet;
-
-    //Mulitplayer managers
-    FGMultiplayMgr *multiplayer_mgr;
 
     /// roots of Aircraft trees
     string_list fg_aircraft_dirs;
+
+    bool haveUserSettings;
+
 public:
 
     FGGlobals();
@@ -213,7 +196,7 @@ public:
     void set_fg_root (const std::string &root);
 
     inline const string_list &get_fg_scenery () const { return fg_scenery; }
-    void set_fg_scenery (const std::string &scenery);
+    void append_fg_scenery (const std::string &scenery);
 
     const string_list& get_aircraft_paths() const { return fg_aircraft_dirs; }
     void append_aircraft_path(const std::string& path);
@@ -238,13 +221,11 @@ public:
     inline const std::string &get_browser () const { return browser; }
     void set_browser (const std::string &b) { browser = b; }
 
-    inline long int get_warp() const { return warp; }
-    inline void set_warp( long int w ) { warp = w; }
-    inline void inc_warp( long int w ) { warp += w; }
+    long int get_warp() const;
+    void set_warp( long int w );
 
-    inline long int get_warp_delta() const { return warp_delta; }
-    inline void set_warp_delta( long int d ) { warp_delta = d; }
-    inline void inc_warp_delta( long int d ) { warp_delta += d; }
+    long int get_warp_delta() const;
+    void set_warp_delta( long int d );
 
     inline SGTime *get_time_params() const { return time_params; }
     inline void set_time_params( SGTime *t ) { time_params = t; }
@@ -261,11 +242,8 @@ public:
     inline FGATCMgr *get_ATC_mgr() const { return ATC_mgr; }
     inline void set_ATC_mgr( FGATCMgr *a ) {ATC_mgr = a; }
 
-    inline FGAIMgr *get_AI_mgr() const { return AI_mgr; }
-    inline void set_AI_mgr( FGAIMgr *a ) {AI_mgr = a; }
-
     inline FGPanel *get_current_panel() const { return current_panel; }
-    inline void set_current_panel( FGPanel *cp ) { current_panel = cp; }
+    void set_current_panel( FGPanel *cp );
 
     inline FGControls *get_controls() const { return controls; }
     inline void set_controls( FGControls *c ) { controls = c; }
@@ -289,6 +267,10 @@ public:
         acmodel = model;
     }
 
+    const SGGeod & get_aircraft_position() const;
+
+    SGVec3d get_aircraft_positon_cart() const;
+    
     inline FGModelMgr *get_model_mgr () { return model_mgr; }
 
     inline void set_model_mgr (FGModelMgr * mgr)
@@ -296,13 +278,6 @@ public:
       model_mgr = mgr;
     }
 
-    inline FGMultiplayMgr *get_multiplayer_mgr () { return multiplayer_mgr; }
-
-    inline void set_multiplayer_mgr (FGMultiplayMgr * mgr)
-    {
-      multiplayer_mgr = mgr;
-    }
-
     inline string_list *get_channel_options_list () {
        return channel_options_list;
     }
@@ -341,10 +316,6 @@ public:
     inline FGTACANList *get_channellist() const { return channellist; }
     inline void set_channellist( FGTACANList *c ) { channellist = c; }
 
-    inline FGAirwayNetwork *get_airwaynet() const { return airwaynet; }
-    inline void set_airwaynet( FGAirwayNetwork *a ) { airwaynet = a; }
-
-
    /**
      * Save the current state as the initial state.
      */
@@ -356,6 +327,15 @@ public:
      */
     void restoreInitialState ();
 
+    /**
+     * Load user settings from autosave.xml
+     */
+    void loadUserSettings(const SGPath& datapath);
+
+    /**
+     * Save user settings in autosave.xml
+     */
+    void saveUserSettings();
 };