fly/flightgear
1
0
Fork 0
Code Activity

Merge branch 'next' into durk-atc

Browse source
This commit is contained in:
Durk Talsma 2011-04-15 19:40:44 +02:00
commit e16f772e54
4 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
src/FDM/JSBSim/models/FGAuxiliary.cpp Executable file → Normal file
View file

0
src/FDM/JSBSim/models/propulsion/FGTurboProp.cpp Executable file → Normal file
View file

0
src/FDM/JSBSim/models/propulsion/FGTurboProp.h Executable file → Normal file
View file

6
src/FDM/YASim/Airplane.cpp
View file

@ -671,8 +671,8 @@ void Airplane::compile()
t->handle = body->addMass(0, t->pos); t->handle = body->addMass(0, t->pos);
totalFuel += t->cap; totalFuel += t->cap;
} }
_cruiseWeight = _emptyWeight + totalFuel*0.5f; _cruiseWeight = _emptyWeight + totalFuel*_cruiseFuel;
_approachWeight = _emptyWeight + totalFuel*0.2f; _approachWeight = _emptyWeight + totalFuel*_approachFuel;
body->recalc(); body->recalc();
@ -795,7 +795,7 @@ void Airplane::setupWeights(bool isApproach)
void Airplane::runCruise() void Airplane::runCruise()
{ {
setupState(_cruiseAoA, _cruiseSpeed,_approachGlideAngle, &_cruiseState); setupState(_cruiseAoA, _cruiseSpeed,_cruiseGlideAngle, &_cruiseState);
_model.setState(&_cruiseState); _model.setState(&_cruiseState);
_model.setAir(_cruiseP, _cruiseT, _model.setAir(_cruiseP, _cruiseT,
Atmosphere::calcStdDensity(_cruiseP, _cruiseT)); Atmosphere::calcStdDensity(_cruiseP, _cruiseT));