X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCockpit%2Fpanel.hxx;h=7cfdf0e2eb72fe6f49566e6a6bfb15ece1de5c54;hb=d05121ef4689d2b50b3fe1848cbb0d1f5a1db877;hp=595c5f8eeeafd0391d9d81265a3b505059273383;hpb=d31e0e70710684d4b9457c425a4cb50a08163933;p=flightgear.git

diff --git a/src/Cockpit/panel.hxx b/src/Cockpit/panel.hxx
index 595c5f8ee..7cfdf0e2e 100644
--- a/src/Cockpit/panel.hxx
+++ b/src/Cockpit/panel.hxx
@@ -30,32 +30,30 @@
 #  include <config.h>
 #endif
 
-#include <simgear/compiler.h>
-
-#ifdef HAVE_WINDOWS_H          
+#ifdef HAVE_WINDOWS_H
 #  include <windows.h>
 #endif
 
-#include GLUT_H
-
-#include <plib/ssg.h>
+#include <plib/fnt.h>
 
+#include <simgear/compiler.h>
+#include <simgear/props/props.hxx>
+#include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/math/interpolater.hxx>
-#include <simgear/misc/props.hxx>
 #include <simgear/timing/timestamp.hxx>
 
+#include <cmath>
 #include <vector>
 #include <map>
-#include <plib/fnt.h>
 
-#include <Main/fgfs.hxx>
 #include <Main/fg_props.hxx>
-
 #include <Input/input.hxx>
 
 SG_USING_STD(vector);
 SG_USING_STD(map);
 
+
+class ssgTexture;
 class FGPanelInstrument;
 
 
@@ -131,7 +129,7 @@ private:
  * redraw themselves when necessary, and will pass mouse clicks on to
  * the appropriate instruments for processing.
  */
-class FGPanel : public FGSubsystem
+class FGPanel : public SGSubsystem
 {
 public:
 
@@ -171,11 +169,11 @@ public:
 
 				// X-offset
   virtual void setXOffset (int offset);
-  virtual int getXOffset () const { return _x_offset; }
+  virtual int getXOffset () const { return _x_offset->getIntValue(); }
 
 				// Y-offset.
   virtual void setYOffset (int offset);
-  virtual int getYOffset () const { return _y_offset; }
+  virtual int getYOffset () const { return _y_offset->getIntValue(); }
 
 				// View height.
   virtual void setViewHeight (int height) { _view_height = height; }
@@ -189,7 +187,6 @@ private:
   void setupVirtualCockpit();
   void cleanupVirtualCockpit();
 
-  mutable bool _visibility;
   mutable bool _mouseDown;
   mutable int _mouseButton, _mouseX, _mouseY;
   mutable int _mouseDelay;
@@ -197,11 +194,13 @@ private:
   typedef vector<FGPanelInstrument *> instrument_list_type;
   int _width;
   int _height;
-  int _x_offset;
-  int _y_offset;
   int _view_height;
-  float _jitter;
-  bool _flipx;
+
+  SGPropertyNode * _visibility;
+  SGPropertyNode * _x_offset;
+  SGPropertyNode * _y_offset;
+  SGPropertyNode * _jitter;
+  SGPropertyNode * _flipx;
 
   const SGPropertyNode * _xsize_node;
   const SGPropertyNode * _ysize_node;
@@ -226,7 +225,7 @@ private:
  * or joystick, but they are tied to specific mouse actions in
  * rectangular areas of the panel.
  */
-class FGPanelAction : public FGConditional
+class FGPanelAction : public SGConditional
 {
 public:
   FGPanelAction ();
@@ -286,7 +285,7 @@ private:
 /**
  * A transformation for a layer.
  */
-class FGPanelTransformation : public FGConditional
+class FGPanelTransformation : public SGConditional
 {
 public:
 
@@ -303,6 +302,8 @@ public:
   const SGPropertyNode * node;
   float min;
   float max;
+  bool has_mod;
+  float mod;
   float factor;
   float offset;
   SGInterpTable * table;
@@ -323,7 +324,7 @@ public:
  * on current FGFS instrument readings: for example, a texture
  * representing a needle can rotate to show the airspeed.
  */
-class FGInstrumentLayer : public FGConditional
+class FGInstrumentLayer : public SGConditional
 {
 public:
 
@@ -365,7 +366,7 @@ protected:
  * may show up in the future (some complex instruments could be 
  * entirely hand-coded, for example).
  */
-class FGPanelInstrument : public FGConditional
+class FGPanelInstrument : public SGConditional
 {
 public:
   FGPanelInstrument ();
@@ -439,7 +440,7 @@ public:
   virtual void draw ();
 				// transfer pointer ownership
   virtual void addLayer (FGInstrumentLayer * layer);
-private:
+protected:
   vector<FGInstrumentLayer *> _layers;
 };
 
@@ -487,12 +488,13 @@ public:
     DOUBLE_VALUE
   };
 
-  class Chunk : public FGConditional
+  class Chunk : public SGConditional
   {
   public:
     Chunk (const string &text, const string &fmt = "%s");
     Chunk (ChunkType type, const SGPropertyNode * node,
-	   const string &fmt = "", float mult = 1.0);
+	   const string &fmt = "", float mult = 1.0, float offs = 0.0,
+           bool truncation = false);
 
     const char * getValue () const;
   private:
@@ -501,6 +503,8 @@ public:
     const SGPropertyNode * _node;
     string _fmt;
     float _mult;
+    float _offs;
+    bool _trunc;
     mutable char _buf[1024];
   };
 
@@ -533,25 +537,18 @@ private:
 
 
 /**
- * A layer that switches between two other layers.
+ * A group layer that switches among its children.
  *
- * The usefulness of this layer is questionable now that all layers
- * can have conditions, and it may be deprecated soon.
+ * The first layer that passes its condition will be drawn, and
+ * any following layers will be ignored.
  */
-class FGSwitchLayer : public FGInstrumentLayer
+class FGSwitchLayer : public FGGroupLayer
 {
 public:
 				// Transfer pointers!!
-  FGSwitchLayer (int w, int h, const SGPropertyNode * node,
-		 FGInstrumentLayer * layer1,
-		 FGInstrumentLayer * layer2);
-  virtual ~FGSwitchLayer ();
-
+  FGSwitchLayer ();
   virtual void draw ();
 
-private:
-  const SGPropertyNode * _node;
-  FGInstrumentLayer * _layer1, * _layer2;
 };
 
 
@@ -567,14 +564,6 @@ private:
 bool fgPanelVisible ();
 
 
-
-////////////////////////////////////////////////////////////////////////
-// The current panel, if any.
-////////////////////////////////////////////////////////////////////////
-
-extern FGPanel * current_panel;	// TODO: move to globals
-
-
 
 #endif // __PANEL_HXX