Roy Vegard Ovesen:

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

diff --git a/src/Model/acmodel.hxx b/src/Model/acmodel.hxx
index 743f162ea6a87a6f36ae672e60d6066ed21005b7..cf337bd5e20e100ce2a5c0aa99636aa996317f0b 100644 (file)
--- a/src/Model/acmodel.hxx
+++ b/src/Model/acmodel.hxx
@@ -15,14 +15,16 @@
 SG_USING_STD(string);
 SG_USING_STD(vector);
 
-#include <simgear/misc/props.hxx>
+#include <simgear/structure/subsystem_mgr.hxx> // for SGSubsystem
 
-#include <Main/fgfs.hxx>
 
-#include "model.hxx"
+// Don't pull in the headers, since we don't need them here.
+class ssgRoot;
+class ssgSelector;
+class SGModelPlacement;
 
 
-class FGAircraftModel : public FGSubsystem
+class FGAircraftModel : public SGSubsystem
 {
 public:
 
@@ -32,13 +34,14 @@ public:
   virtual void init ();
   virtual void bind ();
   virtual void unbind ();
-  virtual void update (int dt);
+  virtual void update (double dt);
   virtual void draw ();
-  virtual FG3DModel * get3DModel() { return _aircraft; }
+  virtual SGModelPlacement * get3DModel() { return _aircraft; }
 
 private:
 
-  FG3DModel * _aircraft;
+  SGModelPlacement * _aircraft;
+  ssgSelector * _selector;
   ssgRoot * _scene;
   float _nearplane;
   float _farplane;
@@ -46,5 +49,3 @@ private:
 };
 
 #endif // __ACMODEL_HXX
-
-