]> git.mxchange.org Git - flightgear.git/blobdiff - src/Main/viewer_rph.cxx
- adjusted for no-value constructor for FGPanel
[flightgear.git] / src / Main / viewer_rph.cxx
index 9b0a7c0e954edcc2742ac7d775c1432a182cd71e..7b6aa6ac2bdfe929725dc631fe54d4f375082d7b 100644 (file)
 #include <simgear/math/polar3d.hxx>
 #include <simgear/math/vector.hxx>
 
-#include <Aircraft/aircraft.hxx>
-#include <Cockpit/panel.hxx>
 #include <Scenery/scenery.hxx>
 
 #include "globals.hxx"
-#include "viewer.hxx"
+#include "viewer_rph.hxx"
 
 
 // Constructor
 FGViewerRPH::FGViewerRPH( void )
 {
+    set_reverse_view_offset(false);
+#ifndef USE_FAST_VIEWROT
+    // This never changes -- NHV
+    LARC_TO_SSG[0][0] = 0.0; 
+    LARC_TO_SSG[0][1] = 1.0; 
+    LARC_TO_SSG[0][2] = -0.0; 
+    LARC_TO_SSG[0][3] = 0.0; 
+
+    LARC_TO_SSG[1][0] = 0.0; 
+    LARC_TO_SSG[1][1] = 0.0; 
+    LARC_TO_SSG[1][2] = 1.0; 
+    LARC_TO_SSG[1][3] = 0.0;
+       
+    LARC_TO_SSG[2][0] = 1.0; 
+    LARC_TO_SSG[2][1] = -0.0; 
+    LARC_TO_SSG[2][2] = 0.0; 
+    LARC_TO_SSG[2][3] = 0.0;
+       
+    LARC_TO_SSG[3][0] = 0.0; 
+    LARC_TO_SSG[3][1] = 0.0; 
+    LARC_TO_SSG[3][2] = 0.0; 
+    LARC_TO_SSG[3][3] = 1.0; 
+#endif // USE_FAST_VIEWROT
 }
 
 
@@ -83,45 +104,6 @@ inline static void fgMakeViewRot( sgMat4 dst, const sgMat4 m1, const sgMat4 m2 )
 #endif
 
 
-// Initialize a view structure
-void FGViewerRPH::init( void ) {
-    set_dirty();
-
-    FG_LOG( FG_VIEW, FG_INFO, "Initializing View parameters" );
-
-    view_offset = goal_view_offset =
-       globals->get_options()->get_default_view_offset();
-    sgSetVec3( pilot_offset, 0.0, 0.0, 0.0 );
-
-    globals->get_options()->set_win_ratio( globals->get_options()->get_xsize() /
-                                          globals->get_options()->get_ysize()
-                                          );
-
-#ifndef USE_FAST_VIEWROT
-    // This never changes -- NHV
-    LARC_TO_SSG[0][0] = 0.0; 
-    LARC_TO_SSG[0][1] = 1.0; 
-    LARC_TO_SSG[0][2] = -0.0; 
-    LARC_TO_SSG[0][3] = 0.0; 
-
-    LARC_TO_SSG[1][0] = 0.0; 
-    LARC_TO_SSG[1][1] = 0.0; 
-    LARC_TO_SSG[1][2] = 1.0; 
-    LARC_TO_SSG[1][3] = 0.0;
-       
-    LARC_TO_SSG[2][0] = 1.0; 
-    LARC_TO_SSG[2][1] = -0.0; 
-    LARC_TO_SSG[2][2] = 0.0; 
-    LARC_TO_SSG[2][3] = 0.0;
-       
-    LARC_TO_SSG[3][0] = 0.0; 
-    LARC_TO_SSG[3][1] = 0.0; 
-    LARC_TO_SSG[3][2] = 0.0; 
-    LARC_TO_SSG[3][3] = 1.0; 
-#endif // USE_FAST_VIEWROT
-}
-
-
 #define USE_FAST_LOCAL
 #ifdef USE_FAST_LOCAL
 inline static void fgMakeLOCAL( sgMat4 dst, const double Theta,
@@ -157,6 +139,7 @@ inline static void fgMakeLOCAL( sgMat4 dst, const double Theta,
 #endif
 
 
+#if 0
 // convert sgMat4 to MAT3 and print
 static void print_sgMat4( sgMat4 &in) {
     int i, j;
@@ -167,6 +150,7 @@ static void print_sgMat4( sgMat4 &in) {
        cout << endl;
     }
 }
+#endif
 
 
 // Update the view parameters
@@ -186,29 +170,29 @@ void FGViewerRPH::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);
     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 );
-    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, "(RPH) Relative view pos = "
            << view_pos[0] << "," << view_pos[1] << "," << view_pos[2] );
 
     // code to calculate LOCAL matrix calculated from Phi, Theta, and
@@ -224,12 +208,12 @@ void FGViewerRPH::update() {
     sgVec3 rollvec;
     sgSetVec3( rollvec, 0.0, 0.0, 1.0 );
     sgMat4 PHI;                // roll
-    sgMakeRotMat4( PHI, rph[0] * RAD_TO_DEG, rollvec );
+    sgMakeRotMat4( PHI, rph[0] * SGD_RADIANS_TO_DEGREES, rollvec );
 
     sgVec3 pitchvec;
     sgSetVec3( pitchvec, 0.0, 1.0, 0.0 );
     sgMat4 THETA;              // pitch
-    sgMakeRotMat4( THETA, rph[1] * RAD_TO_DEG, pitchvec );
+    sgMakeRotMat4( THETA, rph[1] * SGD_RADIANS_TO_DEGREES, pitchvec );
 
     // ROT = PHI * THETA
     sgMat4 ROT;
@@ -240,7 +224,7 @@ void FGViewerRPH::update() {
     sgVec3 yawvec;
     sgSetVec3( yawvec, 1.0, 0.0, 0.0 );
     sgMat4 PSI;                // heading
-    sgMakeRotMat4( PSI, -rph[2] * RAD_TO_DEG, yawvec );
+    sgMakeRotMat4( PSI, -rph[2] * SGD_RADIANS_TO_DEGREES, yawvec );
 
     // LOCAL = ROT * PSI
     // sgMultMat4( LOCAL, ROT, PSI );
@@ -253,16 +237,16 @@ void FGViewerRPH::update() {
     // print_sgMat4( LOCAL );
        
     sgMakeRotMat4( UP, 
-                  geod_view_pos[0] * RAD_TO_DEG,
+                  geod_view_pos[0] * SGD_RADIANS_TO_DEGREES,
                   0.0,
-                  -geod_view_pos[1] * RAD_TO_DEG );
+                  -geod_view_pos[1] * SGD_RADIANS_TO_DEGREES );
 
-    sgSetVec3( local_up, UP[0][0], UP[0][1], UP[0][2] );
-    // sgXformVec3( local_up, UP );
-    // cout << "Local Up = " << local_up[0] << "," << local_up[1] << ","
-    //      << local_up[2] << endl;
+    sgSetVec3( world_up, UP[0][0], UP[0][1], UP[0][2] );
+    // sgXformVec3( world_up, UP );
+    // cout << "World Up = " << world_up[0] << "," << world_up[1] << ","
+    //      << world_up[2] << endl;
     
-    // Alternative method to Derive local up vector based on
+    // Alternative method to Derive world up vector based on
     // *geodetic* coordinates
     // alt_up = sgPolarToCart(FG_Longitude, FG_Latitude, 1.0);
     // printf( "    Alt Up = (%.4f, %.4f, %.4f)\n", 
@@ -290,12 +274,13 @@ void FGViewerRPH::update() {
     sgXformVec3( pilot_offset_world, pilot_offset_world, VIEWo );
 
     // generate the view offset matrix
-    sgMakeRotMat4( VIEW_OFFSET, view_offset * RAD_TO_DEG, view_up );
+    sgMakeRotMat4( VIEW_OFFSET, view_offset * SGD_RADIANS_TO_DEGREES, view_up );
     // cout << "VIEW_OFFSET matrix" << endl;
     // print_sgMat4( VIEW_OFFSET );
     sgXformVec3( view_forward, forward, VIEW_OFFSET );
-    // cout << "view_forward = " << view_forward[0] << ","
-    //      << view_forward[1] << "," << view_forward[2] << endl;
+    SG_LOG( SG_VIEW, SG_DEBUG, "(RPH) view forward = "
+           << view_forward[0] << "," << view_forward[1] << ","
+           << view_forward[2] );
        
     // VIEW_ROT = LARC_TO_SSG * ( VIEWo * VIEW_OFFSET )
 #ifdef USE_FAST_VIEWROT
@@ -321,8 +306,8 @@ void FGViewerRPH::update() {
     // 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 quat_mat[4][4];
-    sgPreMultMat4( VIEW, quat_mat);
+    extern float GuiQuat_mat[4][4];
+    sgPreMultMat4( VIEW, GuiQuat_mat);
     // !!!!!!!!!! testing      
 
     // Given a vector pointing straight down (-Z), map into onto the
@@ -330,7 +315,7 @@ void FGViewerRPH::update() {
     // local direction for moving "south".
     sgSetVec3( minus_z, 0.0, 0.0, -1.0 );
 
-    sgmap_vec_onto_cur_surface_plane(local_up, view_pos, minus_z,
+    sgmap_vec_onto_cur_surface_plane(world_up, view_pos, minus_z,
                                     surface_south);
     sgNormalizeVec3(surface_south);
     // cout << "Surface direction directly south " << surface_south[0] << ","
@@ -339,16 +324,11 @@ void FGViewerRPH::update() {
     // now calculate the surface east vector
 #define USE_FAST_SURFACE_EAST
 #ifdef USE_FAST_SURFACE_EAST
-    sgVec3 local_down;
-    sgNegateVec3(local_down, local_up);
-    sgVectorProductVec3(surface_east, surface_south, local_down);
-#else
-#define USE_LOCAL_UP
-#ifdef USE_LOCAL_UP
-    sgMakeRotMat4( TMP, FG_PI_2 * RAD_TO_DEG, local_up );
+    sgVec3 world_down;
+    sgNegateVec3(world_down, world_up);
+    sgVectorProductVec3(surface_east, surface_south, world_down);
 #else
-    sgMakeRotMat4( TMP, FG_PI_2 * RAD_TO_DEG, view_up );
-#endif // USE_LOCAL_UP
+    sgMakeRotMat4( TMP, SGD_PI_2 * SGD_RADIANS_TO_DEGREES, world_up );
     // cout << "sgMat4 TMP" << endl;
     // print_sgMat4( TMP );
     sgXformVec3(surface_east, surface_south, TMP);