fly/flightgear
1
0
Fork 0
Code Activity

Updates from Jon (addendum to previous changes).

Browse source
This commit is contained in:
curt 2000-05-16 22:43:58 +00:00
parent c4a1cc047e
commit fb2a4f6909
3 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/FDM/JSBSim.cxx
View file

@ -55,8 +55,6 @@
#include "JSBsim.hxx"
double geocRwyRadius;
/******************************************************************************/
// Initialize the JSBsim flight model, dt is the time increment for
@ -114,7 +112,7 @@ int FGJSBsim::init( double dt ) {
fgic->SetLatitudeRadIC(get_Latitude());
fgic->SetLongitudeRadIC(get_Longitude());
FDMExec.GetPosition()->SetRunwayRadius(geocRwyRadius);
FDMExec.GetPosition()->SetRunwayRadius(scenery.cur_radius);
FG_LOG( FG_FLIGHT, FG_INFO, " phi: " << get_Phi());
FG_LOG( FG_FLIGHT, FG_INFO, " theta: " << get_Theta() );
@ -130,11 +128,11 @@ int FGJSBsim::init( double dt ) {
fgtrim->Report();
fgtrim->TrimStats();
fgtrim->ReportState();
controls.set_elevator_trim(FDMExec.GetFCS()->GetDeCmd());
controls.set_trimmed_throttle(FGControls::ALL_ENGINES,FDMExec.GetFCS()->GetThrottleCmd(0)/100);
//the trimming routine only knows how to get 1 value for throttle
//for(int i=0;i<FDMExec.GetAircraft()->GetNumEngines();i++) {
// controls.set_throttle(i,FDMExec.GetFCS()->GetThrottleCmd(i)/100);
//}
@ -189,8 +187,8 @@ int FGJSBsim::update( int multiloop ) {
// FCS->SetBrake( controls.get_brake( 0 ) );
// Inform JSBsim of the local terrain altitude; uncommented 5/3/00
// FDMExec.GetPosition()->SetRunwayElevation(get_Runway_altitude()); // seems to work
FDMExec.GetPosition()->SetRunwayRadius(geocRwyRadius);
// FDMExec.GetPosition()->SetRunwayElevation(get_Runway_altitude()); // seems to work
FDMExec.GetPosition()->SetRunwayRadius(scenery.cur_radius);
FDMExec.GetAtmosphere()->SetExTemperature(get_Static_temperature());
FDMExec.GetAtmosphere()->SetExPressure(get_Static_pressure());

2
src/FDM/JSBSim/FGPosition.cpp
View file

@ -126,8 +126,6 @@ bool FGPosition:: Run(void) {
DistanceAGL = Radius - RunwayRadius; // Geocentric
cout << "h: " << h << " DistanceAGL: " << DistanceAGL << endl;
hoverb = h/b;
if(Vt > 0) {

2
src/Main/main.cxx
View file

@ -85,7 +85,7 @@
// #defines in uiuc_aircraft.h
#include "bfi.hxx"
q#include <FDM/UIUCModel/uiuc_aircraft.h>
#include <FDM/UIUCModel/uiuc_aircraft.h>
#include <FDM/UIUCModel/uiuc_aircraftdir.h>
#include <GUI/gui.h>
#include <Joystick/joystick.hxx>