Merge branch 'jt/runway' into next

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

diff --git a/src/Main/viewmgr.hxx b/src/Main/viewmgr.hxx
index 23a9ac614975ea463c53527c489383fc217f8ff3..ea4470fbb6a93bbd0dd78d416b611b3fcb83166c 100644 (file)
--- a/src/Main/viewmgr.hxx
+++ b/src/Main/viewmgr.hxx
@@ -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$
 
@@ -24,11 +24,7 @@
 #ifndef _VIEWMGR_HXX
 #define _VIEWMGR_HXX
 
-
-#ifndef __cplusplus                                                          
-# error This library requires C++
-#endif                                   
-
+#include <vector>
 
 #include <simgear/compiler.h>
 #include <simgear/structure/subsystem_mgr.hxx>
@@ -37,11 +33,10 @@
 #  include <config.h>
 #endif
 
-#include <vector>
-
+#include "fg_props.hxx"
 #include "viewer.hxx"
 
-SG_USING_STD(vector);
+using std::vector;
 
 
 // Define a structure containing view information
@@ -90,18 +85,13 @@ 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);
+       view_number->fireValueChanged();
        return views[current];
     }
     inline FGViewer *prev_view() {
-       --current;
-       if ( current < 0 ) {
-           current = views.size() - 1;
-       }
+       setView((0 < current) ? (current - 1) : (views.size() - 1));
+       view_number->fireValueChanged();
        return views[current];
     }
 
@@ -149,6 +139,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);
@@ -156,8 +148,11 @@ private:
     int getView () const;
     void setView (int newview);
 
-    typedef vector < FGViewer * > viewer_list;
+    SGPropertyNode_ptr view_number;
+    vector<SGPropertyNode_ptr> config_list;
+    typedef vector<SGSharedPtr<FGViewer> > viewer_list;
     viewer_list views;
+    SGVec3d abs_viewer_position;
 
     int current;