X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2Facmodel.hxx;h=edaaad77cbda801aa658aa43ac96a959fbafadb4;hb=2beb0f29afba98c49606a4b929a49bda4f6db91a;hp=08ffd139fcc0151a354254ccc39588951e76dbc8;hpb=c5f6293f17530e2efb9194cbbf8aa7eefd1aa1c6;p=flightgear.git

diff --git a/src/Model/acmodel.hxx b/src/Model/acmodel.hxx
index 08ffd139f..edaaad77c 100644
--- 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,23 +6,19 @@
 #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>
+#include <memory>
+#include <simgear/structure/subsystem_mgr.hxx>	// for SGSubsystem
 
-SG_USING_STD(string);
-SG_USING_STD(vector);
 
-#include <simgear/misc/props.hxx>
+// Don't pull in the headers, since we don't need them here.
+class SGModelPlacement;
+class FGFX;
 
-#include <Main/fgfs.hxx>
-
-#include "model.hxx"
-
-
-class FGAircraftModel : public FGSubsystem
+class FGAircraftModel : public SGSubsystem
 {
 public:
 
@@ -30,22 +26,26 @@ public:
   virtual ~FGAircraftModel ();
 
   virtual void init ();
+  virtual void shutdown ();
+  virtual void reinit ();
   virtual void bind ();
   virtual void unbind ();
-  virtual void update (int dt);
-  virtual void draw ();
-  virtual FG3DModel * get3DModel() { return _aircraft; }
+  virtual void update (double dt);
+  virtual SGModelPlacement * get3DModel() { return _aircraft.get(); }
+  virtual SGVec3d& getVelocity() { return _velocity; }
 
 private:
-
-  FG3DModel * _aircraft;
-  ssgSelector * _selector;
-  ssgRoot * _scene;
-  float _nearplane;
-  float _farplane;
-
+  void deinit ();
+  
+    std::auto_ptr<SGModelPlacement> _aircraft;
+    std::auto_ptr<SGModelPlacement> _interior;
+    
+  SGVec3d _velocity;
+  SGSharedPtr<FGFX>  _fx;
+
+  SGPropertyNode_ptr _speed_n;
+  SGPropertyNode_ptr _speed_e;
+  SGPropertyNode_ptr _speed_d;
 };
 
 #endif // __ACMODEL_HXX
-
-