// 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) {
+ cerr << "Texture " << relativePath << " does not yet exist" << endl;
FGPath tpath(current_options.get_fg_root());
tpath.append(relativePath);
texture = new ssgTexture((char *)tpath.c_str(), false, false);
_textureMap[relativePath] = texture;
+ if (_textureMap[relativePath] == 0)
+ cerr << "Texture *still* doesn't exist" << endl;
cerr << "Created texture " << relativePath
<< " handle=" << texture->getHandle() << endl;
}
FGPanel::~FGPanel ()
{
- instrument_list_type::iterator current = _instruments.begin();
- instrument_list_type::iterator last = _instruments.end();
-
- for ( ; current != last; ++current) {
- delete *current;
- *current = 0;
+ for (instrument_list_type::iterator it = _instruments.begin();
+ it != _instruments.end();
+ it++) {
+ delete *it;
+ *it = 0;
}
}
glEnable(GL_BLEND);
glEnable(GL_ALPHA_TEST);
glEnable(GL_COLOR_MATERIAL);
- glColor4f(1.0, 1.0, 1.0, 1.0);
+ // glColor4f(1.0, 1.0, 1.0, 1.0);
+ if ( cur_light_params.sun_angle * RAD_TO_DEG < 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);
FGPanel::doMouseAction (int button, int updown, int x, int y)
{
// Note a released button and return
+ // cerr << "Doing mouse action\n";
if (updown == 1) {
_mouseDown = false;
_mouseInstrument = 0;
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,
- double increment, double min, double 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,
+ SGValue * value, float increment,
+ float min, float max, bool wrap=false)
+ : FGPanelAction(button, x, y, w, h),
+ _value(value), _increment(increment), _min(min), _max(max), _wrap(wrap)
{
}
void
FGAdjustAction::doAction ()
{
- double 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 = _value->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);
+ _value->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,
+ SGValue * value1, SGValue * value2)
+ : FGPanelAction(button, x, y, w, h), _value1(value1), _value2(value2)
{
}
void
FGSwapAction::doAction ()
{
- double value = (*_getter1)();
- (*_setter1)((*_getter2)());
- (*_setter2)(value);
+ float val = _value1->getFloatValue();
+ _value1->setDoubleValue(_value2->getFloatValue());
+ _value2->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,
+ SGValue * value)
+ : FGPanelAction(button, x, y, w, h), _value(value)
{
}
void
FGToggleAction::doAction ()
{
- (*_setter)(!((*_getter)()));
+ _value->setBoolValue(!(_value->getBoolValue()));
+}
+
+
+\f
+////////////////////////////////////////////////////////////////////////
+// Implementation of FGPanelTransformation.
+////////////////////////////////////////////////////////////////////////
+
+FGPanelTransformation::FGPanelTransformation ()
+{
+}
+
+FGPanelTransformation::FGPanelTransformation (Type _type,
+ const SGValue * _value,
+ float _min, float _max,
+ float _factor, float _offset)
+ : type(_type), value(_value), min(_min), max(_max),
+ factor(_factor), offset(_offset)
+{
+}
+
+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++) {
glPushMatrix();
FGLayeredInstrument::addLayer (FGInstrumentLayer *layer)
{
int n = _layers.size();
+ if (layer->getWidth() == -1) {
+ layer->setWidth(getWidth());
+ }
+ if (layer->getHeight() == -1) {
+ layer->setHeight(getHeight());
+ }
_layers.push_back(layer);
return n;
}
int
-FGLayeredInstrument::addLayer (ssgTexture * texture)
+FGLayeredInstrument::addLayer (CroppedTexture &texture,
+ int w = -1, int h = -1)
{
- return addLayer(new FGTexturedLayer(texture, _w, _h));
+ return addLayer(new FGTexturedLayer(texture, w, h));
}
void
-FGLayeredInstrument::addTransformation (FGInstrumentLayer::transform_type type,
- FGInstrumentLayer::transform_func func,
- double min, double max,
- double factor, double 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,
- double 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;
- double 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->value == 0 ? 0.0 : t->value->getFloatValue());
+ if (val < t->min) {
+ val = t->min;
+ } else if (val > t->max) {
+ val = t->max;
}
- value = value * t->factor + t->offset;
+ val = val * 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,
- double min, double max,
- double factor, double 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,
- double texX1 = 0.0, double texY1 = 0.0,
- double texX2 = 1.0, double texY2 = 1.0)
- : FGInstrumentLayer(w, h),
- _texX1(texX1), _texY1(texY1), _texX2(texX2), _texY2(texY2)
+
+FGTexturedLayer::FGTexturedLayer (CroppedTexture &texture, int w, int h)
+ : FGInstrumentLayer(w, h)
{
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.texture->getHandle());
glBegin(GL_POLYGON);
-
- glTexCoord2f(_texX1, _texY1); glVertex2f(-w2, -h2);
- glTexCoord2f(_texX2, _texY1); glVertex2f(w2, -h2);
- glTexCoord2f(_texX2, _texY2); glVertex2f(w2, h2);
- glTexCoord2f(_texX1, _texY2); glVertex2f(-w2, h2);
+ if ( cur_light_params.sun_angle * RAD_TO_DEG < 95.0 ) {
+ glColor4fv( cur_light_params.scene_diffuse );
+ } else {
+ glColor4f(0.7, 0.2, 0.2, 1.0);
+ }
+ glTexCoord2f(_texture.minX, _texture.minY); glVertex2f(-w2, -h2);
+ glTexCoord2f(_texture.maxX, _texture.minY); glVertex2f(w2, -h2);
+ glTexCoord2f(_texture.maxX, _texture.maxY); glVertex2f(w2, h2);
+ glTexCoord2f(_texture.minX, _texture.maxY); glVertex2f(-w2, h2);
glEnd();
}
// Implementation of FGTextLayer.
////////////////////////////////////////////////////////////////////////
-FGTextLayer::FGTextLayer (int w, int h)
+FGTextLayer::FGTextLayer (int w, int h, Chunk * chunk1, Chunk * chunk2,
+ Chunk * chunk3)
: FGInstrumentLayer(w, h)
{
_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);
_value._text = text;
}
-FGTextLayer::Chunk::Chunk (text_func func, char * fmt = "%s")
- : _type(FGTextLayer::TEXT_FUNC), _fmt(fmt)
-{
- _value._tfunc = func;
-}
-
-FGTextLayer::Chunk::Chunk (double_func func, char * fmt = "%.2f",
- double mult = 1.0)
- : _type(FGTextLayer::DOUBLE_FUNC), _fmt(fmt), _mult(mult)
+FGTextLayer::Chunk::Chunk (ChunkType type, const SGValue * value,
+ char * fmt = 0, float mult = 1.0)
+ : _type(type), _fmt(fmt), _mult(mult)
{
- _value._dfunc = func;
+ if (_fmt == 0) {
+ if (type == TEXT_VALUE)
+ _fmt = "%s";
+ else
+ _fmt = "%.2f";
+ }
+ _value._value = value;
}
char *
case TEXT:
sprintf(_buf, _fmt, _value._text);
return _buf;
- case TEXT_FUNC:
- sprintf(_buf, _fmt, (*(_value._tfunc))());
+ case TEXT_VALUE:
+ sprintf(_buf, _fmt, _value._value->getStringValue().c_str());
break;
- case DOUBLE_FUNC:
- sprintf(_buf, _fmt, (*(_value._dfunc))() * _mult);
+ case DOUBLE_VALUE:
+ sprintf(_buf, _fmt, _value._value->getFloatValue() * _mult);
break;
}
return _buf;
// Implementation of FGSwitchLayer.
////////////////////////////////////////////////////////////////////////
-FGSwitchLayer::FGSwitchLayer (int w, int h, switch_func func,
+FGSwitchLayer::FGSwitchLayer (int w, int h, const SGValue * value,
FGInstrumentLayer * layer1,
FGInstrumentLayer * layer2)
- : FGInstrumentLayer(w, h), _func(func), _layer1(layer1), _layer2(layer2)
+ : FGInstrumentLayer(w, h), _value(value), _layer1(layer1), _layer2(layer2)
{
}
}
void
-FGSwitchLayer::draw () const
+FGSwitchLayer::draw ()
{
transform();
- if ((*_func)()) {
+ if (_value->getBoolValue()) {
_layer1->draw();
} else {
_layer2->draw();
projects / flightgear.git / blobdiff