Added a specific "altas" format for output which includes a proprietary string

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

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 0cddd59dc531156b758b561d04e21761d734cf34..419614ed303a4fff1afd412bb1d99adbe61cdcf4 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -81,6 +81,7 @@
 
 #include <FDM/UIUCModel/uiuc_aircraftdir.h>
 #include <GUI/gui.h>
+#include <GUI/sgVec3Slider.hxx>
 #include <Joystick/joystick.hxx>
 #ifdef FG_NETWORK_OLK
 #include <NetworkOLK/network.h>
@@ -377,7 +378,8 @@ void fgRenderFrame( void ) {
                       cur_fdm_state->get_Psi() * RAD_TO_DEG,
                       wup );
        sgVec3 npo;             // new pilot offset after rotation
-       sgXformVec3( po, po, pilot_view->get_UP() );
+        sgVec3 *pPO = PilotOffsetGet();
+       sgXformVec3( po, *pPO, pilot_view->get_UP() );
        sgXformVec3( npo, po, CXFM );
 
        chase_view->set_geod_view_pos( cur_fdm_state->get_Longitude(), 
@@ -480,7 +482,6 @@ void fgRenderFrame( void ) {
 #endif
 
        thesky->modify_vis( cur_fdm_state->get_Altitude() * FEET_TO_METER,
-                               
                            ( global_multi_loop * 
                              fgGetInt("/sim/speed-up") ) /
                            (double)fgGetInt("/sim/model-hz") );
@@ -682,8 +683,10 @@ void fgRenderFrame( void ) {
        // position tile nodes and update range selectors
        global_tile_mgr.prep_ssg_nodes();
 
-       // draw the sky backdrop
-       thesky->preDraw();
+       if ( fgGetBool("/sim/rendering/skyblend") ) {
+           // draw the sky backdrop
+           thesky->preDraw();
+       }
 
        // draw the ssg scene
        glEnable( GL_DEPTH_TEST );
@@ -697,8 +700,10 @@ void fgRenderFrame( void ) {
 
        ssgCullAndDraw( lighting );
 
-       // draw the sky cloud layers
-       thesky->postDraw( cur_fdm_state->get_Altitude() * FEET_TO_METER );
+       if ( fgGetBool("/sim/rendering/skyblend") ) {
+           // draw the sky cloud layers
+           thesky->postDraw( cur_fdm_state->get_Altitude() * FEET_TO_METER );
+       }
 
        // display HUD && Panel
        glDisable( GL_FOG );
@@ -769,12 +774,12 @@ void fgUpdateTimeDepCalcs() {
        }
 
        // cout << "multi_loop = " << multi_loop << endl;
-       for ( i = 0; i < multi_loop; ++i ) {
+       for ( i = 0; i < multi_loop * fgGetInt("/sim/speed-up"); ++i ) {
            // run Autopilot system
            current_autopilot->run();
 
-           // update autopiot
-           cur_fdm_state->update( 1 * fgGetInt("/sim/speed-up") );
+           // update autopilot
+           cur_fdm_state->update( 1 );
        }
        FGSteam::update( multi_loop * fgGetInt("/sim/speed-up") );
     } else {
@@ -1408,6 +1413,9 @@ int main( int argc, char **argv ) {
     FGViewerLookAt *chase = new FGViewerLookAt;
     globals->get_viewmgr()->add_view( chase );
 
+    string_list *col = new string_list;
+    globals->set_channel_options_list( col );
+
     // set current view to 0 (first) which is our main pilot view
     globals->set_current_view( globals->get_viewmgr()->get_view( 0 ) );