{
assert(nd);
static char buf[512];
- if (format.find('d') >= 0) {
+ if (format.find('d') != string::npos) {
::snprintf(buf, 512, format.c_str(), nd->getIntValue());
return buf;
}
- if (format.find('s') >= 0) {
+ if (format.find('s') != string::npos) {
::snprintf(buf, 512, format.c_str(), nd->getStringValue());
return buf;
}
class SymbolDef
{
public:
- void initFromNode(SGPropertyNode* node)
+ SymbolDef() :
+ enable(NULL)
+ {}
+
+ bool initFromNode(SGPropertyNode* node)
{
type = node->getStringValue("type");
- enable = sgReadCondition(fgGetNode("/"), node->getChild("enable"));
+ SGPropertyNode* enableNode = node->getChild("enable");
+ if (enableNode) {
+ enable = sgReadCondition(fgGetNode("/"), enableNode);
+ }
+
int n=0;
while (node->hasChild("state", n)) {
string m = node->getChild("state", n++)->getStringValue();
}
} // of matches parsing
- xy0.x() = node->getFloatValue("x0", -5);
- xy0.y() = node->getFloatValue("y0", -5);
+ if (node->hasChild("width")) {
+ float w = node->getFloatValue("width");
+ float h = node->getFloatValue("height", w);
+ xy0.x() = -w * 0.5;
+ xy0.y() = -h * 0.5;
+ xy1.x() = w * 0.5;
+ xy1.y() = h * 0.5;
+ } else {
+ xy0.x() = node->getFloatValue("x0", 0.0);
+ xy0.y() = node->getFloatValue("y0", 0.0);
xy1.x() = node->getFloatValue("x1", 5);
xy1.y() = node->getFloatValue("y1", 5);
-
+ }
+
double texSize = node->getFloatValue("texture-size", 1.0);
uv0.x() = node->getFloatValue("u0", 0) / texSize;
drawLine = node->getBoolValue("draw-line", false);
lineColor = readColor(node->getChild("line-color"), color);
- drawRouteLeg = node->getBoolValue("draw-line", false);
+ drawRouteLeg = node->getBoolValue("draw-leg", false);
stretchSymbol = node->getBoolValue("stretch-symbol", false);
if (stretchSymbol) {
stretchV2 = node->getFloatValue("v2");
stretchV3 = node->getFloatValue("v3");
}
+
+ return true;
}
SGCondition* enable;
bool matches(const string_set& states) const
{
- string_set::const_iterator it = states.begin(),
- end = states.end();
- for (; it != end; ++it) {
- if (required_states.count(*it) == 0) {
- // required state not matched
+ BOOST_FOREACH(const string& s, required_states) {
+ if (states.count(s) == 0) {
return false;
}
-
- if (excluded_states.count(*it) > 0) {
- // excluded state matched
+ }
+
+ BOOST_FOREACH(const string& s, excluded_states) {
+ if (states.count(s) != 0) {
return false;
}
- } // of applicable states iteration
-
- return true; // matches!
+ }
+
+ return true;
}
};
string text() const
{
assert(definition->hasText);
- string r;
+ string r;
+ size_t lastPos = 0;
- int pos = 0;
- int lastPos = 0;
-
- for (; pos < (int) definition->textTemplate.size();) {
- pos = definition->textTemplate.find('{', pos);
- if (pos == -1) { // no more replacements
+ while (true) {
+ size_t pos = definition->textTemplate.find('{', lastPos);
+ if (pos == string::npos) { // no more replacements
r.append(definition->textTemplate.substr(lastPos));
break;
}
r.append(definition->textTemplate.substr(lastPos, pos - lastPos));
- int endReplacement = definition->textTemplate.find('}', pos+1);
+ size_t endReplacement = definition->textTemplate.find('}', pos+1);
if (endReplacement <= pos) {
return "bad replacement";
}
string spec = definition->textTemplate.substr(pos + 1, endReplacement - (pos + 1));
// look for formatter in spec
- int colonPos = spec.find(':');
- if (colonPos < 0) {
+ size_t colonPos = spec.find(':');
+ if (colonPos == string::npos) {
// simple replacement
r.append(props->getStringValue(spec));
} else {
INITFONT("color/alpha", 1, Float);
#undef INITFONT
+ SGPropertyNode* symbolsNode = node->getNode("symbols");
+ SGPropertyNode* symbol;
+
+ for (int i = 0; (symbol = symbolsNode->getChild("symbol", i)) != NULL; ++i) {
+ SymbolDef* def = new SymbolDef;
+ if (!def->initFromNode(symbol)) {
+ delete def;
+ continue;
+ }
+
+ _rules.push_back(def);
+ } // of symbol definition parsing
}
string path = _Instrument->getStringValue("symbol-texture-path",
"Aircraft/Instruments/Textures/nd-symbols.png");
SGPath tpath = globals->resolve_aircraft_path(path);
-
+ if (!tpath.exists()) {
+ SG_LOG(SG_INSTR, SG_WARN, "ND symbol texture not found:" << path);
+ }
+
// no mipmap or else alpha will mix with pixels on the border of shapes, ruining the effect
_symbolTexture = SGLoadTexture2D(tpath, NULL, false, false);
_navRadio1Node = fgGetNode("/instrumentation/nav[0]", true);
_navRadio2Node = fgGetNode("/instrumentation/nav[1]", true);
+ _excessDataNode = _Instrument->getChild("excess-data", 0, true);
+ _excessDataNode->setBoolValue(false);
+
// OSG geometry setup
_radarGeode = new osg::Geode;
_geom->setTexCoordArray(0, _texCoords);
_quadColors = new osg::Vec4Array;
+ _quadColors->setDataVariance(osg::Object::DYNAMIC);
_geom->setColorBinding(osg::Geometry::BIND_PER_VERTEX);
_geom->setColorArray(_quadColors);
_geom->setInitialBound(osg::BoundingBox(osg::Vec3f(-256.0f, -256.0f, 0.0f),
osg::Vec3f(256.0f, 256.0f, 0.0f)));
+
_radarGeode->addDrawable(_geom);
_odg->allocRT();
// Texture in the 2D panel system
_projectMat = osg::Matrixf::scale(_scale, _scale, 1.0) *
degRotation(-_view_heading) * _centerTrans;
- _pos = SGGeod::fromDegFt(_user_lon_node->getDoubleValue(),
- _user_lat_node->getDoubleValue(),
- _user_alt_node->getDoubleValue());
+ _pos = SGGeod::fromDegFt(_user_lon_node->getDoubleValue(),
+ _user_lat_node->getDoubleValue(),
+ _user_alt_node->getDoubleValue());
_vertices->clear();
_lineVertices->clear();
_lineColors->clear();
+ _quadColors->clear();
_texCoords->clear();
_textGeode->removeDrawables(0, _textGeode->getNumDrawables());
BOOST_FOREACH(SymbolDef* def, _rules) {
+ if (def->enable) {
def->enabled = def->enable->test();
+ } else {
+ def->enabled = true;
+ }
}
processRoute();
tpath = path;
}
-#if (FG_OSG_VERSION >= 21000)
osg::ref_ptr<osgDB::ReaderWriter::Options> fontOptions = new osgDB::ReaderWriter::Options("monochrome");
osg::ref_ptr<osgText::Font> font = osgText::readFontFile(tpath.c_str(), fontOptions.get());
-#else
- osg::ref_ptr<osgText::Font> font = osgText::readFontFile(tpath.c_str());
-#endif
if (font != 0) {
_font = font;
_texCoords->push_back(osg::Vec2(def->uv1.x(), def->uv0.y()));
_texCoords->push_back(def->uv1);
_texCoords->push_back(osg::Vec2(def->uv0.x(), def->uv1.y()));
-
+
for (int i=0; i<4; ++i) {
_vertices->push_back(verts[i] + pos);
_quadColors->push_back(def->color);
void NavDisplay::limitDisplayedSymbols()
{
- unsigned int maxSymbols = _Instrument->getIntValue("max-symbols");
+ unsigned int maxSymbols = _Instrument->getIntValue("max-symbols", 100);
if (_symbols.size() <= maxSymbols) {
_excessDataNode->setBoolValue(false);
return;
class Filter : public FGPositioned::Filter
{
public:
+ double minRunwayLengthFt;
+
virtual bool pass(FGPositioned* aPos) const
{
if (aPos->type() == FGPositioned::FIX) {
}
}
+ if (aPos->type() == FGPositioned::AIRPORT) {
+ FGAirport* apt = (FGAirport*) aPos;
+ if (!apt->hasHardRunwayOfLengthFt(minRunwayLengthFt)) {
+ return false;
+ }
+ }
+
return true;
}
void NavDisplay::findItems()
{
Filter filt;
+ filt.minRunwayLengthFt = 2000;
+
FGPositioned::List items =
FGPositioned::findWithinRange(_pos, _rangeNm, &filt);
}
SymbolDefVector rules;
- findRules(wpt->type() , state, rules);
+ findRules("waypoint" , state, rules);
if (rules.empty()) {
return; // no rules matched, we can skip this item
}
void NavDisplay::findRules(const string& type, const string_set& states, SymbolDefVector& rules)
{
BOOST_FOREACH(SymbolDef* candidate, _rules) {
- if (!candidate->enabled) {
+ if (!candidate->enabled || (candidate->type != type)) {
continue;
}
switch (pos->type()) {
case FGPositioned::VOR:
- case FGPositioned::LOC: {
+ case FGPositioned::LOC:
+ case FGPositioned::TACAN: {
FGNavRecord* nav = static_cast<FGNavRecord*>(pos);
nd->setDoubleValue("frequency-mhz", nav->get_freq());
projects / flightgear.git / blobdiff