fly/flightgear
1
0
Fork 0
Code Activity

Work-around for bug #222 - delete the units/WOW property on init.

Browse source 
Another cleanup
This commit is contained in:
James Turner 2010-12-31 18:26:23 +00:00
parent 1758c11889
commit 738d653745
2 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -143,6 +143,8 @@ FGJSBsim::FGJSBsim( double dt )
break;
}
}
resetPropertyState();
fdmex = new FGFDMExec( (FGPropertyManager*)globals->get_props() );
@ -298,13 +300,6 @@ FGJSBsim::FGJSBsim( double dt )
FGJSBsim::~FGJSBsim(void)
{
delete fdmex;
SGPropertyNode_ptr jsbsimRoot = fgGetNode("/fdm/jsbsim");
if (jsbsimRoot) {
SGPropertyNode* fdm = jsbsimRoot->getParent();
fdm->removeChild("jsbsim", 0, false);
}
// properties are deleted when the sharedPtr above goes away
}
/******************************************************************************/
@ -1418,3 +1413,22 @@ void FGJSBsim::update_external_forces(double t_off)
fgSetDouble("/fdm/jsbsim/systems/hook/tailhook-pos-deg", fi);
}
void FGJSBsim::resetPropertyState()
{
// this code works-around bug #222:
// http://code.google.com/p/flightgear-bugs/issues/detail?id=222
// for whatever reason, having an existing value for the WOW
// property causes the NaNs. Should that be fixed, this code can die
SGPropertyNode* gear = fgGetNode("/fdm/jsbsim/gear", false);
if (!gear) {
return;
}
int index = 0;
SGPropertyNode* unitNode = NULL;
for (; (unitNode = gear->getChild("unit", index)) != NULL; ++index) {
unitNode->removeChild("WOW", 0, false);
}
}

1
src/FDM/JSBSim/JSBSim.hxx
View file

@ -284,6 +284,7 @@ private:
void update_external_forces(double t_off);
void resetPropertyState();
};