Added static port system and a new altimeter model connected to it.

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

diff --git a/src/Main/viewer.hxx b/src/Main/viewer.hxx
index bb0eae4ef96c788984ddf6034a450617084a2f13..c9ea6bc3fcf11dff3f854b14a8e0137e3ba95b86 100644 (file)
--- a/src/Main/viewer.hxx
+++ b/src/Main/viewer.hxx
@@ -46,7 +46,7 @@
 
 enum fgViewType {
  FG_LOOKFROM = 0,
- FG_LOOKAT = 1,
+ FG_LOOKAT = 1
 };
 
 // Define a structure containing view information
@@ -56,7 +56,7 @@ public:
 
     enum fgScalingType {  // nominal Field Of View actually applies to ...
        FG_SCALING_WIDTH,       // window width
-       FG_SCALING_MAX,         // max(width, height)
+       FG_SCALING_MAX          // max(width, height)
        // FG_SCALING_G_MEAN,      // geometric_mean(width, height)
        // FG_SCALING_INDEPENDENT  // whole screen
     };
@@ -244,6 +244,9 @@ public:
 
     inline void set_dirty() { _dirty = true; }
     inline void set_clean() { _dirty = false; }
+    
+    // return eye location...
+    virtual FGLocation * getFGLocation () const { return _location; }
 
 
 private:
@@ -349,9 +352,11 @@ private:
     //////////////////////////////////////////////////////////////////
 
     void recalc ();
-    void recalcPositionVectors (double lon_deg, double lat_deg, double alt_ft) const;
+    void recalcLookFrom();
+    void recalcLookAt();
+    void copyLocationData();
     void updateFromModelLocation (FGLocation * location);
-    void recalcOurOwnLocation (double lon_deg, double lat_deg, double alt_ft,
+    void recalcOurOwnLocation (FGLocation * location, double lon_deg, double lat_deg, double alt_ft,
                  double roll_deg, double pitch_deg, double heading_deg);
 
     // add to _heading_offset_deg