- adjusted for no-value constructor for FGPanel

[flightgear.git] / src / Main / viewer_lookat.cxx

diff --git a/src/Main/viewer_lookat.cxx b/src/Main/viewer_lookat.cxx
index e717c86c10cbdcbad0159962561f0dd3668e1ea1..e45b0f5bb7e7b17686f96cd846a9ab11acef2b04 100644 (file)
--- a/src/Main/viewer_lookat.cxx
+++ b/src/Main/viewer_lookat.cxx
@@ -88,6 +88,7 @@ void fgMakeLookAtMat4 ( sgMat4 dst, const sgVec3 eye, const sgVec3 center,
 }
 
 
+#if 0
 // convert sgMat4 to MAT3 and print
 static void print_sgMat4( sgMat4 &in) {
     int i, j;
@@ -98,6 +99,7 @@ static void print_sgMat4( sgMat4 &in) {
        cout << endl;
     }
 }
+#endif
 
 
 // Update the view parameters
@@ -116,10 +118,10 @@ void FGViewerLookAt::update() {
     // calculate view position in current FG view coordinate system
     // p.lon & p.lat are already defined earlier, p.radius was set to
     // the sea level radius, so now we add in our altitude.
-    if ( geod_view_pos[2] > (scenery.cur_elev + 0.5 * METER_TO_FEET) ) {
+    if ( geod_view_pos[2] > (scenery.cur_elev + 0.5 * SG_METER_TO_FEET) ) {
        p.setz( p.radius() + geod_view_pos[2] );
     } else {
-       p.setz( p.radius() + scenery.cur_elev + 0.5 * METER_TO_FEET );
+       p.setz( p.radius() + scenery.cur_elev + 0.5 * SG_METER_TO_FEET );
     }
 
     tmp = sgPolarToCart3d(p);
@@ -133,21 +135,21 @@ void FGViewerLookAt::update() {
     sgSetVec3( view_pos, vp );
     sgAddVec3( view_pos, pilot_offset );
 
-    FG_LOG( FG_VIEW, FG_DEBUG, "sea level radius = " << sea_level_radius );
-    FG_LOG( FG_VIEW, FG_DEBUG, "Polar view pos = " << p );
-    FG_LOG( FG_VIEW, FG_DEBUG, "Absolute view pos = "
+    SG_LOG( SG_VIEW, SG_DEBUG, "sea level radius = " << sea_level_radius );
+    SG_LOG( SG_VIEW, SG_DEBUG, "Polar view pos = " << p );
+    SG_LOG( SG_VIEW, SG_DEBUG, "Absolute view pos = "
            << abs_view_pos[0] << ","
            << abs_view_pos[1] << ","
            << abs_view_pos[2] );
-    FG_LOG( FG_VIEW, FG_DEBUG, "Relative view pos = "
+    SG_LOG( SG_VIEW, SG_DEBUG, "Relative view pos = "
            << view_pos[0] << "," << view_pos[1] << "," << view_pos[2] );
-    FG_LOG( FG_VIEW, FG_DEBUG, "pilot offset = "
+    SG_LOG( SG_VIEW, SG_DEBUG, "pilot offset = "
            << pilot_offset[0] << "," << pilot_offset[1] << ","
            << pilot_offset[2] );
-    FG_LOG( FG_VIEW, FG_DEBUG, "view forward = "
+    SG_LOG( SG_VIEW, SG_DEBUG, "view forward = "
            << view_forward[0] << "," << view_forward[1] << ","
            << view_forward[2] );
-    FG_LOG( FG_VIEW, FG_DEBUG, "view up = "
+    SG_LOG( SG_VIEW, SG_DEBUG, "view up = "
            << view_up[0] << "," << view_up[1] << ","
            << view_up[2] );