]> git.mxchange.org Git - flightgear.git/blobdiff - src/Main/main.cxx
Added a viewmgr system and made corresponding changes to support it.
[flightgear.git] / src / Main / main.cxx
index 63a2ec92ee19743fd27b8d740f31eaf2648e0047..658ee8f74f0536dd10ae63fbc940f2063c86bf5a 100644 (file)
@@ -89,6 +89,7 @@
 #include <Scenery/tilemgr.hxx>
 #include <Time/event.hxx>
 #include <Time/fg_timer.hxx>
+#include <Time/light.hxx>
 #include <Time/sunpos.hxx>
 #include <Time/tmp.hxx>
 
@@ -115,10 +116,8 @@ ssgTransform *ship_pos = NULL;
 #include "fg_io.hxx"
 #include "globals.hxx"
 #include "keyboard.hxx"
-#include "options.hxx"
 #include "splash.hxx"
 
-
 // -dw- use custom sioux settings so I can see output window
 #ifdef macintosh
 #  ifndef FG_NDEBUG
@@ -143,6 +142,9 @@ static bool initial_freeze = true;
 // Another hack
 int use_signals = 0;
 
+// forward declaration
+void fgReshape( int width, int height );
+
 // Global structures for the Audio library
 #ifdef ENABLE_AUDIO_SUPPORT
 slEnvelope pitch_envelope ( 1, SL_SAMPLE_ONE_SHOT ) ;
@@ -242,7 +244,7 @@ void fgInitVisuals( void ) {
 
 #ifndef GLUT_WRONG_VERSION
     // Go full screen if requested ...
-    if ( current_options.get_fullscreen() ) {
+    if ( globals->get_options()->get_fullscreen() ) {
        glutFullScreen();
     }
 #endif
@@ -261,14 +263,14 @@ void fgInitVisuals( void ) {
 
     // glFogi (GL_FOG_MODE, GL_LINEAR);
     glFogi (GL_FOG_MODE, GL_EXP2);
-    if ( (current_options.get_fog() == 1) || 
-        (current_options.get_shading() == 0) ) {
+    if ( (globals->get_options()->get_fog() == 1) || 
+        (globals->get_options()->get_shading() == 0) ) {
        // if fastest fog requested, or if flat shading force fastest
        glHint ( GL_FOG_HINT, GL_FASTEST );
-    } else if ( current_options.get_fog() == 2 ) {
+    } else if ( globals->get_options()->get_fog() == 2 ) {
        glHint ( GL_FOG_HINT, GL_NICEST );
     }
-    if ( current_options.get_wireframe() ) {
+    if ( globals->get_options()->get_wireframe() ) {
        // draw wire frame
        glPolygonMode( GL_FRONT_AND_BACK, GL_LINE );
     }
@@ -291,7 +293,7 @@ void fgRenderFrame( void ) {
     fgLIGHT *l = &cur_light_params;
     static double last_visibility = -9999;
 
-    double angle;
+    // double angle;
     // GLfloat black[4] = { 0.0, 0.0, 0.0, 1.0 };
     // GLfloat white[4] = { 1.0, 1.0, 1.0, 1.0 };
     // GLfloat terrain_color[4] = { 0.54, 0.44, 0.29, 1.0 };
@@ -300,7 +302,7 @@ void fgRenderFrame( void ) {
     
     if ( idle_state != 1000 ) {
        // still initializing, draw the splash screen
-       if ( current_options.get_splash_screen() == 1 ) {
+       if ( globals->get_options()->get_splash_screen() == 1 ) {
            fgSplashUpdate(0.0);
        }
     } else {
@@ -315,30 +317,96 @@ void fgRenderFrame( void ) {
        // timerText -> setLabel (ctime (&t->cur_time));
        // end of hack
 
+       // calculate our current position in cartesian space
+       scenery.center = scenery.next_center;
+       // printf("scenery center = %.2f %.2f %.2f\n", scenery.center.x(),
+       //        scenery.center.y(), scenery.center.z());
+
+       FGViewerRPH *pilot_view =
+           (FGViewerRPH *)globals->get_viewmgr()->get_view( 0 );
+
+       pilot_view->set_geod_view_pos( cur_fdm_state->get_Longitude(), 
+                                      cur_fdm_state->get_Lat_geocentric(), 
+                                      cur_fdm_state->get_Altitude() *
+                                      FEET_TO_METER );
+       pilot_view->set_sea_level_radius( cur_fdm_state->
+                                         get_Sea_level_radius() *
+                                         FEET_TO_METER ); 
+       pilot_view->set_rph( cur_fdm_state->get_Phi(),
+                            cur_fdm_state->get_Theta(),
+                            cur_fdm_state->get_Psi() );
+
+#if 0
+       // this is a test, we are trying to match RPH and LookAt
+       // matrices
+       tv->set_geod_view_pos( cur_fdm_state->get_Longitude(), 
+                              cur_fdm_state->get_Lat_geocentric(), 
+                              cur_fdm_state->get_Altitude() *
+                              FEET_TO_METER );
+       tv->set_sea_level_radius( cur_fdm_state->get_Sea_level_radius() *
+                                 FEET_TO_METER );
+       tv->set_view_forward( globals->get_current_view()->get_view_forward() );
+       tv->set_view_up( globals->get_current_view()->get_view_up() );
+
+       sgMat4 rph;
+       sgCopyMat4( rph, globals->get_current_view()->get_VIEW_ROT() );
+       cout << "RPH Matrix = " << endl;
+       int i, j;
+       for ( i = 0; i < 4; i++ ) {
+           for ( j = 0; j < 4; j++ ) {
+               printf("%10.4f ", rph[i][j]);
+           }
+           cout << endl;
+       }
+       sgMat4 la;
+       sgCopyMat4( la, tv->get_VIEW_ROT() );
+       cout << "LookAt Matrix = " << endl;
+       for ( i = 0; i < 4; i++ ) {
+           for ( j = 0; j < 4; j++ ) {
+               printf("%10.4f ", la[i][j]);
+           }
+           cout << endl;
+       }
+#endif
+
        // update view volume parameters
        // cout << "before pilot_view update" << endl;
-        if ( current_options.get_view_mode() == fgOPTIONS::FG_VIEW_FOLLOW ) {
-         float * offset = globals->get_pilot_view()->get_pilot_offset();
-         globals->get_current_view()->set_pilot_offset( offset[0],
-                                                        offset[1],
-                                                        offset[2] );
+        if ( globals->get_options()->get_view_mode() ==
+            FGOptions::FG_VIEW_FOLLOW )
+       {
+           float * offset = globals->get_current_view()->get_pilot_offset();
+           globals->get_current_view()->set_pilot_offset( offset[0],
+                                                          offset[1],
+                                                          offset[2] );
        } else {
-         globals->get_current_view()->set_pilot_offset(0.0, 0.0, 0.0);
+           globals->get_current_view()->set_pilot_offset(0.0, 0.0, 0.0);
+       }
+
+       if ( ! fgPanelVisible() ) {
+           xglViewport( 0, 0 ,
+                        (GLint)(globals->get_options()->get_xsize()),
+                        (GLint)(globals->get_options()->get_ysize()) );
+       } else {
+           int view_h =
+               int( (current_panel->getViewHeight() -
+                     current_panel->getYOffset())
+                    * (globals->get_options()->get_ysize() / 768.0) );
+           glViewport( 0, 
+                       (GLint)(globals->get_options()->get_ysize() - view_h),
+                       (GLint)(globals->get_options()->get_xsize()),
+                       (GLint)(view_h) );
        }
-       globals->get_pilot_view()->UpdateViewParams(*cur_fdm_state);
-       // cout << "after pilot_view update" << endl;
-       globals->get_current_view()->UpdateViewParams(cur_view_fdm);
 
        // set the sun position
        glLightfv( GL_LIGHT0, GL_POSITION, l->sun_vec );
 
        clear_mask = GL_DEPTH_BUFFER_BIT;
-       if ( current_options.get_wireframe() ) {
+       if ( globals->get_options()->get_wireframe() ) {
            clear_mask |= GL_COLOR_BUFFER_BIT;
        }
 
-       if ( current_options.get_skyblend() ) {
-           if ( current_options.get_textures() ) {
+       if ( globals->get_options()->get_skyblend() ) {
+           if ( globals->get_options()->get_textures() ) {
                // glClearColor(black[0], black[1], black[2], black[3]);
                glClearColor(l->adj_fog_color[0], l->adj_fog_color[1], 
                             l->adj_fog_color[2], l->adj_fog_color[3]);
@@ -361,14 +429,6 @@ void fgRenderFrame( void ) {
        glLoadIdentity();
        ssgSetCamera( (sgMat4)globals->get_current_view()->get_VIEW() );
 
-       /*
-       sgMat4 vm_tmp, view_mat;
-       sgTransposeNegateMat4 ( vm_tmp, current_view.VIEW ) ;
-       sgCopyMat4( view_mat, copy_of_ssgOpenGLAxisSwapMatrix ) ;
-       sgPreMultMat4( view_mat, vm_tmp ) ;
-       glLoadMatrixf( (float *)view_mat );
-       */
-
        // set the opengl state to known default values
        default_state->force();
 
@@ -382,8 +442,8 @@ void fgRenderFrame( void ) {
        thesky->modify_vis( cur_fdm_state->get_Altitude() * FEET_TO_METER,
                                
                            ( global_multi_loop * 
-                             current_options.get_speed_up() ) /
-                           (double)current_options.get_model_hz() );
+                             globals->get_options()->get_speed_up() ) /
+                           (double)globals->get_options()->get_model_hz() );
 
        double actual_visibility = thesky->get_visibility();
        // cout << "actual visibility = " << actual_visibility << endl;
@@ -407,19 +467,7 @@ void fgRenderFrame( void ) {
        }
  
        // update the sky dome
-       if ( current_options.get_skyblend() ) {
-           sgVec3 view_pos;
-           sgSetVec3( view_pos,
-                      globals->get_current_view()->get_view_pos().x(),
-                      globals->get_current_view()->get_view_pos().y(),
-                      globals->get_current_view()->get_view_pos().z() );
-
-           sgVec3 zero_elev;
-           sgSetVec3( zero_elev,
-                      globals->get_current_view()->get_cur_zero_elev().x(),
-                      globals->get_current_view()->get_cur_zero_elev().y(),
-                      globals->get_current_view()->get_cur_zero_elev().z() );
-
+       if ( globals->get_options()->get_skyblend() ) {
            /* cout << "thesky->repaint() sky_color = "
                 << cur_light_params.sky_color[0] << " "
                 << cur_light_params.sky_color[1] << " "
@@ -455,8 +503,9 @@ void fgRenderFrame( void ) {
                 << " moon ra = " << globals->get_ephem()->getMoonRightAscension()
                 << " moon dec = " << globals->get_ephem()->getMoonDeclination() << endl; */
 
-           thesky->reposition( view_pos, zero_elev,
-                               globals->get_current_view()->get_local_up(),
+           thesky->reposition( globals->get_current_view()->get_view_pos(),
+                               globals->get_current_view()->get_zero_elev(),
+                               globals->get_current_view()->get_world_up(),
                                cur_fdm_state->get_Longitude(),
                                cur_fdm_state->get_Latitude(),
                                cur_fdm_state->get_Altitude() * FEET_TO_METER,
@@ -471,7 +520,7 @@ void fgRenderFrame( void ) {
        }
 
        glEnable( GL_DEPTH_TEST );
-       if ( current_options.get_fog() > 0 ) {
+       if ( globals->get_options()->get_fog() > 0 ) {
            glEnable( GL_FOG );
            glFogi( GL_FOG_MODE, GL_EXP2 );
            glFogfv( GL_FOG_COLOR, l->adj_fog_color );
@@ -500,9 +549,8 @@ void fgRenderFrame( void ) {
 
        // glMatrixMode( GL_PROJECTION );
        // glLoadIdentity();
-       float fov = current_options.get_fov();
-       // ssgSetFOV(fov * current_view.get_win_ratio(), fov);
-       ssgSetFOV(fov, fov * globals->get_current_view()->get_win_ratio());
+       float fov = globals->get_options()->get_fov();
+       ssgSetFOV(fov, fov * globals->get_options()->get_win_ratio());
 
        double agl = current_aircraft.fdm_state->get_Altitude() * FEET_TO_METER
            - scenery.cur_elev;
@@ -516,26 +564,20 @@ void fgRenderFrame( void ) {
            ssgSetNearFar( 0.5f, 120000.0f );
        }
 
-       if ( current_options.get_view_mode() == 
-            fgOPTIONS::FG_VIEW_PILOT )
+       if ( globals->get_options()->get_view_mode() == 
+            FGOptions::FG_VIEW_PILOT )
         {
            // disable TuX
            penguin_sel->select(0);
-       } else if ( current_options.get_view_mode() == 
-                   fgOPTIONS::FG_VIEW_FOLLOW )
+       } else if ( globals->get_options()->get_view_mode() == 
+                   FGOptions::FG_VIEW_FOLLOW )
         {
-           // select view matrix from front of view matrix queue
-           // FGMat4Wrapper tmp = current_view.follow.front();
-           // sgCopyMat4( sgVIEW, tmp.m );
-
            // enable TuX and set up his position and orientation
            penguin_sel->select(1);
 
            sgMat4 sgTRANS;
            sgMakeTransMat4( sgTRANS, 
-                            globals->get_pilot_view()->get_view_pos().x(),
-                            globals->get_pilot_view()->get_view_pos().y(),
-                            globals->get_pilot_view()->get_view_pos().z() );
+                            globals->get_current_view()->get_view_pos() );
 
            sgVec3 ownship_up;
            sgSetVec3( ownship_up, 0.0, 0.0, 1.0);
@@ -551,7 +593,7 @@ void fgRenderFrame( void ) {
            // sgTUX = ( sgROT * pilot_view.VIEW_ROT ) * sgTRANS
            sgMat4 sgTUX;
            sgCopyMat4( sgTUX, sgROT );
-           sgPostMultMat4( sgTUX, globals->get_pilot_view()->get_VIEW_ROT() );
+           sgPostMultMat4( sgTUX, globals->get_current_view()->get_VIEW_ROT() );
            sgPostMultMat4( sgTUX, sgTRANS );
        
            sgCoord tuxpos;
@@ -564,7 +606,7 @@ void fgRenderFrame( void ) {
        // $$$ end - added VS Renganthan 17 Oct 2K
 
 # ifdef FG_NETWORK_OLK
-       if ( current_options.get_network_olk() ) {
+       if ( globals->get_options()->get_network_olk() ) {
            sgCoord fgdpos;
            other = head->next;             /* put listpointer to start  */
            while ( other != tail) {        /* display all except myself */
@@ -584,21 +626,9 @@ void fgRenderFrame( void ) {
        }
 # endif
 
-       // ssgSetCamera( current_view.VIEW );
-
        // position tile nodes and update range selectors
        global_tile_mgr.prep_ssg_nodes();
 
-       // force the default state so ssg can get back on track if
-       // we've changed things elsewhere (this is now handled
-       // differently)
-       // 
-       // FGMaterialSlot m_slot;
-       // FGMaterialSlot *m_ptr = &m_slot;
-       // if ( material_mgr.find( "Default", m_ptr ) ) {
-       //    m_ptr->get_state()->force();
-       // }
-
        // draw the sky backdrop
        thesky->preDraw();
 
@@ -647,14 +677,15 @@ void fgUpdateTimeDepCalcs(int multi_loop, int remainder) {
        current_autopilot->run();
 
        // printf("updating flight model x %d\n", multi_loop);
-       /* fgFDMUpdate( current_options.get_flight_model(), 
+       /* fgFDMUpdate( globals->get_options()->get_flight_model(), 
                     fdm_state, 
-                    multi_loop * current_options.get_speed_up(),
+                    multi_loop * globals->get_options()->get_speed_up(),
                     remainder ); */
-       cur_fdm_state->update( multi_loop * current_options.get_speed_up() );
-       FGSteam::update( multi_loop * current_options.get_speed_up() );
+       cur_fdm_state->update( multi_loop *
+                              globals->get_options()->get_speed_up() );
+       FGSteam::update( multi_loop * globals->get_options()->get_speed_up() );
     } else {
-       // fgFDMUpdate( current_options.get_flight_model(), 
+       // fgFDMUpdate( globals->get_options()->get_flight_model(), 
        //              fdm_state, 0, remainder );
        cur_fdm_state->update( 0 );
        FGSteam::update( 0 );
@@ -669,10 +700,12 @@ void fgUpdateTimeDepCalcs(int multi_loop, int remainder) {
        fdm_list.pop_front();
     }
 
-    if ( current_options.get_view_mode() == fgOPTIONS::FG_VIEW_PILOT ) {
+    if ( globals->get_options()->get_view_mode() == FGOptions::FG_VIEW_PILOT ) {
        cur_view_fdm = *cur_fdm_state;
        // do nothing
-    } else if ( current_options.get_view_mode() == fgOPTIONS::FG_VIEW_FOLLOW ) {
+    } else if ( globals->get_options()->get_view_mode()
+               == FGOptions::FG_VIEW_FOLLOW )
+    {
        cur_view_fdm = fdm_list.front();
     }
 
@@ -684,7 +717,8 @@ void fgUpdateTimeDepCalcs(int multi_loop, int remainder) {
            globals->get_current_view()->set_view_offset( globals->get_current_view()->get_goal_view_offset() );
            break;
        } else {
-           // move current_view.view_offset towards current_view.goal_view_offset
+           // move current_view.view_offset towards
+           // current_view.goal_view_offset
            if ( globals->get_current_view()->get_goal_view_offset() > 
                 globals->get_current_view()->get_view_offset() )
             {
@@ -697,7 +731,8 @@ void fgUpdateTimeDepCalcs(int multi_loop, int remainder) {
                }
            } else {
                if ( globals->get_current_view()->get_view_offset() - 
-                    globals->get_current_view()->get_goal_view_offset() < FG_PI )
+                    globals->get_current_view()->get_goal_view_offset() <
+                    FG_PI )
                 {
                    globals->get_current_view()->inc_view_offset( -0.01 );
                } else {
@@ -713,7 +748,8 @@ void fgUpdateTimeDepCalcs(int multi_loop, int remainder) {
     }
 
     double tmp = -(l->sun_rotation + FG_PI) 
-       - (cur_fdm_state->get_Psi() - globals->get_current_view()->get_view_offset() );
+       - (cur_fdm_state->get_Psi() -
+          globals->get_current_view()->get_view_offset() );
     while ( tmp < 0.0 ) {
        tmp += FG_2PI;
     }
@@ -741,7 +777,7 @@ void fgInitTimeDepCalcs( void ) {
     // initialize timer
 
     // #ifdef HAVE_SETITIMER
-    //   fgTimerInit( 1.0 / current_options.get_model_hz(), 
+    //   fgTimerInit( 1.0 / globals->get_options()->get_model_hz(), 
     //                fgUpdateTimeDepCalcs );
     // #endif HAVE_SETITIMER
 }
@@ -770,7 +806,7 @@ static void fgMainLoop( void ) {
     FG_LOG( FG_ALL, FG_DEBUG, "======= ==== ====");
 
 #ifdef FG_NETWORK_OLK
-    if ( current_options.get_network_olk() ) {
+    if ( globals->get_options()->get_network_olk() ) {
        if ( net_is_registered == 0 ) {      // We first have to reg. to fgd
            // printf("FGD: Netupdate\n");
            fgd_send_com( "A", FGFS_host);   // Send Mat4 data
@@ -781,7 +817,8 @@ static void fgMainLoop( void ) {
 
 #if defined( ENABLE_PLIB_JOYSTICK )
     // Read joystick and update control settings
-    if ( current_options.get_control_mode() == fgOPTIONS::FG_JOYSTICK ) {
+    if ( globals->get_options()->get_control_mode() == FGOptions::FG_JOYSTICK )
+    {
        fgJoystickRead();
     }
 #elif defined( ENABLE_GLUT_JOYSTICK )
@@ -810,15 +847,16 @@ static void fgMainLoop( void ) {
                   cur_fdm_state->get_Altitude() * FEET_TO_METER,
                   scenery.cur_elev + alt_adjust_m - 3.0,
                   scenery.cur_elev + alt_adjust_m );
-           fgFDMForceAltitude( current_options.get_flight_model(), 
+           fgFDMForceAltitude( globals->get_options()->get_flight_model(), 
                                scenery.cur_elev + alt_adjust_m );
 
            FG_LOG( FG_ALL, FG_DEBUG, 
                    "<*> resetting altitude to " 
-                   << cur_fdm_state->get_Altitude() * FEET_TO_METER << " meters" );
+                   << cur_fdm_state->get_Altitude() * FEET_TO_METER
+                   << " meters" );
        }
-       fgFDMSetGroundElevation( current_options.get_flight_model(),
-                                scenery.cur_elev );  // meters
+       //fgFDMSetGroundElevation( globals->get_options()->get_flight_model(),
+       //                       scenery.cur_elev );  // meters
     }
 
     /* printf("Adjustment - ground = %.2f  runway = %.2f  alt = %.2f\n",
@@ -887,9 +925,9 @@ static void fgMainLoop( void ) {
        elapsed += remainder;
 
        global_multi_loop = (int)(((double)elapsed * 0.000001) * 
-                          current_options.get_model_hz());
+                          globals->get_options()->get_model_hz());
        remainder = elapsed - ( (global_multi_loop*1000000) / 
-                               current_options.get_model_hz() );
+                               globals->get_options()->get_model_hz() );
        FG_LOG( FG_ALL, FG_DEBUG, 
                "Model iterations needed = " << global_multi_loop
                << ", new remainder = " << remainder );
@@ -917,9 +955,9 @@ static void fgMainLoop( void ) {
 
     // Run audio scheduler
 #ifdef ENABLE_AUDIO_SUPPORT
-    if ( current_options.get_sound() && !audio_sched->not_working() ) {
+    if ( globals->get_options()->get_sound() && !audio_sched->not_working() ) {
 
-       if ( current_options.get_aircraft() == "c172" ) {
+       if ( globals->get_options()->get_aircraft() == "c172" ) {
            // pitch corresponds to rpm
            // volume corresponds to manifold pressure
 
@@ -989,7 +1027,7 @@ static void fgIdleFunction ( void ) {
 
     if ( idle_state == 0 ) {
        // Initialize the splash screen right away
-       if ( current_options.get_splash_screen() ) {
+       if ( globals->get_options()->get_splash_screen() ) {
            fgSplashInit();
        }
        
@@ -997,9 +1035,9 @@ static void fgIdleFunction ( void ) {
     } else if ( idle_state == 1 ) {
        // Start the intro music
 #if !defined(WIN32)
-       if ( current_options.get_intro_music() ) {
+       if ( globals->get_options()->get_intro_music() ) {
            string lockfile = "/tmp/mpg123.running";
-           FGPath mp3file( current_options.get_fg_root() );
+           FGPath mp3file( globals->get_options()->get_fg_root() );
            mp3file.append( "Sounds/intro.mp3" );
 
            string command = "(touch " + lockfile + "; mpg123 "
@@ -1054,7 +1092,7 @@ static void fgIdleFunction ( void ) {
 #ifdef ENABLE_AUDIO_SUPPORT
 
 #if !defined(WIN32)
-       if ( current_options.get_intro_music() ) {
+       if ( globals->get_options()->get_intro_music() ) {
            // Let's wait for mpg123 to finish
            string lockfile = "/tmp/mpg123.running";
            struct stat stat_buf;
@@ -1070,13 +1108,13 @@ static void fgIdleFunction ( void ) {
        }
 #endif // WIN32
 
-       if ( current_options.get_sound() ) {
+       if ( globals->get_options()->get_sound() ) {
            audio_sched = new slScheduler ( 8000 );
            audio_mixer = new smMixer;
            audio_mixer -> setMasterVolume ( 80 ) ;  /* 80% of max volume. */
            audio_sched -> setSafetyMargin ( 1.0 ) ;
 
-           FGPath slfile( current_options.get_fg_root() );
+           FGPath slfile( globals->get_options()->get_fg_root() );
            slfile.append( "Sounds/wasp.wav" );
 
            s1 = new slSample ( (char *)slfile.c_str() );
@@ -1110,6 +1148,10 @@ static void fgIdleFunction ( void ) {
 
        // sleep(1);
        idle_state = 1000;
+
+       cout << "Panel visible = " << fgPanelVisible() << endl;
+       fgReshape( globals->get_options()->get_xsize(),
+                  globals->get_options()->get_ysize() );
     } 
 
     if ( idle_state == 1000 ) {
@@ -1118,7 +1160,7 @@ static void fgIdleFunction ( void ) {
 
        fgMainLoop();
     } else {
-       if ( current_options.get_splash_screen() == 1 ) {
+       if ( globals->get_options()->get_splash_screen() == 1 ) {
            fgSplashUpdate(0.0);
        }
     }
@@ -1128,39 +1170,26 @@ static void fgIdleFunction ( void ) {
 // Handle new window size or exposure
 void fgReshape( int width, int height ) {
     if ( ! fgPanelVisible() || idle_state != 1000 ) {
-       globals->get_current_view()->set_win_ratio( (float)height / (float)width );
+       globals->get_options()->set_win_ratio( (float)height /
+                                              (float)width );
        glViewport(0, 0 , (GLint)(width), (GLint)(height) );
     } else {
         int view_h =
          int((current_panel->getViewHeight() - current_panel->getYOffset())
              * (height / 768.0)) + 1;
-       globals->get_current_view()->set_win_ratio( (float)view_h / (float)width );
+       globals->get_options()->set_win_ratio( (float)view_h /
+                                              (float)width );
        glViewport(0, (GLint)(height - view_h),
                   (GLint)(width), (GLint)(view_h) );
     }
 
-    globals->get_current_view()->set_winWidth( width );
-    globals->get_current_view()->set_winHeight( height );
-    globals->get_current_view()->force_update_fov_math();
-
-    // set these fov to be the same as in fgRenderFrame()
-    // float x_fov = current_options.get_fov();
-    // float y_fov = x_fov * 1.0 / current_view.get_win_ratio();
-    // ssgSetFOV( x_fov, y_fov );
+    globals->get_options()->set_xsize( width );
+    globals->get_options()->set_ysize( height );
 
-    // glViewport ( 0, 0, width, height );
-    float fov = current_options.get_fov();
-    // ssgSetFOV(fov * current_view.get_win_ratio(), fov);
-    ssgSetFOV(fov, fov * globals->get_current_view()->get_win_ratio());
+    float fov = globals->get_options()->get_fov();
+    ssgSetFOV(fov, fov * globals->get_options()->get_win_ratio());
 
     fgHUDReshape();
-
-    if ( idle_state == 1000 ) {
-       // yes we've finished all our initializations and are running
-       // the main loop, so this will now work without seg faulting
-       // the system.
-       globals->get_current_view()->UpdateViewParams(cur_view_fdm);
-    }
 }
 
 
@@ -1177,14 +1206,15 @@ int fgGlutInit( int *argc, char **argv ) {
     glutInitDisplayMode( GLUT_RGB | GLUT_DEPTH | GLUT_DOUBLE );
 
     FG_LOG( FG_GENERAL, FG_INFO, "Opening a window: " <<
-           current_options.get_xsize() << "x" << current_options.get_ysize() );
+           globals->get_options()->get_xsize() << "x"
+           << globals->get_options()->get_ysize() );
 
     // Define initial window size
-    glutInitWindowSize( current_options.get_xsize(),
-                        current_options.get_ysize() );
+    glutInitWindowSize( globals->get_options()->get_xsize(),
+                        globals->get_options()->get_ysize() );
 
     // Initialize windows
-    if ( current_options.get_game_mode() == 0 ) {
+    if ( globals->get_options()->get_game_mode() == 0 ) {
        // Open the regular window
        glutCreateWindow("FlightGear");
 #ifndef GLUT_WRONG_VERSION
@@ -1192,9 +1222,9 @@ int fgGlutInit( int *argc, char **argv ) {
        // Open the cool new 'game mode' window
        char game_mode_str[256];
        sprintf( game_mode_str, "width=%d height=%d bpp=%d",
-                current_options.get_xsize(),
-                current_options.get_ysize(),
-                current_options.get_bpp());
+                globals->get_options()->get_xsize(),
+                globals->get_options()->get_ysize(),
+                globals->get_options()->get_bpp());
 
        FG_LOG( FG_GENERAL, FG_INFO, 
                "game mode params = " << game_mode_str );
@@ -1228,16 +1258,16 @@ int fgGlutInit( int *argc, char **argv ) {
            // probably a voodoo-2
            if ( renderer.find( "TMU/SLI" ) != string::npos ) {
                // probably two SLI'd Voodoo-2's
-               current_options.set_xsize( 1024 );
-               current_options.set_ysize( 768 );
+               globals->get_options()->set_xsize( 1024 );
+               globals->get_options()->set_ysize( 768 );
                FG_LOG( FG_GENERAL, FG_INFO,
                        "It looks like you have two sli'd voodoo-2's." << endl
                        << "upgrading your win resolution to 1024 x 768" );
                glutReshapeWindow(1024, 768);
            } else {
                // probably a single non-SLI'd Voodoo-2
-               current_options.set_xsize( 800 );
-               current_options.set_ysize( 600 );
+               globals->get_options()->set_xsize( 800 );
+               globals->get_options()->set_ysize( 600 );
                FG_LOG( FG_GENERAL, FG_INFO,
                        "It looks like you have a voodoo-2." << endl
                        << "upgrading your win resolution to 800 x 600" );
@@ -1302,14 +1332,31 @@ int main( int argc, char **argv ) {
     // seed the random number generater
     fg_srandom();
 
+    // Allocate global data structures.  This needs to happen before
+    // we parse command line options
+    globals = new FGGlobals;
+
+    SGRoute *route = new SGRoute;
+    globals->set_route( route );
+
+    FGOptions *options = new FGOptions;
+    globals->set_options( options );
+
+    FGViewMgr *viewmgr = new FGViewMgr;
+    globals->set_viewmgr( viewmgr );
+
+    FGViewerRPH *pv = new FGViewerRPH;
+    globals->get_viewmgr()->add_view( pv );
+    globals->set_current_view( pv );
+
     // Scan the config file(s) and command line options to see if
     // fg_root was specified (ignore all other options for now)
     fgInitFGRoot(argc, argv);
 
-    // cout << "1. airport_id = " << current_options.get_airport_id() << endl;
+    // cout << "1. airport_id = " << globals->get_options()->get_airport_id() << endl;
 
     // Read global preferences from $FG_ROOT/preferences.xml
-    FGPath props_path(current_options.get_fg_root());
+    FGPath props_path(globals->get_options()->get_fg_root());
     props_path.append("preferences.xml");
     FG_LOG(FG_INPUT, FG_INFO, "Reading global preferences");
     if (!readPropertyList(props_path.str(), &current_properties)) {
@@ -1319,20 +1366,11 @@ int main( int argc, char **argv ) {
       FG_LOG(FG_INPUT, FG_INFO, "Finished Reading global preferences");
     }
 
-    // cout << "2. airport_id = " << current_options.get_airport_id() << endl;
+    // cout << "2. airport_id = " << globals->get_options()->get_airport_id() << endl;
 
     // Initialize the Aircraft directory to "" (UIUC)
     aircraft_dir = "";
 
-    // needs to happen before we parse command line options
-    globals = new FGGlobals;
-    SGRoute *route = new SGRoute;
-    globals->set_route( route );
-    FGViewer *pv = new FGViewer;
-    globals->set_pilot_view( pv );
-    FGViewer *cv = new FGViewer;
-    globals->set_current_view( cv );
-    
     // Load the configuration parameters
     if ( !fgInitConfig(argc, argv) ) {
        FG_LOG( FG_GENERAL, FG_ALERT, "Config option parsing failed ..." );
@@ -1362,18 +1400,18 @@ int main( int argc, char **argv ) {
     guiInit();
 
     // set current_options lon/lat if an airport id is specified
-    // cout << "3. airport_id = " << current_options.get_airport_id() << endl;
-    if ( current_options.get_airport_id().length() ) {
-       // fgSetPosFromAirportID( current_options.get_airport_id() );
-       fgSetPosFromAirportIDandHdg( current_options.get_airport_id(),
-                                    current_options.get_heading() );
+    // cout << "3. airport_id = " << globals->get_options()->get_airport_id() << endl;
+    if ( globals->get_options()->get_airport_id().length() ) {
+       // fgSetPosFromAirportID( globals->get_options()->get_airport_id() );
+       fgSetPosFromAirportIDandHdg( globals->get_options()->get_airport_id(),
+                                    globals->get_options()->get_heading() );
     }
 
     // Initialize time
-    FGPath zone( current_options.get_fg_root() );
+    FGPath zone( globals->get_options()->get_fg_root() );
     zone.append( "Timezone" );
-    SGTime *t = new SGTime( current_options.get_lon() * DEG_TO_RAD,
-                           current_options.get_lat() * DEG_TO_RAD,
+    SGTime *t = new SGTime( globals->get_options()->get_lon() * DEG_TO_RAD,
+                           globals->get_options()->get_lat() * DEG_TO_RAD,
                            zone.str() );
 
     // Handle potential user specified time offsets
@@ -1384,27 +1422,29 @@ int main( int argc, char **argv ) {
        sgTimeGetGMT( fgLocaltime(&cur_time, t->get_zonename() ) );
 
     // Okay, we now have six possible scenarios
-    switch ( current_options.get_time_offset_type() ) {
-    case fgOPTIONS::FG_TIME_SYS_OFFSET:
-       globals->set_warp( current_options.get_time_offset() );
+    switch ( globals->get_options()->get_time_offset_type() ) {
+    case FGOptions::FG_TIME_SYS_OFFSET:
+       globals->set_warp( globals->get_options()->get_time_offset() );
        break;
-    case fgOPTIONS::FG_TIME_GMT_OFFSET:
-       globals->set_warp( current_options.get_time_offset() - 
+    case FGOptions::FG_TIME_GMT_OFFSET:
+       globals->set_warp( globals->get_options()->get_time_offset() - 
                           (currGMT - systemLocalTime) );
        break;
-    case fgOPTIONS::FG_TIME_LAT_OFFSET:
-       globals->set_warp( current_options.get_time_offset() - 
+    case FGOptions::FG_TIME_LAT_OFFSET:
+       globals->set_warp( globals->get_options()->get_time_offset() - 
                           (aircraftLocalTime - systemLocalTime) );
        break;
-    case fgOPTIONS::FG_TIME_SYS_ABSOLUTE:
-       globals->set_warp( current_options.get_time_offset() - cur_time );
+    case FGOptions::FG_TIME_SYS_ABSOLUTE:
+       globals->set_warp( globals->get_options()->get_time_offset() -
+                          cur_time );
        //printf("warp = %d\n", warp); 
        break;
-    case fgOPTIONS::FG_TIME_GMT_ABSOLUTE:
-       globals->set_warp( current_options.get_time_offset() - currGMT );
+    case FGOptions::FG_TIME_GMT_ABSOLUTE:
+       globals->set_warp( globals->get_options()->get_time_offset() -
+                          currGMT );
        break;
-    case fgOPTIONS::FG_TIME_LAT_ABSOLUTE:
-       globals->set_warp( current_options.get_time_offset() - 
+    case FGOptions::FG_TIME_LAT_ABSOLUTE:
+       globals->set_warp( globals->get_options()->get_time_offset() - 
                           (aircraftLocalTime - systemLocalTime) - 
                           cur_time ); 
        break;
@@ -1434,11 +1474,11 @@ int main( int argc, char **argv ) {
     // distribution) specifically from the ssg tux example
     //
 
-    FGPath modelpath( current_options.get_fg_root() );
+    FGPath modelpath( globals->get_options()->get_fg_root() );
     // modelpath.append( "Models" );
     // modelpath.append( "Geometry" );
   
-    FGPath texturepath( current_options.get_fg_root() );
+    FGPath texturepath( globals->get_options()->get_fg_root() );
     texturepath.append( "Models" );
     texturepath.append( "Textures" );
   
@@ -1450,7 +1490,7 @@ int main( int argc, char **argv ) {
     scene->setName( "Scene" );
 
     // Initialize the sky
-    FGPath ephem_data_path( current_options.get_fg_root() );
+    FGPath ephem_data_path( globals->get_options()->get_fg_root() );
     ephem_data_path.append( "Astro" );
     SGEphemeris *ephem = new SGEphemeris( ephem_data_path.c_str() );
     ephem->update( globals->get_time_params()->getMjd(),
@@ -1458,7 +1498,7 @@ int main( int argc, char **argv ) {
                   0.0 );
     globals->set_ephem( ephem );
 
-    FGPath sky_tex_path( current_options.get_fg_root() );
+    FGPath sky_tex_path( globals->get_options()->get_fg_root() );
     sky_tex_path.append( "Textures" );
     sky_tex_path.append( "Sky" );
     thesky = new SGSky;
@@ -1470,7 +1510,7 @@ int main( int argc, char **argv ) {
                   globals->get_ephem()->getNumStars(),
                   globals->get_ephem()->getStars(), 60000.0 );
 
-    if ( current_options.get_clouds() == true ) {
+    if ( globals->get_options()->get_clouds() == true ) {
        thesky->add_cloud_layer( 2600.0, 200.0, 50.0, 40000.0,
                                 SG_CLOUD_MOSTLY_SUNNY );
        thesky->add_cloud_layer( 6000.0, 20.0, 10.0, 40000.0,
@@ -1524,7 +1564,7 @@ int main( int argc, char **argv ) {
 
 #ifdef FG_NETWORK_OLK
     // Do the network intialization
-    if ( current_options.get_network_olk() ) {
+    if ( globals->get_options()->get_network_olk() ) {
        printf("Multipilot mode %s\n", fg_net_init( scene ) );
     }
 #endif
@@ -1544,23 +1584,13 @@ int main( int argc, char **argv ) {
 // $$$ end - added VS Renganathan, 15 Oct 2K
 void fgLoadDCS(void) {
 
-    double obj_lat,obj_lon,obj_alt;
-    int i = 1;
     string obj_filename;
 
-    FGPath tile_path( current_options.get_fg_root());
-    tile_path.append( "Scenery" );
-    tile_path.append( "Objects.txt" );
-    fg_gzifstream in( tile_path.str() );
-    if ( ! in.is_open() ) {
-       FG_LOG( FG_TERRAIN, FG_ALERT, "Cannot open file: " << tile_path.str() );
-    }
-
-    FGPath modelpath( current_options.get_fg_root() );
+    FGPath modelpath( globals->get_options()->get_fg_root() );
     modelpath.append( "Models" );
     modelpath.append( "Geometry" );
   
-    FGPath texturepath( current_options.get_fg_root() );
+    FGPath texturepath( globals->get_options()->get_fg_root() );
     texturepath.append( "Models" );
     texturepath.append( "Textures" );
  
@@ -1594,14 +1624,13 @@ void fgLoadDCS(void) {
 
 void fgUpdateDCS (void) {
 
-    double eye_lat,eye_lon,eye_alt;
+    // double eye_lat,eye_lon,eye_alt;
     static double obj_lat=15.377603*DEG_TO_RAD;
     static double obj_lon= 73.816436*DEG_TO_RAD;
     static double obj_alt=0.15;
-    static double obj_head;
+    // static double obj_head;
     double sl_radius,obj_latgc;
-    float nresultmat[4][4];
-    sgMat4 Trans,rothead,rotlon,rot180,rotlat,resultmat1,resultmat2,resultmat3;
+    // float nresultmat[4][4];
     double bz[3];
 
     obj_lat = obj_lat + 0.0000001;