Fix line endings

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

diff --git a/src/Main/viewer.hxx b/src/Main/viewer.hxx
index 26e581387282d053dad9094aa1cd4cfc70d4959b..5039e9a5c750a206c4353ff635ec547f52d6655a 100644 (file)
--- a/src/Main/viewer.hxx
+++ b/src/Main/viewer.hxx
@@ -5,7 +5,7 @@
 //   partially rewritten by Jim Wilson jim@kelcomaine.com using interface
 //                          by David Megginson March 2002
 //
-// Copyright (C) 1997 - 2000  Curtis L. Olson  - curt@flightgear.org
+// Copyright (C) 1997 - 2000  Curtis L. Olson  - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -65,7 +65,8 @@ public:
               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,
+              double roll_offset_deg,
+              double fov_deg, double aspect_ratio_multiplier,
               double target_x_offset_m, double target_y_offset_m,
               double target_z_offset_m, double near_m, bool internal );
 
@@ -218,8 +219,6 @@ public:
     virtual float *get_world_up() {if ( _dirty ) { recalc(); } return _world_up; }
     // Get the relative (to scenery center) view position in fgfs coordinates.
     virtual float * getRelativeViewPos ();
-    // Get the absolute zero-elevation view position in fgfs coordinates.
-    virtual float * getZeroElevViewPos ();
     // Get surface east vector
     virtual float *get_surface_east() {        if ( _dirty ) { recalc(); } return _surface_east; }
     // Get surface south vector
@@ -245,6 +244,13 @@ public:
     }
     virtual double get_aspect_ratio() const { return _aspect_ratio; }
 
+    virtual void set_aspect_ratio_multiplier( double m ) {
+       _aspect_ratio_multiplier = m;
+    }
+    virtual double get_aspect_ratio_multiplier() const {
+        return _aspect_ratio_multiplier;
+    }
+
     virtual double getNear_m () const { return _ground_level_nearplane_m; }
     inline void setNear_m (double near_m) {
         _ground_level_nearplane_m = near_m;
@@ -272,7 +278,6 @@ private:
 
     mutable sgdVec3 _absolute_view_pos;
     mutable sgVec3 _relative_view_pos;
-    mutable sgVec3 _zero_elev_view_pos;
 
     double _lon_deg;
     double _lat_deg;
@@ -343,8 +348,14 @@ private:
     // the nominal field of view (angle, in degrees)
     double _fov_deg; 
 
-    // ratio of window width and height; height = width * aspect_ratio
-    double _aspect_ratio;
+    // Ratio of window width and height; height = width *
+    // aspect_ratio.  This value is automatically calculated based on
+    // window dimentions.
+    double _aspect_ratio;       
+
+    // default = 1.0, this value is user configurable and is
+    // multiplied into the aspect_ratio to get the actual vertical fov
+    double _aspect_ratio_multiplier;
 
     bool _reverse_view_offset;
 
@@ -405,6 +416,12 @@ private:
        _pitch_offset_deg += amt;
     }
 
+    // add to _roll_offset_deg
+    inline void incRollOffset_deg( double amt ) {
+       set_dirty();
+       _roll_offset_deg += amt;
+    }
+
     inline void set_reverse_view_offset( bool val ) {
        _reverse_view_offset = val;
     }