Moved some of the low level scene graph construction code over to simgear.

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

diff --git a/src/Main/fgfs.hxx b/src/Main/fgfs.hxx
index 942eee31709e2db3208e36ea83181aed8844c15a..bc435893121212964b0742d56877fe6b2de7818d 100644 (file)
--- a/src/Main/fgfs.hxx
+++ b/src/Main/fgfs.hxx
@@ -49,7 +49,7 @@ SG_USING_STD(vector);
 #include <map>
 SG_USING_STD(map);
 
-#include <simgear/misc/props.hxx>
+#include <simgear/props/props.hxx>
 
 
 \f
@@ -70,13 +70,13 @@ SG_USING_STD(map);
  * <pre>
  * void MySubsystem::bind ()
  * {
- *   fgTie("/controls/elevator", &_elevator);
- *   fgSetArchivable("/controls/elevator");
+ *   fgTie("/controls/flight/elevator", &_elevator);
+ *   fgSetArchivable("/controls/flight/elevator");
  * }
  *
  * void MySubsystem::unbind ()
  * {
- *   fgUntie("/controls/elevator");
+ *   fgUntie("/controls/flight/elevator");
  * }
  * </pre>
  *
@@ -145,7 +145,16 @@ public:
    * in the constructor, so that FlightGear can control the
    * initialization order.</p>
    */
-  virtual void init () = 0;
+  virtual void init ();
+
+
+  /**
+   * Reinitialize the subsystem.
+   *
+   * <p>This method should cause the subsystem to reinitialize itself,
+   * and (normally) to reload any configuration files.</p>
+   */
+  virtual void reinit ();
 
 
   /**
@@ -155,7 +164,7 @@ public:
    * publishes.  It will be invoked after init, but before any
    * invocations of update.</p>
    */
-  virtual void bind () = 0;
+  virtual void bind ();
 
 
   /**
@@ -165,7 +174,7 @@ public:
    * publishes.  It will be invoked by FlightGear (not the destructor)
    * just before the subsystem is removed.</p>
    */
-  virtual void unbind () = 0;
+  virtual void unbind ();
 
 
   /**
@@ -243,9 +252,13 @@ public:
     virtual ~FGSubsystemGroup ();
 
     virtual void init ();
+    virtual void reinit ();
     virtual void bind ();
     virtual void unbind ();
     virtual void update (double delta_time_sec);
+    virtual void suspend ();
+    virtual void resume ();
+    virtual bool is_suspended () const;
 
     virtual void set_subsystem (const string &name,
                                 FGSubsystem * subsystem,
@@ -278,12 +291,29 @@ private:
 
 \f
 /**
- * Manage subsystems for the application.
+ * Manage subsystems for FlightGear.
+ *
+ * This top-level subsystem will eventually manage all of the
+ * subsystems in FlightGear: it broadcasts its life-cycle events
+ * (init, bind, etc.) to all of the subsystems it manages.  Subsystems
+ * are grouped to guarantee order of initialization and execution --
+ * currently, the only two groups are INIT and GENERAL, but others
+ * will appear in the future.
+ *
+ * All subsystems are named as well as grouped, and subsystems can be
+ * looked up by name and cast to the appropriate subtype when another
+ * subsystem needs to invoke specialized methods.
+ *
+ * The subsystem manager owns the pointers to all the subsystems in
+ * it.
  */
 class FGSubsystemMgr : public FGSubsystem
 {
 public:
 
+    /**
+     * Types of subsystem groups.
+     */
     enum GroupType {
         INIT = 0,
         GENERAL,
@@ -294,19 +324,27 @@ public:
     virtual ~FGSubsystemMgr ();
 
     virtual void init ();
+    virtual void reinit ();
     virtual void bind ();
     virtual void unbind ();
     virtual void update (double delta_time_sec);
+    virtual void suspend ();
+    virtual void resume ();
+    virtual bool is_suspended () const;
 
-    virtual void add (GroupType group, const string &name,
+    virtual void add (const char * name,
                       FGSubsystem * subsystem,
+                      GroupType group = GENERAL, 
                       double min_time_sec = 0);
 
     virtual FGSubsystemGroup * get_group (GroupType group);
 
+    virtual FGSubsystem * get_subsystem(const string &name);
+
 private:
 
     FGSubsystemGroup _groups[MAX_GROUPS];
+    map<string,FGSubsystem *> _subsystem_map;
 
 };