GUI windows are now draggable. This missing feature has annoyed me

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

diff --git a/src/Main/viewer.hxx b/src/Main/viewer.hxx
index 52cb51f37c45569785bdfb4bf9b4cee1898ad18e..3f9c95e2917ae8a58eed703198fb2fa64c5f1349 100644 (file)
--- a/src/Main/viewer.hxx
+++ b/src/Main/viewer.hxx
@@ -34,13 +34,11 @@
 
 #include <simgear/compiler.h>
 #include <simgear/constants.h>
+#include <simgear/structure/subsystem_mgr.hxx>
+#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
 
@@ -50,7 +48,7 @@ enum fgViewType {
 };
 
 // Define a structure containing view information
-class FGViewer : public FGSubsystem {
+class FGViewer : public SGSubsystem {
 
 public:
 
@@ -64,17 +62,18 @@ public:
     // Constructor
     FGViewer( fgViewType Type, bool from_model, int from_model_index,
               bool at_model, int at_model_index,
+              double damp_roll, double damp_pitch, double damp_heading,
               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 );
+              double target_z_offset_m, double near_m, bool internal );
 
     // Destructor
     virtual ~FGViewer( void );
 
     //////////////////////////////////////////////////////////////////////
-    // Part 1: standard FGSubsystem implementation.
+    // Part 1: standard SGSubsystem implementation.
     //////////////////////////////////////////////////////////////////////
 
     virtual void init ();
@@ -90,6 +89,9 @@ public:
     virtual fgViewType getType() const { return _type; }
     virtual void setType( int type );
 
+    virtual bool getInternal() const { return _internal; }
+    virtual void setInternal( bool internal );
+
     // Reference geodetic position of view from position...
     //   These are the actual aircraft position (pilot in
     //   pilot view, model in model view).
@@ -256,7 +258,7 @@ public:
     inline void set_clean() { _dirty = false; }
     
     // return eye location...
-    virtual FGLocation * getFGLocation () const { return _location; }
+    virtual SGLocation * getSGLocation () const { return _location; }
 
 
 private:
@@ -286,6 +288,15 @@ private:
     double _target_pitch_deg;
     double _target_heading_deg;
 
+    double _damp_sync;
+    double _damp_roll;
+    double _damp_pitch;
+    double _damp_heading;
+
+    double _damped_roll_deg;
+    double _damped_pitch_deg;
+    double _damped_heading_deg;
+
     // 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
@@ -315,6 +326,9 @@ private:
     fgViewType _type;
     fgScalingType _scaling_type;
 
+    // internal view (e.g. cockpit) flag
+    bool _internal;
+
     // view is looking from a model
     bool _from_model;
     int _from_model_index;  // number of model (for multi model)
@@ -323,8 +337,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; 
@@ -373,10 +387,11 @@ private:
     void recalcLookFrom();
     void recalcLookAt();
     void copyLocationData();
-    void updateFromModelLocation (FGLocation * location);
-    void updateAtModelLocation (FGLocation * location);
-    void recalcOurOwnLocation (FGLocation * location, double lon_deg, double lat_deg, double alt_ft,
+    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);
+    void dampEyeData (double &roll_deg, double &pitch_deg, double &heading_deg);
 
     // add to _heading_offset_deg
     inline void incHeadingOffset_deg( double amt ) {
@@ -390,6 +405,12 @@ private:
        _pitch_offset_deg += amt;
     }
 
+    // add to _roll_offset_deg
+    inline void incRollOffset_deg( double amt ) {
+       set_dirty();
+       _roll_offset_deg += amt;
+    }
+
     inline void set_reverse_view_offset( bool val ) {
        _reverse_view_offset = val;
     }