Redo the runway database scheme to use a flat/ascii file and load the entire

[flightgear.git] / src / Main / viewer.hxx

diff --git a/src/Main/viewer.hxx b/src/Main/viewer.hxx
index 291f4a4913ace6bb19dbb4764d5579caf5002061..1aa49a366ec94a3be358b4c99ad93373dcbf42f2 100644 (file)
--- a/src/Main/viewer.hxx
+++ b/src/Main/viewer.hxx
@@ -63,6 +63,7 @@ public:
     // Constructor
     FGViewer( fgViewType Type, bool from_model, int from_model_index,
               bool at_model, int at_model_index,
+              double damp_roll, double damp_pitch, double damp_heading,
               double x_offset_m, double y_offset_m, double z_offset_m,
               double heading_offset_deg, double pitch_offset_deg,
               double roll_offset_deg, double fov_deg,
@@ -255,7 +256,7 @@ public:
     inline void set_clean() { _dirty = false; }
     
     // return eye location...
-    virtual FGLocation * getFGLocation () const { return _location; }
+    virtual SGLocation * getSGLocation () const { return _location; }
 
 
 private:
@@ -285,6 +286,15 @@ private:
     double _target_pitch_deg;
     double _target_heading_deg;
 
+    double _damp_sync;
+    double _damp_roll;
+    double _damp_pitch;
+    double _damp_heading;
+
+    double _damped_roll_deg;
+    double _damped_pitch_deg;
+    double _damped_heading_deg;
+
     // Position offsets from FDM origin.  The X axis is positive
     // out the tail, Y is out the right wing, and Z is positive up.
     // distance in meters
@@ -322,8 +332,8 @@ private:
     bool _at_model;
     int _at_model_index;  // number of model (for multi model)
 
-    FGLocation * _location;
-    FGLocation * _target_location;
+    SGLocation * _location;
+    SGLocation * _target_location;
 
     // the nominal field of view (angle, in degrees)
     double _fov_deg; 
@@ -372,10 +382,11 @@ private:
     void recalcLookFrom();
     void recalcLookAt();
     void copyLocationData();
-    void updateFromModelLocation (FGLocation * location);
-    void updateAtModelLocation (FGLocation * location);
-    void recalcOurOwnLocation (FGLocation * location, double lon_deg, double lat_deg, double alt_ft,
+    void updateFromModelLocation (SGLocation * location);
+    void updateAtModelLocation (SGLocation * location);
+    void recalcOurOwnLocation (SGLocation * location, double lon_deg, double lat_deg, double alt_ft,
                  double roll_deg, double pitch_deg, double heading_deg);
+    void dampEyeData (double &roll_deg, double &pitch_deg, double &heading_deg);
 
     // add to _heading_offset_deg
     inline void incHeadingOffset_deg( double amt ) {