fly/flightgear
1
0
Fork 0
Code Activity

Fix bug 191, uninitialised HUD color.

Browse source
This commit is contained in:
James Turner 2010-12-02 00:41:29 +00:00
parent 55c0d3f4d6
commit a9a1734f1e
2 changed files with 36 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/Instrumentation/HUD/HUD.cxx
View file

@ -137,6 +137,8 @@ void HUD::init()
_font_renderer->setPointSize(_font_size); _font_renderer->setPointSize(_font_size);
_text_list.setFont(_font_renderer); _text_list.setFont(_font_renderer);
currentColorChanged();
_path->fireValueChanged(); _path->fireValueChanged();
} }
@ -446,29 +448,9 @@ void HUD::valueChanged(SGPropertyNode *node)
load(fgGetString("/sim/hud/path[1]", "Huds/default.xml")); load(fgGetString("/sim/hud/path[1]", "Huds/default.xml"));
if (!strcmp(node->getName(), "current-color")) { if (!strcmp(node->getName(), "current-color")) {
int i = node->getIntValue(); currentColorChanged();
if (i < 0)
i = 0;
SGPropertyNode *n = fgGetNode("/sim/hud/palette", true);
if ((n = n->getChild("color", i, false))) {
if (n->hasValue("red"))
_red->setFloatValue(n->getFloatValue("red", 1.0));
if (n->hasValue("green"))
_green->setFloatValue(n->getFloatValue("green", 1.0));
if (n->hasValue("blue"))
_blue->setFloatValue(n->getFloatValue("blue", 1.0));
if (n->hasValue("alpha"))
_alpha->setFloatValue(n->getFloatValue("alpha", 0.67));
if (n->hasValue("alpha-clamp"))
_alpha_clamp->setFloatValue(n->getFloatValue("alpha-clamp", 0.01));
if (n->hasValue("brightness"))
_brightness->setFloatValue(n->getFloatValue("brightness", 0.75));
if (n->hasValue("antialiased"))
_antialiasing->setBoolValue(n->getBoolValue("antialiased", false));
if (n->hasValue("transparent"))
_transparency->setBoolValue(n->getBoolValue("transparent", false));
}
} }
_scr_width = _scr_widthN->getIntValue(); _scr_width = _scr_widthN->getIntValue();
_scr_height = _scr_heightN->getIntValue(); _scr_height = _scr_heightN->getIntValue();
@ -487,6 +469,36 @@ void HUD::valueChanged(SGPropertyNode *node)
_listener_active = false; _listener_active = false;
} }
void HUD::currentColorChanged()
{
SGPropertyNode *n = fgGetNode("/sim/hud/palette", true);
int index = _current->getIntValue();
if (index < 0) {
index = 0;
}
n = n->getChild("color", index, false);
if (!n) {
return;
}
if (n->hasValue("red"))
_red->setFloatValue(n->getFloatValue("red", 1.0));
if (n->hasValue("green"))
_green->setFloatValue(n->getFloatValue("green", 1.0));
if (n->hasValue("blue"))
_blue->setFloatValue(n->getFloatValue("blue", 1.0));
if (n->hasValue("alpha"))
_alpha->setFloatValue(n->getFloatValue("alpha", 0.67));
if (n->hasValue("alpha-clamp"))
_alpha_clamp->setFloatValue(n->getFloatValue("alpha-clamp", 0.01));
if (n->hasValue("brightness"))
_brightness->setFloatValue(n->getFloatValue("brightness", 0.75));
if (n->hasValue("antialiased"))
_antialiasing->setBoolValue(n->getBoolValue("antialiased", false));
if (n->hasValue("transparent"))
_transparency->setBoolValue(n->getBoolValue("transparent", false));
}
void HUD::setColor() const void HUD::setColor() const
{ {

2
src/Instrumentation/HUD/HUD.hxx
View file

@ -202,6 +202,8 @@ private:
void draw3D(); void draw3D();
void draw2D(GLfloat, GLfloat, GLfloat, GLfloat); void draw2D(GLfloat, GLfloat, GLfloat, GLfloat);
void currentColorChanged();
class Input; class Input;
class Item; class Item;
class Label; class Label;