fly/flightgear
1
0
Fork 0
Code Activity

Don't display the menubar in e highres screenshot.

Browse source
This commit is contained in:
ehofman 2006-01-11 10:53:04 +00:00
parent c3cf810562
commit fcfe5d2010
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/GUI/gui_funcs.cxx
View file

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

17
src/Main/renderer.cxx
View file

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