]> git.mxchange.org Git - flightgear.git/blobdiff - src/FDM/JSBSim/JSBSim.cpp
JSBSim tweaks.
[flightgear.git] / src / FDM / JSBSim / JSBSim.cpp
index 3d2c84d6a01de8ff55658123e75efa66ed3e3d22..400b6088b63ea20f2e47e9170d9874eb303e2735 100644 (file)
@@ -39,80 +39,80 @@ HISTORY
 INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#if __BCPLUSPLUS__  == 0x0540   // If compiling under Borland C++Builder
-#pragma hdrstop
+#include "FGFDMExec.h"
+#include "FGRotation.h"
+#include "FGAtmosphere.h"
+#include "FGState.h"
+#include "FGFCS.h"
+#include "FGAircraft.h"
+#include "FGTranslation.h"
+#include "FGPosition.h"
+#include "FGAuxiliary.h"
+#include "FGOutput.h"
+#include "FGConfigFile.h"
+
+#ifdef FGFS
+#include <simgear/compiler.h>
+#include STL_IOSTREAM
+#  ifdef SG_HAVE_STD_INCLUDES
+#    include <ctime>
+#  else
+#    include <time.h>
+#  endif
+#else
+#include <iostream>
+#include <ctime>
+#endif
+
+#if __BORLANDC__ > 0x540
 #include <condefs.h>
 USEUNIT("FGUtility.cpp");
+USEUNIT("FGAircraft.cpp");
 USEUNIT("FGAtmosphere.cpp");
 USEUNIT("FGAuxiliary.cpp");
 USEUNIT("FGCoefficient.cpp");
 USEUNIT("FGConfigFile.cpp");
-USEUNIT("FGControls.cpp");
 USEUNIT("FGEngine.cpp");
 USEUNIT("FGFCS.cpp");
 USEUNIT("FGFDMExec.cpp");
 USEUNIT("FGfdmSocket.cpp");
+USEUNIT("FGForce.cpp");
+USEUNIT("FGGroundReactions.cpp");
+USEUNIT("FGInertial.cpp");
 USEUNIT("FGInitialCondition.cpp");
 USEUNIT("FGLGear.cpp");
+USEUNIT("FGMassBalance.cpp");
 USEUNIT("FGMatrix.cpp");
 USEUNIT("FGModel.cpp");
+USEUNIT("FGNozzle.cpp");
 USEUNIT("FGOutput.cpp");
+USEUNIT("FGPiston.cpp");
 USEUNIT("FGPosition.cpp");
+USEUNIT("FGPropeller.cpp");
+USEUNIT("FGPropulsion.cpp");
+USEUNIT("FGRocket.cpp");
 USEUNIT("FGRotation.cpp");
+USEUNIT("FGRotor.cpp");
 USEUNIT("FGState.cpp");
+USEUNIT("FGTable.cpp");
 USEUNIT("FGTank.cpp");
+USEUNIT("FGThruster.cpp");
 USEUNIT("FGTranslation.cpp");
-USEUNIT("FGAircraft.cpp");
-USERES("JSBSim.res");
-USEUNIT("filtersjb\FGfcsComponent.cpp");
+USEUNIT("FGTrim.cpp");
+USEUNIT("FGTrimAxis.cpp");
+USEUNIT("FGTurboJet.cpp");
+USEUNIT("FGTurboProp.cpp");
+USEUNIT("FGTurboShaft.cpp");
+USEUNIT("FGAerodynamics.cpp");
 USEUNIT("filtersjb\FGSwitch.cpp");
+USEUNIT("filtersjb\FGFCSComponent.cpp");
 USEUNIT("filtersjb\FGFilter.cpp");
+USEUNIT("filtersjb\FGFlaps.cpp");
 USEUNIT("filtersjb\FGGain.cpp");
 USEUNIT("filtersjb\FGGradient.cpp");
 USEUNIT("filtersjb\FGSummer.cpp");
 USEUNIT("filtersjb\FGDeadBand.cpp");
-USEUNIT("filtersjb\FGFlaps.cpp");
-USEFILE("JSBSim.cxx");
-USEUNIT("FGForce.cpp");
-USEUNIT("FGInertial.cpp");
-USEUNIT("FGNozzle.cpp");
-USEUNIT("FGPropeller.cpp");
-USEUNIT("FGRotor.cpp");
-USEUNIT("FGThruster.cpp");
-USEUNIT("FGMassBalance.cpp");
-USEUNIT("FGRocket.cpp");
-USEUNIT("FGTurboJet.cpp");
-USEUNIT("FGPiston.cpp");
-USEUNIT("FGTurboShaft.cpp");
-USEUNIT("FGPropulsion.cpp");
-USEUNIT("FGGroundReactions.cpp");
-USEUNIT("FGAerodynamics.cpp");
-
-#pragma argsused
-#endif
-
-#include "FGFDMExec.h"
-#include "FGRotation.h"
-#include "FGAtmosphere.h"
-#include "FGState.h"
-#include "FGFCS.h"
-#include "FGAircraft.h"
-#include "FGTranslation.h"
-#include "FGPosition.h"
-#include "FGAuxiliary.h"
-#include "FGOutput.h"
-
-#ifdef FGFS
-#include <simgear/compiler.h>
-#include STL_IOSTREAM
-#  ifdef SG_HAVE_STD_INCLUDES
-#    include <ctime>
-#  else
-#    include <time.h>
-#  endif
-#else
-#include <iostream>
-#include <ctime>
+//---------------------------------------------------------------------------
 #endif
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -123,7 +123,7 @@ DEFINITIONS
 GLOBAL DATA
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-static const char *IdSrc = "$Header$";
+static const char *IdSrc = "$Id$";
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 COMMENTS, REFERENCES, and NOTES [use "class documentation" below for API docs]
@@ -136,8 +136,8 @@ DOCUMENTATION
 /** Standalone JSBSim main program
     This is the wrapper program used to instantiate the JSBSim system and control
     it. Use this program to build a version of JSBSim that can be run from the
-    command line. This program is also designed to be built using Borland C++
-    Builder, v4.0 or greater.
+    command line. To get any use out of this, you will have to create a script
+    to run a test case and specify what kind of output you would like.
     @author Jon S. Berndt
     @version $Id$
     @see -
@@ -150,56 +150,54 @@ IMPLEMENTATION
 int main(int argc, char** argv)
 {
   FGFDMExec* FDMExec;
+  float cmd = 0.0;
   bool result = false;
+  bool scripted = false;
+
+  if (argc == 2) {
+    FGConfigFile testFile(argv[1]);
 
-  if (argc != 3) {
+    if (!testFile.IsOpen()) {
+      cout << "Script file not opened" << endl;
+      exit(-1); 
+    }
+
+    testFile.GetNextConfigLine();
+    if (testFile.GetValue("runscript").length() <= 0) {
+      cout << "File: " << argv[1] << " is not a script file" << endl;
+      exit(-1); 
+    }
+    scripted = true;
+  } else if (argc != 3) {
     cout << endl
          << "  You must enter the name of a registered aircraft and reset point:"
          << endl << endl << "  FDM <aircraft name> <reset file>" << endl;
+    cout << endl << "  Alternatively, you may specify only the name of a script file:"
+         << endl << endl << "  FDM <script file>" << endl << endl;
     exit(0);
   }
 
   FDMExec = new FGFDMExec();
 
-  result = FDMExec->LoadModel("aircraft", "engine", string(argv[1]));
-  
-  if (!result) {
-       cerr << "Aircraft file " << argv[1] << " was not found" << endl;
-         exit(-1);
-  }
-  
-  if ( ! FDMExec->GetState()->Reset("aircraft", string(argv[1]), string(argv[2])))
-    FDMExec->GetState()->Initialize(2000,0,0,0,0,0,0.5,0.5,40000);
-
-  float cmd = 0.0;
-
-  while (FDMExec->GetState()->Getsim_time() <= 10.0)
-  {
-    // Fake an elevator ramp here after 1 second, hold for one second, ramp down
-    
-    if (FDMExec->GetState()->Getsim_time() >= 1.00 &&
-        FDMExec->GetState()->Getsim_time() < 2.0)
-    {
-      cmd = -(FDMExec->GetState()->Getsim_time() - 1.00)/4.0;
-    } else if (FDMExec->GetState()->Getsim_time() >= 2.00 &&
-        FDMExec->GetState()->Getsim_time() < 6.0)
-    {
-      cmd = -1.00/4.0;
-    } else if (FDMExec->GetState()->Getsim_time() >= 6.00 &&
-        FDMExec->GetState()->Getsim_time() < 7.0)
-    {
-      cmd = -(7.0 - FDMExec->GetState()->Getsim_time())/4.0;
-    } else {
-      cmd = 0.00;
+  if (scripted) {
+    result = FDMExec->LoadScript(argv[1]);
+    if (!result) {
+      cerr << "Script file " << argv[1] << " was not successfully loaded" << endl;
+      exit(-1);
+    }
+  } else {
+    result = FDMExec->LoadModel("aircraft", "engine", string(argv[1]));
+    if (!result) {
+       cerr << "Aircraft file " << argv[1] << " was not found" << endl;
+           exit(-1);
     }
-    FDMExec->GetFCS()->SetDeCmd(cmd);    // input between -1 and 1
-    
-    FDMExec->Run();
+    if ( ! FDMExec->GetState()->Reset("aircraft", string(argv[1]), string(argv[2])))
+                   FDMExec->GetState()->Initialize(2000,0,0,0,0,0,0.5,0.5,40000);
   }
 
+  while (FDMExec->Run()) {}
+
   delete FDMExec;
 
   return 0;
 }
-
-