Roy Vegard Ovesen:

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

diff --git a/src/Main/viewmgr.hxx b/src/Main/viewmgr.hxx
index 9cccf8c5f555e27c119eabe883121e7780275e94..23a9ac614975ea463c53527c489383fc217f8ff3 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
@@ -31,6 +31,7 @@
 
 
 #include <simgear/compiler.h>
+#include <simgear/structure/subsystem_mgr.hxx>
 
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
@@ -38,14 +39,13 @@
 
 #include <vector>
 
-#include "fgfs.hxx"
 #include "viewer.hxx"
 
 SG_USING_STD(vector);
 
 
 // Define a structure containing view information
-class FGViewMgr : public FGSubsystem
+class FGViewMgr : public SGSubsystem
 {
 
 public:
@@ -60,6 +60,7 @@ public:
     virtual void bind ();
     virtual void unbind ();
     virtual void update (double dt);
+    virtual void reinit ();
 
     // getters
     inline int size() const { return views.size(); }
@@ -121,26 +122,39 @@ 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 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;
     viewer_list views;