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 e1dcff32bd2d0c1ce6bcf7ee01d579a09255f7f0..ea4470fbb6a93bbd0dd78d416b611b3fcb83166c 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$
 
@@ -24,28 +24,23 @@
 #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>
 
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
 
-#include <vector>
-
-#include "fgfs.hxx"
+#include "fg_props.hxx"
 #include "viewer.hxx"
 
-SG_USING_STD(vector);
+using std::vector;
 
 
 // Define a structure containing view information
-class FGViewMgr : public FGSubsystem
+class FGViewMgr : public SGSubsystem
 {
 
 public:
@@ -59,7 +54,8 @@ public:
     virtual void init ();
     virtual void bind ();
     virtual void unbind ();
-    virtual void update (int dt);
+    virtual void update (double dt);
+    virtual void reinit ();
 
     // getters
     inline int size() const { return views.size(); }
@@ -89,17 +85,13 @@ public:
        return views[i];
     }
     inline FGViewer *next_view() {
-       ++current;
-       if ( current >= (int)views.size() ) {
-           current = 0;
-       }
+       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];
     }
 
@@ -110,6 +102,8 @@ public:
        views.push_back(v);
         v->init();
     }
+    // copies current offset settings to current-view path...
+    void copyToCurrent ();
 
 private:
 
@@ -118,27 +112,47 @@ private:
 
     void do_axes ();
 
-    double getViewOffset_deg () const;
-    void setViewOffset_deg (double offset);
-    double getGoalViewOffset_deg () const;
-    void setGoalViewOffset_deg (double offset);
-    double getViewTilt_deg () const;
-    void setViewTilt_deg (double tilt);
-    double getGoalViewTilt_deg () const;
-    void setGoalViewTilt_deg (double tilt);
-    double getPilotXOffset_m () const;
-    void setPilotXOffset_m (double x);
-    double getPilotYOffset_m () const;
-    void setPilotYOffset_m (double y);
-    double getPilotZOffset_m () const;
-    void setPilotZOffset_m (double z);
+    //  callbacks in manager to access viewer methods
+    double getViewHeadingOffset_deg () const;
+    void setViewHeadingOffset_deg (double offset);
+    double getViewGoalHeadingOffset_deg () const;
+    void setViewGoalHeadingOffset_deg (double offset);
+    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);
+    double getViewYOffset_m () const;
+    void setViewYOffset_m (double y);
+    double getViewZOffset_m () const;
+    void setViewZOffset_m (double z);
+    double getViewTargetXOffset_m () const;
+    void setViewTargetXOffset_m (double x);
+    double getViewTargetYOffset_m () const;
+    void setViewTargetYOffset_m (double y);
+    double getViewTargetZOffset_m () const;
+    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);
     void setViewAxisLat (double axis);
+    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;