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

diff --git a/src/Model/acmodel.hxx b/src/Model/acmodel.hxx
index 5a0b31a0e..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,20 +6,11 @@
 #ifndef __ACMODEL_HXX
 #define __ACMODEL_HXX 1
 
-#ifndef __cplusplus
-# error This library requires C++
-#endif
-
-#include <vector>
-#include <string>
-
-using std::string;
-using std::vector;
-
 #include <osg/ref_ptr>
 #include <osg/Group>
 #include <osg/Switch>
 
+#include <memory>
 #include <simgear/structure/subsystem_mgr.hxx>	// for SGSubsystem
 
 
@@ -35,27 +26,26 @@ public:
   virtual ~FGAircraftModel ();
 
   virtual void init ();
+  virtual void shutdown ();
+  virtual void reinit ();
   virtual void bind ();
   virtual void unbind ();
   virtual void update (double dt);
-  virtual SGModelPlacement * get3DModel() { return _aircraft; }
-  virtual SGVec3f getVelocity() { return _velocity; }
+  virtual SGModelPlacement * get3DModel() { return _aircraft.get(); }
+  virtual SGVec3d& getVelocity() { return _velocity; }
 
 private:
-
-  SGModelPlacement * _aircraft;
-  SGVec3f _velocity;
-  FGFX * _fx;
-
-  SGPropertyNode * _lon;
-  SGPropertyNode * _lat;
-  SGPropertyNode * _alt;
-  SGPropertyNode * _pitch;
-  SGPropertyNode * _roll;
-  SGPropertyNode * _heading;
-  SGPropertyNode * _speed;
-  SGPropertyNode * _speed_up;
-
+  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