new FSF address

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

diff --git a/src/Main/viewmgr.hxx b/src/Main/viewmgr.hxx
index b4a4fbf0eb1ebe06eed96ba2b7d34d5fec717176..c328a9d701db37bb75bef1d922a47c96f6c5a78d 100644 (file)
--- a/src/Main/viewmgr.hxx
+++ b/src/Main/viewmgr.hxx
@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started October 2000.
 //
-// Copyright (C) 2000  Curtis L. Olson  - curt@flightgear.org
+// Copyright (C) 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
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -90,18 +90,11 @@ public:
        return views[i];
     }
     inline FGViewer *next_view() {
-       ++current;
-       if ( current >= (int)views.size() ) {
-           current = 0;
-       }
-        copyToCurrent();
+       setView((current+1 < (int)views.size()) ? (current + 1) : 0);
        return views[current];
     }
     inline FGViewer *prev_view() {
-       --current;
-       if ( current < 0 ) {
-           current = views.size() - 1;
-       }
+       setView((0 < current) ? (current - 1) : (views.size() - 1));
        return views[current];
     }
 
@@ -130,6 +123,10 @@ private:
     double getViewPitchOffset_deg () const;
     void setViewPitchOffset_deg (double tilt);
     double getGoalViewPitchOffset_deg () const;
+    void setGoalViewRollOffset_deg (double tilt);
+    double getViewRollOffset_deg () const;
+    void setViewRollOffset_deg (double tilt);
+    double getGoalViewRollOffset_deg () const;
     void setGoalViewPitchOffset_deg (double tilt);
     double getViewXOffset_m () const;
     void setViewXOffset_m (double x);
@@ -145,6 +142,8 @@ private:
     void setViewTargetZOffset_m (double z);
     double getFOV_deg () const;
     void setFOV_deg (double fov);
+    double getARM_deg () const; // Aspect Ratio Multiplier
+    void setARM_deg (double fov);
     double getNear_m () const;
     void setNear_m (double near_m);
     void setViewAxisLong (double axis);