fly/flightgear
1
0
Fork 0
Code Activity

Tweaks to get TCAS / multiplayer aircraft showing on the NavDisplay.

Browse source
This commit is contained in:
James Turner 2012-01-06 20:47:21 +00:00
parent a0bfa25aa7
commit b1c6e31c22
1 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/Instrumentation/NavDisplay.cxx
View file

@ -1123,6 +1123,16 @@ void NavDisplay::computePositionedState(FGPositioned* pos, string_set& states)
} // FGPositioned::Type switch } // FGPositioned::Type switch
} }
static string mapAINodeToType(SGPropertyNode* model)
{
// assume all multiplayer items are aircraft for the moment. Not ideal.
if (!strcmp(model->getName(), "multiplayer")) {
return "ai-aircraft";
}
return string("ai-") + model->getName();
}
void NavDisplay::processAI() void NavDisplay::processAI()
{ {
SGPropertyNode *ai = fgGetNode("/ai/models", true); SGPropertyNode *ai = fgGetNode("/ai/models", true);
@ -1137,7 +1147,7 @@ void NavDisplay::processAI()
string_set ss; string_set ss;
computeAIStates(model, ss); computeAIStates(model, ss);
SymbolDefVector rules; SymbolDefVector rules;
findRules(string("ai-") + model->getName(), ss, rules); findRules(mapAINodeToType(model), ss, rules);
if (rules.empty()) { if (rules.empty()) {
return; // no rules matched, we can skip this item return; // no rules matched, we can skip this item
} }
@ -1160,14 +1170,15 @@ void NavDisplay::processAI()
void NavDisplay::computeAIStates(const SGPropertyNode* ai, string_set& states) void NavDisplay::computeAIStates(const SGPropertyNode* ai, string_set& states)
{ {
int threatLevel = ai->getIntValue("tcas/threat-level",-1); int threatLevel = ai->getIntValue("tcas/threat-level",-1);
if (threatLevel >= 0) { if (threatLevel < 1)
states.insert("tcas"); threatLevel = 0;
std::ostringstream os; states.insert("tcas");
os << "tcas-threat-level-" << threatLevel;
states.insert(os.str()); std::ostringstream os;
} os << "tcas-threat-level-" << threatLevel;
states.insert(os.str());
double vspeed = ai->getDoubleValue("velocities/vertical-speed-fps"); double vspeed = ai->getDoubleValue("velocities/vertical-speed-fps");
if (vspeed < -3.0) { if (vspeed < -3.0) {
states.insert("descending"); states.insert("descending");