Tweaks.

diff --git a/src/Cockpit/panel.cxx b/src/Cockpit/panel.cxx
index 01bf36cdb974a0f42b428f9de0c003eef3ecd7cb..11370d7452ea70c783d1d68f5cbc1997844679de 100644 (file)
--- a/src/Cockpit/panel.cxx
+++ b/src/Cockpit/panel.cxx
@@ -45,6 +45,7 @@ bool
 fgPanelVisible ()
 {
   return ((globals->get_options()->get_panel_status()) &&
+         (globals->get_viewmgr()->get_current() == 0) &&
          (globals->get_current_view()->get_view_offset() == 0.0));
 }
 

diff --git a/src/Main/viewer.hxx b/src/Main/viewer.hxx
index 8475b24c37b6a17fbe9e3adf9a1932f4872d390d..0854934c588586742598af6334aff0a7b39c9fa8 100644 (file)
--- a/src/Main/viewer.hxx
+++ b/src/Main/viewer.hxx
@@ -89,6 +89,9 @@ protected:
     // translated to scenery.center
     sgVec3 zero_elev;
 
+    // height ASL of the terrain for our current view position
+    // (future?) double ground_elev;
+
     // pilot offset from center of gravity.  The X axis is positive
     // out the tail, Y is out the right wing, and Z is positive up.
     // Distances in meters of course.
@@ -185,6 +188,11 @@ public:
        if ( dirty ) { update(); }
        return zero_elev;
     }
+    // (future?)
+    // inline double get_ground_elev() {
+    //  if ( dirty ) { update(); }
+    // return ground_elev;
+    // }
     inline float *get_surface_south() {
        if ( dirty ) { update(); }
        return surface_south;

diff --git a/src/Main/viewer_rph.cxx b/src/Main/viewer_rph.cxx
index 17926f5f8172a66aa4a10de690f57bb590007827..ca632928e07b5c479f0eca12e79e01c98c7dae4c 100644 (file)
--- a/src/Main/viewer_rph.cxx
+++ b/src/Main/viewer_rph.cxx
@@ -176,12 +176,12 @@ void FGViewerRPH::update() {
     tmp = sgPolarToCart3d(p);
     sgdSetVec3( abs_view_pos, tmp[0], tmp[1], tmp[2] );
 
+    // view_pos = abs_view_pos - scenery.center;
     sgdVec3 sc;
     sgdSetVec3( sc, scenery.center.x(), scenery.center.y(), scenery.center.z());
     sgdVec3 vp;
     sgdSubVec3( vp, abs_view_pos, sc );
     sgSetVec3( view_pos, vp );
-    // view_pos = abs_view_pos - scenery.center;
 
     FG_LOG( FG_VIEW, FG_DEBUG, "sea level radius = " << sea_level_radius );
     FG_LOG( FG_VIEW, FG_DEBUG, "Polar view pos = " << p );