X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FGUI%2Fgui.cxx;h=985cfc60b68e51c6aefd0d8e7b2e28a90ef22755;hb=ef5037fe4294c67bd8b2dc7cbb903ecdc74c6bbb;hp=74c7b5283f3bc8a7648138f6cdab54c3cc491b72;hpb=bff544aada682998cb5254060b81a736f7781f50;p=flightgear.git diff --git a/src/GUI/gui.cxx b/src/GUI/gui.cxx index 74c7b5283..985cfc60b 100644 --- a/src/GUI/gui.cxx +++ b/src/GUI/gui.cxx @@ -30,7 +30,7 @@ #include -#ifdef FG_MATH_EXCEPTION_CLASH +#ifdef SG_MATH_EXCEPTION_CLASH # include #endif @@ -39,7 +39,7 @@ #endif #include -#include +#include #if defined(FX) && defined(XMESA) # include @@ -53,7 +53,7 @@ #include #include -#include +#include #include #include @@ -64,11 +64,11 @@ #include #include #include -#include
#include
#include
#include
#include
+#include
#ifdef FG_NETWORK_OLK #include @@ -83,18 +83,17 @@ #include "gui_local.hxx" #include "apt_dlg.hxx" #include "net_dlg.hxx" +#include "sgVec3Slider.hxx" -FG_USING_STD(string); +SG_USING_STD(string); -#ifndef FG_HAVE_NATIVE_SGI_COMPILERS -FG_USING_STD(cout); +#ifndef SG_HAVE_NATIVE_SGI_COMPILERS +SG_USING_STD(cout); #endif -#if defined(WIN32) || defined(__CYGWIN32__) -#define WIN32_CURSOR_TWEAKS -#elif (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9) -#define X_CURSOR_TWEAKS -#endif +#ifdef _MSC_VER +#define snprintf _snprintf +#endif /* _MSC_VER */ // main.cxx hack, should come from an include someplace extern void fgInitVisuals( void ); @@ -190,7 +189,7 @@ static puInput *SaveDialogInput = 0; static puOneShot *SaveDialogOkButton = 0; static puOneShot *SaveDialogCancelButton = 0; -static puOneShot *SaveDialogResetButton = 0; +// static puOneShot *SaveDialogResetButton = 0; // Default save filename static char saveFile[256] = "fgfs.sav"; @@ -213,10 +212,10 @@ void SaveDialogOk(puObject*) { if (output.good() && fgSaveFlight(output)) { output.close(); mkDialog("Saved flight"); - FG_LOG(FG_INPUT, FG_INFO, "Saved flight"); + SG_LOG(SG_INPUT, SG_INFO, "Saved flight"); } else { mkDialog("Cannot save flight"); - FG_LOG(FG_INPUT, FG_ALERT, "Cannot save flight"); + SG_LOG(SG_INPUT, SG_ALERT, "Cannot save flight"); } } @@ -255,7 +254,7 @@ static puInput *LoadDialogInput = 0; static puOneShot *LoadDialogOkButton = 0; static puOneShot *LoadDialogCancelButton = 0; -static puOneShot *LoadDialogResetButton = 0; +// static puOneShot *LoadDialogResetButton = 0; // Default load filename static char loadFile[256] = "fgfs.sav"; @@ -272,10 +271,10 @@ void LoadDialogOk(puObject *) { if (input.good() && fgLoadFlight(input)) { input.close(); mkDialog("Loaded flight"); - FG_LOG(FG_INPUT, FG_INFO, "Restored flight"); + SG_LOG(SG_INPUT, SG_INFO, "Restored flight"); } else { mkDialog("Failed to load flight"); - FG_LOG(FG_INPUT, FG_ALERT, "Cannot load flight"); + SG_LOG(SG_INPUT, SG_ALERT, "Cannot load flight"); } } @@ -315,7 +314,13 @@ static void loadFlight(puObject *cb) // This is the accessor function void guiTogglePanel(puObject *cb) { - globals->get_options()->toggle_panel(); + if (fgGetBool("/sim/panel/visibility")) + fgSetBool("/sim/panel/visibility", false); + else + fgSetBool("/sim/panel/visibility", true); + + fgReshape(fgGetInt("/sim/startup/xsize"), + fgGetInt("/sim/startup/ysize")); } //void MenuHideMenuCb(puObject *cb) @@ -326,12 +331,12 @@ void hideMenuCb (puObject *cb) void goodBye(puObject *) { - // FG_LOG( FG_INPUT, FG_ALERT, + // SG_LOG( SG_INPUT, SG_ALERT, // "Program exiting normally at user request." ); cout << "Program exiting normally at user request." << endl; #ifdef FG_NETWORK_OLK - if ( globals->get_options()->get_network_olk() ) { + if ( fgGetBool("/sim/networking/network-olk") ) { if ( net_is_registered == 0 ) fgd_send_com( "8", FGFS_host); } #endif @@ -351,8 +356,8 @@ void goAwayCb (puObject *me) void mkDialogInit (void) { // printf("mkDialogInit\n"); - int x = (globals->get_options()->get_xsize()/2 - 400/2); - int y = (globals->get_options()->get_ysize()/2 - 100/2); + int x = (fgGetInt("/sim/startup/xsize")/2 - 400/2); + int y = (fgGetInt("/sim/startup/ysize")/2 - 100/2); dialogBox = new puDialogBox (x, y); // 150, 50 { dialogFrame = new puFrame (0,0,400,100); @@ -384,8 +389,8 @@ void ConfirmExitDialogInit(void) // printf("ConfirmExitDialogInit\n"); int len = 200 - puGetStringWidth( puGetDefaultLabelFont(), msg )/2; - int x = (globals->get_options()->get_xsize()/2 - 400/2); - int y = (globals->get_options()->get_ysize()/2 - 100/2); + int x = (fgGetInt("/sim/startup/xsize")/2 - 400/2); + int y = (fgGetInt("/sim/startup/ysize")/2 - 100/2); YNdialogBox = new puDialogBox (x, y); // 150, 50 // YNdialogBox = new puDialogBox (150, 50); @@ -427,25 +432,221 @@ void helpCb (puObject *) # endif #endif -#if !defined(WIN32) - string url = "http://www.flightgear.org/Docs/InstallGuide/getstart.html"; + SGPath path( globals->get_fg_root() ); + path.append( "Docs/index.html" ); + string help_app = fgGetString("/sim/startup/browser-app"); + if ( system("xwininfo -name Netscape > /dev/null 2>&1") == 0 ) { - command = "netscape -remote \"openURL(" + url + ")\" &"; + command = help_app + " -remote \"openURL(" + path.str() + ")\""; } else { - command = "netscape " + url + " &"; + command = help_app + " " + path.str(); } -#else - command = "webrun.bat"; +#if !defined(WIN32) + command += " &"; #endif system( command.c_str() ); - //string text = "Help started in netscape window."; - - //mkDialog (text.c_str()); mkDialog ("Help started in netscape window."); } +#define TR_HIRES_SNAP +#if defined( TR_HIRES_SNAP) +#include +extern void trRenderFrame( void ); +extern void fgUpdateHUD( GLfloat x_start, GLfloat y_start, + GLfloat x_end, GLfloat y_end ); + +void fgHiResDump() +{ + FILE *f; + string message; + bool show_pu_cursor = false; + bool show_menu = false; + char *filename = new char [24]; + static int count = 1; + + int freeze = globals->get_freeze(); + if(!freeze) + globals->set_freeze( true ); + + if(gui_menu_on) { + show_menu = true; + guiToggleMenu(); + } + + if ( !puCursorIsHidden() ) { + show_pu_cursor = true; + puHideCursor(); + } + + fgInitVisuals(); + fgReshape( fgGetInt("/sim/startup/xsize"), + fgGetInt("/sim/startup/ysize") ); + + // we need two render frames here to clear the menu and cursor + // ... not sure why but doing an extra fgRenderFrame() shouldn't + // hurt anything + fgRenderFrame(); + fgRenderFrame(); + + // Make sure we have SSG projection primed for current view + glMatrixMode(GL_MODELVIEW); + glLoadIdentity(); + ssgSetCamera( (sgVec4 *)globals->get_current_view()->get_VIEW() ); + float fov = globals->get_current_view()->get_fov(); + ssgSetFOV(fov, fov * globals->get_current_view()->get_win_ratio()); + // ssgSetNearFar( 10.0f, 120000.0f ); + ssgSetNearFar( 0.5f, 1200000.0f ); + + + // This ImageSize stuff is a temporary hack + // should probably use 128x128 tile size and + // support any image size + + // This should be a requester to get multiplier from user + int multiplier = 3; + int width = fgGetInt("/sim/startup/xsize"); + int height = fgGetInt("/sim/startup/ysize"); + + /* allocate buffer large enough to store one tile */ + GLubyte *tile = (GLubyte *)malloc(width * height * 3 * sizeof(GLubyte)); + if (!tile) { + printf("Malloc of tile buffer failed!\n"); + return; + } + + int imageWidth = multiplier*width; + int imageHeight = multiplier*height; + + /* allocate buffer to hold a row of tiles */ + GLubyte *buffer + = (GLubyte *)malloc(imageWidth * height * 3 * sizeof(GLubyte)); + if (!buffer) { + free(tile); + printf("Malloc of tile row buffer failed!\n"); + return; + } + TRcontext *tr = trNew(); + trTileSize(tr, width, height, 0); + trTileBuffer(tr, GL_RGB, GL_UNSIGNED_BYTE, tile); + trImageSize(tr, imageWidth, imageHeight); + trRowOrder(tr, TR_TOP_TO_BOTTOM); + sgFrustum *frustum = ssgGetFrustum(); + trFrustum(tr, + frustum->getLeft(), frustum->getRight(), + frustum->getBot(), frustum->getTop(), + frustum->getNear(), frustum->getFar()); + + /* Prepare ppm output file */ + while (count < 1000) { + snprintf(filename, 24, "fgfs-screen-%03d.ppm", count++); + if ( (f = fopen(filename, "r")) == NULL ) + break; + fclose(f); + } + f = fopen(filename, "wb"); + if (!f) { + printf("Couldn't open image file: %s\n", filename); + free(buffer); + free(tile); + return; + } + fprintf(f,"P6\n"); + fprintf(f,"# ppm-file created by %s\n", "trdemo2"); + fprintf(f,"%i %i\n", imageWidth, imageHeight); + fprintf(f,"255\n"); + + /* just to be safe... */ + glPixelStorei(GL_PACK_ALIGNMENT, 1); + + /* Because the HUD and Panel change the ViewPort we will + * need to handle some lowlevel stuff ourselves */ + int ncols = trGet(tr, TR_COLUMNS); + int nrows = trGet(tr, TR_ROWS); + + bool do_hud = fgGetBool("/sim/hud/visibility"); + GLfloat hud_col_step = 640.0 / ncols; + GLfloat hud_row_step = 480.0 / nrows; + + bool do_panel = fgPanelVisible(); + GLfloat panel_col_step = current_panel->getWidth() / ncols; + GLfloat panel_row_step = current_panel->getHeight() / nrows; + + /* Draw tiles */ + int more = 1; + while (more) { + trBeginTile(tr); + int curColumn = trGet(tr, TR_CURRENT_COLUMN); + int curRow = trGet(tr, TR_CURRENT_ROW); + trRenderFrame(); + if ( do_hud ) + fgUpdateHUD( curColumn*hud_col_step, curRow*hud_row_step, + (curColumn+1)*hud_col_step, (curRow+1)*hud_row_step ); + if (do_panel) + current_panel->update( curColumn*panel_col_step, panel_col_step, + curRow*panel_row_step, panel_row_step ); + more = trEndTile(tr); + + /* save tile into tile row buffer*/ + int curTileWidth = trGet(tr, TR_CURRENT_TILE_WIDTH); + int bytesPerImageRow = imageWidth * 3*sizeof(GLubyte); + int bytesPerTileRow = (width) * 3*sizeof(GLubyte); + int xOffset = curColumn * bytesPerTileRow; + int bytesPerCurrentTileRow = (curTileWidth) * 3*sizeof(GLubyte); + int i; + for (i=0;iset_freeze( false ); +} +#endif // #if defined( TR_HIRES_SNAP) + + #if defined( WIN32 ) && !defined( __CYGWIN__) static void rotateView( double roll, double pitch, double yaw ) @@ -457,13 +658,13 @@ static GlBitmap *b1 = NULL; extern FGInterface cur_view_fdm; GLubyte *hiResScreenCapture( int multiplier ) { - float oldfov = globals->get_options()->get_fov(); + float oldfov = fgGetDouble("/sim/field-of-view"); float fov = oldfov / multiplier; FGViewer *v = globals->get_current_view(); - globals->get_options()->set_fov(fov); + fgSetDouble("/sim/field-of-view", fov); fgInitVisuals(); - int cur_width = globals->get_options()->get_xsize( ); - int cur_height = globals->get_options()->get_ysize( ); + int cur_width = fgGetInt("/sim/startup/xsize"); + int cur_height = fgGetInt("/sim/startup/ysize"); if (b1) delete( b1 ); // New empty (mostly) bitmap b1 = new GlBitmap( GL_RGB, 1, 1, (unsigned char *)"123" ); @@ -479,7 +680,7 @@ GLubyte *hiResScreenCapture( int multiplier ) b1->copyBitmap( &b2, cur_width*x, cur_height*y ); } } - globals->get_options()->set_fov(oldfov); + fgSetDouble("/sim/field-of-view", oldfov); return b1->getBitmap(); } #endif @@ -498,8 +699,8 @@ void printScreen ( puObject *obj ) { mainMenuBar->hide(); CGlPrinter p( CGlPrinter::PRINT_BITMAP ); - int cur_width = globals->get_options()->get_xsize( ); - int cur_height = globals->get_options()->get_ysize( ); + 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) ); @@ -520,9 +721,17 @@ void dumpSnapShot ( puObject *obj ) { } +void dumpHiResSnapShot ( puObject *obj ) { + fgHiResDump(); +} + + // do a screen snap shot void fgDumpSnapShot () { bool show_pu_cursor = false; + char *filename = new char [24]; + string message; + static int count = 1; int freeze = globals->get_freeze(); if(!freeze) @@ -536,20 +745,36 @@ void fgDumpSnapShot () { } fgInitVisuals(); - fgReshape( globals->get_options()->get_xsize(), - globals->get_options()->get_ysize() ); + fgReshape( fgGetInt("/sim/startup/xsize"), + fgGetInt("/sim/startup/ysize") ); // we need two render frames here to clear the menu and cursor - // ... not sure why but doing an extra fgFenderFrame() shoulnd't + // ... not sure why but doing an extra fgRenderFrame() shouldn't // hurt anything fgRenderFrame(); fgRenderFrame(); - my_glDumpWindow( "fgfs-screen.ppm", - globals->get_options()->get_xsize(), - globals->get_options()->get_ysize() ); - - mkDialog ("Snap shot saved to fgfs-screen.ppm"); + while (count < 1000) { + FILE *fp; + snprintf(filename, 24, "fgfs-screen-%03d.ppm", count++); + if ( (fp = fopen(filename, "r")) == NULL ) + break; + fclose(fp); + } + + if ( sg_glDumpWindow( filename, + fgGetInt("/sim/startup/xsize"), + fgGetInt("/sim/startup/ysize")) ) { + message = "Snap shot saved to "; + message += filename; + } else { + message = "Failed to save to "; + message += filename; + } + + mkDialog (message.c_str()); + + delete [] filename; if ( show_pu_cursor ) { puShowCursor(); @@ -597,6 +822,7 @@ char *fileSubmenu [] = { "Print", #endif "Snap Shot", + "Hires Snap Shot", "---------", "Reset", "Load flight", @@ -610,6 +836,7 @@ puCallback fileSubmenuCb [] = { #endif /* NULL, notCb, */ dumpSnapShot, + dumpHiResSnapShot, NULL, reInit, loadFlight, @@ -629,11 +856,13 @@ puCallback editSubmenuCb [] = { extern void fgHUDalphaAdjust( puObject * ); char *viewSubmenu [] = { "HUD Alpha", + "Pilot Offset", /* "Cockpit View > ", "View >","------------", */ "Toggle Panel...", NULL }; puCallback viewSubmenuCb [] = { fgHUDalphaAdjust, + PilotOffsetAdjust, /* notCb, notCb, NULL, */ guiTogglePanel, NULL }; @@ -720,12 +949,12 @@ void guiInit() gui_msg_RESET = msg_RESET; // "RESET" // Next check home directory - FGPath fntpath; + SGPath fntpath; char* envp = ::getenv( "FG_FONTS" ); if ( envp != NULL ) { fntpath.set( envp ); } else { - fntpath.set( globals->get_options()->get_fg_root() ); + fntpath.set( globals->get_fg_root() ); fntpath.append( "Fonts" ); } @@ -737,7 +966,7 @@ void guiInit() puSetDefaultFonts( GuiFont, GuiFont ) ; guiFnt = puGetDefaultLabelFont(); - if ( globals->get_options()->get_mouse_pointer() == 0 ) { + if (!fgHasNode("/sim/startup/mouse-pointer")) { // no preference specified for mouse pointer, attempt to autodetect... // Determine if we need to render the cursor, or if the windowing // system will do it. First test if we are rendering with glide. @@ -752,9 +981,9 @@ void guiInit() } } // mouse_active = ~mouse_active; - } else if ( globals->get_options()->get_mouse_pointer() == 1 ) { + } else if ( !fgGetBool("/sim/startup/mouse-pointer") ) { // don't show pointer - } else if ( globals->get_options()->get_mouse_pointer() == 2 ) { + } else { // force showing pointer puShowCursor(); // mouse_active = ~mouse_active; @@ -782,7 +1011,7 @@ void guiInit() mainMenuBar -> add_submenu ("Autopilot", autopilotSubmenu, autopilotSubmenuCb); // mainMenuBar -> add_submenu ("Options", optionsSubmenu, optionsSubmenuCb); #ifdef FG_NETWORK_OLK - if ( globals->get_options()->get_network_olk() ) { + if ( fgGetBool("/sim/networking/network-olk") ) { mainMenuBar -> add_submenu ("Network", networkSubmenu, networkSubmenuCb); } #endif