diff --git a/src/Main/keyboard.cxx b/src/Main/keyboard.cxx index 7fcb9aa2c..508b5f25d 100644 --- a/src/Main/keyboard.cxx +++ b/src/Main/keyboard.cxx @@ -420,9 +420,15 @@ void GLUTspecialkey(int k, int x, int y) { return; case GLUT_KEY_F9: // F9 toggles textures on and off... if ( material_mgr.loaded() ) { - current_options.get_textures() ? - current_options.set_textures(false) : + if (current_options.get_textures()) { + current_options.set_textures(false); + glDisable(GL_TEXTURE_2D); + ssgOverrideTexture(true); + } else { current_options.set_textures(true); + glEnable(GL_TEXTURE_2D); + ssgOverrideTexture(false); + } FG_LOG( FG_INPUT, FG_INFO, "Toggling texture" ); } else { FG_LOG( FG_INPUT, FG_INFO, diff --git a/src/Main/main.cxx b/src/Main/main.cxx index fae72031e..0317b0d77 100644 --- a/src/Main/main.cxx +++ b/src/Main/main.cxx @@ -901,13 +901,13 @@ static void fgIdleFunction ( void ) { // 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 ); - // xglViewport(0, 0 , (GLint)(width), (GLint)(height) ); + current_view.set_win_ratio( (GLfloat) width / (GLfloat) height ); + xglViewport(0, 0 , (GLint)(width), (GLint)(height) ); } else { - // current_view.set_win_ratio( (GLfloat) width / - // ((GLfloat) (height)*0.4232) ); - // xglViewport(0, (GLint)((height)*0.5768), (GLint)(width), - // (GLint)((height)*0.4232) ); + current_view.set_win_ratio( (GLfloat) width / + ((GLfloat) (height)*0.4232) ); + xglViewport(0, (GLint)((height)*0.5768), (GLint)(width), + (GLint)((height)*0.4232) ); } current_view.set_winWidth( width ); diff --git a/src/Main/options.cxx b/src/Main/options.cxx index 13832655c..826dfe621 100644 --- a/src/Main/options.cxx +++ b/src/Main/options.cxx @@ -642,7 +642,6 @@ int fgOPTIONS::parse_option( const string& arg ) { flight_model = parse_fdm( arg.substr(6) ); } else if ( arg.find( "--model-hz=" ) != string::npos ) { model_hz = atoi( arg.substr(11) ); - cout << "model hz = " << model_hz << endl; } else if ( arg.find( "--speed=" ) != string::npos ) { speed_up = atoi( arg.substr(8) ); } else if ( arg == "--fog-disable" ) { diff --git a/src/Main/views.cxx b/src/Main/views.cxx index c7d2114c3..542db906d 100644 --- a/src/Main/views.cxx +++ b/src/Main/views.cxx @@ -153,10 +153,10 @@ void FGView::UpdateViewParams( void ) { } if ( ! current_options.get_panel_status() ) { - // xglViewport(0, 0 , (GLint)(winWidth), (GLint)(winHeight) ); + xglViewport(0, 0 , (GLint)(winWidth), (GLint)(winHeight) ); } else { - // xglViewport(0, (GLint)((winHeight)*0.5768), (GLint)(winWidth), - // (GLint)((winHeight)*0.4232) ); + xglViewport(0, (GLint)((winHeight)*0.5768), (GLint)(winWidth), + (GLint)((winHeight)*0.4232) ); } panel_hist = current_options.get_panel_status();