Port over remaining Point3D usage to the more type and unit safe SG* classes.

[flightgear.git] / src / Model / modelmgr.hxx

diff --git a/src/Model/modelmgr.hxx b/src/Model/modelmgr.hxx
index 41376f47d1e469d6df7b89a6eed2456b220fa552..0b1cf53435248d91511b2181c75682fd5962b229 100644 (file)
--- a/src/Model/modelmgr.hxx
+++ b/src/Model/modelmgr.hxx
@@ -15,10 +15,9 @@
 #include <simgear/compiler.h>  // for SG_USING_STD
 #include <simgear/structure/subsystem_mgr.hxx>
 
-SG_USING_STD(vector);
+using std::vector;
 
 // Don't pull in headers, since we don't need them here.
-class ssgSelector;
 class SGPropertyNode;
 class SGModelPlacement;
 
@@ -48,12 +47,14 @@ public:
     Instance ();
     virtual ~Instance ();
     SGModelPlacement * model;
-    SGPropertyNode * lon_deg_node;
-    SGPropertyNode * lat_deg_node;
-    SGPropertyNode * elev_ft_node;
-    SGPropertyNode * roll_deg_node;
-    SGPropertyNode * pitch_deg_node;
-    SGPropertyNode * heading_deg_node;
+    SGPropertyNode_ptr node;
+    SGPropertyNode_ptr lon_deg_node;
+    SGPropertyNode_ptr lat_deg_node;
+    SGPropertyNode_ptr elev_ft_node;
+    SGPropertyNode_ptr roll_deg_node;
+    SGPropertyNode_ptr pitch_deg_node;
+    SGPropertyNode_ptr heading_deg_node;
+    bool shadow;
   };
 
   FGModelMgr ();
@@ -64,6 +65,8 @@ public:
   virtual void unbind ();
   virtual void update (double dt);
 
+  virtual void add_model (SGPropertyNode * node);
+
   /**
    * Add an instance of a dynamic model to the manager.
    *
@@ -84,13 +87,26 @@ public:
    */
   virtual void remove_instance (Instance * instance);
 
-  virtual void draw ();
 
 private:
+  /**
+   * Listener class that adds models at runtime.
+   */
+  class Listener : public SGPropertyChangeListener
+  {
+  public:
+    Listener(FGModelMgr *mgr) : _mgr(mgr) {}
+    virtual void childAdded (SGPropertyNode * parent, SGPropertyNode * child);
+    virtual void childRemoved (SGPropertyNode * parent, SGPropertyNode * child);
 
-  vector<Instance *> _instances;
+  private:
+    FGModelMgr * _mgr;
+  };
 
-  ssgSelector * _selector;
+  SGPropertyNode_ptr _models;
+  Listener * _listener;
+
+  vector<Instance *> _instances;
 
 };