Rob Deters: UIUC updates from March 1, 2004.

[flightgear.git] / src / FDM / JSBSim / FGForce.cpp

diff --git a/src/FDM/JSBSim/FGForce.cpp b/src/FDM/JSBSim/FGForce.cpp
index 86d4b915ca6c654c5c91e6f9bceeb05592fb065a..72256d198a91e605bfadb735412ffcbf1c99cc17 100644 (file)
--- a/src/FDM/JSBSim/FGForce.cpp
+++ b/src/FDM/JSBSim/FGForce.cpp
@@ -43,9 +43,8 @@ and the cg.
 #include "FGFDMExec.h"
 #include "FGAircraft.h"
 #include "FGTranslation.h"
-#include "FGMatrix33.h"
-#include "FGColumnVector3.h"
-#include "FGColumnVector4.h"
+#include "FGMassBalance.h"
+#include "FGState.h"
 #include "FGForce.h"
 
 namespace JSBSim {
@@ -83,9 +82,7 @@ FGColumnVector3& FGForce::GetBodyForces(void)
   // needs to be done like this to convert from structural to body coords.
   // CG and RP values are in inches
 
-  vDXYZ(eX) = -(vActingXYZn(eX) - fdmex->GetMassBalance()->GetXYZcg(eX))*inchtoft;
-  vDXYZ(eY) =  (vActingXYZn(eY) - fdmex->GetMassBalance()->GetXYZcg(eY))*inchtoft;
-  vDXYZ(eZ) = -(vActingXYZn(eZ) - fdmex->GetMassBalance()->GetXYZcg(eZ))*inchtoft;
+  vDXYZ = fdmex->GetMassBalance()->StructuralToBody(vActingXYZn);
 
   vM = vMn + vDXYZ*vFb;
 
@@ -102,7 +99,6 @@ FGMatrix33 FGForce::Transform(void)
   case tLocalBody:
     return fdmex->GetState()->GetTl2b();
   case tCustom:
-
   case tNone:
     return mT;
   default: