Merge branch 'next' into comm-subsystem

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

diff --git a/src/Model/acmodel.hxx b/src/Model/acmodel.hxx
index b2674e70fe3418e23c565fd0993a77e4ad3e0ca3..b774874d233c39119ee4097d8244a0bda04ba586 100644 (file)
--- a/src/Model/acmodel.hxx
+++ b/src/Model/acmodel.hxx
@@ -1,4 +1,4 @@
-// model.hxx - manage a 3D aircraft model.
+// acmodel.hxx - manage a 3D aircraft model.
 // Written by David Megginson, started 2002.
 //
 // This file is in the Public Domain, and comes with no warranty.
@@ -6,25 +6,18 @@
 #ifndef __ACMODEL_HXX
 #define __ACMODEL_HXX 1
 
-#ifndef __cplusplus
-# error This library requires C++
-#endif
+#include <osg/ref_ptr>
+#include <osg/Group>
+#include <osg/Switch>
 
-#include <vector>
-
-SG_USING_STD(string);
-SG_USING_STD(vector);
-
-#include <Main/fgfs.hxx>       // for FGSubsystem
+#include <simgear/structure/subsystem_mgr.hxx> // for SGSubsystem
 
 
 // Don't pull in the headers, since we don't need them here.
-class ssgRoot;
-class ssgSelector;
-class FGModelPlacement;
-
+class SGModelPlacement;
+class FGFX;
 
-class FGAircraftModel : public FGSubsystem
+class FGAircraftModel : public SGSubsystem
 {
 public:
 
@@ -32,20 +25,29 @@ public:
   virtual ~FGAircraftModel ();
 
   virtual void init ();
+  virtual void reinit ();
   virtual void bind ();
   virtual void unbind ();
   virtual void update (double dt);
-  virtual void draw ();
-  virtual FGModelPlacement * get3DModel() { return _aircraft; }
+  virtual SGModelPlacement * get3DModel() { return _aircraft; }
+  virtual SGVec3d& getVelocity() { return _velocity; }
 
 private:
-
-  FGModelPlacement * _aircraft;
-  ssgSelector * _selector;
-  ssgRoot * _scene;
-  float _nearplane;
-  float _farplane;
-
+  void deinit ();
+  
+  SGModelPlacement * _aircraft;
+  SGVec3d _velocity;
+  SGSharedPtr<FGFX>  _fx;
+
+  SGPropertyNode_ptr _lon;
+  SGPropertyNode_ptr _lat;
+  SGPropertyNode_ptr _alt;
+  SGPropertyNode_ptr _pitch;
+  SGPropertyNode_ptr _roll;
+  SGPropertyNode_ptr _heading;
+  SGPropertyNode_ptr _speed_n;
+  SGPropertyNode_ptr _speed_e;
+  SGPropertyNode_ptr _speed_d;
 };
 
 #endif // __ACMODEL_HXX