#include <plib/fnt.h>
#include <simgear/debug/logstream.hxx>
-#include <simgear/misc/fgpath.hxx>
-#include <Main/options.hxx>
-#include <Main/views.hxx>
+#include <simgear/misc/sg_path.hxx>
+
+#include <Main/globals.hxx>
+#include <Main/fg_props.hxx>
#include <Objects/texload.h>
+#include <Time/light.hxx>
#include "hud.hxx"
#include "panel.hxx"
+bool
+fgPanelVisible ()
+{
+ return ((current_panel != 0) &&
+ (current_panel->getVisibility()) &&
+ (globals->get_viewmgr()->get_current() == 0) &&
+ (globals->get_current_view()->get_view_offset() == 0.0));
+}
+
+
\f
////////////////////////////////////////////////////////////////////////
// Implementation of FGTextureManager.
////////////////////////////////////////////////////////////////////////
-map<const char *,ssgTexture *> FGTextureManager::_textureMap;
+map<string,ssgTexture *> FGTextureManager::_textureMap;
ssgTexture *
-FGTextureManager::createTexture (const char * relativePath)
+FGTextureManager::createTexture (const string &relativePath)
{
- ssgTexture *texture;
-
- texture = _textureMap[relativePath];
+ ssgTexture * texture = _textureMap[relativePath];
if (texture == 0) {
- FGPath tpath(current_options.get_fg_root());
+ SG_LOG( SG_COCKPIT, SG_DEBUG,
+ "Texture " << relativePath << " does not yet exist" );
+ SGPath tpath(globals->get_fg_root());
tpath.append(relativePath);
texture = new ssgTexture((char *)tpath.c_str(), false, false);
_textureMap[relativePath] = texture;
- cerr << "Created texture " << relativePath
- << " handle=" << texture->getHandle() << endl;
+ if (_textureMap[relativePath] == 0)
+ SG_LOG( SG_COCKPIT, SG_ALERT, "Texture *still* doesn't exist" );
+ SG_LOG( SG_COCKPIT, SG_DEBUG, "Created texture " << relativePath
+ << " handle=" << texture->getHandle() );
}
return texture;
}
+
+\f
+////////////////////////////////////////////////////////////////////////
+// Implementation of FGCropped Texture.
+////////////////////////////////////////////////////////////////////////
+
+
+FGCroppedTexture::FGCroppedTexture ()
+ : _path(""), _texture(0),
+ _minX(0.0), _minY(0.0), _maxX(1.0), _maxY(1.0)
+{
+}
+
+
+FGCroppedTexture::FGCroppedTexture (const string &path,
+ float minX, float minY,
+ float maxX, float maxY)
+ : _path(path), _texture(0),
+ _minX(minX), _minY(minY), _maxX(maxX), _maxY(maxY)
+{
+}
+
+
+FGCroppedTexture::~FGCroppedTexture ()
+{
+}
+
+
+ssgTexture *
+FGCroppedTexture::getTexture ()
+{
+ if (_texture == 0) {
+ _texture = FGTextureManager::createTexture(_path);
+ }
+ return _texture;
+}
+
+
\f
////////////////////////////////////////////////////////////////////////
// Implementation of FGPanel.
////////////////////////////////////////////////////////////////////////
FGPanel * current_panel = NULL;
+static fntRenderer text_renderer;
-FGPanel::FGPanel (int x, int y, int w, int h)
+
+/**
+ * Constructor.
+ */
+FGPanel::FGPanel (int window_x, int window_y, int window_w, int window_h)
: _mouseDown(false),
_mouseInstrument(0),
- _x(x), _y(y), _w(w), _h(h)
+ _winx(window_x), _winy(window_y), _winw(window_w), _winh(window_h),
+ _width(_winw), _height(int(_winh * 0.5768 + 1)),
+ _x_offset(0), _y_offset(0), _view_height(int(_winh * 0.4232)),
+ _bound(false)
{
- setVisibility(current_options.get_panel_status());
- _panel_h = (int)(h * 0.5768 + 1);
+ setVisibility(fgPanelVisible());
}
+
+/**
+ * Destructor.
+ */
FGPanel::~FGPanel ()
{
- instrument_list_type::iterator current = _instruments.begin();
- instrument_list_type::iterator last = _instruments.end();
-
- for ( ; current != last; ++current) {
- delete *current;
- *current = 0;
+ if (_bound)
+ unbind();
+ for (instrument_list_type::iterator it = _instruments.begin();
+ it != _instruments.end();
+ it++) {
+ delete *it;
+ *it = 0;
}
}
+
+/**
+ * Add an instrument to the panel.
+ */
void
FGPanel::addInstrument (FGPanelInstrument * instrument)
{
_instruments.push_back(instrument);
}
+
+/**
+ * Initialize the panel.
+ */
void
-FGPanel::update () const
+FGPanel::init ()
+{
+ // NO-OP
+}
+
+
+/**
+ * Bind panel properties.
+ */
+void
+FGPanel::bind ()
+{
+ fgTie("/sim/panel/visibility", &_visibility);
+ fgTie("/sim/panel/x-offset", &_x_offset);
+ fgTie("/sim/panel/y-offset", &_y_offset);
+ _bound = true;
+}
+
+
+/**
+ * Unbind panel properties.
+ */
+void
+FGPanel::unbind ()
+{
+ fgUntie("/sim/panel/visibility");
+ fgUntie("/sim/panel/x-offset");
+ fgUntie("/sim/panel/y-offset");
+ _bound = false;
+}
+
+
+/**
+ * Update the panel.
+ */
+void FGPanel::update ()
+{
+ update(_winx, _winw, _winy, _winh);
+}
+
+
+void
+FGPanel::update (GLfloat winx, GLfloat winw, GLfloat winy, GLfloat winh)
{
// Do nothing if the panel isn't visible.
- if (!_visibility)
+ if (!fgPanelVisible())
return;
// If the mouse is down, do something
glMatrixMode(GL_PROJECTION);
glPushMatrix();
glLoadIdentity();
- gluOrtho2D(_x, _x + _w, _y, _y + _h);
+ gluOrtho2D(winx, winx + winw, winy, winy + winh);
glMatrixMode(GL_MODELVIEW);
glPushMatrix();
glLoadIdentity();
+ glTranslated(_x_offset, _y_offset, 0);
+
// Draw the background
glEnable(GL_TEXTURE_2D);
glDisable(GL_LIGHTING);
glEnable(GL_ALPHA_TEST);
glEnable(GL_COLOR_MATERIAL);
// glColor4f(1.0, 1.0, 1.0, 1.0);
- if ( cur_light_params.sun_angle * RAD_TO_DEG < 95.0 ) {
+ if ( cur_light_params.sun_angle * SGD_RADIANS_TO_DEGREES < 95.0 ) {
glColor4fv( cur_light_params.scene_diffuse );
} else {
glColor4f(0.7, 0.2, 0.2, 1.0);
}
glBindTexture(GL_TEXTURE_2D, _bg->getHandle());
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+ // glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+ // glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
glBegin(GL_POLYGON);
- glTexCoord2f(0.0, 0.0); glVertex3f(_x, _y, 0);
- glTexCoord2f(10.0, 0.0); glVertex3f(_x + _w, _y, 0);
- glTexCoord2f(10.0, 5.0); glVertex3f(_x + _w, _y + _panel_h, 0);
- glTexCoord2f(0.0, 5.0); glVertex3f(_x, _y + _panel_h, 0);
+ glTexCoord2f(0.0, 0.0); glVertex3f(_winx, _winy, 0);
+ glTexCoord2f(1.0, 0.0); glVertex3f(_winx + _width, _winy, 0);
+ glTexCoord2f(1.0, 1.0); glVertex3f(_winx + _width, _winy + _height, 0);
+ glTexCoord2f(0.0, 1.0); glVertex3f(_winx, _winy + _height, 0);
glEnd();
// Draw the instruments.
for ( ; current != end; current++) {
FGPanelInstrument * instr = *current;
glLoadIdentity();
+ glTranslated(_x_offset, _y_offset, 0);
glTranslated(instr->getXPos(), instr->getYPos(), 0);
instr->draw();
}
glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
}
+
+/**
+ * Set the panel's visibility.
+ */
void
FGPanel::setVisibility (bool visibility)
{
_visibility = visibility;
}
+
+/**
+ * Return true if the panel is visible.
+ */
bool
FGPanel::getVisibility () const
{
return _visibility;
}
+
+/**
+ * Set the panel's background texture.
+ */
void
FGPanel::setBackground (ssgTexture * texture)
{
_bg = texture;
}
+
+/**
+ * Set the panel's x-offset.
+ */
+void
+FGPanel::setXOffset (int offset)
+{
+ if (offset <= 0 && offset >= -_width + _winw)
+ _x_offset = offset;
+}
+
+
+/**
+ * Set the panel's y-offset.
+ */
+void
+FGPanel::setYOffset (int offset)
+{
+ if (offset <= 0 && offset >= -_height)
+ _y_offset = offset;
+}
+
+
+/**
+ * Perform a mouse action.
+ */
bool
FGPanel::doMouseAction (int button, int updown, int x, int y)
{
+
// Note a released button and return
// cerr << "Doing mouse action\n";
if (updown == 1) {
return true;
}
- x = (int)(((float)x / current_view.get_winWidth()) * _w);
- y = (int)(_h - (((float)y / current_view.get_winHeight()) * _h));
+ // Scale for the real window size.
+ x = int(((float)x / fgGetInt("/sim/startup/xsize")) * _winw);
+ y = int(_winh - (((float)y / fgGetInt("/sim/startup/ysize"))
+ * _winh));
- for (int i = 0; i < _instruments.size(); i++) {
+ // Adjust for offsets.
+ x -= _x_offset;
+ y -= _y_offset;
+
+ // Search for a matching instrument.
+ for (int i = 0; i < (int)_instruments.size(); i++) {
FGPanelInstrument *inst = _instruments[i];
int ix = inst->getXPos();
int iy = inst->getYPos();
int iw = inst->getWidth() / 2;
int ih = inst->getHeight() / 2;
if (x >= ix - iw && x < ix + iw && y >= iy - ih && y < iy + ih) {
-// cout << "Do mouse action for component " << i << '\n';
_mouseDown = true;
_mouseDelay = 20;
_mouseInstrument = inst;
return true;
}
}
-// cout << "Did not click on an instrument\n";
return false;
}
+\f
+////////////////////////////////////////////////////////////////////////.
+// Implementation of FGPanelAction.
+////////////////////////////////////////////////////////////////////////
+
+FGPanelAction::FGPanelAction ()
+{
+}
+
+FGPanelAction::FGPanelAction (int button, int x, int y, int w, int h)
+ : _button(button), _x(x), _y(y), _w(w), _h(h)
+{
+}
+
+FGPanelAction::~FGPanelAction ()
+{
+}
+
+
\f
////////////////////////////////////////////////////////////////////////
// Implementation of FGAdjustAction.
////////////////////////////////////////////////////////////////////////
-FGAdjustAction::FGAdjustAction (getter_type getter, setter_type setter,
- float increment, float min, float max,
- bool wrap=false)
- : _getter(getter), _setter(setter), _increment(increment),
- _min(min), _max(max), _wrap(wrap)
+FGAdjustAction::FGAdjustAction (int button, int x, int y, int w, int h,
+ SGPropertyNode * node, float increment,
+ float min, float max, bool wrap)
+ : FGPanelAction(button, x, y, w, h),
+ _node(node), _increment(increment), _min(min), _max(max), _wrap(wrap)
{
}
void
FGAdjustAction::doAction ()
{
- float value = (*_getter)();
-// cout << "Do action; value=" << value << '\n';
- value += _increment;
- if (value < _min) {
- value = (_wrap ? _max : _min);
- } else if (value > _max) {
- value = (_wrap ? _min : _max);
+ float val = _node->getFloatValue();
+ val += _increment;
+ if (val < _min) {
+ val = (_wrap ? _max : _min);
+ } else if (val > _max) {
+ val = (_wrap ? _min : _max);
}
-// cout << "New value is " << value << '\n';
- (*_setter)(value);
+ _node->setDoubleValue(val);
}
// Implementation of FGSwapAction.
////////////////////////////////////////////////////////////////////////
-FGSwapAction::FGSwapAction (getter_type getter1, setter_type setter1,
- getter_type getter2, setter_type setter2)
- : _getter1(getter1), _setter1(setter1),
- _getter2(getter2), _setter2(setter2)
+FGSwapAction::FGSwapAction (int button, int x, int y, int w, int h,
+ SGPropertyNode * node1, SGPropertyNode * node2)
+ : FGPanelAction(button, x, y, w, h), _node1(node1), _node2(node2)
{
}
void
FGSwapAction::doAction ()
{
- float value = (*_getter1)();
- (*_setter1)((*_getter2)());
- (*_setter2)(value);
+ float val = _node1->getFloatValue();
+ _node1->setDoubleValue(_node2->getFloatValue());
+ _node2->setDoubleValue(val);
}
// Implementation of FGToggleAction.
////////////////////////////////////////////////////////////////////////
-FGToggleAction::FGToggleAction (getter_type getter, setter_type setter)
- : _getter(getter), _setter(setter)
+FGToggleAction::FGToggleAction (int button, int x, int y, int w, int h,
+ SGPropertyNode * node)
+ : FGPanelAction(button, x, y, w, h), _node(node)
{
}
void
FGToggleAction::doAction ()
{
- (*_setter)(!((*_getter)()));
+ _node->setBoolValue(!(_node->getBoolValue()));
+}
+
+
+\f
+////////////////////////////////////////////////////////////////////////
+// Implementation of FGPanelTransformation.
+////////////////////////////////////////////////////////////////////////
+
+FGPanelTransformation::FGPanelTransformation ()
+ : table(0)
+{
+}
+
+FGPanelTransformation::~FGPanelTransformation ()
+{
}
FGPanelInstrument::~FGPanelInstrument ()
{
- action_list_type::iterator it = _actions.begin();
- action_list_type::iterator last = _actions.end();
- for ( ; it != last; it++) {
- delete it->action;
+ for (action_list_type::iterator it = _actions.begin();
+ it != _actions.end();
+ it++) {
+ delete *it;
+ *it = 0;
}
}
}
void
-FGPanelInstrument::addAction (int button, int x, int y, int w, int h,
- FGPanelAction * action)
+FGPanelInstrument::addAction (FGPanelAction * action)
{
- FGPanelInstrument::inst_action act;
- act.button = button;
- act.x = x;
- act.y = y;
- act.w = w;
- act.h = h;
- act.action = action;
- _actions.push_back(act);
+ _actions.push_back(action);
}
// Coordinates relative to centre.
{
action_list_type::iterator it = _actions.begin();
action_list_type::iterator last = _actions.end();
-// cout << "Mouse action at " << x << ',' << y << '\n';
for ( ; it != last; it++) {
-// cout << "Trying action at " << it->x << ',' << it->y << ','
-// << it->w <<',' << it->h << '\n';
- if (button == it->button &&
- x >= it->x && x < it->x + it->w && y >= it->y && y < it->y + it->h) {
- it->action->doAction();
+ if ((*it)->inArea(button, x, y)) {
+ (*it)->doAction();
return true;
}
}
FGLayeredInstrument::~FGLayeredInstrument ()
{
- // FIXME: free layers
+ for (layer_list::iterator it = _layers.begin(); it != _layers.end(); it++) {
+ delete *it;
+ *it = 0;
+ }
}
void
-FGLayeredInstrument::draw () const
+FGLayeredInstrument::draw ()
{
- for (int i = 0; i < _layers.size(); i++) {
+ for (int i = 0; i < (int)_layers.size(); i++) {
glPushMatrix();
glTranslatef(0.0, 0.0, (i / 100.0) + 0.1);
_layers[i]->draw();
}
int
-FGLayeredInstrument::addLayer (CroppedTexture &texture,
- int w = -1, int h = -1)
+FGLayeredInstrument::addLayer (FGCroppedTexture &texture,
+ int w, int h)
{
return addLayer(new FGTexturedLayer(texture, w, h));
}
void
-FGLayeredInstrument::addTransformation (FGInstrumentLayer::transform_type type,
- FGInstrumentLayer::transform_func func,
- float min, float max,
- float factor, float offset)
+FGLayeredInstrument::addTransformation (FGPanelTransformation * transformation)
{
int layer = _layers.size() - 1;
- _layers[layer]->addTransformation(type, func, min, max, factor, offset);
-}
-
-void
-FGLayeredInstrument::addTransformation (FGInstrumentLayer::transform_type type,
- float offset)
-{
- addTransformation(type, 0, 0.0, 0.0, 1.0, offset);
+ _layers[layer]->addTransformation(transformation);
}
FGInstrumentLayer::~FGInstrumentLayer ()
{
- transformation_list::iterator it = _transformations.begin();
- transformation_list::iterator end = _transformations.end();
- while (it != end) {
+ for (transformation_list::iterator it = _transformations.begin();
+ it != _transformations.end();
+ it++) {
delete *it;
- it++;
+ *it = 0;
}
}
transformation_list::const_iterator it = _transformations.begin();
transformation_list::const_iterator last = _transformations.end();
while (it != last) {
- transformation *t = *it;
- float value = (t->func == 0 ? 0.0 : (*(t->func))());
- if (value < t->min) {
- value = t->min;
- } else if (value > t->max) {
- value = t->max;
+ FGPanelTransformation *t = *it;
+ float val = (t->node == 0 ? 0.0 : t->node->getFloatValue());
+ if (val < t->min) {
+ val = t->min;
+ } else if (val > t->max) {
+ val = t->max;
+ }
+ if(t->table==0) {
+ val = val * t->factor + t->offset;
+ } else {
+ val = t->table->interpolate(val) * t->factor + t->offset;
}
- value = value * t->factor + t->offset;
switch (t->type) {
- case XSHIFT:
- glTranslatef(value, 0.0, 0.0);
+ case FGPanelTransformation::XSHIFT:
+ glTranslatef(val, 0.0, 0.0);
break;
- case YSHIFT:
- glTranslatef(0.0, value, 0.0);
+ case FGPanelTransformation::YSHIFT:
+ glTranslatef(0.0, val, 0.0);
break;
- case ROTATION:
- glRotatef(-value, 0.0, 0.0, 1.0);
+ case FGPanelTransformation::ROTATION:
+ glRotatef(-val, 0.0, 0.0, 1.0);
break;
}
it++;
}
void
-FGInstrumentLayer::addTransformation (transform_type type,
- transform_func func,
- float min, float max,
- float factor, float offset)
+FGInstrumentLayer::addTransformation (FGPanelTransformation * transformation)
{
- transformation *t = new transformation;
- t->type = type;
- t->func = func;
- t->min = min;
- t->max = max;
- t->factor = factor;
- t->offset = offset;
- _transformations.push_back(t);
+ _transformations.push_back(transformation);
}
// Implementation of FGTexturedLayer.
////////////////////////////////////////////////////////////////////////
-// FGTexturedLayer::FGTexturedLayer (ssgTexture * texture, int w, int h,
-// float texX1 = 0.0, float texY1 = 0.0,
-// float texX2 = 1.0, float texY2 = 1.0)
-// : FGInstrumentLayer(w, h),
-// _texX1(texX1), _texY1(texY1), _texX2(texX2), _texY2(texY2)
-// {
-// setTexture(texture);
-// }
-FGTexturedLayer::FGTexturedLayer (CroppedTexture &texture, int w, int h)
- : FGInstrumentLayer(w, h),
- _texX1(texture.minX), _texY1(texture.minY),
- _texX2(texture.maxX), _texY2(texture.maxY)
+FGTexturedLayer::FGTexturedLayer (const FGCroppedTexture &texture, int w, int h)
+ : FGInstrumentLayer(w, h)
{
- setTexture(texture.texture);
+ setTexture(texture);
}
+
FGTexturedLayer::~FGTexturedLayer ()
{
}
+
void
-FGTexturedLayer::draw () const
+FGTexturedLayer::draw ()
{
int w2 = _w / 2;
int h2 = _h / 2;
transform();
- glBindTexture(GL_TEXTURE_2D, _texture->getHandle());
+ glBindTexture(GL_TEXTURE_2D, _texture.getTexture()->getHandle());
glBegin(GL_POLYGON);
- if ( cur_light_params.sun_angle * RAD_TO_DEG < 95.0 ) {
+
+ // From Curt: turn on the panel
+ // lights after sundown.
+ if ( cur_light_params.sun_angle * SGD_RADIANS_TO_DEGREES < 95.0 ) {
glColor4fv( cur_light_params.scene_diffuse );
} else {
glColor4f(0.7, 0.2, 0.2, 1.0);
}
- glTexCoord2f(_texX1, _texY1); glVertex2f(-w2, -h2);
- glTexCoord2f(_texX2, _texY1); glVertex2f(w2, -h2);
- glTexCoord2f(_texX2, _texY2); glVertex2f(w2, h2);
- glTexCoord2f(_texX1, _texY2); glVertex2f(-w2, h2);
+
+
+ glTexCoord2f(_texture.getMinX(), _texture.getMinY()); glVertex2f(-w2, -h2);
+ glTexCoord2f(_texture.getMaxX(), _texture.getMinY()); glVertex2f(w2, -h2);
+ glTexCoord2f(_texture.getMaxX(), _texture.getMaxY()); glVertex2f(w2, h2);
+ glTexCoord2f(_texture.getMinX(), _texture.getMaxY()); glVertex2f(-w2, h2);
glEnd();
}
// Implementation of FGTextLayer.
////////////////////////////////////////////////////////////////////////
-FGTextLayer::FGTextLayer (int w, int h, Chunk * chunk1, Chunk * chunk2,
- Chunk * chunk3)
- : FGInstrumentLayer(w, h)
+FGTextLayer::FGTextLayer (int w, int h)
+ : FGInstrumentLayer(w, h), _pointSize(14.0)
{
+ _then.stamp();
_color[0] = _color[1] = _color[2] = 0.0;
_color[3] = 1.0;
- if (chunk1)
- addChunk(chunk1);
- if (chunk2)
- addChunk(chunk2);
- if (chunk3)
- addChunk(chunk3);
}
FGTextLayer::~FGTextLayer ()
}
void
-FGTextLayer::draw () const
+FGTextLayer::draw ()
{
glPushMatrix();
glColor4fv(_color);
transform();
- _renderer.setFont(guiFntHandle);
- _renderer.setPointSize(14);
- _renderer.begin();
- _renderer.start3f(0, 0, 0);
-
- // Render each of the chunks.
- chunk_list::const_iterator it = _chunks.begin();
- chunk_list::const_iterator last = _chunks.end();
- for ( ; it != last; it++) {
- _renderer.puts((*it)->getValue());
+ text_renderer.setFont(guiFntHandle);
+ text_renderer.setPointSize(_pointSize);
+ text_renderer.begin();
+ text_renderer.start3f(0, 0, 0);
+
+ _now.stamp();
+ if (_now - _then > 100000) {
+ recalc_value();
+ _then = _now;
}
+ text_renderer.puts((char *)(_value.c_str()));
- _renderer.end();
+ text_renderer.end();
glColor4f(1.0, 1.0, 1.0, 1.0); // FIXME
glPopMatrix();
}
}
void
-FGTextLayer::setPointSize (const float size)
+FGTextLayer::setPointSize (float size)
{
- _renderer.setPointSize(size);
+ _pointSize = size;
}
void
FGTextLayer::setFont(fntFont * font)
{
- _renderer.setFont(font);
+ text_renderer.setFont(font);
+}
+
+
+void
+FGTextLayer::recalc_value () const
+{
+ _value = "";
+ chunk_list::const_iterator it = _chunks.begin();
+ chunk_list::const_iterator last = _chunks.end();
+ for ( ; it != last; it++) {
+ _value += (*it)->getValue();
+ }
}
// Implementation of FGTextLayer::Chunk.
////////////////////////////////////////////////////////////////////////
-FGTextLayer::Chunk::Chunk (char * text, char * fmt = "%s")
+FGTextLayer::Chunk::Chunk (const string &text, const string &fmt)
: _type(FGTextLayer::TEXT), _fmt(fmt)
{
- _value._text = text;
+ _text = text;
+ if (_fmt == "")
+ _fmt = "%s";
}
-FGTextLayer::Chunk::Chunk (text_func func, char * fmt = "%s")
- : _type(FGTextLayer::TEXT_FUNC), _fmt(fmt)
+FGTextLayer::Chunk::Chunk (ChunkType type, const SGPropertyNode * node,
+ const string &fmt, float mult)
+ : _type(type), _fmt(fmt), _mult(mult)
{
- _value._tfunc = func;
-}
-
-FGTextLayer::Chunk::Chunk (double_func func, char * fmt = "%.2f",
- float mult = 1.0)
- : _type(FGTextLayer::DOUBLE_FUNC), _fmt(fmt), _mult(mult)
-{
- _value._dfunc = func;
+ if (_fmt == "") {
+ if (type == TEXT_VALUE)
+ _fmt = "%s";
+ else
+ _fmt = "%.2f";
+ }
+ _node = node;
}
-char *
+const char *
FGTextLayer::Chunk::getValue () const
{
switch (_type) {
case TEXT:
- sprintf(_buf, _fmt, _value._text);
+ sprintf(_buf, _fmt.c_str(), _text.c_str());
return _buf;
- case TEXT_FUNC:
- sprintf(_buf, _fmt, (*(_value._tfunc))());
+ case TEXT_VALUE:
+ sprintf(_buf, _fmt.c_str(), _node->getStringValue().c_str());
break;
- case DOUBLE_FUNC:
- sprintf(_buf, _fmt, (*(_value._dfunc))() * _mult);
+ case DOUBLE_VALUE:
+ sprintf(_buf, _fmt.c_str(), _node->getFloatValue() * _mult);
break;
}
return _buf;
// Implementation of FGSwitchLayer.
////////////////////////////////////////////////////////////////////////
-FGSwitchLayer::FGSwitchLayer (int w, int h, switch_func func,
+FGSwitchLayer::FGSwitchLayer (int w, int h, const SGPropertyNode * node,
FGInstrumentLayer * layer1,
FGInstrumentLayer * layer2)
- : FGInstrumentLayer(w, h), _func(func), _layer1(layer1), _layer2(layer2)
+ : FGInstrumentLayer(w, h), _node(node), _layer1(layer1), _layer2(layer2)
{
}
}
void
-FGSwitchLayer::draw () const
+FGSwitchLayer::draw ()
{
transform();
- if ((*_func)()) {
+ if (_node->getBoolValue()) {
_layer1->draw();
} else {
_layer2->draw();
projects / flightgear.git / blobdiff