return false;
if(globals->get_viewmgr()->get_current() != 0)
return false;
- if(globals->get_current_view()->get_view_offset() != 0 &&
+ if(globals->get_current_view()->getHeadingOffset_deg() * SGD_DEGREES_TO_RADIANS != 0 &&
!fgGetBool("/sim/virtual-cockpit"))
return false;
return true;
* Update the panel.
*/
void
-FGPanel::update (int dt)
+FGPanel::update (double dt)
{
// TODO: cache the nodes
_visibility = fgGetBool("/sim/panel/visibility");
// Generate a "look at" matrix using OpenGL (!) coordinate
// conventions.
float lookat[3];
- float pitch = view->get_view_tilt();
- float rot = view->get_view_offset();
+ float pitch = view->getPitchOffset_deg() * SGD_DEGREES_TO_RADIANS;
+ float rot = view->getHeadingOffset_deg() * SGD_DEGREES_TO_RADIANS;
lookat[0] = -sin(rot);
lookat[1] = sin(pitch) / cos(pitch);
lookat[2] = -cos(rot);
if (updown == 1) {
_mouseDown = false;
_mouseInstrument = 0;
- return true;
+ return false;
}
// Scale for the real window size.
_mouseX = x - ix;
_mouseY = y - iy;
// Always do the action once.
- _mouseInstrument->doMouseAction(_mouseButton, _mouseX, _mouseY);
- return true;
+ return _mouseInstrument->doMouseAction(_mouseButton, _mouseX, _mouseY);
}
}
return false;
FGLayeredInstrument::draw ()
{
if (test()) {
+ float z = 0.1f;
+ float z_inc = 0.01;
+ bool vc = fgGetBool("/sim/virtual-cockpit");
for (int i = 0; i < (int)_layers.size(); i++) {
glPushMatrix();
- if(!fgGetBool("/sim/virtual-cockpit"))
- glTranslatef(0.0, 0.0, (i / 100.0) + 0.1);
+ if(!vc) {
+ glTranslatef(0.0, 0.0, z);
+ z += z_inc;
+ }
_layers[i]->draw();
glPopMatrix();
}
text_renderer.start3f(0, 0, 0);
_now.stamp();
- if (_now - _then > 100000) {
+ long diff = _now - _then;
+#if 0
+ // It would be nice to keep this #ifdef'd stuff for (04/18/2002 +
+ // a couple days) as I verify my solution to the panel text
+ // drawing problem is actually correct. -CLO
+ cout << "time diff = " << diff << endl;
+ if ( _now - _then < 0 ) {
+ cout << "Eeek, the past is now in the future!" << endl;
+ cout << "Now = " << _now.get_seconds() << " seconds "
+ << _now.get_usec() << "usecs" << endl;
+ cout << "Past = " << _then.get_seconds() << " seconds "
+ << _then.get_usec() << "usecs" << endl;
+ exit(-1);
+ }
+#endif
+ if (diff > 100000 || diff < 0 ) {
+ // ( diff < 0 ) is a sanity check and indicates our time stamp
+ // difference math probably overflowed. We can handle a max
+ // difference of 35.8 minutes since the returned value is in
+ // usec. So if the panel is left off longer than that we can
+ // over flow the math with it is turned back on. This (diff <
+ // 0) catches that situation, get's us out of trouble, and
+ // back on track.
recalc_value();
_then = _now;
}
: _type(FGTextLayer::TEXT), _fmt(fmt)
{
_text = text;
- if (_fmt == "")
+ if (_fmt.empty())
_fmt = "%s";
}
const string &fmt, float mult)
: _type(type), _fmt(fmt), _mult(mult)
{
- if (_fmt == "") {
+ if (_fmt.empty()) {
if (type == TEXT_VALUE)
_fmt = "%s";
else
FGTextLayer::Chunk::getValue () const
{
if (test()) {
+ _buf[0] = '\0';
switch (_type) {
case TEXT:
sprintf(_buf, _fmt.c_str(), _text.c_str());
return _buf;
case TEXT_VALUE:
- sprintf(_buf, _fmt.c_str(), _node->getStringValue().c_str());
+ sprintf(_buf, _fmt.c_str(), _node->getStringValue());
break;
case DOUBLE_VALUE:
sprintf(_buf, _fmt.c_str(), _node->getFloatValue() * _mult);
// end of panel.cxx
+