X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Fviewer.cxx;h=ef142a1a0e09f2caf2bdf27b49c38941ecf20f28;hb=4606f96e139204d5b2d76ee93c3b0c66885b5f5f;hp=21e3d42f20c6f2825a21c6df54560daaf22c907b;hpb=a0d90b9746e8deb331bd1075de0bf052357c5d16;p=flightgear.git

diff --git a/src/Main/viewer.cxx b/src/Main/viewer.cxx
index 21e3d42f2..ef142a1a0 100644
--- a/src/Main/viewer.cxx
+++ b/src/Main/viewer.cxx
@@ -133,12 +133,12 @@ static void MakeVIEW_OFFSET( sgMat4 dst,
 // Constructor...
 FGViewer::FGViewer( fgViewType Type, bool from_model, int from_model_index,
                     bool at_model, int at_model_index,
-                    double damp_alt, double damp_roll, double damp_pitch, double damp_heading,
+                    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 ):
     _dirty(true),
     _lon_deg(0),
     _lat_deg(0),
@@ -149,7 +149,7 @@ FGViewer::FGViewer( fgViewType Type, bool from_model, int from_model_index,
     _roll_deg(0),
     _pitch_deg(0),
     _heading_deg(0),
-    _damp_alt(0),
+    _damp_sync(0),
     _damp_roll(0),
     _damp_pitch(0),
     _damp_heading(0),
@@ -161,14 +161,15 @@ FGViewer::FGViewer( fgViewType Type, bool from_model, int from_model_index,
     _from_model_index = from_model_index;
     _at_model = at_model;
     _at_model_index = at_model_index;
-    if (damp_alt > 0.0)
-      _damp_alt = 1 - 1.0 / pow(10, fabs(damp_alt));
+
+    _internal = internal;
+
     if (damp_roll > 0.0)
-      _damp_roll = 1 - 1.0 / pow(10, fabs(damp_roll));
+      _damp_roll = 1.0 / pow(10, fabs(damp_roll));
     if (damp_pitch > 0.0)
-      _damp_pitch = 1 - 1.0 / pow(10, fabs(damp_pitch));
+      _damp_pitch = 1.0 / pow(10, fabs(damp_pitch));
     if (damp_heading > 0.0)
-      _damp_heading = 1 - 1.0 / pow(10, fabs(damp_heading));
+      _damp_heading = 1.0 / pow(10, fabs(damp_heading));
 
     _x_offset_m = x_offset_m;
     _y_offset_m = y_offset_m;
@@ -231,6 +232,12 @@ FGViewer::setType ( int type )
     _type = FG_LOOKAT;
 }
 
+void
+FGViewer::setInternal ( bool internal )
+{
+  _internal = internal;
+}
+
 void
 FGViewer::setLongitude_deg (double lon_deg)
 {
@@ -508,7 +515,7 @@ FGViewer::recalcOurOwnLocation (SGLocation * location, double lon_deg, double la
                         double roll_deg, double pitch_deg, double heading_deg)
 {
   // update from our own data...
-  dampEyeData(alt_ft, roll_deg, pitch_deg, heading_deg);
+  dampEyeData(roll_deg, pitch_deg, heading_deg);
   location->setPosition( lon_deg, lat_deg, alt_ft );
   location->setOrientation( roll_deg, pitch_deg, heading_deg );
   sgCopyMat4(LOCAL,
@@ -634,7 +641,6 @@ FGViewer::recalcLookAt ()
     updateFromModelLocation(_location);
   } else {
     // update from our own data, just the rotation here...
-
     recalcOurOwnLocation( _location, _lon_deg, _lat_deg, _alt_ft, 
           _roll_deg, _pitch_deg, _heading_deg );
   }
@@ -723,41 +729,41 @@ FGViewer::copyLocationData()
 }
 
 void
-FGViewer::dampEyeData (double &alt_ft, double &roll_deg, double &pitch_deg, double &heading_deg)
+FGViewer::dampEyeData (double &roll_deg, double &pitch_deg, double &heading_deg)
 {
-  static FGViewer *last = 0;
-  if (last != this) {
+  const double interval = 0.01;
+
+  static FGViewer *last_view = 0;
+  if (last_view != this) {
     _damp_sync = 0.0;
-    _damped_alt_ft = alt_ft;
     _damped_roll_deg = roll_deg;
     _damped_pitch_deg = pitch_deg;
     _damped_heading_deg = heading_deg;
-    last = this;
+    last_view = this;
     return;
   }
 
-  if (_damp_sync < 0.01) {
-    alt_ft = _damped_alt_ft;
-    roll_deg = _damped_roll_deg;
-    pitch_deg = _damped_pitch_deg;
-    heading_deg = _damped_heading_deg;
+  if (_damp_sync < interval) {
+    if (_damp_roll > 0.0)
+      roll_deg = _damped_roll_deg;
+    if (_damp_pitch > 0.0)
+      pitch_deg = _damped_pitch_deg;
+    if (_damp_heading > 0.0)
+      heading_deg = _damped_heading_deg;
     return;
   }
 
-  while (_damp_sync >= 0.01) {
-    _damp_sync -= 0.01;
+  while (_damp_sync >= interval) {
+    _damp_sync -= interval;
 
     double d;
-    if (_damp_alt > 0.0)
-      alt_ft = _damped_alt_ft = alt_ft * (1 - _damp_alt) + _damped_alt_ft * _damp_alt;
-
     if (_damp_roll > 0.0) {
       d = _damped_roll_deg - roll_deg;
       if (d >= 180.0)
         _damped_roll_deg -= 360.0;
       else if (d < -180.0)
         _damped_roll_deg += 360.0;
-      roll_deg = _damped_roll_deg = roll_deg * (1 - _damp_roll) + _damped_roll_deg * _damp_roll;
+      roll_deg = _damped_roll_deg = roll_deg * _damp_roll + _damped_roll_deg * (1 - _damp_roll);
     }
 
     if (_damp_pitch > 0.0) {
@@ -766,7 +772,7 @@ FGViewer::dampEyeData (double &alt_ft, double &roll_deg, double &pitch_deg, doub
         _damped_pitch_deg -= 360.0;
       else if (d < -180.0)
         _damped_pitch_deg += 360.0;
-      pitch_deg = _damped_pitch_deg = pitch_deg * (1 - _damp_pitch) + _damped_pitch_deg * _damp_pitch;
+      pitch_deg = _damped_pitch_deg = pitch_deg * _damp_pitch + _damped_pitch_deg * (1 - _damp_pitch);
     }
 
     if (_damp_heading > 0.0) {
@@ -775,7 +781,7 @@ FGViewer::dampEyeData (double &alt_ft, double &roll_deg, double &pitch_deg, doub
         _damped_heading_deg -= 360.0;
       else if (d < -180.0)
         _damped_heading_deg += 360.0;
-      heading_deg = _damped_heading_deg = heading_deg * (1 - _damp_heading) + _damped_heading_deg * _damp_heading;
+      heading_deg = _damped_heading_deg = heading_deg * _damp_heading + _damped_heading_deg * (1 - _damp_heading);
     }
   }
 }