Melchior FRANZ:

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

diff --git a/src/Main/globals.hxx b/src/Main/globals.hxx
index 9e91b443bce4b8b780d591748bfce7a163ec4016..6af7367660fd8d81f043032cd8750f3061c49212 100644 (file)
--- a/src/Main/globals.hxx
+++ b/src/Main/globals.hxx
@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started July 2000.
 //
-// Copyright (C) 2000  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 2000  Curtis L. Olson - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -42,6 +42,8 @@ SG_USING_STD( string );
 typedef vector<string> string_list;
 
 
+#include "renderer.hxx"
+
 // Forward declarations
 
 // This file is included, directly or indirectly, almost everywhere in
@@ -59,21 +61,24 @@ 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 FGFlightPlanDispatcher;
 class FGIO;
+class FGNavList;
+class FGFixList;
 class FGLight;
 class FGModelMgr;
+class FGRouteMgr;
 class FGScenery;
 #ifdef FG_MPLAYER_AS
 class FGMultiplayRxMgr;
@@ -94,8 +99,9 @@ class FGGlobals
 
 private:
 
-    SGSubsystemMgr * subsystem_mgr;
-    SGEventMgr * event_mgr;
+    FGRenderer *renderer;
+    SGSubsystemMgr *subsystem_mgr;
+    SGEventMgr *event_mgr;
 
     // Number of milliseconds elapsed since the start of the program.
     double sim_time_sec;
@@ -103,8 +109,8 @@ private:
     // Root of FlightGear data tree
     string fg_root;
 
-    // Root of FlightGear scenery tree
-    string fg_scenery;
+    // Roots of FlightGear scenery tree
+    string_list fg_scenery;
 
     // Fullscreen mode for old 3DFX cards.
 #if defined(FX) && defined(XMESA)
@@ -131,11 +137,8 @@ private:
     // Material properties library
     SGMaterialLib *matlib;
 
-    // Current autopilot
-    FGAutopilot *autopilot;
-
     // Global autopilot "route"
-    SGRoute *route;
+    FGRouteMgr *route_mgr;
 
     // 2D panel
     FGPanel *current_panel;
@@ -175,6 +178,8 @@ private:
 
     SGModelLib *model_lib;
 
+  //FGFlightPlanDispatcher *fpDispatcher;
+
     FGAircraftModel *acmodel;
 
     FGModelMgr * model_mgr;
@@ -182,6 +187,10 @@ private:
     // list of serial port-like configurations
     string_list *channel_options_list;
 
+    // A list of initial waypoints that are read from the command line
+    // and or flight-plan file during initialization
+    string_list *initial_waypoints;
+
     // FlightGear scenery manager
     FGScenery *scenery;
 
@@ -191,6 +200,14 @@ private:
     // Input/Ouput subsystem
     FGIO *io;
 
+    // Navigational Aids
+    FGNavList *navlist;
+    FGNavList *loclist;
+    FGNavList *gslist;
+    FGNavList *dmelist;
+    FGNavList *mkrlist;
+    FGFixList *fixlist;
+
 #ifdef FG_MPLAYER_AS
     //Mulitplayer managers
     FGMultiplayTxMgr *multiplayer_tx_mgr;
@@ -203,9 +220,11 @@ public:
     FGGlobals();
     virtual ~FGGlobals();
 
-    virtual SGSubsystemMgr * get_subsystem_mgr () const;
+    virtual FGRenderer *get_renderer () const;
+
+    virtual SGSubsystemMgr *get_subsystem_mgr () const;
 
-    virtual SGSubsystem * get_subsystem (const char * name);
+    virtual SGSubsystem *get_subsystem (const char * name);
 
     virtual void add_subsystem (const char * name,
                                 SGSubsystem * subsystem,
@@ -213,7 +232,7 @@ public:
                                 type = SGSubsystemMgr::GENERAL,
                                 double min_time_sec = 0);
 
-    virtual SGEventMgr * get_event_mgr () const;
+    virtual SGEventMgr *get_event_mgr () const;
 
     inline double get_sim_time_sec () const { return sim_time_sec; }
     inline void inc_sim_time_sec (double dt) { sim_time_sec += dt; }
@@ -222,10 +241,8 @@ public:
     inline const string &get_fg_root () const { return fg_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) {
-      fg_scenery = scenery;
-    }
+    inline const string_list &get_fg_scenery () const { return fg_scenery; }
+    void set_fg_scenery (const string &scenery);
 
 #if defined(FX) && defined(XMESA)
     inline bool get_fullscreen() const { return fullscreen; }
@@ -252,12 +269,6 @@ public:
     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 FGAirportList *get_airports() const { return airports; }
     inline void set_airports( FGAirportList *a ) {airports = a; }
 
@@ -337,6 +348,14 @@ public:
        channel_options_list = l;
     }
 
+    inline string_list *get_initial_waypoints () {
+        return initial_waypoints;
+    }
+  
+    inline void set_initial_waypoints (string_list *list) {
+        initial_waypoints = list;
+    }
+
     inline FGScenery * get_scenery () const { return scenery; }
     inline void set_scenery ( FGScenery *s ) { scenery = s; }
 
@@ -345,7 +364,21 @@ public:
 
     inline FGIO* get_io() const { return io; }
 
-    /**
+    inline FGNavList *get_navlist() const { return navlist; }
+    inline void set_navlist( FGNavList *n ) { navlist = n; }
+    inline FGNavList *get_loclist() const { return loclist; }
+    inline void set_loclist( FGNavList *n ) { loclist = n; }
+    inline FGNavList *get_gslist() const { return gslist; }
+    inline void set_gslist( FGNavList *n ) { gslist = n; }
+    inline FGNavList *get_dmelist() const { return dmelist; }
+    inline void set_dmelist( FGNavList *n ) { dmelist = n; }
+    inline FGNavList *get_mkrlist() const { return mkrlist; }
+    inline void set_mkrlist( FGNavList *n ) { mkrlist = n; }
+
+    inline FGFixList *get_fixlist() const { return fixlist; }
+    inline void set_fixlist( FGFixList *f ) { fixlist = f; }
+
+   /**
      * Save the current state as the initial state.
      */
     void saveInitialState ();