X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCockpit%2Fpanel.hxx;h=b99889ce1628f26788f8ffb033bc1a3480998e4b;hb=897f295988b446d50b099a51d81df20df88a3a60;hp=25c0037ac5ad87574da1558b634589a99b8d585c;hpb=f6fac40a11bf6c9de69ec51a9cf9229ec25ae20d;p=flightgear.git

diff --git a/src/Cockpit/panel.hxx b/src/Cockpit/panel.hxx
index 25c0037ac..b99889ce1 100644
--- a/src/Cockpit/panel.hxx
+++ b/src/Cockpit/panel.hxx
@@ -30,36 +30,43 @@
 #  include <config.h>
 #endif
 
-#include <simgear/compiler.h>
-
-#ifdef HAVE_WINDOWS_H          
+#ifdef HAVE_WINDOWS_H
 #  include <windows.h>
 #endif
 
-#include <GL/glut.h>
 #include <plib/ssg.h>
+#include <plib/fnt.h>
 
-#include <simgear/misc/props.hxx>
+#include <simgear/compiler.h>
+#include <simgear/props/props.hxx>
+#include <simgear/structure/subsystem_mgr.hxx>
+#include <simgear/math/interpolater.hxx>
+#include <simgear/timing/timestamp.hxx>
 
+#include <cmath>
 #include <vector>
 #include <map>
-#include <plib/fnt.h>
 
-#include <Time/timestamp.hxx>
+#include <Main/fg_props.hxx>
+#include <Input/input.hxx>
 
-FG_USING_STD(vector);
-FG_USING_STD(map);
+SG_USING_STD(vector);
+SG_USING_STD(map);
 
 class FGPanelInstrument;
 
 
 
 ////////////////////////////////////////////////////////////////////////
-// Texture manager (should migrate out into FGFS).
-//
-// This class ensures that no texture is loaded more than once.
+// Texture management.
 ////////////////////////////////////////////////////////////////////////
 
+
+/**
+ * Texture manager (should migrate out into FGFS).
+ *
+ * This class ensures that no texture is loaded more than once.
+ */
 class FGTextureManager
 {
 public:
@@ -69,13 +76,11 @@ private:
 };
 
 
-
-////////////////////////////////////////////////////////////////////////
-// Cropped texture (should migrate out into FGFS).
-//
-// This structure wraps an SSG texture with cropping information.
-////////////////////////////////////////////////////////////////////////
-
+/**
+ * Cropped texture (should migrate out into FGFS).
+ *
+ * This structure wraps an SSG texture with cropping information.
+ */
 class FGCroppedTexture
 {
 public:
@@ -111,30 +116,44 @@ private:
 
 
 ////////////////////////////////////////////////////////////////////////
-// Instrument panel class.
-//
-// The panel is a container that has a background texture and holds
-// zero or more instruments.  The panel will order the instruments to
-// redraw themselves when necessary, and will pass mouse clicks on to
-// the appropriate instruments for processing.
+// Top-level panel.
 ////////////////////////////////////////////////////////////////////////
 
-class FGPanel
+
+/**
+ * Instrument panel class.
+ *
+ * The panel is a container that has a background texture and holds
+ * zero or more instruments.  The panel will order the instruments to
+ * redraw themselves when necessary, and will pass mouse clicks on to
+ * the appropriate instruments for processing.
+ */
+class FGPanel : public SGSubsystem
 {
 public:
 
-  FGPanel (int window_x, int window_y, int window_w, int window_h);
+  FGPanel ();
   virtual ~FGPanel ();
 
+				// Update the panel (every frame).
+  virtual void init ();
+  virtual void bind ();
+  virtual void unbind ();
+  virtual void draw ();
+  virtual void update (double dt);
+  virtual void update (GLfloat winx, GLfloat winw, GLfloat winy, GLfloat winh);
+
+  virtual void updateMouseDelay();
+
 				// transfer pointer ownership!!!
   virtual void addInstrument (FGPanelInstrument * instrument);
 
-				// Update the panel (every frame).
-  virtual void update () const;
-
 				// Background texture.
   virtual void setBackground (ssgTexture * texture);
 
+				// Background multiple textures.
+  virtual void setMultiBackground (ssgTexture * texture, int idx);
+
 				// Make the panel visible or invisible.
   virtual bool getVisibility () const;
   virtual void setVisibility (bool visibility);
@@ -149,11 +168,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; }
@@ -161,22 +180,32 @@ public:
 
 				// Handle a mouse click.
   virtual bool doMouseAction (int button, int updown, int x, int y);
+  virtual bool doLocalMouseAction(int button, int updown, int x, int y);
 
 private:
-  mutable bool _visibility;
+  void setupVirtualCockpit();
+  void cleanupVirtualCockpit();
+
   mutable bool _mouseDown;
   mutable int _mouseButton, _mouseX, _mouseY;
   mutable int _mouseDelay;
   mutable FGPanelInstrument * _mouseInstrument;
   typedef vector<FGPanelInstrument *> instrument_list_type;
-  int _winx, _winy, _winw, _winh;
   int _width;
   int _height;
-  int _x_offset;
-  int _y_offset;
   int _view_height;
+
+  SGPropertyNode * _visibility;
+  SGPropertyNode * _x_offset;
+  SGPropertyNode * _y_offset;
+  SGPropertyNode * _jitter;
+  SGPropertyNode * _flipx;
+
+  const SGPropertyNode * _xsize_node;
+  const SGPropertyNode * _ysize_node;
   
   ssgTexture * _bg;
+  ssgTexture * _mbg[8];
 				// List of instruments in panel.
   instrument_list_type _instruments;
 };
@@ -184,18 +213,22 @@ private:
 
 
 ////////////////////////////////////////////////////////////////////////
-// Base class for user action types.
-//
-// Individual instruments can have actions associated with a mouse
-// click in a rectangular area.  Current concrete classes include
-// FGAdjustAction, FGSwapAction, and FGToggleAction.
+// Actions
 ////////////////////////////////////////////////////////////////////////
 
-class FGPanelAction
+
+/**
+ * Class for user actions.
+ *
+ * The actions are command bindings, like bindings for the keyboard
+ * or joystick, but they are tied to specific mouse actions in
+ * rectangular areas of the panel.
+ */
+class FGPanelAction : public SGConditional
 {
 public:
   FGPanelAction ();
-  FGPanelAction (int button, int x, int y, int w, int h);
+  FGPanelAction (int button, int x, int y, int w, int h, bool repeatable);
   virtual ~FGPanelAction ();
 
 				// Getters.
@@ -206,6 +239,9 @@ public:
   virtual int getHeight () const { return _h; }
 
 				// Setters.
+
+				// transfer pointer ownership
+  virtual void addBinding (FGBinding * binding, int updown);
   virtual void setButton (int button) { _button = button; }
   virtual void setX (int x) { _x = x; }
   virtual void setY (int y) { _y = y; }
@@ -223,144 +259,33 @@ public:
   }
 
 				// Perform the action.
-  virtual void doAction () = 0;
+  virtual bool doAction (int updown);
 
 private:
+  typedef vector<FGBinding *> binding_list_t;
+
   int _button;
   int _x;
   int _y;
   int _w;
   int _h;
+  bool _repeatable;
+  int _last_state;
+  binding_list_t _bindings[2];
 };
 
 
 
 ////////////////////////////////////////////////////////////////////////
-// Adjustment action.
-//
-// This is an action to increase or decrease an FGFS value by a certain
-// increment within a certain range.  If the wrap flag is true, the
-// value will wrap around if it goes below min or above max; otherwise,
-// it will simply stop at min or max.
-////////////////////////////////////////////////////////////////////////
-
-class FGAdjustAction : public FGPanelAction
-{
-public:
-  FGAdjustAction (int button, int x, int y, int w, int h,
-		  SGValue * value, float increment,
-		  float min, float max, bool wrap=false);
-  virtual ~FGAdjustAction ();
-  virtual void doAction ();
-
-private:
-  SGValue * _value;
-  float _increment;
-  float _min;
-  float _max;
-  bool _wrap;
-};
-
-
-
-////////////////////////////////////////////////////////////////////////
-// Swap action.
-//
-// This is an action to swap two values.  It's currently used in the
-// navigation radios.
-////////////////////////////////////////////////////////////////////////
-
-class FGSwapAction : public FGPanelAction
-{
-public:
-  FGSwapAction (int button, int x, int y, int w, int h,
-		SGValue * value1, SGValue * value2);
-  virtual ~FGSwapAction ();
-  virtual void doAction ();
-
-private:
-  SGValue * _value1;
-  SGValue * _value2;
-};
-
-
-
-////////////////////////////////////////////////////////////////////////
-// Toggle action.
-//
-// This is an action to toggle a boolean value.
-////////////////////////////////////////////////////////////////////////
-
-class FGToggleAction : public FGPanelAction
-{
-public:
-  FGToggleAction (int button, int x, int y, int w, int h,
-		  SGValue * value);
-  virtual ~FGToggleAction ();
-  virtual void doAction ();
-
-private:
-  SGValue * _value;
-};
-
-
-
-////////////////////////////////////////////////////////////////////////
-// Abstract base class for a panel instrument.
-//
-// A panel instrument consists of zero or more actions, associated
-// with mouse clicks in rectangular areas.  Currently, the only
-// concrete class derived from this is FGLayeredInstrument, but others
-// may show up in the future (some complex instruments could be 
-// entirely hand-coded, for example).
-////////////////////////////////////////////////////////////////////////
-
-class FGPanelInstrument
-{
-public:
-  FGPanelInstrument ();
-  FGPanelInstrument (int x, int y, int w, int h);
-  virtual ~FGPanelInstrument ();
-
-  virtual void draw () = 0;
-
-  virtual void setPosition(int x, int y);
-  virtual void setSize(int w, int h);
-
-  virtual int getXPos () const;
-  virtual int getYPos () const;
-  virtual int getWidth () const;
-  virtual int getHeight () const;
-
-				// Coordinates relative to centre.
-				// Transfer pointer ownership!!
-  virtual void addAction (FGPanelAction * action);
-
-				// Coordinates relative to centre.
-  virtual bool doMouseAction (int button, int x, int y);
-
-protected:
-  int _x, _y, _w, _h;
-  typedef vector<FGPanelAction *> action_list_type;
-  action_list_type _actions;
-};
-
-
-
-////////////////////////////////////////////////////////////////////////
-// Abstract base class for an instrument layer.
-//
-// The FGLayeredInstrument class builds up instruments by using layers
-// of textures or text.  Each layer can have zero or more
-// transformations applied to it: for example, a needle layer can
-// rotate to show the altitude or airspeed.
+// Transformations.
 ////////////////////////////////////////////////////////////////////////
 
 
 /**
  * A transformation for a layer.
  */
-class FGPanelTransformation {
+class FGPanelTransformation : public SGConditional
+{
 public:
 
   enum Type {
@@ -373,15 +298,24 @@ public:
   virtual ~FGPanelTransformation ();
 
   Type type;
-  const SGValue * value;
+  const SGPropertyNode * node;
   float min;
   float max;
+  bool has_mod;
+  float mod;
   float factor;
   float offset;
+  SGInterpTable * table;
 };
 
 
 
+
+////////////////////////////////////////////////////////////////////////
+// Layers
+////////////////////////////////////////////////////////////////////////
+
+
 /**
  * A single layer of a multi-layered instrument.
  *
@@ -389,7 +323,7 @@ public:
  * on current FGFS instrument readings: for example, a texture
  * representing a needle can rotate to show the airspeed.
  */
-class FGInstrumentLayer
+class FGInstrumentLayer : public SGConditional
 {
 public:
 
@@ -418,16 +352,51 @@ protected:
 
 
 ////////////////////////////////////////////////////////////////////////
-// An instrument composed of layers.
-//
-// This class represents an instrument which is simply a series of
-// layers piled one on top of the other, each one undergoing its own
-// set of transformations.  For example, one layer can represent
-// the instrument's face (which doesn't move), while the next layer
-// can represent a needle that rotates depending on an FGFS variable.
+// Instruments.
 ////////////////////////////////////////////////////////////////////////
 
 
+/**
+ * Abstract base class for a panel instrument.
+ *
+ * A panel instrument consists of zero or more actions, associated
+ * with mouse clicks in rectangular areas.  Currently, the only
+ * concrete class derived from this is FGLayeredInstrument, but others
+ * may show up in the future (some complex instruments could be 
+ * entirely hand-coded, for example).
+ */
+class FGPanelInstrument : public SGConditional
+{
+public:
+  FGPanelInstrument ();
+  FGPanelInstrument (int x, int y, int w, int h);
+  virtual ~FGPanelInstrument ();
+
+  virtual void draw () = 0;
+  virtual void drawHotspots();
+
+  virtual void setPosition(int x, int y);
+  virtual void setSize(int w, int h);
+
+  virtual int getXPos () const;
+  virtual int getYPos () const;
+  virtual int getWidth () const;
+  virtual int getHeight () const;
+
+				// Coordinates relative to centre.
+				// Transfer pointer ownership!!
+  virtual void addAction (FGPanelAction * action);
+
+				// Coordinates relative to centre.
+  virtual bool doMouseAction (int button, int updown, int x, int y);
+
+protected:
+  int _x, _y, _w, _h;
+  typedef vector<FGPanelAction *> action_list_type;
+  action_list_type _actions;
+};
+
+
 /**
  * An instrument constructed of multiple layers.
  *
@@ -455,15 +424,33 @@ protected:
 };
 
 
-
-////////////////////////////////////////////////////////////////////////
-// A textured layer of an instrument.
-//
-// This is a layer holding a single texture.  Normally, the texture's
-// backgound should be transparent so that lower layers and the panel
-// background can show through.
-////////////////////////////////////////////////////////////////////////
+/**
+ * An instrument layer containing a group of sublayers.
+ *
+ * This class is useful for gathering together a group of related
+ * layers, either to hold in an external file or to work under
+ * the same condition.
+ */
+class FGGroupLayer : public FGInstrumentLayer
+{
+public:
+  FGGroupLayer ();
+  virtual ~FGGroupLayer ();
+  virtual void draw ();
+				// transfer pointer ownership
+  virtual void addLayer (FGInstrumentLayer * layer);
+protected:
+  vector<FGInstrumentLayer *> _layers;
+};
+
 
+/**
+ * A textured layer of an instrument.
+ *
+ * This is a layer holding a single texture.  Normally, the texture's
+ * backgound should be transparent so that lower layers and the panel
+ * background can show through.
+ */
 class FGTexturedLayer : public FGInstrumentLayer
 {
 public:
@@ -484,37 +471,39 @@ private:
 };
 
 
-
-////////////////////////////////////////////////////////////////////////
-// A text layer of an instrument.
-//
-// This is a layer holding a string of static and/or generated text.
-// It is useful for instruments that have text displays, such as
-// a chronometer, GPS, or NavCom radio.
-////////////////////////////////////////////////////////////////////////
-
+/**
+ * A text layer of an instrument.
+ *
+ * This is a layer holding a string of static and/or generated text.
+ * It is useful for instruments that have text displays, such as
+ * a chronometer, GPS, or NavCom radio.
+ */
 class FGTextLayer : public FGInstrumentLayer
 {
 public:
-  typedef enum ChunkType {
+  enum ChunkType {
     TEXT,
     TEXT_VALUE,
     DOUBLE_VALUE
   };
 
-  class Chunk {
+  class Chunk : public SGConditional
+  {
   public:
     Chunk (const string &text, const string &fmt = "%s");
-    Chunk (ChunkType type, const SGValue * value,
-	   const string &fmt = "", float mult = 1.0);
+    Chunk (ChunkType type, const SGPropertyNode * node,
+	   const string &fmt = "", float mult = 1.0, float offs = 0.0,
+           bool truncation = false);
 
     const char * getValue () const;
   private:
     ChunkType _type;
     string _text;
-    const SGValue * _value;
+    const SGPropertyNode * _node;
     string _fmt;
     float _mult;
+    float _offs;
+    bool _trunc;
     mutable char _buf[1024];
   };
 
@@ -527,6 +516,7 @@ public:
   virtual void addChunk (Chunk * chunk);
   virtual void setColor (float r, float g, float b);
   virtual void setPointSize (float size);
+  virtual void setFontName ( const string &name );
   virtual void setFont (fntFont * font);
 
 private:
@@ -538,41 +528,39 @@ private:
   float _color[4];
 
   float _pointSize;
-
+  mutable string _font_name;
   mutable string _value;
-  mutable FGTimeStamp _then;
-  mutable FGTimeStamp _now;
+  mutable SGTimeStamp _then;
+  mutable SGTimeStamp _now;
 };
 
 
-
-////////////////////////////////////////////////////////////////////////
-// A layer that switches between two other layers.
-////////////////////////////////////////////////////////////////////////
-
-class FGSwitchLayer : public FGInstrumentLayer
+/**
+ * A group layer that switches among its children.
+ *
+ * The first layer that passes its condition will be drawn, and
+ * any following layers will be ignored.
+ */
+class FGSwitchLayer : public FGGroupLayer
 {
 public:
 				// Transfer pointers!!
-  FGSwitchLayer (int w, int h, const SGValue * value,
-		 FGInstrumentLayer * layer1,
-		 FGInstrumentLayer * layer2);
-  virtual ~FGSwitchLayer ();
-
+  FGSwitchLayer ();
   virtual void draw ();
 
-private:
-  const SGValue * _value;
-  FGInstrumentLayer * _layer1, * _layer2;
 };
 
 
+
 
 ////////////////////////////////////////////////////////////////////////
-// The current panel, if any.
+// Functions.
 ////////////////////////////////////////////////////////////////////////
 
-extern FGPanel * current_panel;
+/**
+ * Test whether the panel should be visible.
+ */
+bool fgPanelVisible ();
 
 
 
@@ -581,3 +569,4 @@ extern FGPanel * current_panel;
 // end of panel.hxx
 
 
+