]> 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 003dbd1c9a2fd6cd383927b49fbc563293d9a72c..658ee8f74f0536dd10ae63fbc940f2063c86bf5a 100644 (file)
@@ -21,9 +21,6 @@
 // $Id$
 
 
-#define MICHAEL_JOHNSON_EXPERIMENTAL_ENGINE_AUDIO
-
-
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
@@ -66,7 +63,6 @@
 
 #include <simgear/constants.h>  // for VERSION
 #include <simgear/debug/logstream.hxx>
-#include <simgear/math/fg_geodesy.hxx>
 #include <simgear/math/polar3d.hxx>
 #include <simgear/math/fg_random.h>
 #include <simgear/misc/fgpath.hxx>
 #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>
 
+// $$$ begin - added VS Renganathan
+#include <simgear/misc/fgstream.hxx>
+#include <FDM/flight.hxx>
+void fgLoadDCS (void);
+void fgUpdateDCS (void);
+ssgSelector *ship_sel = NULL;
+ssgTransform *ship_pos = NULL;
+//int totalDCSobj = 0;
+// $$$ end - added VS Renganathan
+
 #ifndef FG_OLD_WEATHER
 #  include <WeatherCM/FGLocalWeatherDatabase.h>
 #else
 #  include <Weather/weather.hxx>
 #endif
 
+#include "version.h"
+
 #include "bfi.hxx"
 #include "fg_init.hxx"
 #include "fg_io.hxx"
 #include "globals.hxx"
 #include "keyboard.hxx"
-#include "options.hxx"
 #include "splash.hxx"
-#include "views.hxx"
-
 
 // -dw- use custom sioux settings so I can see output window
-#ifdef MACOS
+#ifdef macintosh
 #  ifndef FG_NDEBUG
 #    include <sioux.h> // settings for output window
 #  endif
@@ -130,9 +136,15 @@ FGGeneral general;
 static int idle_state = 0;
 static int global_multi_loop;
 
+// attempt to avoid a large bounce at startup
+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 ) ;
@@ -171,7 +183,7 @@ sgMat4 copy_of_ssgOpenGLAxisSwapMatrix =
   {  0.0f,  0.0f,  0.0f,  1.0f }
 } ;
 
-// The following defines flight gear options. Because glutlib will also
+// The following defines flightgear options. Because glutlib will also
 // want to parse its own options, those options must not be included here
 // or they will get parsed by the main program option parser. Hence case
 // is significant for any option added that might be in conflict with
@@ -198,6 +210,7 @@ ssgSimpleState *menus;
 
 void fgBuildRenderStates( void ) {
     default_state = new ssgSimpleState;
+    default_state->ref();
     default_state->disable( GL_TEXTURE_2D );
     default_state->enable( GL_CULL_FACE );
     default_state->enable( GL_COLOR_MATERIAL );
@@ -209,12 +222,14 @@ void fgBuildRenderStates( void ) {
     default_state->disable( GL_LIGHTING );
 
     hud_and_panel = new ssgSimpleState;
+    hud_and_panel->ref();
     hud_and_panel->disable( GL_CULL_FACE );
     hud_and_panel->disable( GL_TEXTURE_2D );
     hud_and_panel->disable( GL_LIGHTING );
     hud_and_panel->enable( GL_BLEND );
 
     menus = new ssgSimpleState;
+    menus->ref();
     menus->disable( GL_CULL_FACE );
     menus->disable( GL_TEXTURE_2D );
     menus->enable( GL_BLEND );
@@ -229,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
@@ -248,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 );
     }
@@ -278,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 };
@@ -287,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 {
@@ -302,22 +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;
-       pilot_view.UpdateViewParams(*cur_fdm_state);
-       // cout << "after pilot_view update" << endl;
-       current_view.UpdateViewParams(cur_view_fdm);
+        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);
+       }
+
+       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) );
+       }
 
        // 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]);
@@ -338,15 +427,7 @@ void fgRenderFrame( void ) {
        // ssg does to set up the model view matrix
        glMatrixMode(GL_MODELVIEW);
        glLoadIdentity();
-       ssgSetCamera( current_view.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 );
-       */
+       ssgSetCamera( (sgMat4)globals->get_current_view()->get_VIEW() );
 
        // set the opengl state to known default values
        default_state->force();
@@ -361,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;
@@ -386,19 +467,7 @@ void fgRenderFrame( void ) {
        }
  
        // update the sky dome
-       if ( current_options.get_skyblend() ) {
-           sgVec3 view_pos;
-           sgSetVec3( view_pos,
-                      current_view.get_view_pos().x(),
-                      current_view.get_view_pos().y(),
-                      current_view.get_view_pos().z() );
-
-           sgVec3 zero_elev;
-           sgSetVec3( zero_elev,
-                      current_view.get_cur_zero_elev().x(),
-                      current_view.get_cur_zero_elev().y(),
-                      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] << " "
@@ -434,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,
-                               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,
@@ -450,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 );
@@ -479,8 +549,8 @@ void fgRenderFrame( void ) {
 
        // glMatrixMode( GL_PROJECTION );
        // glLoadIdentity();
-       float fov = current_options.get_fov();
-       ssgSetFOV(fov * current_view.get_win_ratio(), fov);
+       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;
@@ -494,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, 
-                            pilot_view.view_pos.x(),
-                            pilot_view.view_pos.y(),
-                            pilot_view.view_pos.z() );
+                            globals->get_current_view()->get_view_pos() );
 
            sgVec3 ownship_up;
            sgSetVec3( ownship_up, 0.0, 0.0, 1.0);
@@ -529,7 +593,7 @@ void fgRenderFrame( void ) {
            // sgTUX = ( sgROT * pilot_view.VIEW_ROT ) * sgTRANS
            sgMat4 sgTUX;
            sgCopyMat4( sgTUX, sgROT );
-           sgPostMultMat4( sgTUX, pilot_view.VIEW_ROT );
+           sgPostMultMat4( sgTUX, globals->get_current_view()->get_VIEW_ROT() );
            sgPostMultMat4( sgTUX, sgTRANS );
        
            sgCoord tuxpos;
@@ -537,8 +601,12 @@ void fgRenderFrame( void ) {
            penguin_pos->setTransform( &tuxpos );
        }
 
+       // $$$ begin - added VS Renganthan 17 Oct 2K
+       fgUpdateDCS();
+       // $$$ 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 */
@@ -558,25 +626,14 @@ 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();
 
        // draw the ssg scene
+       glEnable( GL_DEPTH_TEST );
        ssgCullAndDraw( scene );
 
        // draw the sky cloud layers
@@ -615,22 +672,27 @@ void fgUpdateTimeDepCalcs(int multi_loop, int remainder) {
        multi_loop = 1;
     }
 
-    if ( !globals->get_freeze() ) {
+    if ( !globals->get_freeze() && !initial_freeze ) {
        // run Autopilot system
        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 );
+
+       if ( global_tile_mgr.queue_size() == 0 ) {
+           initial_freeze = false;
+       }
     }
 
     fdm_list.push_back( *cur_fdm_state );
@@ -638,51 +700,56 @@ 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();
     }
 
     // update the view angle
     for ( i = 0; i < multi_loop; i++ ) {
-       if ( fabs(current_view.get_goal_view_offset() - 
-                 current_view.get_view_offset()) < 0.05 )
+       if ( fabs(globals->get_current_view()->get_goal_view_offset() - 
+                 globals->get_current_view()->get_view_offset()) < 0.05 )
        {
-           current_view.set_view_offset( current_view.get_goal_view_offset() );
+           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
-           if ( current_view.get_goal_view_offset() > 
-                current_view.get_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() )
             {
-               if ( current_view.get_goal_view_offset() - 
-                    current_view.get_view_offset() < FG_PI )
+               if ( globals->get_current_view()->get_goal_view_offset() - 
+                    globals->get_current_view()->get_view_offset() < FG_PI )
                 {
-                   current_view.inc_view_offset( 0.01 );
+                   globals->get_current_view()->inc_view_offset( 0.01 );
                } else {
-                   current_view.inc_view_offset( -0.01 );
+                   globals->get_current_view()->inc_view_offset( -0.01 );
                }
            } else {
-               if ( current_view.get_view_offset() - 
-                    current_view.get_goal_view_offset() < FG_PI )
+               if ( globals->get_current_view()->get_view_offset() - 
+                    globals->get_current_view()->get_goal_view_offset() <
+                    FG_PI )
                 {
-                   current_view.inc_view_offset( -0.01 );
+                   globals->get_current_view()->inc_view_offset( -0.01 );
                } else {
-                   current_view.inc_view_offset( 0.01 );
+                   globals->get_current_view()->inc_view_offset( 0.01 );
                }
            }
-           if ( current_view.get_view_offset() > FG_2PI ) {
-               current_view.inc_view_offset( -FG_2PI );
-           } else if ( current_view.get_view_offset() < 0 ) {
-               current_view.inc_view_offset( FG_2PI );
+           if ( globals->get_current_view()->get_view_offset() > FG_2PI ) {
+               globals->get_current_view()->inc_view_offset( -FG_2PI );
+           } else if ( globals->get_current_view()->get_view_offset() < 0 ) {
+               globals->get_current_view()->inc_view_offset( FG_2PI );
            }
        }
     }
 
     double tmp = -(l->sun_rotation + FG_PI) 
-       - (cur_fdm_state->get_Psi() - current_view.get_view_offset() );
+       - (cur_fdm_state->get_Psi() -
+          globals->get_current_view()->get_view_offset() );
     while ( tmp < 0.0 ) {
        tmp += FG_2PI;
     }
@@ -710,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
 }
@@ -739,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
@@ -750,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 )
@@ -779,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",
@@ -809,10 +878,10 @@ static void fgMainLoop( void ) {
     }
 
     // update magvar model
-    cur_magvar.update( cur_fdm_state->get_Longitude(),
-                      cur_fdm_state->get_Latitude(),
-                      cur_fdm_state->get_Altitude()* FEET_TO_METER,
-                      globals->get_time_params()->getJD() );
+    globals->get_mag()->update( cur_fdm_state->get_Longitude(),
+                               cur_fdm_state->get_Latitude(),
+                               cur_fdm_state->get_Altitude()* FEET_TO_METER,
+                               globals->get_time_params()->getJD() );
 
     // Get elapsed time (in usec) for this past frame
     elapsed = fgGetTimeInterval();
@@ -856,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 );
@@ -872,82 +941,67 @@ static void fgMainLoop( void ) {
        }
     }
 
-#if ! defined( MACOS )
+#if ! defined( macintosh )
     // Do any I/O channel work that might need to be done
     fgIOProcess();
 #endif
 
     // see if we need to load any new scenery tiles
-    global_tile_mgr.update( cur_fdm_state->get_Longitude(),
-                           cur_fdm_state->get_Latitude() );
+    global_tile_mgr.update( cur_fdm_state->get_Longitude() * RAD_TO_DEG,
+                           cur_fdm_state->get_Latitude() * RAD_TO_DEG );
 
     // Process/manage pending events
     global_events.Process();
 
     // Run audio scheduler
 #ifdef ENABLE_AUDIO_SUPPORT
-    if ( current_options.get_sound() && !audio_sched->not_working() ) {
-
-#   ifdef MICHAEL_JOHNSON_EXPERIMENTAL_ENGINE_AUDIO
-
-       // note: all these factors are relative to the sample.  our
-       // sample format should really contain a conversion factor so
-       // that we can get prop speed right for arbitrary samples.
-       // Note that for normal-size props, there is a point at which
-       // the prop tips approach the speed of sound; that is a pretty
-       // strong limit to how fast the prop can go.
-
-       // multiplication factor is prime pitch control; add some log
-       // component for verisimilitude
-
-       double pitch = log((controls.get_throttle(0) * 14.0) + 1.0);
-       //fprintf(stderr, "pitch1: %f ", pitch);
-       // if (controls.get_throttle(0) > 0.0 || 
-       //     cur_fdm_state->v_rel_wind > 40.0) {
-
-       //fprintf(stderr, "rel_wind: %f ", cur_fdm_state->v_rel_wind);
-       // only add relative wind and AoA if prop is moving
-       // or we're really flying at idle throttle
-       if (pitch < 5.4) {  // this needs tuning
-           // prop tips not breaking sound barrier
-           pitch += log(cur_fdm_state->v_rel_wind + 0.8)/2;
-       } else {
-           // prop tips breaking sound barrier
-           pitch += log(cur_fdm_state->v_rel_wind + 0.8)/10;
-       }
-       //fprintf(stderr, "pitch2: %f ", pitch);
-       //fprintf(stderr, "AoA: %f ", FG_Gamma_vert_rad);
-
-       // Angle of Attack next... -x^3(e^x) is my best guess Just
-       // need to calculate some reasonable scaling factor and
-       // then clamp it on the positive aoa (neg adj) side
-       double aoa = cur_fdm_state->get_Gamma_vert_rad() * 2.2;
-       double tmp = 3.0;
-       double aoa_adj = pow(-aoa, tmp) * pow(M_E, aoa);
-       if (aoa_adj < -0.8) aoa_adj = -0.8;
-       pitch += aoa_adj;
-       //fprintf(stderr, "pitch3: %f ", pitch);
+    if ( globals->get_options()->get_sound() && !audio_sched->not_working() ) {
 
-       // don't run at absurdly slow rates -- not realistic
-       // and sounds bad to boot.  :-)
-       if (pitch < 0.8) pitch = 0.8;
-       // }
-       // fprintf(stderr, "pitch4: %f\n", pitch);
+       if ( globals->get_options()->get_aircraft() == "c172" ) {
+           // pitch corresponds to rpm
+           // volume corresponds to manifold pressure
 
-       double volume = controls.get_throttle(0) * 1.15 + 0.3 +
-           log(cur_fdm_state->v_rel_wind + 1.0)/14.0;
-       // fprintf(stderr, "volume: %f\n", volume);
+           double rpm_factor;
+           if ( cur_fdm_state->get_engine(0) != NULL ) {
+               rpm_factor = cur_fdm_state->get_engine(0)->get_RPM() / 2500.0;
+           } else {
+               rpm_factor = 1.0;
+           }
+           // cout << "rpm = " << cur_fdm_state->get_engine(0)->get_RPM()
+           //      << endl;
 
-       pitch_envelope.setStep  ( 0, 0.01, pitch );
-       volume_envelope.setStep ( 0, 0.01, volume );
+           double pitch = 0.3 + rpm_factor * 3.0;
+       
+           // don't run at absurdly slow rates -- not realistic
+           // and sounds bad to boot.  :-)
+           if (pitch < 0.7) { pitch = 0.7; }
+           if (pitch > 5.0) { pitch = 5.0; }
+           // cout << "pitch = " << pitch << endl;
+
+           double mp_factor;
+           if ( cur_fdm_state->get_engine(0) != NULL ) {
+               mp_factor = 
+                   cur_fdm_state->get_engine(0)->get_Manifold_Pressure() / 28;
+           } else {
+               mp_factor = 1.0;
+           }
+           // cout << "mp = " 
+           //      << cur_fdm_state->get_engine(0)->get_Manifold_Pressure()
+           //      << endl;
 
-#   else
+           double volume = mp_factor;
 
-       double param = controls.get_throttle( 0 ) * 2.0 + 1.0;
-       pitch_envelope.setStep  ( 0, 0.01, param );
-       volume_envelope.setStep ( 0, 0.01, param );
+           if ( volume < 0.3 ) { volume = 0.3; }
+           if ( volume > 2.0 ) { volume = 2.0; }
+           // cout << "volume = " << volume << endl;
 
-#   endif // experimental throttle patch
+           pitch_envelope.setStep  ( 0, 0.01, pitch );
+           volume_envelope.setStep ( 0, 0.01, volume );
+       } else {
+           double param = controls.get_throttle( 0 ) * 2.0 + 1.0;
+           pitch_envelope.setStep  ( 0, 0.01, param );
+           volume_envelope.setStep ( 0, 0.01, param );
+       }
 
        audio_sched -> update();
     }
@@ -973,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();
        }
        
@@ -981,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 "
@@ -1010,7 +1064,7 @@ static void fgIdleFunction ( void ) {
     } else if ( idle_state == 3 ) {
        // This is the top level init routine which calls all the
        // other subsystem initialization routines.  If you are adding
-       // a subsystem to flight gear, its initialization call should
+       // a subsystem to flightgear, its initialization call should
        // located in this routine.
        if( !fgInitSubsystems()) {
            FG_LOG( FG_GENERAL, FG_ALERT,
@@ -1038,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;
@@ -1054,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() );
@@ -1094,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 ) {
@@ -1102,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);
        }
     }
@@ -1111,44 +1169,34 @@ static void fgIdleFunction ( void ) {
 // options.cxx needs to see this for toggle_panel()
 // Handle new window size or exposure
 void fgReshape( int width, int height ) {
-    if ( ! current_options.get_panel_status() ) {
-       current_view.set_win_ratio( (GLfloat) width / (GLfloat) height );
+    if ( ! fgPanelVisible() || idle_state != 1000 ) {
+       globals->get_options()->set_win_ratio( (float)height /
+                                              (float)width );
        glViewport(0, 0 , (GLint)(width), (GLint)(height) );
     } else {
-       current_view.set_win_ratio( (GLfloat) width / 
-                                   ((GLfloat) (height)*0.4232) );
-       glViewport(0, (GLint)((height)*0.5768),
-                  (GLint)(width), (GLint)((height)*0.4232) );
+        int view_h =
+         int((current_panel->getViewHeight() - current_panel->getYOffset())
+             * (height / 768.0)) + 1;
+       globals->get_options()->set_win_ratio( (float)view_h /
+                                              (float)width );
+       glViewport(0, (GLint)(height - view_h),
+                  (GLint)(width), (GLint)(view_h) );
     }
 
-    current_view.set_winWidth( width );
-    current_view.set_winHeight( height );
-    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);
+    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.
-       current_view.UpdateViewParams(cur_view_fdm);
-    }
 }
 
 
 // Initialize GLUT and define a main window
 int fgGlutInit( int *argc, char **argv ) {
 
-#if !defined( MACOS )
+#if !defined( macintosh )
     // GLUT will extract all glut specific options so later on we only
     // need wory about our own.
     glutInit(argc, argv);
@@ -1158,24 +1206,25 @@ 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("Flight Gear");
+       glutCreateWindow("FlightGear");
 #ifndef GLUT_WRONG_VERSION
     } else {
        // 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 );
@@ -1190,8 +1239,11 @@ int fgGlutInit( int *argc, char **argv ) {
     general.set_glVendor( (char *)glGetString ( GL_VENDOR ) );
     general.set_glRenderer( (char *)glGetString ( GL_RENDERER ) );
     general.set_glVersion( (char *)glGetString ( GL_VERSION ) );
-
+    int tmp;
+    glGetIntegerv( GL_MAX_TEXTURE_SIZE, &tmp );
+    general.set_glMaxTexSize( tmp );
     FG_LOG ( FG_GENERAL, FG_INFO, general.get_glRenderer() );
+    FG_LOG ( FG_GENERAL, FG_INFO, "Max texture size = " << tmp );
 
 #if 0
     // try to determine if we should adjust the initial default
@@ -1206,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" );
@@ -1261,7 +1313,7 @@ int fgGlutInitEvents( void ) {
 // Main ...
 int main( int argc, char **argv ) {
 
-#if defined( MACOS )
+#if defined( macintosh )
     freopen ("stdout.txt", "w", stdout );
     freopen ("stderr.txt", "w", stderr );
     argc = ccommand( &argv );
@@ -1274,16 +1326,51 @@ int main( int argc, char **argv ) {
     // set default log levels
     fglog().setLogLevels( FG_ALL, FG_INFO );
 
-    FG_LOG( FG_GENERAL, FG_INFO, "Flight Gear:  Version " << VERSION << endl );
+    FG_LOG( FG_GENERAL, FG_INFO, "FlightGear:  Version "
+           << FLIGHTGEAR_VERSION << endl );
 
     // seed the random number generater
     fg_srandom();
 
-    aircraft_dir = ""; // Initialize the Aircraft directory to "" (UIUC)
-
-    // needs to happen before we parse command line options
+    // 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 = " << globals->get_options()->get_airport_id() << endl;
+
+    // Read global preferences from $FG_ROOT/preferences.xml
+    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)) {
+      FG_LOG(FG_INPUT, FG_ALERT, "Failed to read global preferences from "
+            << props_path.str());
+    } else {
+      FG_LOG(FG_INPUT, FG_INFO, "Finished Reading global preferences");
+    }
+
+    // cout << "2. airport_id = " << globals->get_options()->get_airport_id() << endl;
+
+    // Initialize the Aircraft directory to "" (UIUC)
+    aircraft_dir = "";
+
     // Load the configuration parameters
     if ( !fgInitConfig(argc, argv) ) {
        FG_LOG( FG_GENERAL, FG_ALERT, "Config option parsing failed ..." );
@@ -1312,10 +1399,20 @@ int main( int argc, char **argv ) {
     // fonts !!!
     guiInit();
 
+    // set current_options lon/lat if an airport id is specified
+    // 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( 0.0, 0.0, zone.str() );
+    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
     time_t cur_time = t->get_cur_time();
@@ -1325,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;
@@ -1375,11 +1474,11 @@ int main( int argc, char **argv ) {
     // distribution) specifically from the ssg tux example
     //
 
-    FGPath modelpath( current_options.get_fg_root() );
-    modelpath.append( "Models" );
-    modelpath.append( "Geometry" );
+    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" );
   
@@ -1391,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(),
@@ -1399,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;
@@ -1411,14 +1510,20 @@ int main( int argc, char **argv ) {
                   globals->get_ephem()->getNumStars(),
                   globals->get_ephem()->getStars(), 60000.0 );
 
-    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,
-                            SG_CLOUD_CIRRUS );
+    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,
+                                SG_CLOUD_CIRRUS );
+       // thesky->add_cloud_layer( 1000.0, 200.0, 50.0,
+       //                          SG_CLOUD_MOSTLY_SUNNY );
+       // thesky->add_cloud_layer( 1800.0, 400.0, 100.0, SG_CLOUD_OVERCAST );
+       // thesky->add_cloud_layer( 5000.0, 20.0, 10.0, SG_CLOUD_CIRRUS );
+    }
 
-    // thesky->add_cloud_layer( 1000.0, 200.0, 50.0, SG_CLOUD_MOSTLY_SUNNY );
-    // thesky->add_cloud_layer( 1800.0, 400.0, 100.0, SG_CLOUD_OVERCAST );
-    // thesky->add_cloud_layer( 5000.0, 20.0, 10.0, SG_CLOUD_CIRRUS );
+    // Initialize MagVar model
+    SGMagVar *magvar = new SGMagVar();
+    globals->set_mag( magvar );
 
     // Terrain branch
     terrain = new ssgBranch;
@@ -1428,20 +1533,38 @@ int main( int argc, char **argv ) {
     // temporary visible aircraft "own ship"
     penguin_sel = new ssgSelector;
     penguin_pos = new ssgTransform;
-    // ssgBranch *tux_obj = ssgMakeSphere( 10.0, 10, 10 );
-    ssgEntity *tux_obj = ssgLoadAC( "glider.ac" );
-    // ssgEntity *tux_obj = ssgLoadAC( "Tower1x.ac" );
-
-    penguin_pos->addKid( tux_obj );
+    string tux_path =
+      current_properties.getStringValue("/sim/model/path",
+                                       "Models/Geometry/glider.ac");
+    ssgEntity *tux_obj = ssgLoad((char *)(tux_path.c_str()));
+
+    // align the model properly for FGFS
+    ssgTransform *tux_align = new ssgTransform;
+    tux_align->addKid(tux_obj);
+    sgMat4 tux_matrix;
+    float h_rot =
+      current_properties.getFloatValue("/sim/model/h-rotation", 0.0);
+    float p_rot =
+      current_properties.getFloatValue("/sim/model/p-rotation", 0.0);
+    float r_rot =
+      current_properties.getFloatValue("/sim/model/r-rotation", 0.0);
+    sgMakeRotMat4(tux_matrix, h_rot, h_rot, r_rot);
+    tux_align->setTransform(tux_matrix);
+
+    penguin_pos->addKid( tux_align );
     penguin_sel->addKid( penguin_pos );
     ssgFlatten( tux_obj );
     ssgStripify( penguin_sel );
     penguin_sel->clrTraversalMaskBits( SSGTRAV_HOT );
     scene->addKid( penguin_sel );
 
+    // $$$ begin - added VS Renganthan 17 Oct 2K
+    fgLoadDCS();
+    // $$$ end - added VS Renganthan 17 Oct 2K
+
 #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
@@ -1456,3 +1579,107 @@ int main( int argc, char **argv ) {
     // etc.
     return 0;
 }
+
+
+// $$$ end - added VS Renganathan, 15 Oct 2K
+void fgLoadDCS(void) {
+
+    string obj_filename;
+
+    FGPath modelpath( globals->get_options()->get_fg_root() );
+    modelpath.append( "Models" );
+    modelpath.append( "Geometry" );
+  
+    FGPath texturepath( globals->get_options()->get_fg_root() );
+    texturepath.append( "Models" );
+    texturepath.append( "Textures" );
+    ssgModelPath( (char *)modelpath.c_str() );
+    ssgTexturePath( (char *)texturepath.c_str() );
+
+    // while ( ! in.eof() ) {
+    //     in >> obj_filename >> obj_lat >> obj_lon >> obj_alt;
+    //     totalDCSobj = totalDCSobj+1;
+
+    ship_sel = new ssgSelector;
+    ship_pos = new ssgTransform;
+    ssgEntity *ship_obj = ssgLoadOBJ( "saratoga.obj" );
+    if ( ship_obj != NULL ) {
+       ship_pos->addKid( ship_obj ); // add object to transform node
+       ship_sel->addKid( ship_pos ); // add transform node to selector
+       // ssgFlatten( ship_obj );
+       // ssgStripify( ship_sel );
+       ship_sel->clrTraversalMaskBits( SSGTRAV_HOT );
+       scene->addKid( ship_sel ); //add selector node to root node
+    } else {
+       FG_LOG( FG_TERRAIN, FG_ALERT, "Cannot open file: " << "saratoga.obj" );
+    }
+
+    //     if (in.eof()) break;
+
+    // } // while
+    return;
+}
+
+
+void fgUpdateDCS (void) {
+
+    // 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;
+    double sl_radius,obj_latgc;
+    // float nresultmat[4][4];
+    double bz[3];
+
+    obj_lat = obj_lat + 0.0000001;
+
+    // Instantaneous Geodetic Lat/Lon/Alt of moving object
+    //    obj_lon = current_aircraft.fdm_state->get_aux5()*DEG_TO_RAD;
+    //    obj_lat = current_aircraft.fdm_state->get_aux6()*DEG_TO_RAD;
+    //    obj_alt = current_aircraft.fdm_state->get_aux7();
+         
+    // Geodetic to Geocentric angles for rotation
+    sgGeodToGeoc(obj_lat,obj_alt,&sl_radius,&obj_latgc);
+
+    // moving object gbs-posn in cartesian coords
+    Point3D obj_posn = Point3D( obj_lon,obj_lat,obj_alt);
+    Point3D obj_pos = sgGeodToCart( obj_posn );
+
+    // Translate moving object w.r.t eye
+    Point3D Objtrans = obj_pos-scenery.center;
+    bz[0]=Objtrans.x();
+    bz[1]=Objtrans.y();
+    bz[2]=Objtrans.z();
+
+    // rotate dynamic objects for lat,lon & alt and other motion about its axes
+    if ( ship_sel != NULL ) {
+       ship_sel->select(1);
+       
+       sgMat4 sgTRANS;
+       sgMakeTransMat4( sgTRANS, bz[0],bz[1],bz[2]);
+
+       sgVec3 ship_fwd,ship_rt,ship_up;
+       sgSetVec3( ship_fwd, 1.0, 0.0, 0.0);//east,roll
+       sgSetVec3( ship_rt, 0.0, 1.0, 0.0);//up,pitch
+       sgSetVec3( ship_up, 0.0, 0.0, 1.0); //north,yaw
+
+       sgMat4 sgROT_lon, sgROT_lat, sgROT_hdg;
+       sgMakeRotMat4( sgROT_lon, obj_lon*RAD_TO_DEG, ship_up );
+       sgMakeRotMat4( sgROT_lat, 90-obj_latgc*RAD_TO_DEG, ship_rt );
+       sgMakeRotMat4( sgROT_hdg, 180.0, ship_up );
+       
+       sgMat4 sgTUX;
+       sgCopyMat4( sgTUX, sgROT_hdg );
+       sgPostMultMat4( sgTUX, sgROT_lat );
+       sgPostMultMat4( sgTUX, sgROT_lon );
+       sgPostMultMat4( sgTUX, sgTRANS );
+
+       sgCoord shippos;
+       sgSetCoord( &shippos, sgTUX );
+       ship_pos->setTransform( &shippos );
+    }
+}
+
+// $$$ end - added VS Renganathan, 15 Oct 2K