fly/flightgear
1
0
Fork 0
Code Activity

Fix up Win32 GUI code after simgear/screen cleanup; deprecated dialog code going away.

Browse source
This commit is contained in:
James Turner 2010-07-31 16:54:37 +01:00 • committed by unknown
parent d9236f33b2
commit 5c507beba2
3 changed files with 2 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/GUI/gui.h
View file

@ -60,9 +60,7 @@ extern void fgDumpSnapShotWrapper();
extern void fgHiResDumpWrapper();
extern void fgHiResDump();
#endif
#if defined( _WIN32 ) && !defined(__MINGW32__)
extern void printScreen();
#endif
extern void helpCb();
typedef struct {

63
src/GUI/gui_funcs.cxx
View file

@ -53,11 +53,8 @@
#ifdef _WIN32
# include <shellapi.h>
# if !defined(__MINGW32__)
# include <simgear/screen/win32-printer.h>
# include <simgear/screen/GlBitmaps.h>
# endif
#endif
#include "gui.h"
using std::string;
@ -75,9 +72,6 @@ const __fg_gui_fn_t __fg_gui_fn[] = {
{"dumpHiResSnapShot", fgHiResDumpWrapper},
#endif
{"dumpSnapShot", fgDumpSnapShotWrapper},
#if defined( _WIN32 ) && !defined(__MINGW32__)
{"printScreen", printScreen},
#endif
// Help
{"helpCb", helpCb},
@ -403,61 +397,6 @@ void fgHiResDump()
}
#endif // #if defined( TR_HIRES_SNAP)
#if defined( _WIN32 ) && !defined(__MINGW32__)
void rotateView( double roll, double pitch, double yaw )
{
// rotate view
}
GlBitmap *b1 = NULL;
GLubyte *hiResScreenCapture( int multiplier )
{
float oldfov = fgGetDouble("/sim/current-view/field-of-view");
float fov = oldfov / multiplier;
FGViewer *v = globals->get_current_view();
fgSetDouble("/sim/current-view/field-of-view", fov);
// globals->get_renderer()->init();
int cur_width = fgGetInt("/sim/startup/xsize");
int cur_height = fgGetInt("/sim/startup/ysize");
delete( b1 );
// New empty (mostly) bitmap
b1 = new GlBitmap( GL_RGB, 1, 1, (unsigned char *)"123" );
int x,y;
for ( y = 0; y < multiplier; y++ ) {
for ( x = 0; x < multiplier; x++ ) {
globals->get_renderer()->resize( cur_width, cur_height );
// pan to tile
rotateView( 0, (y*fov)-((multiplier-1)*fov/2), (x*fov)-((multiplier-1)*fov/2) );
globals->get_renderer()->update( false );
// restore view
GlBitmap b2;
b1->copyBitmap( &b2, cur_width*x, cur_height*y );
}
}
fgSetDouble("/sim/current-view/field-of-view", oldfov);
return b1->getBitmap();
}
#endif
#if defined( _WIN32 ) && !defined(__MINGW32__)
// win32 print screen function
void printScreen () {
int mouse = fgGetMouseCursor();
fgSetMouseCursor(MOUSE_CURSOR_NONE);
CGlPrinter p( CGlPrinter::PRINT_BITMAP );
int cur_width = fgGetInt("/sim/startup/xsize");
int cur_height = fgGetInt("/sim/startup/ysize");
p.Begin( "FlightGear", cur_width*3, cur_height*3 );
p.End( hiResScreenCapture(3) );
fgSetMouseCursor(mouse);
}
#endif // #ifdef _WIN32
void fgDumpSnapShotWrapper () {
fgDumpSnapShot();
}

13
src/GUI/menubar.cxx
View file

@ -36,16 +36,6 @@ do_hires_snapshot_dialog (const SGPropertyNode * arg)
}
#endif // TR_HIRES_SNAP
#if defined( _WIN32 ) && !defined(__MINGW32__)
extern void printScreen ();
static bool
do_print_dialog (const SGPropertyNode * arg)
{
printScreen();
return true;
}
#endif
extern void helpCb ();
static bool
do_help_dialog (const SGPropertyNode * arg)
@ -60,9 +50,6 @@ static struct {
} deprecated_dialogs [] = {
#if defined(TR_HIRES_SNAP)
{ "old-hires-snapshot-dialog", do_hires_snapshot_dialog },
#endif
#if defined( _WIN32 ) && !defined(__MINGW32__)
{ "old-print-dialog", do_print_dialog },
#endif
{ "old-help-dialog", do_help_dialog },
{ 0, 0 }