Moved "scenery" from being declaried in scenery.cxx to being declared

[flightgear.git] / src / Cockpit / panel.hxx

diff --git a/src/Cockpit/panel.hxx b/src/Cockpit/panel.hxx
index d58ccf3339bf5a7a849b32f3afdab7c15e1ad859..c17b897357dc0ba5c1d97d8f4be0e9c03b96ca1a 100644 (file)
--- a/src/Cockpit/panel.hxx
+++ b/src/Cockpit/panel.hxx
@@ -141,7 +141,7 @@ public:
   virtual void init ();
   virtual void bind ();
   virtual void unbind ();
-  virtual void update (int dt);
+  virtual void update (double dt);
   virtual void update (GLfloat winx, GLfloat winw, GLfloat winy, GLfloat winh);
 
                                // transfer pointer ownership!!!
@@ -150,6 +150,9 @@ public:
                                // 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);
@@ -178,6 +181,9 @@ public:
   virtual bool doMouseAction (int button, int updown, int x, int y);
 
 private:
+  void setupVirtualCockpit();
+  void cleanupVirtualCockpit();
+
   mutable bool _visibility;
   mutable bool _mouseDown;
   mutable int _mouseButton, _mouseX, _mouseY;
@@ -189,13 +195,13 @@ private:
   int _x_offset;
   int _y_offset;
   int _view_height;
-  bool _bound;
   float _jitter;
 
   const SGPropertyNode * _xsize_node;
   const SGPropertyNode * _ysize_node;
   
   ssgTexture * _bg;
+  ssgTexture * _mbg[8];
                                // List of instruments in panel.
   instrument_list_type _instruments;
 };
@@ -466,7 +472,7 @@ private:
 class FGTextLayer : public FGInstrumentLayer
 {
 public:
-  typedef enum ChunkType {
+  enum ChunkType {
     TEXT,
     TEXT_VALUE,
     DOUBLE_VALUE
@@ -498,6 +504,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:
@@ -509,7 +516,7 @@ private:
   float _color[4];
 
   float _pointSize;
-
+  mutable string _font_name;
   mutable string _value;
   mutable SGTimeStamp _then;
   mutable SGTimeStamp _now;
@@ -565,3 +572,4 @@ extern FGPanel * current_panel;     // TODO: move to globals
 // end of panel.hxx
 
 
+