X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCockpit%2Fpanel.cxx;h=4134c196cfa91f498c134949798c357a7ac19d83;hb=75747d35167cdf4586d32fc82d8c7dddd6bfeee9;hp=130b1315c4ca2197af5bc53788214c732aa4ac5d;hpb=64028a37ef716a24c1110f3ab82fd177098f862d;p=flightgear.git

diff --git a/src/Cockpit/panel.cxx b/src/Cockpit/panel.cxx
index 130b1315c..4134c196c 100644
--- a/src/Cockpit/panel.cxx
+++ b/src/Cockpit/panel.cxx
@@ -29,6 +29,10 @@
 #include <stdio.h>	// sprintf
 #include <string.h>
 
+#include <simgear/compiler.h>
+
+#include SG_GLU_H
+
 #include <plib/ssg.h>
 #include <plib/fnt.h>
 
@@ -38,7 +42,6 @@
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
 #include <Main/viewmgr.hxx>
-#include <Objects/texload.h>
 #include <Time/light.hxx>
 
 #include "hud.hxx"
@@ -54,7 +57,6 @@
 // my hardware/driver requires many more.
 #define POFF_UNITS 4
 
-
 ////////////////////////////////////////////////////////////////////////
 // Local functions.
 ////////////////////////////////////////////////////////////////////////
@@ -80,9 +82,9 @@ get_aspect_adjust (int xsize, int ysize)
 bool
 fgPanelVisible ()
 {
-     if(current_panel == 0)
+     if(globals->get_current_panel() == 0)
 	return false;
-     if(current_panel->getVisibility() == 0)
+     if(globals->get_current_panel()->getVisibility() == 0)
 	return false;
      if(globals->get_viewmgr()->get_current() != 0)
 	return false;
@@ -163,7 +165,6 @@ FGCroppedTexture::getTexture ()
 // Implementation of FGPanel.
 ////////////////////////////////////////////////////////////////////////
 
-FGPanel * current_panel = NULL;
 static fntRenderer text_renderer;
 static fntTexFont *default_font = 0;
 static fntTexFont *led_font = 0;
@@ -175,12 +176,15 @@ FGPanel::FGPanel ()
   : _mouseDown(false),
     _mouseInstrument(0),
     _width(WIN_W), _height(int(WIN_H * 0.5768 + 1)),
-    _x_offset(0), _y_offset(0), _view_height(int(WIN_H * 0.4232)),
-    _jitter(0.0),
+    _view_height(int(WIN_H * 0.4232)),
+    _visibility(fgGetNode("/sim/panel/visibility", true)),
+    _x_offset(fgGetNode("/sim/panel/x-offset", true)),
+    _y_offset(fgGetNode("/sim/panel/y-offset", true)),
+    _jitter(fgGetNode("/sim/panel/jitter", true)),
+    _flipx(fgGetNode("/sim/panel/flip-x", true)),
     _xsize_node(fgGetNode("/sim/startup/xsize", true)),
     _ysize_node(fgGetNode("/sim/startup/ysize", true))
 {
-  setVisibility(fgPanelVisible());
 }
 
 
@@ -267,13 +271,6 @@ FGPanel::unbind ()
 void
 FGPanel::update (double dt)
 {
-				// TODO: cache the nodes
-    _visibility = fgGetBool("/sim/panel/visibility");
-    _x_offset = fgGetInt("/sim/panel/x-offset");
-    _y_offset = fgGetInt("/sim/panel/y-offset");
-    _jitter = fgGetFloat("/sim/panel/jitter");
-    _flipx = fgGetBool("/sim/panel/flip-x");
-
 				// Do nothing if the panel isn't visible.
     if ( !fgPanelVisible() ) {
         return;
@@ -300,7 +297,7 @@ void FGPanel::updateMouseDelay()
     if (_mouseDown) {
         _mouseDelay--;
         if (_mouseDelay < 0) {
-            _mouseInstrument->doMouseAction(_mouseButton, _mouseX, _mouseY);
+            _mouseInstrument->doMouseAction(_mouseButton, 0, _mouseX, _mouseY);
             _mouseDelay = 2;
         }
     }
@@ -315,20 +312,20 @@ FGPanel::update (GLfloat winx, GLfloat winw, GLfloat winy, GLfloat winh)
 				// The factors and bounds are just
 				// initial guesses; using sqrt smooths
 				// out the spikes.
-  double x_offset = _x_offset;
-  double y_offset = _y_offset;
+  double x_offset = _x_offset->getIntValue();
+  double y_offset = _y_offset->getIntValue();
 
 #if 0
-  if (_jitter != 0.0) {
+  if (_jitter->getFloatValue() != 0.0) {
     double a_x_pilot = current_aircraft.fdm_state->get_A_X_pilot();
     double a_y_pilot = current_aircraft.fdm_state->get_A_Y_pilot();
     double a_z_pilot = current_aircraft.fdm_state->get_A_Z_pilot();
 
     double a_zx_pilot = a_z_pilot - a_x_pilot;
     
-    int x_adjust = int(sqrt(fabs(a_y_pilot) * _jitter)) *
+    int x_adjust = int(sqrt(fabs(a_y_pilot) * _jitter->getFloatValue())) *
 		   (a_y_pilot < 0 ? -1 : 1);
-    int y_adjust = int(sqrt(fabs(a_zx_pilot) * _jitter)) *
+    int y_adjust = int(sqrt(fabs(a_zx_pilot) * _jitter->getFloatValue())) *
 		   (a_zx_pilot < 0 ? -1 : 1);
 
 				// adjustments in screen coordinates
@@ -340,7 +337,7 @@ FGPanel::update (GLfloat winx, GLfloat winw, GLfloat winy, GLfloat winh)
   glMatrixMode(GL_PROJECTION);
   glPushMatrix();
   glLoadIdentity();
-  if ( _flipx ) {
+  if ( _flipx->getBoolValue() ) {
     gluOrtho2D(winx + winw, winx, winy + winh, winy); /* up side down */
   } else {
     gluOrtho2D(winx, winx + winw, winy, winy + winh); /* right side up */
@@ -374,7 +371,8 @@ FGPanel::draw()
 
   // save some state
   glPushAttrib( GL_COLOR_BUFFER_BIT | GL_ENABLE_BIT | GL_LIGHTING_BIT
-                | GL_TEXTURE_BIT | GL_PIXEL_MODE_BIT );
+                | GL_TEXTURE_BIT | GL_PIXEL_MODE_BIT | GL_CULL_FACE 
+                | GL_DEPTH_BUFFER_BIT );
 
   // Draw the background
   glEnable(GL_TEXTURE_2D);
@@ -382,8 +380,13 @@ FGPanel::draw()
   glEnable(GL_BLEND);
   glEnable(GL_ALPHA_TEST);
   glEnable(GL_COLOR_MATERIAL);
+  glEnable(GL_CULL_FACE);
+  glCullFace(GL_BACK);
+  glDisable(GL_DEPTH_TEST);
   sgVec4 panel_color;
-  sgCopyVec4( panel_color, cur_light_params.scene_diffuse );
+
+  FGLight *l = (FGLight *)(globals->get_subsystem("lighting"));
+  sgCopyVec4( panel_color, l->scene_diffuse());
   if ( fgGetDouble("/systems/electrical/outputs/instrument-lights") > 1.0 ) {
       if ( panel_color[0] < 0.7 ) panel_color[0] = 0.7;
       if ( panel_color[1] < 0.2 ) panel_color[1] = 0.2;
@@ -438,16 +441,12 @@ FGPanel::draw()
 
   // Draw yellow "hotspots" if directed to.  This is a panel authoring
   // feature; not intended to be high performance or to look good.
-  if(fgGetBool("/sim/panel-hotspots")) {
-    glPushAttrib(GL_ALL_ATTRIB_BITS);
-    glDisable(GL_DEPTH_TEST);
+  if ( fgGetBool("/sim/panel-hotspots") ) {
     glDisable(GL_TEXTURE_2D);
     glColor3f(1, 1, 0);
     
-    for(int i=0; i<_instruments.size(); i++)
+    for ( unsigned int i = 0; i < _instruments.size(); i++ )
       _instruments[i]->drawHotspots();
-
-    glPopAttrib();
   }
 
 
@@ -463,7 +462,7 @@ FGPanel::draw()
 void
 FGPanel::setVisibility (bool visibility)
 {
-  _visibility = visibility;
+  _visibility->setBoolValue( visibility );
 }
 
 
@@ -473,7 +472,7 @@ FGPanel::setVisibility (bool visibility)
 bool
 FGPanel::getVisibility () const
 {
-  return _visibility;
+  return _visibility->getBoolValue();
 }
 
 
@@ -503,7 +502,7 @@ void
 FGPanel::setXOffset (int offset)
 {
   if (offset <= 0 && offset >= -_width + WIN_W)
-    _x_offset = offset;
+    _x_offset->setIntValue( offset );
 }
 
 
@@ -514,7 +513,7 @@ void
 FGPanel::setYOffset (int offset)
 {
   if (offset <= 0 && offset >= -_height)
-    _y_offset = offset;
+    _y_offset->setIntValue( offset );
 }
 
 /**
@@ -527,6 +526,8 @@ FGPanel::doLocalMouseAction(int button, int updown, int x, int y)
 {
   // Note a released button and return
   if (updown == 1) {
+    if (_mouseInstrument != 0)
+        _mouseInstrument->doMouseAction(_mouseButton, 1, _mouseX, _mouseY);
     _mouseDown = false;
     _mouseInstrument = 0;
     return false;
@@ -547,7 +548,8 @@ FGPanel::doLocalMouseAction(int button, int updown, int x, int y)
       _mouseX = x - ix;
       _mouseY = y - iy;
       // Always do the action once.
-      return _mouseInstrument->doMouseAction(_mouseButton, _mouseX, _mouseY);
+      return _mouseInstrument->doMouseAction(_mouseButton, 0,
+                                             _mouseX, _mouseY);
     }
   }
   return false;
@@ -574,12 +576,12 @@ FGPanel::doMouseAction (int button, int updown, int x, int y)
   }
 
 				// Adjust for offsets.
-  x -= _x_offset;
-  y -= _y_offset;
+  x -= _x_offset->getIntValue();
+  y -= _y_offset->getIntValue();
 
   // Having fixed up the coordinates, fall through to the local
   // coordinate handler.
-  doLocalMouseAction(button, updown, x, y);
+  return doLocalMouseAction(button, updown, x, y);
 } 
 
 
@@ -592,11 +594,14 @@ 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 (int button, int x, int y, int w, int h,
+                              bool repeatable)
+    : _button(button), _x(x), _y(y), _w(w), _h(h), _repeatable(repeatable)
 {
-  for (unsigned int i = 0; i < _bindings.size(); i++)
-    delete _bindings[i];
+  for (unsigned int i = 0; i < 2; i++) {
+      for (unsigned int j = 0; j < _bindings[i].size(); j++)
+          delete _bindings[i][j];
+  }
 }
 
 FGPanelAction::~FGPanelAction ()
@@ -604,19 +609,24 @@ FGPanelAction::~FGPanelAction ()
 }
 
 void
-FGPanelAction::addBinding (FGBinding * binding)
+FGPanelAction::addBinding (FGBinding * binding, int updown)
 {
-  _bindings.push_back(binding);
+  _bindings[updown].push_back(binding);
 }
 
-void
-FGPanelAction::doAction ()
+bool
+FGPanelAction::doAction (int updown)
 {
   if (test()) {
-    int nBindings = _bindings.size();
-    for (int i = 0; i < nBindings; i++) {
-      _bindings[i]->fire();
+    if ((updown != _last_state) || (updown == 0 && _repeatable)) {
+        int nBindings = _bindings[updown].size();
+        for (int i = 0; i < nBindings; i++)
+            _bindings[updown][i]->fire();
     }
+    _last_state = updown;
+    return true;
+  } else {
+    return false;
   }
 }
 
@@ -668,7 +678,7 @@ FGPanelInstrument::~FGPanelInstrument ()
 void
 FGPanelInstrument::drawHotspots()
 {
-  for(int i=0; i<_actions.size(); i++) {
+  for ( unsigned int i = 0; i < _actions.size(); i++ ) {
     FGPanelAction* a = _actions[i];
     float x1 = getXPos() + a->getX();
     float x2 = x1 + a->getWidth();
@@ -730,16 +740,15 @@ FGPanelInstrument::addAction (FGPanelAction * action)
 
 				// Coordinates relative to centre.
 bool
-FGPanelInstrument::doMouseAction (int button, int x, int y)
+FGPanelInstrument::doMouseAction (int button, int updown, int x, int y)
 {
   if (test()) {
     action_list_type::iterator it = _actions.begin();
     action_list_type::iterator last = _actions.end();
     for ( ; it != last; it++) {
-      if ((*it)->inArea(button, x, y)) {
-	(*it)->doAction();
-	return true;
-      }
+      if ((*it)->inArea(button, x, y) &&
+          (*it)->doAction(updown))
+        return true;
     }
   }
   return false;
@@ -772,7 +781,6 @@ FGLayeredInstrument::draw ()
   
   for (int i = 0; i < (int)_layers.size(); i++) {
     glPushMatrix();
-    glPolygonOffset(-1, -POFF_UNITS*(i+2));
     _layers[i]->draw();
     glPopMatrix();
   }
@@ -837,11 +845,15 @@ FGInstrumentLayer::transform () const
     FGPanelTransformation *t = *it;
     if (t->test()) {
       float val = (t->node == 0 ? 0.0 : t->node->getFloatValue());
+
+      if (t->has_mod)
+          val = fmod(val, t->mod);
       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 {
@@ -890,6 +902,7 @@ void
 FGGroupLayer::draw ()
 {
   if (test()) {
+    transform();
     int nLayers = _layers.size();
     for (int i = 0; i < nLayers; i++)
       _layers[i]->draw();
@@ -935,7 +948,9 @@ FGTexturedLayer::draw ()
 				// From Curt: turn on the panel
 				// lights after sundown.
     sgVec4 panel_color;
-    sgCopyVec4( panel_color, cur_light_params.scene_diffuse );
+
+    FGLight *l = (FGLight *)(globals->get_subsystem("lighting"));
+    sgCopyVec4( panel_color, l->scene_diffuse());
     if ( fgGetDouble("/systems/electrical/outputs/instrument-lights") > 1.0 ) {
         if ( panel_color[0] < 0.7 ) panel_color[0] = 0.7;
         if ( panel_color[1] < 0.2 ) panel_color[1] = 0.2;
@@ -1080,8 +1095,9 @@ FGTextLayer::Chunk::Chunk (const string &text, const string &fmt)
 }
 
 FGTextLayer::Chunk::Chunk (ChunkType type, const SGPropertyNode * node,
-			   const string &fmt, float mult)
-  : _type(type), _fmt(fmt), _mult(mult)
+			   const string &fmt, float mult, float offs,
+                           bool truncation)
+  : _type(type), _fmt(fmt), _mult(mult), _offs(offs), _trunc(truncation)
 {
   if (_fmt.empty()) {
     if (type == TEXT_VALUE)
@@ -1105,7 +1121,9 @@ FGTextLayer::Chunk::getValue () const
       sprintf(_buf, _fmt.c_str(), _node->getStringValue());
       break;
     case DOUBLE_VALUE:
-      sprintf(_buf, _fmt.c_str(), _node->getFloatValue() * _mult);
+      double d = _offs + _node->getFloatValue() * _mult;
+      if (_trunc)  d = (d < 0) ? -floor(-d) : floor(d);
+      sprintf(_buf, _fmt.c_str(), d);
       break;
     }
     return _buf;
@@ -1120,28 +1138,22 @@ FGTextLayer::Chunk::getValue () const
 // Implementation of FGSwitchLayer.
 ////////////////////////////////////////////////////////////////////////
 
-FGSwitchLayer::FGSwitchLayer (int w, int h, const SGPropertyNode * node,
-			      FGInstrumentLayer * layer1,
-			      FGInstrumentLayer * layer2)
-  : FGInstrumentLayer(w, h), _node(node), _layer1(layer1), _layer2(layer2)
+FGSwitchLayer::FGSwitchLayer ()
+  : FGGroupLayer()
 {
 }
 
-FGSwitchLayer::~FGSwitchLayer ()
-{
-  delete _layer1;
-  delete _layer2;
-}
-
 void
 FGSwitchLayer::draw ()
 {
   if (test()) {
     transform();
-    if (_node->getBoolValue()) {
-      _layer1->draw();
-    } else {
-      _layer2->draw();
+    int nLayers = _layers.size();
+    for (int i = 0; i < nLayers; i++) {
+      if (_layers[i]->test()) {
+          _layers[i]->draw();
+          return;
+      }
     }
   }
 }