Interim windows build fix

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

diff --git a/src/Main/globals.hxx b/src/Main/globals.hxx
index 8f1736f146b125697138e43feb1638487bedbc12..82dd12681ff03050be786207911c88bb46907b40 100644 (file)
--- a/src/Main/globals.hxx
+++ b/src/Main/globals.hxx
@@ -31,6 +31,7 @@
 
 #include <vector>
 #include <string>
+#include <memory>
 
 typedef std::vector<std::string> string_list;
 typedef std::vector<SGPath> PathList;
@@ -55,7 +56,6 @@ class SGSubsystemMgr;
 class SGSubsystem;
 class SGSoundMgr;
 
-class FGATISMgr;
 class FGControls;
 class FGTACANList;
 class FGLocale;
@@ -68,6 +68,10 @@ class FGRenderer;
 class FGFontCache;
 class FGSampleQueue;
 
+namespace simgear { namespace pkg {
+  class Root;
+}}
+
 /**
  * Bucket for subsystem pointers representing the sim's state.
  */
@@ -79,7 +83,6 @@ private:
 
     // properties, destroy last
     SGPropertyNode_ptr props;
-    SGPropertyNode_ptr initial_state;
 
     // localization
     FGLocale* locale;
@@ -104,6 +107,7 @@ private:
 
     // Roots of FlightGear scenery tree
     string_list fg_scenery;
+    string_list secure_fg_scenery;
 
     std::string browser;
 
@@ -114,19 +118,7 @@ private:
     SGEphemeris *ephem;
 
     // Material properties library
-    SGMaterialLib *matlib;
-
-    // Global autopilot "route"
-    FGRouteMgr *route_mgr;
-
-    // ATC manager
-    FGATISMgr *ATIS_mgr;
-
-    // control input state
-    FGControls *controls;
-
-    // viewer manager
-    FGViewMgr *viewmgr;
+    SGSharedPtr<SGMaterialLib> matlib;
 
     SGCommandMgr *commands;
 
@@ -137,12 +129,6 @@ private:
     // and or flight-plan file during initialization
     string_list *initial_waypoints;
 
-    // FlightGear scenery manager
-    SGSharedPtr<FGScenery> _scenery;
-
-    // Tile manager
-    SGSharedPtr<FGTileMgr> _tile_mgr;
-
     FGFontCache *fontcache;
 
     // Navigational Aids
@@ -150,6 +136,7 @@ private:
 
     /// roots of Aircraft trees
     string_list fg_aircraft_dirs;
+    SGPath catalog_aircraft_dir;
 
     bool haveUserSettings;
 
@@ -168,7 +155,8 @@ private:
     
     typedef std::vector<SGPropertyChangeListener*> SGPropertyChangeListenerVec;
     SGPropertyChangeListenerVec _listeners_to_cleanup;
-    
+  
+    SGSharedPtr<simgear::pkg::Root> _packageRoot;
 public:
 
     FGGlobals();
@@ -177,19 +165,36 @@ public:
     virtual FGRenderer *get_renderer () const;
     void set_renderer(FGRenderer* render);
     
-    virtual SGSubsystemMgr *get_subsystem_mgr () const;
+    SGSubsystemMgr *get_subsystem_mgr () const;
 
-    virtual SGSubsystem *get_subsystem (const char * name);
+    SGSubsystem *get_subsystem (const char * name) const;
 
-    virtual void add_subsystem (const char * name,
+    template<class T>
+    T* get_subsystem() const
+    {
+        return dynamic_cast<T*>(get_subsystem(T::subsystemName()));
+    }
+
+
+    void add_subsystem (const char * name,
                                 SGSubsystem * subsystem,
                                 SGSubsystemMgr::GroupType
                                 type = SGSubsystemMgr::GENERAL,
                                 double min_time_sec = 0);
 
-    virtual SGEventMgr *get_event_mgr () const;
+    template<class T>
+    T* add_new_subsystem (SGSubsystemMgr::GroupType
+                                type = SGSubsystemMgr::GENERAL,
+                                double min_time_sec = 0)
+    {
+        T* sub = new T;
+        add_subsystem(T::subsystemName(), sub, type, min_time_sec);
+        return sub;
+    }
 
-    virtual SGSoundMgr *get_soundmgr () const;
+    SGEventMgr *get_event_mgr () const;
+
+    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; }
@@ -222,9 +227,28 @@ public:
     void set_fg_home (const std::string &home);
 
     inline const string_list &get_fg_scenery () const { return fg_scenery; }
-    void append_fg_scenery (const std::string &scenery);
+    inline const string_list &get_secure_fg_scenery () const { return secure_fg_scenery; }
+    /**
+     * Add a scenery directory
+     *
+     * secure = allow Nasal to read this directory; to avoid
+     * can-read-any-file security holes, do NOT set this on directories
+     * obtained from the property tree (e.g. /sim/terrasync/scenery-dir)
+     * or other Nasal-writable places
+     */ 
+    void append_fg_scenery (const std::string &scenery, bool secure = false);
+
+    void clear_fg_scenery();
+
+    /**
+     * specify a path we'll prepend to the aircraft paths list if non-empty.
+     * This is used with packaged aircraft, to ensure their catalog (and hence,
+     * dependency packages) are found correctly.
+     */
+    void set_catalog_aircraft_path(const SGPath& path);
+
+    string_list get_aircraft_paths() const;
 
-    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);
     
@@ -271,16 +295,6 @@ public:
     inline SGMaterialLib *get_matlib() const { return matlib; }
     void set_matlib( SGMaterialLib *m );
 
-    inline FGATISMgr *get_ATIS_mgr() const { return ATIS_mgr; }
-    inline void set_ATIS_mgr( FGATISMgr *a ) {ATIS_mgr = a; }
-
-    inline FGControls *get_controls() const { return controls; }
-    inline void set_controls( FGControls *c ) { controls = c; }
-
-    inline FGViewMgr *get_viewmgr() const { return viewmgr; }
-    inline void set_viewmgr( FGViewMgr *vm ) { viewmgr = vm; }
-    FGViewer *get_current_view() const;
-
     inline SGPropertyNode *get_props () { return props; }
 
     /**
@@ -318,27 +332,19 @@ public:
         initial_waypoints = list;
     }
 
+    FGViewMgr *get_viewmgr() const;
+    FGViewer *get_current_view() const;
+
+    FGControls *get_controls() const;
+
     FGScenery * get_scenery () const;
-    void set_scenery ( FGScenery *s );
 
     FGTileMgr * get_tile_mgr () const;
-    void set_tile_mgr ( FGTileMgr *t );
 
     inline FGFontCache *get_fontcache() const { return fontcache; }
   
     inline FGTACANList *get_channellist() const { return channellist; }
     inline void set_channellist( FGTACANList *c ) { channellist = c; }
-  
-   /**
-     * Save the current state as the initial state.
-     */
-    void saveInitialState ();
-
-
-    /**
-     * Restore the saved initial state, if any.
-     */
-    void restoreInitialState ();
 
     /**
      * Load user settings from autosave.xml
@@ -354,6 +360,9 @@ public:
     void set_chatter_queue(FGSampleQueue* queue);
     
     void addListenerToCleanup(SGPropertyChangeListener* l);
+  
+    simgear::pkg::Root* packageRoot();
+    void setPackageRoot(const SGSharedPtr<simgear::pkg::Root>& p);
 };