Sync with latest JSBSim CVS

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

diff --git a/src/Main/viewer_lookat.cxx b/src/Main/viewer_lookat.cxx
index e717c86c10cbdcbad0159962561f0dd3668e1ea1..3b4fb808b8c7af8a2e122c13711b2142a8aea018 100644 (file)
--- a/src/Main/viewer_lookat.cxx
+++ b/src/Main/viewer_lookat.cxx
@@ -34,6 +34,7 @@
 #include <simgear/debug/logstream.hxx>
 #include <simgear/math/point3d.hxx>
 #include <simgear/math/polar3d.hxx>
+#include <simgear/math/sg_geodesy.hxx>
 #include <simgear/math/vector.hxx>
 
 #include <Scenery/scenery.hxx>
@@ -88,6 +89,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 +100,7 @@ static void print_sgMat4( sgMat4 &in) {
        cout << endl;
     }
 }
+#endif
 
 
 // Update the view parameters
@@ -105,21 +108,24 @@ void FGViewerLookAt::update() {
     Point3D tmp;
     sgVec3 minus_z;
 
+    // convert to geocentric coordinates
+    double geoc_lat;
+    sgGeodToGeoc( geod_view_pos[1], geod_view_pos[2],
+                 &sea_level_radius, &geoc_lat );
+
     // calculate the cartesion coords of the current lat/lon/0 elev
-    Point3D p = Point3D( geod_view_pos[0], 
-                        geod_view_pos[1], 
-                        sea_level_radius );
+    Point3D p = Point3D( geod_view_pos[0], geoc_lat, sea_level_radius );
 
-    tmp = sgPolarToCart3d(p) - scenery.center;
+    tmp = sgPolarToCart3d(p) - scenery.get_center();
     sgSetVec3( zero_elev, tmp[0], tmp[1], tmp[2] );
 
     // 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.get_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.get_cur_elev() + 0.5 * SG_METER_TO_FEET );
     }
 
     tmp = sgPolarToCart3d(p);
@@ -127,27 +133,49 @@ void FGViewerLookAt::update() {
 
     // view_pos = abs_view_pos - scenery.center;
     sgdVec3 sc;
-    sgdSetVec3( sc, scenery.center.x(), scenery.center.y(), scenery.center.z());
+    sgdSetVec3( sc,
+               scenery.get_center().x(),
+               scenery.get_center().y(),
+               scenery.get_center().z() );
     sgdVec3 vp;
     sgdSubVec3( vp, abs_view_pos, sc );
     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 = "
+    sgVec3 tmp_offset;
+    sgCopyVec3( tmp_offset, pilot_offset );
+    SG_LOG( SG_VIEW, SG_DEBUG, "tmp offset = "
+            << tmp_offset[0] << "," << tmp_offset[1] << ","
+            << tmp_offset[2] );
+       
+    //!!!!!!!!!!!!!!!!!!!      
+    // THIS IS THE EXPERIMENTAL VIEWING ANGLE SHIFTER
+    // THE MAJORITY OF THE WORK IS DONE IN GUI.CXX
+    extern float GuiQuat_mat[4][4];
+    sgXformPnt3( tmp_offset, tmp_offset, GuiQuat_mat );
+    SG_LOG( SG_VIEW, SG_DEBUG, "tmp_offset = "
+            << tmp_offset[0] << "," << tmp_offset[1] << ","
+            << tmp_offset[2] );
+       
+    sgAddVec3( view_pos, tmp_offset );
+    // !!!!!!!!!! testing
+       
+    // sgAddVec3( view_pos, pilot_offset );
+
+    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] );
 
@@ -174,14 +202,6 @@ void FGViewerLookAt::update() {
     //      << world_up[2] << endl;
     
 
-    //!!!!!!!!!!!!!!!!!!!      
-    // THIS IS THE EXPERIMENTAL VIEWING ANGLE SHIFTER
-    // THE MAJORITY OF THE WORK IS DONE IN GUI.CXX
-    // this in gui.cxx for now just testing
-    extern float GuiQuat_mat[4][4];
-    sgPreMultMat4( VIEW, GuiQuat_mat);
-    // !!!!!!!!!! testing      
-
     // Given a vector pointing straight down (-Z), map into onto the
     // local plane representing "horizontal".  This should give us the
     // local direction for moving "south".