Change FGSteam into a proper subsystem rather than a collection of

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

diff --git a/src/Model/modelmgr.hxx b/src/Model/modelmgr.hxx
index 15933d63cc42122e2f650abc0c9a6e4c7144e6ad..d0b7841cd7410007b5a4bb3b34bc74ff7a61bd19 100644 (file)
--- a/src/Model/modelmgr.hxx
+++ b/src/Model/modelmgr.hxx
@@ -12,17 +12,17 @@
 
 #include <vector>
 
-#include <plib/ssg.h>
+#include <simgear/compiler.h>  // for SG_USING_STD
 
-#include <simgear/compiler.h>
-#include <simgear/misc/props.hxx>
-
-#include <Main/fgfs.hxx>
-
-#include "model.hxx"
+#include <Main/fgfs.hxx>       // for FGSubsystem
 
 SG_USING_STD(vector);
 
+// Don't pull in headers, since we don't need them here.
+class ssgSelector;
+class SGPropertyNode;
+class FGModelPlacement;
+
 
 /**
  * Manage a list of user-specified models.
@@ -36,7 +36,7 @@ public:
   virtual void init ();
   virtual void bind ();
   virtual void unbind ();
-  virtual void update (int dt);
+  virtual void update (double dt);
 
   virtual void draw ();
 
@@ -46,7 +46,7 @@ private:
   {
     Instance ();
     virtual ~Instance ();
-    FG3DModel * model;
+    FGModelPlacement * model;
     SGPropertyNode * lon_deg_node;
     SGPropertyNode * lat_deg_node;
     SGPropertyNode * elev_ft_node;
@@ -62,6 +62,3 @@ private:
 };
 
 #endif // __MODELMGR_HXX
-
-
-