Don't display the menubar in e highres screenshot.

diff --git a/src/GUI/gui_funcs.cxx b/src/GUI/gui_funcs.cxx
index ddcc3e9a4a961e114e4ebbf482bd962e7c5577f1..69e9c0c1bda5c0f99c2a740d8dda31c8a7c387ae 100644 (file)
--- a/src/GUI/gui_funcs.cxx
+++ b/src/GUI/gui_funcs.cxx
@@ -274,6 +274,7 @@ void fgHiResDump()
     FILE *f;
     string message;
     bool show_pu_cursor = false;
+    bool menu_status = fgGetBool("/sim/menubar/visibility");
     char *filename = new char [24];
     static int count = 1;
 
@@ -285,6 +286,7 @@ void fgHiResDump()
         fgSetBool("/sim/freeze/master", true);
     }
 
+    fgSetBool("/sim/menubar/visibility", false);
     TurnCursorOff();
     if ( !puCursorIsHidden() ) {
        show_pu_cursor = true;
@@ -299,8 +301,8 @@ void fgHiResDump()
     // we need two render frames here to clear the menu and cursor
     // ... not sure why but doing an extra fgRenderFrame() shouldn't
     // hurt anything
-    renderer->update( true );
-    renderer->update( true );
+    //renderer->update( true );
+    //renderer->update( true );
 
     // This ImageSize stuff is a temporary hack
     // should probably use 128x128 tile size and
@@ -439,6 +441,7 @@ void fgHiResDump()
     }
 
     TurnCursorOn();
+    fgSetBool("/sim/menubar/visibility", menu_status);
 
     if ( !freeze ) {
         fgSetBool("/sim/freeze/master", false);

diff --git a/src/Main/renderer.cxx b/src/Main/renderer.cxx
index 40487bc8280d765b09f15217adc98d83d00fbf65..03a863266b5febefe9050c88de9bdf935258349a 100644 (file)
--- a/src/Main/renderer.cxx
+++ b/src/Main/renderer.cxx
@@ -75,6 +75,8 @@
 #include "main.hxx"
 
 
+extern void sgShaderFrameInit(double delta_time_sec);
+
 float default_attenuation[3] = {1.0, 0.0, 0.0};
 
 ssgSelector *lightpoints_brightness = new ssgSelector;
@@ -234,7 +236,8 @@ FGRenderer::init( void ) {
 // Update all Visuals (redraws anything graphics related)
 void
 FGRenderer::update( bool refresh_camera_settings ) {
-    bool scenery_loaded = fgGetBool("sim/sceneryloaded") || fgGetBool("sim/sceneryloaded-override");
+    bool scenery_loaded = fgGetBool("sim/sceneryloaded") \
+                          || fgGetBool("sim/sceneryloaded-override");
 
     if ( idle_state < 1000 || !scenery_loaded ) {
         // still initializing, draw the splash screen
@@ -245,13 +248,6 @@ FGRenderer::update( bool refresh_camera_settings ) {
         SGAnimation::set_sim_time_sec( 0.0 );
         return;
     }
-//    return; 
-
-       // TODO:TEST only, don't commit that !!
-//     sgFXperFrameInit();
-
-    extern void sgShaderFrameInit(double delta_time_sec);
-    sgShaderFrameInit(delta_time_sec);
 
     bool draw_otw = fgGetBool("/sim/rendering/draw-otw");
     bool skyblend = fgGetBool("/sim/rendering/skyblend");
@@ -290,6 +286,11 @@ FGRenderer::update( bool refresh_camera_settings ) {
         actual_visibility = fgGetDouble("/environment/visibility-m");
     }
 
+        // TODO:TEST only, don't commit that !!
+//      sgFXperFrameInit();
+
+    sgShaderFrameInit(delta_time_sec);
+
     if ( actual_visibility != last_visibility ) {
         last_visibility = actual_visibility;