X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2Facmodel.hxx;h=7965658cd719b682815b36773dd3b290efe63eda;hb=72c5a314e6daa5052165310a600c4a9a4c20e43f;hp=cf337bd5e20e100ce2a5c0aa99636aa996317f0b;hpb=980012e1682fdb27c9b9ec27edea0b549d603f9d;p=flightgear.git

diff --git a/src/Model/acmodel.hxx b/src/Model/acmodel.hxx
index cf337bd5e..7965658cd 100644
--- a/src/Model/acmodel.hxx
+++ b/src/Model/acmodel.hxx
@@ -6,23 +6,16 @@
 #ifndef __ACMODEL_HXX
 #define __ACMODEL_HXX 1
 
-#ifndef __cplusplus
-# error This library requires C++
-#endif
-
-#include <vector>
-
-SG_USING_STD(string);
-SG_USING_STD(vector);
+#include <osg/ref_ptr>
+#include <osg/Group>
+#include <osg/Switch>
 
 #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 SGModelPlacement;
-
+class FGFX;
 
 class FGAircraftModel : public SGSubsystem
 {
@@ -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 SGModelPlacement * get3DModel() { return _aircraft; }
+  virtual SGVec3d& getVelocity() { return _velocity; }
 
 private:
-
+  void deinit ();
+  
   SGModelPlacement * _aircraft;
-  ssgSelector * _selector;
-  ssgRoot * _scene;
-  float _nearplane;
-  float _farplane;
-
+  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