Updated to match changes in radiostack.[ch]xx

[flightgear.git] / src / FDM / JSBSim / FGPosition.h

diff --git a/src/FDM/JSBSim/FGPosition.h b/src/FDM/JSBSim/FGPosition.h
index 8d2d45e85e0e24f313e65d8cac429719f9142d51..0fd024354c8cd6c454ee08fcbe26368ce750dc1d 100644 (file)
--- a/src/FDM/JSBSim/FGPosition.h
+++ b/src/FDM/JSBSim/FGPosition.h
@@ -39,7 +39,9 @@ INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
 #include "FGModel.h"
-#include "FGMatrix.h"
+#include "FGMatrix33.h"
+#include "FGColumnVector3.h"
+#include "FGColumnVector4.h"
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 DEFINITIONS
@@ -62,6 +64,10 @@ DOCUMENTATION
 /** Models the lateral and longitudinal translational EOM.
     @author Jon S. Berndt
     @version $Id$
+    @see <a href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/jsbsim/JSBSim/FGPosition.h?rev=HEAD&content-type=text/vnd.viewcvs-markup">
+         Header File </a>
+    @see <a href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/jsbsim/JSBSim/FGPosition.cpp?rev=HEAD&content-type=text/vnd.viewcvs-markup">
+         Source File </a>
   */
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -76,34 +82,37 @@ public:
   /// Destructor
   ~FGPosition();
 
+  bool InitModel(void);
+
   /** Runs the Position model; called by the Executive
       @see JSBSim.cpp documentation
       @return false if no error */
   bool Run(void);
   
-  inline FGColumnVector GetVel(void) { return vVel; }
-  inline FGColumnVector GetVelDot(void) { return vVelDot; }
-  inline FGColumnVector GetUVW(void) { return vUVW; }
-  inline double GetVn(void)  { return vVel(eX); }
-  inline double GetVe(void)  { return vVel(eY); }
-  inline double GetVd(void)  { return vVel(eZ); }
-  inline double GetVground(void) { return Vground; }
-  inline double GetGroundTrack(void) { return psigt; }
-  inline double Geth(void)  { return h; }
-  inline double Gethdot(void) { return RadiusDot; }
-  inline double GetLatitude(void) { return Latitude; }
-  inline double GetLatitudeDot(void) { return LatitudeDot; }
-  inline double GetLongitude(void) { return Longitude; }
-  inline double GetLongitudeDot(void) { return LongitudeDot; }
-  inline double GetRunwayRadius(void) { return RunwayRadius; }
-  inline double GetDistanceAGL(void)  { return DistanceAGL; }
-  inline FGColumnVector GetRunwayNormal(void) { return vRunwayNormal; }
+  inline FGColumnVector3& GetVel(void) { return vVel; }
+  inline FGColumnVector3& GetVelDot(void) { return vVelDot; }
+  inline double GetVn(void)  const { return vVel(eX); }
+  inline double GetVe(void)  const { return vVel(eY); }
+  inline double GetVd(void)  const { return vVel(eZ); }
+  inline double GetVground(void) const { return Vground; }
+  inline double GetGroundTrack(void) const { return psigt; }
+  inline double Geth(void)  const { return h; }
+  inline double Gethdot(void) const { return RadiusDot; }
+  inline double GetLatitude(void) const { return Latitude; }
+  inline double GetLatitudeDot(void) const { return LatitudeDot; }
+  inline double GetLongitude(void) const { return Longitude; }
+  inline double GetLongitudeDot(void) const { return LongitudeDot; }
+  inline double GetRunwayRadius(void) const { return RunwayRadius; }
+  inline double GetDistanceAGL(void)  const { return DistanceAGL; }
+  inline double GetRadius(void) const { return Radius; }
+  inline FGColumnVector3& GetRunwayNormal(void) { return vRunwayNormal; }
   
-  inline double GetGamma(void) { return gamma; }
-  inline void SetGamma(float tt) { gamma = tt; }
-  inline double GetHOverB(void) { return hoverb; }
-  void SetvVel(const FGColumnVector& v) { vVel = v; }
-  void SetLatitude(float tt) { Latitude = tt; }
+  inline double GetGamma(void) const { return gamma; }
+  inline void SetGamma(double tt) { gamma = tt; }
+  inline double GetHOverBCG(void) const { return hoverbcg; }
+  inline double GetHOverBMAC(void) const { return hoverbmac; }
+  void SetvVel(const FGColumnVector3& v) { vVel = v; }
+  void SetLatitude(double tt) { Latitude = tt; }
   void SetLongitude(double tt) { Longitude = tt; }
   void Seth(double tt);
   void SetRunwayRadius(double tt) { RunwayRadius = tt; }
@@ -113,29 +122,30 @@ public:
       vRunwayNormal << fgx << fgy << fgz;
   }
   
+  void bind(void);
+  void unbind(void);
+  
 private:  
-  FGColumnVector vUVW;
-  FGColumnVector vVel;
-  FGColumnVector vVelDot;
-  FGColumnVector vRunwayNormal;
+  FGColumnVector3 vVel;
+  FGColumnVector3 vVelDot;
+  FGColumnVector3 vRunwayNormal;
   
-  double Vee, invMass, invRadius;
   double Radius, h;
   double LatitudeDot, LongitudeDot, RadiusDot;
   double lastLatitudeDot, lastLongitudeDot, lastRadiusDot;
   double Longitude, Latitude;
-  float dt;
+  double dt;
   double RunwayRadius;
   double DistanceAGL;
   double SeaLevelRadius;
   double gamma;
   double Vt, Vground;
-  double hoverb,b;
+  double hoverbcg,hoverbmac,b;
 
   double psigt;
 
   void GetState(void);
-  void Debug(void);
+  void Debug(int from);
 };
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%