fly/flightgear
1
0
Fork 0
Code Activity

Do not use the new JSBSim ground reactions code by default until there is a good way to identify Nasal scripts that do this themselves

Browse source
This commit is contained in:
Erik Hofman 2014-01-19 15:23:15 +01:00
parent 49a0398fc6
commit fe79be0702
1 changed files with 4 additions and 2 deletions

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

@ -1341,8 +1341,9 @@ FGJSBsim::get_agl_ft(double t, const double pt[3], double alt_off,
SGQuatd hlToEc = SGQuatd::fromLonLat(geodPt); SGQuatd hlToEc = SGQuatd::fromLonLat(geodPt);
*agl = dot(hlToEc.rotate(SGVec3d(0, 0, 1)), SGVec3d(contact) - SGVec3d(pt)); *agl = dot(hlToEc.rotate(SGVec3d(0, 0, 1)), SGVec3d(contact) - SGVec3d(pt));
static SGPropertyNode_ptr terrain_nas = fgGetNode("/fdm/jsbsim/environment/terrain-hight", false); #ifdef JSBSIM_USE_GROUNDREACTIONS
if (!terrain_nas && material) { static SGPropertyNode_ptr terrain_nas = fgGetNode("/fdm/jsbsim/systems/fg-terrain", false);
if (material && !terrain_nas) {
double frictionFactor = (*material).get_friction_factor(); double frictionFactor = (*material).get_friction_factor();
double rollingFriction = (*material).get_rolling_friction(); double rollingFriction = (*material).get_rolling_friction();
@ -1359,6 +1360,7 @@ FGJSBsim::get_agl_ft(double t, const double pt[3], double alt_off,
GroundReactions->SetSolid((*material).get_solid()); GroundReactions->SetSolid((*material).get_solid());
GroundReactions->SetPosition(pt); GroundReactions->SetPosition(pt);
} }
#endif
return true; return true;
} }