Linux needs stdarg.h for va_args

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

diff --git a/src/Main/globals.hxx b/src/Main/globals.hxx
index 40c2b697ee838bd34a260668c55cbaf8e0466cc9..7ed60b9c3f1e7907e5f33b3f1dfdd72a846c617e 100644 (file)
--- a/src/Main/globals.hxx
+++ b/src/Main/globals.hxx
@@ -33,6 +33,7 @@
 #include <string>
 
 typedef std::vector<std::string> string_list;
+typedef std::vector<SGPath> PathList;
 
 // Forward declarations
 
@@ -93,6 +94,11 @@ private:
     // Root of FlightGear data tree
     std::string fg_root;
 
+    /**
+     * locations to search for (non-scenery) data. 
+     */
+    PathList additional_data_paths;
+    
     // Users home directory for data
     std::string fg_home;
 
@@ -148,6 +154,7 @@ private:
     bool haveUserSettings;
 
     SGPropertyNode_ptr positionLon, positionLat, positionAlt;
+    SGPropertyNode_ptr viewLon, viewLat, viewAlt;
     SGPropertyNode_ptr orientHeading, orientPitch, orientRoll;
 public:
 
@@ -177,6 +184,26 @@ public:
     inline const std::string &get_fg_root () const { return fg_root; }
     void set_fg_root (const std::string &root);
 
+    /**
+     * Get list of data locations. fg_root is always the final item in the
+     * result.
+     */
+    PathList get_data_paths() const;
+    
+    /**
+     * Get data locations which contain the file path suffix. Eg pass ing
+     * 'AI/Traffic' to get all data paths which define <path>/AI/Traffic subdir
+     */
+    PathList get_data_paths(const std::string& suffix) const;
+    
+    void append_data_path(const SGPath& path);
+    
+    /**
+     * Given a path suffix (eg 'Textures' or 'AI/Traffic'), find the
+     * first data directory which defines it.
+     */
+    SGPath find_data_dir(const std::string& pathSuffix) const;
+    
     inline const std::string &get_fg_home () const { return fg_home; }
     void set_fg_home (const std::string &home);
 
@@ -210,7 +237,7 @@ public:
      *  2. All aircraft directories if branch starts with Aircraft/
      *  3. fg_data directory
      */
-    SGPath resolve_ressource_path(const std::string& branch) const;
+    SGPath resolve_resource_path(const std::string& branch) const;
 
     inline const std::string &get_browser () const { return browser; }
     void set_browser (const std::string &b) { browser = b; }
@@ -249,10 +276,14 @@ public:
 
     SGGeod get_aircraft_position() const;
 
-    SGVec3d get_aircraft_positon_cart() const;
+    SGVec3d get_aircraft_position_cart() const;
 
     void get_aircraft_orientation(double& heading, double& pitch, double& roll);
   
+    SGGeod get_view_position() const;
+  
+    SGVec3d get_view_position_cart() const;
+  
     inline string_list *get_channel_options_list () {
        return channel_options_list;
     }