Moved some of the low level scene graph construction code over to simgear.

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

diff --git a/src/Main/viewer.hxx b/src/Main/viewer.hxx
index bb0eae4ef96c788984ddf6034a450617084a2f13..890d351876b99c4cfac01d701e88278556e811ef 100644 (file)
--- a/src/Main/viewer.hxx
+++ b/src/Main/viewer.hxx
@@ -34,19 +34,18 @@
 
 #include <simgear/compiler.h>
 #include <simgear/constants.h>
+#include <simgear/scene/model/location.hxx>
 
 #include <plib/sg.h>           // plib include
 
 #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,
+ FG_LOOKAT = 1
 };
 
 // Define a structure containing view information
@@ -56,15 +55,19 @@ public:
 
     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( 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 );
+              bool at_model, int at_model_index,
+              double x_offset_m, double y_offset_m, double z_offset_m,
+              double heading_offset_deg, double pitch_offset_deg,
+              double roll_offset_deg, double fov_deg,
+              double target_x_offset_m, double target_y_offset_m,
+              double target_z_offset_m, double near_m );
 
     // Destructor
     virtual ~FGViewer( void );
@@ -126,9 +129,15 @@ public:
     virtual double getXOffset_m () const { return _x_offset_m; }
     virtual double getYOffset_m () const { return _y_offset_m; }
     virtual double getZOffset_m () const { return _z_offset_m; }
+    virtual double getTargetXOffset_m () const { return _target_x_offset_m; }
+    virtual double getTargetYOffset_m () const { return _target_y_offset_m; }
+    virtual double getTargetZOffset_m () const { return _target_z_offset_m; }
     virtual void setXOffset_m (double x_offset_m);
     virtual void setYOffset_m (double y_offset_m);
     virtual void setZOffset_m (double z_offset_m);
+    virtual void setTargetXOffset_m (double x_offset_m);
+    virtual void setTargetYOffset_m (double y_offset_m);
+    virtual void setTargetZOffset_m (double z_offset_m);
     virtual void setPositionOffsets (double x_offset_m,
                                     double y_offset_m,
                                     double z_offset_m);
@@ -244,6 +253,9 @@ public:
 
     inline void set_dirty() { _dirty = true; }
     inline void set_clean() { _dirty = false; }
+    
+    // return eye location...
+    virtual SGLocation * getSGLocation () const { return _location; }
 
 
 private:
@@ -273,13 +285,21 @@ private:
     double _target_pitch_deg;
     double _target_heading_deg;
 
-    // Position offsets from center of gravity.  The X axis is positive
+    // Position offsets from FDM origin.  The X axis is positive
     // out the tail, Y is out the right wing, and Z is positive up.
     // distance in meters
     double _x_offset_m;
     double _y_offset_m;
     double _z_offset_m;
 
+    // Target offsets from FDM origin (for "lookat" targets) The X
+    // axis is positive out the tail, Y is out the right wing, and Z
+    // is positive up.  distance in meters
+    double _target_x_offset_m;
+    double _target_y_offset_m;
+    double _target_z_offset_m;
+
+
     // orientation offsets from reference (_goal* are for smoothed transitions)
     double _roll_offset_deg;
     double _pitch_offset_deg;
@@ -302,8 +322,8 @@ private:
     bool _at_model;
     int _at_model_index;  // number of model (for multi model)
 
-    FGLocation * _location;
-    FGLocation * _target_location;
+    SGLocation * _location;
+    SGLocation * _target_location;
 
     // the nominal field of view (angle, in degrees)
     double _fov_deg; 
@@ -338,7 +358,7 @@ private:
 
     // sg versions of our friendly matrices
     sgMat4 VIEW, UP;
-    sgMat4 LOCAL, TRANS, LARC_TO_SSG;
+    sgMat4 LOCAL, ATLOCAL, TRANS, LARC_TO_SSG;
 
     // Transformation matrix for the view direction offset relative to
     // the AIRCRAFT matrix
@@ -349,9 +369,12 @@ private:
     //////////////////////////////////////////////////////////////////
 
     void recalc ();
-    void recalcPositionVectors (double lon_deg, double lat_deg, double alt_ft) const;
-    void updateFromModelLocation (FGLocation * location);
-    void recalcOurOwnLocation (double lon_deg, double lat_deg, double alt_ft,
+    void recalcLookFrom();
+    void recalcLookAt();
+    void copyLocationData();
+    void updateFromModelLocation (SGLocation * location);
+    void updateAtModelLocation (SGLocation * location);
+    void recalcOurOwnLocation (SGLocation * location, double lon_deg, double lat_deg, double alt_ft,
                  double roll_deg, double pitch_deg, double heading_deg);
 
     // add to _heading_offset_deg