fly/flightgear
1
0
Fork 0
Code Activity

- fix function argument order (top & bottom were swapped)

Browse source 
- drop wrong and superfluous rounding (sprintf() rounds already)
- remove redundant default values to property getters (default is 0 already)
This commit is contained in:
mfranz 2008-08-05 05:22:05 +00:00
parent c4a38e10ec
commit fa2387c05b
2 changed files with 5 additions and 7 deletions
src/Instrumentation/HUD
HUD.cxxHUD_tape.cxx

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

@ -462,10 +462,8 @@ void HUD::setColor() const
} }
void HUD::textAlign(fntRenderer *rend, const char *s, int align, void HUD::textAlign(fntRenderer *rend, const char *s, int align,
float *x, float *y, float *l, float *r, float *t, float *b) float *x, float *y, float *l, float *r, float *b, float *t)
{ {
fntFont *font = rend->getFont(); fntFont *font = rend->getFont();
float gap = font->getGap(); float gap = font->getGap();

8
src/Instrumentation/HUD/HUD_tape.cxx
View file

@ -32,8 +32,8 @@ HUD::Tape::Tape(HUD *hud, const SGPropertyNode *n, float x, float y) :
_draw_cap_top(n->getBoolValue("cap-top", false)), _draw_cap_top(n->getBoolValue("cap-top", false)),
_draw_cap_right(n->getBoolValue("cap-right", false)), _draw_cap_right(n->getBoolValue("cap-right", false)),
_draw_cap_left(n->getBoolValue("cap-left", false)), _draw_cap_left(n->getBoolValue("cap-left", false)),
_marker_offset(n->getFloatValue("marker-offset", 0.0)), _marker_offset(n->getFloatValue("marker-offset")),
_label_gap(n->getFloatValue("label-gap-width", 0.0) / 2.0), _label_gap(n->getFloatValue("label-gap-width") / 2.0),
_pointer(n->getBoolValue("enable-pointer", true)), _pointer(n->getBoolValue("enable-pointer", true)),
_format(n->getStringValue("format", "%d")) _format(n->getStringValue("format", "%d"))
{ {
@ -531,9 +531,9 @@ char *HUD::Tape::format_value(float v)
v = 0.0f; v = 0.0f;
if (_label_fmt == INT) if (_label_fmt == INT)
snprintf(_buf, BUFSIZE, _format.c_str(), int(v + 0.5f)); snprintf(_buf, BUFSIZE, _format.c_str(), int(v));
else if (_label_fmt == LONG) else if (_label_fmt == LONG)
snprintf(_buf, BUFSIZE, _format.c_str(), long(v + 0.5f)); snprintf(_buf, BUFSIZE, _format.c_str(), long(v));
else if (_label_fmt == FLOAT) else if (_label_fmt == FLOAT)
snprintf(_buf, BUFSIZE, _format.c_str(), v); snprintf(_buf, BUFSIZE, _format.c_str(), v);
else // _label_fmt == DOUBLE else // _label_fmt == DOUBLE