X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCockpit%2Fpanel.hxx;h=ab4f5264fabee673544d1a7ba01370b312607c45;hb=d83715903abc3cf24187eac059e497da55bda501;hp=6be0dbfd792eff54c941420c3a3a76e18845f153;hpb=471fecd72c1a7c3f1bf3a6fc08ee0a4250e55a20;p=flightgear.git

diff --git a/src/Cockpit/panel.hxx b/src/Cockpit/panel.hxx
index 6be0dbfd7..ab4f5264f 100644
--- a/src/Cockpit/panel.hxx
+++ b/src/Cockpit/panel.hxx
@@ -21,24 +21,14 @@
 #ifndef __PANEL_HXX
 #define __PANEL_HXX
 
-#ifndef __cplusplus
-# error This library requires C++
-#endif
-
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
-#include <plib/fnt.h>
+#include <osg/ref_ptr>
+#include <osg/StateSet>
+#include <osg/Texture2D>
 
 #include <simgear/compiler.h>
 #include <simgear/props/props.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
+#include <simgear/structure/SGBinding.hxx>
 #include <simgear/math/interpolater.hxx>
 #include <simgear/timing/timestamp.hxx>
 
@@ -47,18 +37,11 @@
 #include <map>
 
 #include <Main/fg_props.hxx>
-#include <Input/input.hxx>
-#include <Instrumentation/dclgps.hxx>
-
-SG_USING_STD(vector);
-SG_USING_STD(map);
 
-
-class ssgTexture;
 class FGPanelInstrument;
+class fntFont;
+class DCLGPS;
 
-
-
 ////////////////////////////////////////////////////////////////////////
 // Texture management.
 ////////////////////////////////////////////////////////////////////////
@@ -72,9 +55,11 @@ class FGPanelInstrument;
 class FGTextureManager
 {
 public:
-  static ssgTexture * createTexture(const string &relativePath);
+  static osg::Texture2D* createTexture(const std::string &relativePath,
+                                       bool staticTexture = true);
+  static void addTexture(const std::string &relativePath, osg::Texture2D* texture);
 private:
-  static map<string,ssgTexture *> _textureMap;
+  static std::map<std::string,osg::ref_ptr<osg::Texture2D> > _textureMap;
 };
 
 
@@ -88,16 +73,16 @@ class FGCroppedTexture
 public:
 
   FGCroppedTexture ();
-  FGCroppedTexture (const string &path,
+  FGCroppedTexture (const std::string &path,
 		  float _minX = 0.0, float _minY = 0.0,
 		  float _maxX = 1.0, float _maxY = 1.0);
   virtual ~FGCroppedTexture ();
 
-  virtual void setPath (const string &path) { _path = path; }
+  virtual void setPath (const std::string &path) { _path = path; }
 
-  virtual const string &getPath () const { return _path; }
+  virtual const std::string &getPath () const { return _path; }
 
-  virtual ssgTexture * getTexture ();
+  virtual osg::StateSet* getTexture ();
 
   virtual void setCrop (float minX, float minY, float maxX, float maxY) {
     _minX = minX; _minY = minY; _maxX = maxX; _maxY = maxY;
@@ -110,8 +95,8 @@ public:
 
 
 private:
-  string _path;
-  ssgTexture * _texture;
+  std::string _path;
+  osg::ref_ptr<osg::StateSet> _texture;
   float _minX, _minY, _maxX, _maxY;
 };
 
@@ -141,9 +126,10 @@ public:
   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 draw (osg::State& state);
+  virtual void update (double);
+  void update (osg::State& state);
+  virtual void update (osg::State& state, GLfloat winx, GLfloat winw, GLfloat winy, GLfloat winh);
 
   virtual void updateMouseDelay();
 
@@ -151,10 +137,10 @@ public:
   virtual void addInstrument (FGPanelInstrument * instrument);
 
 				// Background texture.
-  virtual void setBackground (ssgTexture * texture);
+  virtual void setBackground (osg::Texture2D* texture);
 
 				// Background multiple textures.
-  virtual void setMultiBackground (ssgTexture * texture, int idx);
+  virtual void setMultiBackground (osg::Texture2D* texture, int idx);
 
 				// Make the panel visible or invisible.
   virtual bool getVisibility () const;
@@ -186,6 +172,9 @@ public:
 
   virtual void setDepthTest (bool enable);
 
+  bool getAutohide(void) const { return _autohide; };
+  void setAutohide(bool enable) { _autohide = enable; };
+
 private:
   void setupVirtualCockpit();
   void cleanupVirtualCockpit();
@@ -194,7 +183,7 @@ private:
   mutable int _mouseButton, _mouseX, _mouseY;
   mutable int _mouseDelay;
   mutable FGPanelInstrument * _mouseInstrument;
-  typedef vector<FGPanelInstrument *> instrument_list_type;
+  typedef std::vector<FGPanelInstrument *> instrument_list_type;
   int _width;
   int _height;
   int _view_height;
@@ -208,11 +197,12 @@ private:
   SGConstPropertyNode_ptr _xsize_node;
   SGConstPropertyNode_ptr _ysize_node;
   
-  ssgTexture * _bg;
-  ssgTexture * _mbg[8];
+  osg::ref_ptr<osg::StateSet> _bg;
+  osg::ref_ptr<osg::StateSet> _mbg[8];
 				// List of instruments in panel.
   instrument_list_type _instruments;
   bool _enable_depth_test;
+  bool _autohide;
 };
 
 
@@ -246,7 +236,7 @@ public:
 				// Setters.
 
 				// transfer pointer ownership
-  virtual void addBinding (FGBinding * binding, int updown);
+  virtual void addBinding (SGBinding * binding, int updown);
   virtual void setButton (int button) { _button = button; }
   virtual void setX (int x) { _x = x; }
   virtual void setY (int y) { _y = y; }
@@ -267,7 +257,7 @@ public:
   virtual bool doAction (int updown);
 
 private:
-  typedef vector<FGBinding *> binding_list_t;
+  typedef std::vector<SGBinding *> binding_list_t;
 
   int _button;
   int _x;
@@ -335,7 +325,7 @@ public:
   FGInstrumentLayer (int w = -1, int h = -1);
   virtual ~FGInstrumentLayer ();
 
-  virtual void draw () = 0;
+  virtual void draw (osg::State& state) = 0;
   virtual void transform () const;
 
   virtual int getWidth () const { return _w; }
@@ -350,7 +340,7 @@ public:
 protected:
   int _w, _h;
 
-  typedef vector<FGPanelTransformation *> transformation_list;
+  typedef std::vector<FGPanelTransformation *> transformation_list;
   transformation_list _transformations;
 };
 
@@ -377,8 +367,8 @@ public:
   FGPanelInstrument (int x, int y, int w, int h);
   virtual ~FGPanelInstrument ();
 
-  virtual void draw () = 0;
-  virtual void drawHotspots();
+  virtual void draw (osg::State& state) = 0;
+  virtual void drawHotspots(osg::State& state);
 
   virtual void setPosition(int x, int y);
   virtual void setSize(int w, int h);
@@ -397,7 +387,7 @@ public:
 
 protected:
   int _x, _y, _w, _h;
-  typedef vector<FGPanelAction *> action_list_type;
+  typedef std::vector<FGPanelAction *> action_list_type;
   action_list_type _actions;
 };
 
@@ -414,7 +404,7 @@ public:
   FGLayeredInstrument (int x, int y, int w, int h);
   virtual ~FGLayeredInstrument ();
 
-  virtual void draw ();
+  virtual void draw (osg::State& state);
 
 				// Transfer pointer ownership!!
   virtual int addLayer (FGInstrumentLayer *layer);
@@ -424,7 +414,7 @@ public:
   virtual void addTransformation (FGPanelTransformation * transformation);
 
 protected:
-  typedef vector<FGInstrumentLayer *> layer_list;
+  typedef std::vector<FGInstrumentLayer *> layer_list;
   layer_list _layers;
 };
 
@@ -444,7 +434,7 @@ public:
   //FGSpecialInstrument (int x, int y, int w, int h);
   virtual ~FGSpecialInstrument ();
 
-  virtual void draw ();
+  virtual void draw (osg::State& state);
   
 protected:
   DCLGPS* complex;
@@ -463,11 +453,11 @@ class FGGroupLayer : public FGInstrumentLayer
 public:
   FGGroupLayer ();
   virtual ~FGGroupLayer ();
-  virtual void draw ();
+  virtual void draw (osg::State& state);
 				// transfer pointer ownership
   virtual void addLayer (FGInstrumentLayer * layer);
 protected:
-  vector<FGInstrumentLayer *> _layers;
+  std::vector<FGInstrumentLayer *> _layers;
 };
 
 
@@ -485,7 +475,7 @@ public:
   FGTexturedLayer (const FGCroppedTexture &texture, int w = -1, int h = -1);
   virtual ~FGTexturedLayer ();
 
-  virtual void draw ();
+  virtual void draw (osg::State& state);
 
   virtual void setTexture (const FGCroppedTexture &texture) {
     _texture = texture;
@@ -520,17 +510,17 @@ public:
   class Chunk : public SGConditional
   {
   public:
-    Chunk (const string &text, const string &fmt = "%s");
+    Chunk (const std::string &text, const std::string &fmt = "%s");
     Chunk (ChunkType type, const SGPropertyNode * node,
-	   const string &fmt = "", float mult = 1.0, float offs = 0.0,
+	   const std::string &fmt = "", float mult = 1.0, float offs = 0.0,
            bool truncation = false);
 
     const char * getValue () const;
   private:
     ChunkType _type;
-    string _text;
+    std::string _text;
     SGConstPropertyNode_ptr _node;
-    string _fmt;
+    std::string _fmt;
     float _mult;
     float _offs;
     bool _trunc;
@@ -540,26 +530,26 @@ public:
   FGTextLayer (int w = -1, int h = -1);
   virtual ~FGTextLayer ();
 
-  virtual void draw ();
+  virtual void draw (osg::State& state);
 
 				// Transfer pointer!!
   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 setFontName ( const std::string &name );
   virtual void setFont (fntFont * font);
 
 private:
 
   void recalc_value () const;
 
-  typedef vector<Chunk *> chunk_list;
+  typedef std::vector<Chunk *> chunk_list;
   chunk_list _chunks;
   float _color[4];
 
   float _pointSize;
-  mutable string _font_name;
-  mutable string _value;
+  mutable std::string _font_name;
+  mutable std::string _value;
   mutable SGTimeStamp _then;
   mutable SGTimeStamp _now;
 };
@@ -576,7 +566,7 @@ class FGSwitchLayer : public FGGroupLayer
 public:
 				// Transfer pointers!!
   FGSwitchLayer ();
-  virtual void draw ();
+  virtual void draw (osg::State& state);
 
 };