[Jsbsim-cvslogs] CVS: JSBSim/examples FlightGear.cxx, 1.23, 1.24 FlightGear.hxx, 1.21, 1.22

[Erik H. <eh...@us...>]

Update of /cvsroot/jsbsim/JSBSim/examples
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24037/examples

Modified Files:
	FlightGear.cxx FlightGear.hxx 
Log Message:
Backport from FlightGear

Index: FlightGear.cxx
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/examples/FlightGear.cxx,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** FlightGear.cxx	9 Dec 2015 04:28:17 -0000	1.23
--- FlightGear.cxx	18 May 2016 13:26:59 -0000	1.24
***************
*** 76,80 ****
  #include <FDM/JSBSim/input_output/FGPropertyManager.h>
  #include <FDM/JSBSim/input_output/FGGroundCallback.h>
- #include <FDM/JSBSim/math/FGLocation.h>
  
  using namespace JSBSim;
--- 76,79 ----
***************
*** 231,234 ****
--- 230,235 ----
  // end of sim-time-sec deprecation patch
  
+     terrain = fgGetNode("/sim/fdm/surface", true);
+ 
      fdmex->Setdt( dt );
  
***************
*** 594,599 ****
      FCS->SetPitchTrimCmd( globals->get_controls()->get_elevator_trim() );
      FCS->SetDrCmd( -globals->get_controls()->get_rudder() );
-     FCS->SetYawTrimCmd( -globals->get_controls()->get_rudder_trim() );
      FCS->SetDsCmd( globals->get_controls()->get_rudder() );
      FCS->SetDfCmd( globals->get_controls()->get_flaps() );
      FCS->SetDsbCmd( globals->get_controls()->get_speedbrake() );
--- 595,600 ----
      FCS->SetPitchTrimCmd( globals->get_controls()->get_elevator_trim() );
      FCS->SetDrCmd( -globals->get_controls()->get_rudder() );
      FCS->SetDsCmd( globals->get_controls()->get_rudder() );
+     FCS->SetYawTrimCmd( -globals->get_controls()->get_rudder_trim() );
      FCS->SetDfCmd( globals->get_controls()->get_flaps() );
      FCS->SetDsbCmd( globals->get_controls()->get_speedbrake() );
***************
*** 1354,1359 ****
    *agl = dot(hlToEc.rotate(SGVec3d(0, 0, 1)), SGVec3d(contact) - SGVec3d(pt));
  
-   static SGPropertyNode_ptr terrain = fgGetNode("/sim/fdm/surface", true);
- 
  #ifdef JSBSIM_USE_GROUNDREACTIONS
    bool terrain_active = (terrain->getIntValue("override-level", -1) > 0) ? false : true;
--- 1355,1358 ----

Index: FlightGear.hxx
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/examples/FlightGear.hxx,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** FlightGear.hxx	7 Dec 2015 10:01:48 -0000	1.21
--- FlightGear.hxx	18 May 2016 13:26:59 -0000	1.22
***************
*** 239,245 ****
--- 239,248 ----
      JSBSim::FGPropertyManager* PropertyManager;
  
+     // disabling unused members
+     /*
      int runcount;
      double trim_elev;
      double trim_throttle;
+      */
  
      SGPropertyNode_ptr startup_trim;
***************
*** 289,292 ****
--- 292,297 ----
      SGPropertyNode_ptr slaved;
  
+     SGPropertyNode_ptr terrain;
+ 
      static std::map<std::string,int> TURBULENCE_TYPE_NAMES;