Added static port system and a new altimeter model connected to it.

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

diff --git a/src/Main/viewer.hxx b/src/Main/viewer.hxx
index feda79145a9da12f43a5dec7433eda27284497a3..c9ea6bc3fcf11dff3f854b14a8e0137e3ba95b86 100644 (file)
--- a/src/Main/viewer.hxx
+++ b/src/Main/viewer.hxx
@@ -39,31 +39,32 @@
 
 #include "fgfs.hxx"
 
+#include <Main/location.hxx>
 
 #define FG_FOV_MIN 0.1
 #define FG_FOV_MAX 179.9
 
+enum fgViewType {
+ FG_LOOKFROM = 0,
+ FG_LOOKAT = 1
+};
 
 // Define a structure containing view information
 class FGViewer : public FGSubsystem {
 
 public:
 
-    enum fgViewType {
-       FG_RPH = 0,
-       FG_LOOKAT = 1,
-       FG_HPR = 2
-    };
-
     enum fgScalingType {  // nominal Field Of View actually applies to ...
        FG_SCALING_WIDTH,       // window width
-       FG_SCALING_MAX,         // max(width, height)
+       FG_SCALING_MAX          // max(width, height)
        // FG_SCALING_G_MEAN,      // geometric_mean(width, height)
        // FG_SCALING_INDEPENDENT  // whole screen
     };
 
     // Constructor
-    FGViewer( void );
+    FGViewer( fgViewType Type, bool from_model, int from_model_index,
+              bool at_model, int at_model_index, double x_offset_m,
+              double y_offset_m, double z_offset_m, double near_m );
 
     // Destructor
     virtual ~FGViewer( void );
@@ -75,7 +76,7 @@ public:
     virtual void init ();
     virtual void bind ();
     virtual void unbind ();
-    void update (int dt);
+    void update (double dt);
 
 
     //////////////////////////////////////////////////////////////////////
@@ -214,12 +215,10 @@ public:
 
     // Matrices...
     virtual const sgVec4 *get_VIEW() { if ( _dirty ) { recalc(); } return VIEW; }
-    virtual const sgVec4 *get_VIEW_ROT() { if ( _dirty ) { recalc(); } return VIEW_ROT; }
-    virtual const sgVec4 *get_LOCAL_ROT() { if ( _dirty ) { recalc(); }        return LOCAL_ROT; }
     virtual const sgVec4 *get_UP() { if ( _dirty ) { recalc(); } return UP; }
 
     //////////////////////////////////////////////////////////////////////
-    // Part 4: frustrum data setters and getters
+    // Part 4: View and frustrum data setters and getters
     //////////////////////////////////////////////////////////////////////
 
     virtual void set_fov( double fov_deg ) {
@@ -234,6 +233,22 @@ public:
     }
     virtual double get_aspect_ratio() const { return _aspect_ratio; }
 
+    virtual double getNear_m () const { return _ground_level_nearplane_m; }
+    inline void setNear_m (double near_m) {
+        _ground_level_nearplane_m = near_m;
+    }
+
+    //////////////////////////////////////////////////////////////////////
+    // Part 5: misc setters and getters
+    //////////////////////////////////////////////////////////////////////
+
+    inline void set_dirty() { _dirty = true; }
+    inline void set_clean() { _dirty = false; }
+    
+    // return eye location...
+    virtual FGLocation * getFGLocation () const { return _location; }
+
+
 private:
 
     //////////////////////////////////////////////////////////////////
@@ -276,9 +291,23 @@ private:
     double _goal_pitch_offset_deg;
     double _goal_heading_offset_deg;
 
+    // used to set nearplane when at ground level for this view
+    double _ground_level_nearplane_m;
+
     fgViewType _type;
     fgScalingType _scaling_type;
 
+    // view is looking from a model
+    bool _from_model;
+    int _from_model_index;  // number of model (for multi model)
+
+    // view is looking at a model
+    bool _at_model;
+    int _at_model_index;  // number of model (for multi model)
+
+    FGLocation * _location;
+    FGLocation * _target_location;
+
     // the nominal field of view (angle, in degrees)
     double _fov_deg; 
 
@@ -310,11 +339,8 @@ private:
     // top of the aircraft
     sgVec3 _view_up;
 
-//    // the vector pointing straight out the nose of the aircraft
-//    sgVec3 _view_forward;
-
     // sg versions of our friendly matrices
-    sgMat4 VIEW, VIEW_ROT, UP, LOCAL_ROT;
+    sgMat4 VIEW, UP;
     sgMat4 LOCAL, TRANS, LARC_TO_SSG;
 
     // Transformation matrix for the view direction offset relative to
@@ -326,10 +352,12 @@ private:
     //////////////////////////////////////////////////////////////////
 
     void recalc ();
-    void recalcPositionVectors (double lon_deg, double lat_deg, double alt_ft) const;
-
-    inline void set_dirty() { _dirty = true; }
-    inline void set_clean() { _dirty = false; }
+    void recalcLookFrom();
+    void recalcLookAt();
+    void copyLocationData();
+    void updateFromModelLocation (FGLocation * location);
+    void recalcOurOwnLocation (FGLocation * location, double lon_deg, double lat_deg, double alt_ft,
+                 double roll_deg, double pitch_deg, double heading_deg);
 
     // add to _heading_offset_deg
     inline void incHeadingOffset_deg( double amt ) {
@@ -351,13 +379,3 @@ private:
 
 
 #endif // _VIEWER_HXX
-
-
-
-
-
-
-
-
-
-