X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Fglobals.hxx;h=e241b6297a0630b911ecd03c092aad1380976f6f;hb=38226af24ec01e8f0a20d7fd73ef838a69f6ef25;hp=d962bae2c2937bbc6e2f12de46e177e6ac6d0f53;hpb=70be1629e61d9b751a2f73df30b83bb1be6ca4fe;p=flightgear.git diff --git a/src/Main/globals.hxx b/src/Main/globals.hxx index d962bae2c..e241b6297 100644 --- a/src/Main/globals.hxx +++ b/src/Main/globals.hxx @@ -27,6 +27,7 @@ #include #include #include +#include #include #include @@ -49,25 +50,20 @@ class SGMagVar; class SGMaterialLib; class SGPropertyNode; class SGTime; -class SGSoundMgr; class SGEventMgr; class SGSubsystemMgr; class SGSubsystem; +class SGSoundMgr; -class FGAIMgr; class FGATCMgr; class FGAircraftModel; class FGControls; class FGFlightPlanDispatcher; -class FGIO; class FGNavList; -class FGAirwayNetwork; class FGTACANList; -class FGLight; class FGModelMgr; class FGRouteMgr; class FGScenery; -class FGMultiplayMgr; class FGPanel; class FGTileMgr; class FGViewMgr; @@ -95,6 +91,7 @@ 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; @@ -107,14 +104,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; @@ -133,15 +122,9 @@ private: // 2D panel FGPanel *current_panel; - // sound manager - SGSoundMgr *soundmgr; - // ATC manager FGATCMgr *ATC_mgr; - // AI manager - FGAIMgr *AI_mgr; - // control input state FGControls *controls; @@ -169,9 +152,6 @@ private: // Tile manager FGTileMgr *tile_mgr; - // Input/Ouput subsystem - FGIO *io; - FGFontCache *fontcache; // Navigational Aids @@ -182,11 +162,9 @@ private: FGNavList *tacanlist; FGNavList *carrierlist; FGTACANList *channellist; - FGAirwayNetwork *airwaynet; - - //Mulitplayer managers - FGMultiplayMgr *multiplayer_mgr; + /// roots of Aircraft trees + string_list fg_aircraft_dirs; public: FGGlobals(); @@ -206,6 +184,8 @@ public: virtual SGEventMgr *get_event_mgr () const; + virtual SGSoundMgr *get_soundmgr () const; + inline double get_sim_time_sec () const { return sim_time_sec; } inline void inc_sim_time_sec (double dt) { sim_time_sec += dt; } inline void set_sim_time_sec (double t) { sim_time_sec = t; } @@ -216,16 +196,34 @@ public: inline const string_list &get_fg_scenery () const { return fg_scenery; } void set_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); + void append_aircraft_paths(const std::string& path); + + /** + * Given a path to an aircraft-related resource file, resolve it + * against the appropriate root. This means looking at the location + * defined by /sim/aircraft-dir, and then aircraft_path in turn, + * finishing with fg_root/Aircraft. + * + * if the path could not be resolved, an empty path is returned. + */ + SGPath resolve_aircraft_path(const std::string& branch) const; + + /** + * Same as above, but test for non 'Aircraft/' branch paths, and + * always resolve them against fg_root. + */ + SGPath resolve_maybe_aircraft_path(const std::string& branch) const; + 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; } @@ -242,15 +240,9 @@ 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; } - 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; } @@ -280,13 +272,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; } @@ -308,9 +293,8 @@ public: inline FGTileMgr * get_tile_mgr () const { return tile_mgr; } inline void set_tile_mgr ( FGTileMgr *t ) { tile_mgr = t; } - inline FGIO* get_io() const { return io; } inline FGFontCache *get_fontcache() const { return fontcache; } - + inline FGNavList *get_navlist() const { return navlist; } inline void set_navlist( FGNavList *n ) { navlist = n; } inline FGNavList *get_loclist() const { return loclist; } @@ -326,10 +310,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. */