fly/flightgear
1
0
Fork 0
Code Activity

Melchior FRANZ:

Browse source 
- don't treat *every* child in the xml as submodel, especially not a "param"
  block
- do not only *enable* the contrail flag above some altitude, but also
  disable it below
This commit is contained in:
ehofman 2005-03-31 08:54:04 +00:00
parent f43b011ee3
commit d461e7868f
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/AIModel/submodel.cxx
View file

@ -88,9 +88,7 @@ FGSubmodelMgr::update (double dt)
if (!(_serviceable_node->getBoolValue())) return; if (!(_serviceable_node->getBoolValue())) return;
int i=-1; int i=-1;
if (_user_alt_node->getDoubleValue() > contrail_altitude) { _contrail_trigger->setBoolValue(_user_alt_node->getDoubleValue() > contrail_altitude);
_contrail_trigger->setBoolValue(true);
}
submodel_iterator = submodels.begin(); submodel_iterator = submodels.begin();
while(submodel_iterator != submodels.end()) { while(submodel_iterator != submodels.end()) {
@ -150,8 +148,6 @@ FGSubmodelMgr::release (submodel* sm, double dt)
void void
FGSubmodelMgr::load () FGSubmodelMgr::load ()
{ {
int i;
SGPropertyNode *path = fgGetNode("/sim/submodels/path"); SGPropertyNode *path = fgGetNode("/sim/submodels/path");
SGPropertyNode root; SGPropertyNode root;
@ -169,12 +165,14 @@ FGSubmodelMgr::load ()
} }
} }
int count = root.nChildren(); vector<SGPropertyNode_ptr> children = root.getChildren("submodel");
for (i = 0; i < count; i++) { vector<SGPropertyNode_ptr>::iterator it = children.begin();
// cout << "Reading submodel " << i << endl; vector<SGPropertyNode_ptr>::iterator end = children.end();
SGPropertyNode *prop; for (int i = 0; it < end; ++it, i++) {
// cout << "Reading submodel " << (*it)->getPath() << endl;
submodel* sm = new submodel; submodel* sm = new submodel;
SGPropertyNode * entry_node = root.getChild(i); SGPropertyNode * entry_node = *it;
sm->trigger = fgGetNode(entry_node->getStringValue("trigger", "none"), true); sm->trigger = fgGetNode(entry_node->getStringValue("trigger", "none"), true);
sm->name = entry_node->getStringValue("name", "none_defined"); sm->name = entry_node->getStringValue("name", "none_defined");
sm->model = entry_node->getStringValue("model", "Models/Geometry/rocket.ac"); sm->model = entry_node->getStringValue("model", "Models/Geometry/rocket.ac");