From 5629cf1a8de02c35aca68fd549c58b39c95de9ee Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Sun, 24 Jan 2016 12:54:47 -0600
Subject: [PATCH] =?utf8?q?Remove=20legacy=20=E2=80=98axes/lat=E2=80=99=20a?=
 =?utf8?q?nd=20=E2=80=98axes/long=E2=80=99=20props.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

- only exits to support some legacy joystick hat configs,
  which have been updated to use the goal- properties directly.
---
 src/Viewer/viewmgr.cxx | 70 ------------------------------------------
 src/Viewer/viewmgr.hxx |  8 -----
 2 files changed, 78 deletions(-)

diff --git a/src/Viewer/viewmgr.cxx b/src/Viewer/viewmgr.cxx
index 3443522c7..962fa3b05 100644
--- a/src/Viewer/viewmgr.cxx
+++ b/src/Viewer/viewmgr.cxx
@@ -37,8 +37,6 @@
 
 // Constructor
 FGViewMgr::FGViewMgr( void ) :
-  axis_long(0),
-  axis_lat(0),
   inited(false),
   config_list(fgGetNode("/sim", true)->getChildren("view")),
   current(0)
@@ -101,8 +99,6 @@ FGViewMgr::reinit ()
     }
 }
 
-typedef double (FGViewMgr::*double_getter)() const;
-
 void
 FGViewMgr::bind()
 {
@@ -116,15 +112,6 @@ FGViewMgr::bind()
     _viewNumberProp->setAttribute(SGPropertyNode::ARCHIVE, false);
     _viewNumberProp->setAttribute(SGPropertyNode::PRESERVE, true);
 
-
-    _tiedProperties.Tie("axes/long", this,
-                        (double_getter)0, &FGViewMgr::setViewAxisLong);
-    fgSetArchivable("/sim/current-view/axes/long");
-
-    _tiedProperties.Tie("axes/lat", this,
-                        (double_getter)0, &FGViewMgr::setViewAxisLat);
-    fgSetArchivable("/sim/current-view/axes/lat");
-
     current_x_offs = fgGetNode("/sim/current-view/x-offset-m", true);
     current_y_offs = fgGetNode("/sim/current-view/y-offset-m", true);
     current_z_offs = fgGetNode("/sim/current-view/z-offset-m", true);
@@ -176,7 +163,6 @@ FGViewMgr::update (double dt)
     currentView->setTargetZOffset_m(target_z_offs->getDoubleValue());
 
   // Update the current view
-  do_axes();
   currentView->update(dt);
 
 
@@ -300,59 +286,3 @@ FGViewMgr::setView (int newview)
     // on FGViewer, so update() is a no-op.
     update(0.0);
 }
-
-void
-FGViewMgr::setViewAxisLong (double axis)
-{
-  axis_long = axis;
-}
-
-void
-FGViewMgr::setViewAxisLat (double axis)
-{
-  axis_lat = axis;
-}
-
-void
-FGViewMgr::do_axes ()
-{
-                // Take no action when hat is centered
-  if ( ( axis_long <  0.01 ) &&
-       ( axis_long > -0.01 ) &&
-       ( axis_lat  <  0.01 ) &&
-       ( axis_lat  > -0.01 )
-     )
-    return;
-
-  double viewDir = 999;
-
-  /* Do all the quick and easy cases */
-  if (axis_long < 0) {        // Longitudinal axis forward
-    if (axis_lat == axis_long)
-      viewDir = fgGetDouble("/sim/view/config/front-left-direction-deg");
-    else if (axis_lat == - axis_long)
-      viewDir = fgGetDouble("/sim/view/config/front-right-direction-deg");
-    else if (axis_lat == 0)
-      viewDir = fgGetDouble("/sim/view/config/front-direction-deg");
-  } else if (axis_long > 0) {    // Longitudinal axis backward
-    if (axis_lat == - axis_long)
-      viewDir = fgGetDouble("/sim/view/config/back-left-direction-deg");
-    else if (axis_lat == axis_long)
-      viewDir = fgGetDouble("/sim/view/config/back-right-direction-deg");
-    else if (axis_lat == 0)
-      viewDir = fgGetDouble("/sim/view/config/back-direction-deg");
-  } else if (axis_long == 0) {    // Longitudinal axis neutral
-    if (axis_lat < 0)
-      viewDir = fgGetDouble("/sim/view/config/left-direction-deg");
-    else if (axis_lat > 0)
-      viewDir = fgGetDouble("/sim/view/config/right-direction-deg");
-    else return; /* And assertion failure maybe? */
-  }
-
-                // Do all the difficult cases
-  if ( viewDir > 900 )
-    viewDir = SGD_RADIANS_TO_DEGREES * atan2 ( -axis_lat, -axis_long );
-  if ( viewDir < -1 ) viewDir += 360;
-
-  get_current_view()->setGoalHeadingOffset_deg(viewDir);
-}
diff --git a/src/Viewer/viewmgr.hxx b/src/Viewer/viewmgr.hxx
index 29e0109d8..5054539d0 100644
--- a/src/Viewer/viewmgr.hxx
+++ b/src/Viewer/viewmgr.hxx
@@ -81,14 +81,6 @@ public:
 private:
     simgear::TiedPropertyList _tiedProperties;
 
-    double axis_long;
-    double axis_lat;
-
-    void do_axes ();
-
-
-    void setViewAxisLong (double axis);
-    void setViewAxisLat (double axis);
     int getView () const;
     void setView (int newview);
 
-- 
2.39.5