Merge commit 'refs/merge-requests/1551' of git://gitorious.org/fg/flightgear into...

[flightgear.git] / src / Instrumentation / HUD / HUD.hxx

diff --git a/src/Instrumentation/HUD/HUD.hxx b/src/Instrumentation/HUD/HUD.hxx
index ca40d1602a0662d1e5d4d5aba6fc33dfb968e7fc..6776495f26478547ca855dc592494a6d93578a01 100644 (file)
--- a/src/Instrumentation/HUD/HUD.hxx
+++ b/src/Instrumentation/HUD/HUD.hxx
@@ -38,8 +38,6 @@ using std::vector;
 
 #include <osg/State>
 
-#include <plib/sg.h>
-
 #include <simgear/math/SGLimits.hxx>
 #include <simgear/constants.h>
 #include <simgear/structure/subsystem_mgr.hxx>
@@ -58,6 +56,7 @@ class ClipBox {
 public:
     ClipBox(const SGPropertyNode *, float xoffset = 0, float yoffset = 0);
     void set();
+    void unset();
 
 private:
     bool _active;
@@ -214,6 +213,7 @@ private:
     deque<Item *> _items;
     deque<Item *> _ladders;
 
+    SGPropertyNode_ptr _path;
     SGPropertyNode_ptr _current;
     SGPropertyNode_ptr _visibility;
     SGPropertyNode_ptr _3DenabledN;
@@ -239,6 +239,7 @@ private:
     fntTexFont *_font;
     float _font_size;
     int _style;
+    bool _listener_active;
 
     ClipBox *_clip_box;
     TextList _text_list;
@@ -356,6 +357,7 @@ protected:
     void draw_stipple_line(float x1, float y1, float x2, float y2);
     void draw_text(float x, float y, const char *msg, int align = 0, int digit = 0);
     void draw_circle(float x1, float y1, float r) const;
+    void draw_arc(float x1, float y1, float t0, float t1, float r) const;
     void draw_bullet(float, float, float);
 
     HUD         *_hud;
@@ -456,6 +458,7 @@ private:
     bool   _draw_cap_right;
     bool   _draw_cap_left;
     float  _marker_offset;
+    float  _label_offset;
     float  _label_gap;
     bool   _pointer;
     Format _label_fmt;
@@ -576,7 +579,7 @@ private:
     bool boundOutsidePoints(sgdVec3& v, sgdVec3& m);
     bool drawLine(const sgdVec3& a1, const sgdVec3& a2, const sgdVec3& p1, const sgdVec3& p2);
     void drawArrow();
-    bool get_active_runway(FGRunway& rwy);
+    FGRunway* get_active_runway();
     void get_rwy_points(sgdVec3 *points);
     void setLineWidth();
 
@@ -591,7 +594,7 @@ private:
     double _default_pitch;
     double _default_heading;
     GLint  _view[4];
-    FGRunway _runway;
+    FGRunway* _runway;
     FGViewer* _cockpit_view;
     unsigned short _stipple_out;    // stipple pattern of the outline of the runway
     unsigned short _stipple_center; // stipple pattern of the center line of the runway
@@ -608,9 +611,25 @@ public:
 
 private:
     SGSharedPtr<SGCondition> _active_condition;  // stadiametric (true) or standby (false)
+    SGSharedPtr<SGCondition> _tachy_condition;  // tachymetric (true) or standby (false)
+    SGSharedPtr<SGCondition> _align_condition;  // tachymetric (true) or standby (false)
+
     Input   _diameter;               // inner/outer radius relation
+    Input  _pitch;
+    Input  _yaw;
+    Input  _speed;
+    Input  _range;
+    Input  _t0;
+    Input  _t1;
+    Input  _offset_x;
+    Input  _offset_y;
+
     float   _bullet_size;
     float   _inner_radius;
+    float   _compression;
+    float  _limit_x;
+    float  _limit_y;
+
 };