fly/flightgear
1
0
Fork 0
Code Activity

Fix the startup position error. I'll leave it to Bertrand wether this is the best way to fix it

Browse source
This commit is contained in:
Erik Hofman 2016-08-07 11:41:03 +02:00
parent 1947c100d9
commit 02d037d205
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/FDM/JSBSim/JSBSim.cxx
View file

@ -1055,7 +1055,7 @@ void FGJSBsim::set_Altitude(double alt)
{ {
SG_LOG(SG_FLIGHT,SG_INFO, "FGJSBsim::set_Altitude: " << alt ); SG_LOG(SG_FLIGHT,SG_INFO, "FGJSBsim::set_Altitude: " << alt );
if (needTrim) { if (0){ // needTrim) {
FGLocation position = fgic->GetPosition(); FGLocation position = fgic->GetPosition();
position.SetPositionGeodetic(0.0, position.GetGeodLatitudeRad(), alt); position.SetPositionGeodetic(0.0, position.GetGeodLatitudeRad(), alt);

5
src/FDM/JSBSim/models/flight_control/FGAngles.cpp Normal file → Executable file
View file

@ -74,7 +74,7 @@ using namespace std;
namespace JSBSim { namespace JSBSim {
IDENT(IdSrc,"$Id: FGAngles.cpp,v 1.4 2014/01/13 10:46:07 ehofman Exp $"); IDENT(IdSrc,"$Id: FGAngles.cpp,v 1.5 2016/07/27 22:42:47 andgi Exp $");
IDENT(IdHdr,ID_ANGLES); IDENT(IdHdr,ID_ANGLES);
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@ -145,7 +145,8 @@ bool FGAngles::Run(void )
double x2 = cos(target_angle); double x2 = cos(target_angle);
double y2 = sin(target_angle); double y2 = sin(target_angle);
double angle_to_heading_rad = acos(x1*x2 + y1*y2); double x1x2_y1y2 = max(-1.0, min(x1*x2 + y1*y2, 1.0));
double angle_to_heading_rad = acos(x1x2_y1y2);
double x1y2 = x1*y2; double x1y2 = x1*y2;
double x2y1 = x2*y1; double x2y1 = x2*y1;