*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* $Id$
**************************************************************************/
# include <windows.h>
#endif
-#include <GL/gl.h>
+#include SG_GL_H
#if defined(FX) && defined(XMESA)
# include <GL/xmesa.h>
# endif
#endif
+#include <plib/ssg.h>
+
#include <simgear/constants.h>
#include <simgear/debug/logstream.hxx>
#include <simgear/misc/sg_path.hxx>
#include <Include/general.hxx>
#include <Aircraft/aircraft.hxx>
+#include <Aircraft/controls.hxx>
#include <Airports/simple.hxx>
#include <Autopilot/auto_gui.hxx>
#include <Cockpit/panel.hxx>
-#include <Controls/controls.hxx>
#include <FDM/flight.hxx>
#include <Main/main.hxx>
#include <Main/fg_init.hxx>
#include <Main/fg_io.hxx>
#include <Main/globals.hxx>
#include <Main/fg_props.hxx>
+#include <Main/renderer.hxx>
#include <Main/viewmgr.hxx>
+#include <GUI/new_gui.hxx>
#if defined( WIN32 ) && !defined( __CYGWIN__ ) && !defined(__MINGW32__)
# include <simgear/screen/win32-printer.h>
SG_USING_STD(string);
SG_USING_STD(cout);
-extern void fgHUDalphaAdjust( puObject * );
-
// from cockpit.cxx
extern void fgLatLonFormatToggle( puObject *);
GLfloat x_end, GLfloat y_end );
#endif
-puDialogBox *dialogBox = 0;
-puFrame *dialogFrame = 0;
-puText *dialogBoxMessage = 0;
-puOneShot *dialogBoxOkButton = 0;
-
-puDialogBox *YNdialogBox = 0;
-puFrame *YNdialogFrame = 0;
-puText *YNdialogBoxMessage = 0;
-puOneShot *YNdialogBoxOkButton = 0;
-puOneShot *YNdialogBoxNoButton = 0;
-char *gui_msg_OK; // "OK"
-char *gui_msg_NO; // "NO"
-char *gui_msg_YES; // "YES"
-char *gui_msg_CANCEL; // "CANCEL"
-char *gui_msg_RESET; // "RESET"
+// TODO: remove after the last hardcoded dialog has died
+char *gui_msg_OK = "OK";
+char *gui_msg_NO = "NO";
+char *gui_msg_YES = "YES";
+char *gui_msg_CANCEL = "CANCEL";
+char *gui_msg_RESET = "RESET";
-char msg_OK[] = "OK";
-char msg_NO[] = "NO";
-char msg_YES[] = "YES";
-char msg_CANCEL[] = "Cancel";
-char msg_RESET[] = "Reset";
-
-char global_dialog_string[256];
const __fg_gui_fn_t __fg_gui_fn[] = {
// File
- {"saveFlight", saveFlight},
- {"loadFlight", loadFlight},
{"reInit", reInit},
#ifdef TR_HIRES_SNAP
- {"dumpHiResSnapShot", dumpHiResSnapShot},
+ {"dumpHiResSnapShot", fgHiResDumpWrapper},
#endif
- {"dumpSnapShot", dumpSnapShot},
+ {"dumpSnapShot", fgDumpSnapShotWrapper},
#if defined( WIN32 ) && !defined( __CYGWIN__) && !defined(__MINGW32__)
{"printScreen", printScreen},
#endif
- {"MayBeGoodBye", MayBeGoodBye},
//View
{"guiTogglePanel", guiTogglePanel},
- {"PilotOffsetAdjust", PilotOffsetAdjust},
- {"fgHUDalphaAdjust", fgHUDalphaAdjust},
{"prop_pickerView", prop_pickerView},
// Environment
/* ================ General Purpose Functions ================ */
-void initDialog(void) {
- // Initialize our GLOBAL GUI STRINGS
- gui_msg_OK = msg_OK; // "OK"
- gui_msg_NO = msg_NO; // "NO"
- gui_msg_YES = msg_YES; // "YES"
- gui_msg_CANCEL = msg_CANCEL; // "CANCEL"
- gui_msg_RESET = msg_RESET; // "RESET"
-}
-
// General Purpose Message Box
void mkDialog (const char *txt)
{
- strncpy(global_dialog_string, txt, 256);
- dialogBoxMessage->setLabel(global_dialog_string);
- FG_PUSH_PUI_DIALOG( dialogBox );
+ NewGUI *gui = (NewGUI *)globals->get_subsystem("gui");
+ if (!gui)
+ return;
+ SGPropertyNode_ptr dlg = gui->getDialog("message");
+ if (!dlg)
+ return;
+
+ dlg->setStringValue("text/label", txt);
+ dlg->setStringValue("button/legend", "OK");
+ gui->showDialog("message");
}
// Message Box to report an error.
void guiErrorMessage (const char *txt)
{
SG_LOG(SG_GENERAL, SG_ALERT, txt);
- if (dialogBox != 0)
- mkDialog(txt);
+ mkDialog(txt);
}
// Message Box to report a throwable (usually an exception).
msg += ')';
}
SG_LOG(SG_GENERAL, SG_ALERT, msg);
- if (dialogBox != 0)
- mkDialog(msg.c_str());
-}
-
-// Intercept the Escape Key
-void ConfirmExitDialog(void)
-{
- FG_PUSH_PUI_DIALOG( YNdialogBox );
+ mkDialog(msg.c_str());
}
// Added by David Findlay <nedz@bigpond.com>
// on Sunday 3rd of December
-// Start new Save Dialog Box
-puDialogBox *SaveDialog = 0;
-puFrame *SaveDialogFrame = 0;
-puText *SaveDialogMessage = 0;
-puInput *SaveDialogInput = 0;
-
-puOneShot *SaveDialogOkButton = 0;
-puOneShot *SaveDialogCancelButton = 0;
-// static puOneShot *SaveDialogResetButton = 0;
-
-// Default save filename
-char saveFile[256] = "fgfs.sav";
-
-// Cancel Button
-void SaveDialogCancel(puObject *) {
- FG_POP_PUI_DIALOG( SaveDialog );
-}
-
-// If press OK do this
-void SaveDialogOk(puObject*) {
-
- FG_POP_PUI_DIALOG( SaveDialog );
-
- char *s;
- SaveDialogInput->getValue(&s);
-
- ofstream output(s);
- // cout << saveFile << endl;
- if (output.good() && fgSaveFlight(output)) {
- output.close();
- mkDialog("Saved flight");
- SG_LOG(SG_INPUT, SG_INFO, "Saved flight");
- } else {
- mkDialog("Cannot save flight");
- SG_LOG(SG_INPUT, SG_ALERT, "Cannot save flight");
- }
-}
-
-// Create Dialog
-void saveFlight(puObject *cv) {
- SaveDialog = new puDialogBox (150, 50);
- {
- SaveDialogFrame = new puFrame (0,0,350, 150);
- SaveDialogMessage
- = new puText( (150 - puGetDefaultLabelFont().getStringWidth( "File Name:" ) / 2), 110 );
- SaveDialogMessage -> setLabel ("File Name:");
-
- SaveDialogInput = new puInput (50, 70, 300, 100);
- SaveDialogInput -> setValue (saveFile);
- SaveDialogInput -> acceptInput();
-
- SaveDialogOkButton = new puOneShot (50, 10, 110, 50);
- SaveDialogOkButton -> setLegend (gui_msg_OK);
- SaveDialogOkButton -> setCallback ( SaveDialogOk );
- SaveDialogOkButton -> makeReturnDefault(TRUE);
-
- SaveDialogCancelButton = new puOneShot (140, 10, 210, 50);
- SaveDialogCancelButton -> setLegend (gui_msg_CANCEL);
- SaveDialogCancelButton -> setCallback ( SaveDialogCancel );
- }
- FG_FINALIZE_PUI_DIALOG( SaveDialog );
-
- SaveDialog -> reveal();
-}
-
-// Load Dialog Start
-puDialogBox *LoadDialog = 0;
-puFrame *LoadDialogFrame = 0;
-puText *LoadDialogMessage = 0;
-puInput *LoadDialogInput = 0;
-
-puOneShot *LoadDialogOkButton = 0;
-puOneShot *LoadDialogCancelButton = 0;
-// static puOneShot *LoadDialogResetButton = 0;
-
-// Default load filename
-char loadFile[256] = "fgfs.sav";
-
-// Do this if the person click okay
-void LoadDialogOk(puObject *) {
-
- FG_POP_PUI_DIALOG( LoadDialog );
-
- char *l;
- LoadDialogInput->getValue(&l);
-
- ifstream input(l);
- if (input.good() && fgLoadFlight(input)) {
- input.close();
- mkDialog("Loaded flight");
- SG_LOG(SG_INPUT, SG_INFO, "Restored flight");
- } else {
- mkDialog("Failed to load flight");
- SG_LOG(SG_INPUT, SG_ALERT, "Cannot load flight");
- }
-}
-
-// Do this if the person presses cancel
-void LoadDialogCancel(puObject *) {
- FG_POP_PUI_DIALOG( LoadDialog );
-}
-
-// Create Load Dialog
-void loadFlight(puObject *cb)
-{
- LoadDialog = new puDialogBox (150, 50);
- {
- LoadDialogFrame = new puFrame (0,0,350, 150);
- LoadDialogMessage
- = new puText( (150 - puGetDefaultLabelFont().getStringWidth( "File Name:" ) / 2), 110 );
- LoadDialogMessage -> setLabel ("File Name:");
-
- LoadDialogInput = new puInput (50, 70, 300, 100);
- LoadDialogInput -> setValue (loadFile);
- LoadDialogInput -> acceptInput();
-
- LoadDialogOkButton = new puOneShot (50, 10, 110, 50);
- LoadDialogOkButton -> setLegend (gui_msg_OK);
- LoadDialogOkButton -> setCallback ( LoadDialogOk );
- LoadDialogOkButton -> makeReturnDefault(TRUE);
-
- LoadDialogCancelButton = new puOneShot (140, 10, 210, 50);
- LoadDialogCancelButton -> setLegend (gui_msg_CANCEL);
- LoadDialogCancelButton -> setCallback ( LoadDialogCancel );
- }
- FG_FINALIZE_PUI_DIALOG( LoadDialog );
-
- LoadDialog -> reveal();
-}
// This is the accessor function
void guiTogglePanel(puObject *cb)
fgGetInt("/sim/startup/ysize"));
}
-void goodBye(puObject *)
-{
- // SG_LOG( SG_INPUT, SG_ALERT,
- // "Program exiting normally at user request." );
- cout << "Program exiting normally at user request." << endl;
-
- // close all external I/O connections
- globals->get_io()->shutdown_all();
-
- exit(0);
-}
-
-
-void goAwayCb (puObject *me)
-{
- FG_POP_PUI_DIALOG( dialogBox );
-}
-
-void mkDialogInit (void)
-{
- // printf("mkDialogInit\n");
- 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);
- dialogBoxMessage = new puText (10, 70);
- dialogBoxMessage -> setLabel ("");
- dialogBoxOkButton = new puOneShot (180, 10, 240, 50);
- dialogBoxOkButton -> setLegend (gui_msg_OK);
- dialogBoxOkButton -> makeReturnDefault (TRUE );
- dialogBoxOkButton -> setCallback (goAwayCb);
- }
- FG_FINALIZE_PUI_DIALOG( dialogBox );
-}
-
-void MayBeGoodBye(puObject *)
-{
- ConfirmExitDialog();
-}
-
-void goAwayYesNoCb(puObject *me)
-{
- FG_POP_PUI_DIALOG( YNdialogBox);
-}
-
-void ConfirmExitDialogInit(void)
-{
- char msg[] = "Really Quit";
- char *s;
-
- // printf("ConfirmExitDialogInit\n");
- int len = 200 - puGetDefaultLabelFont().getStringWidth ( msg ) / 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
- {
- YNdialogFrame = new puFrame (0,0,400, 100);
-
- YNdialogBoxMessage = new puText (len, 70);
- YNdialogBoxMessage -> setDefaultValue (msg);
- YNdialogBoxMessage -> getDefaultValue (&s);
- YNdialogBoxMessage -> setLabel (s);
-
- YNdialogBoxOkButton = new puOneShot (100, 10, 160, 50);
- YNdialogBoxOkButton -> setLegend (gui_msg_OK);
- YNdialogBoxOkButton -> makeReturnDefault (TRUE );
- YNdialogBoxOkButton -> setCallback (goodBye);
-
- YNdialogBoxNoButton = new puOneShot (240, 10, 300, 50);
- YNdialogBoxNoButton -> setLegend (gui_msg_NO);
- YNdialogBoxNoButton -> setCallback (goAwayYesNoCb);
- }
- FG_FINALIZE_PUI_DIALOG( YNdialogBox );
-}
-
-void notCb (puObject *)
-{
- mkDialog ("This function isn't implemented yet");
-}
-
void helpCb (puObject *)
{
string command;
# ifdef __CYGWIN__
cygwin32_conv_to_full_win32_path(path.c_str(),win32_name);
# else
- strcpy(win32_name,path.c_str());
+ strncpy(win32_name,path.c_str(), 1024);
# endif
Dummy[0] = 0;
FindExecutable(win32_name, Dummy, ExecName);
- sprintf(browserParameter, "file:///%s", win32_name);
+ snprintf(browserParameter, 1024, "file:///%s", win32_name);
ShellExecute ( NULL, "open", ExecName, browserParameter, Dummy,
SW_SHOWNORMAL ) ;
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;
static const SGPropertyNode *master_freeze
- = fgGetNode("/sim/freeze/master");
+ = fgGetNode("/sim/freeze/master");
bool freeze = master_freeze->getBoolValue();
if ( !freeze ) {
fgSetBool("/sim/freeze/master", true);
}
+ fgSetBool("/sim/menubar/visibility", false);
+ TurnCursorOff();
if ( !puCursorIsHidden() ) {
- show_pu_cursor = true;
- puHideCursor();
+ show_pu_cursor = true;
+ puHideCursor();
}
FGRenderer *renderer = globals->get_renderer();
// 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( 0.0 );
- renderer->update( 0.0 );
-
- // Make sure we have SSG projection primed for current view
- glMatrixMode(GL_MODELVIEW);
- glLoadIdentity();
- ssgSetCamera( (sgVec4 *)globals->get_current_view()->get_VIEW() );
- ssgSetFOV( globals->get_current_view()->get_h_fov(),
- globals->get_current_view()->get_v_fov() );
- // ssgSetNearFar( 10.0f, 120000.0f );
- ssgSetNearFar( 0.5f, 1200000.0f );
+ //renderer->update( true );
+ //renderer->update( true );
-
// 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 multiplier = fgGetInt("/sim/startup/hires-multiplier", 3);
int width = fgGetInt("/sim/startup/xsize");
int height = fgGetInt("/sim/startup/ysize");
bool do_panel = fgPanelVisible();
GLfloat panel_col_step = globals->get_current_panel()->getWidth() / ncols;
GLfloat panel_row_step = globals->get_current_panel()->getHeight() / nrows;
+
+ glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
+ glHint(GL_POLYGON_SMOOTH_HINT, GL_NICEST);
+ glHint(GL_LINE_SMOOTH_HINT, GL_NICEST);
+ glHint(GL_POINT_SMOOTH_HINT, GL_NICEST);
+ glHint(GL_FOG_HINT, GL_NICEST);
/* Draw tiles */
int more = 1;
trBeginTile(tr);
int curColumn = trGet(tr, TR_CURRENT_COLUMN);
int curRow = trGet(tr, TR_CURRENT_ROW);
- globals->get_renderer()->screendump();
+
+ renderer->update( false );
if ( do_hud )
fgUpdateHUD( curColumn*hud_col_step, curRow*hud_row_step,
(curColumn+1)*hud_col_step, (curRow+1)*hud_row_step );
}
- globals->get_renderer()->resize( width, height );
+ renderer->resize( width, height );
trDelete(tr);
+ glHint(GL_POLYGON_SMOOTH_HINT, GL_DONT_CARE);
+ glHint(GL_LINE_SMOOTH_HINT, GL_DONT_CARE);
+ glHint(GL_POINT_SMOOTH_HINT, GL_DONT_CARE);
+ glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_DONT_CARE);
+ if ( (!strcmp(fgGetString("/sim/rendering/fog"), "disabled")) ||
+ (!fgGetBool("/sim/rendering/shading"))) {
+ // if fastest fog requested, or if flat shading force fastest
+ glHint ( GL_FOG_HINT, GL_FASTEST );
+ } else if ( !strcmp(fgGetString("/sim/rendering/fog"), "nicest") ) {
+ glHint ( GL_FOG_HINT, GL_DONT_CARE );
+ }
+
fclose(f);
- message = "Snap shot saved to ";
+ message = "Snapshot saved to \"";
message += filename;
+ message += "\".";
mkDialog (message.c_str());
free(tile);
free(buffer);
- // message = "Snap shot saved to ";
- // message += filename;
- // mkDialog (message.c_str());
-
delete [] filename;
if ( show_pu_cursor ) {
puShowCursor();
}
+ TurnCursorOn();
+ fgSetBool("/sim/menubar/visibility", menu_status);
+
if ( !freeze ) {
fgSetBool("/sim/freeze/master", false);
}
globals->get_renderer()->init();
int cur_width = fgGetInt("/sim/startup/xsize");
int cur_height = fgGetInt("/sim/startup/ysize");
- if (b1) delete( b1 );
+ delete( b1 );
// New empty (mostly) bitmap
b1 = new GlBitmap( GL_RGB, 1, 1, (unsigned char *)"123" );
int x,y;
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) );
- fgRenderFrame();
+ globals->get_renderer()->update( false );
// restore view
GlBitmap b2;
b1->copyBitmap( &b2, cur_width*x, cur_height*y );
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) );
+ p.End( hiResScreenCapture(3) );
// BusyCursor(1);
if ( show_pu_cursor ) {
#endif // #ifdef WIN32
-void dumpSnapShot ( puObject *obj ) {
+void fgDumpSnapShotWrapper ( puObject *obj ) {
fgDumpSnapShot();
}
-void dumpHiResSnapShot ( puObject *obj ) {
+void fgHiResDumpWrapper ( puObject *obj ) {
fgHiResDump();
}
puHideCursor();
}
- globals->get_renderer()->init();
- globals->get_renderer()->resize( fgGetInt("/sim/startup/xsize"),
- fgGetInt("/sim/startup/ysize") );
+ FGRenderer *renderer = globals->get_renderer();
+ renderer->init();
+ renderer->resize( 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();
+ renderer->update( true );
+ renderer->update( true );
while (count < 1000) {
FILE *fp;
if ( sg_glDumpWindow( filename,
fgGetInt("/sim/startup/xsize"),
fgGetInt("/sim/startup/ysize")) ) {
- message = "Snap shot saved to ";
+ message = "Snapshot saved to \"";
message += filename;
+ message += "\".";
} else {
- message = "Failed to save to ";
+ message = "Failed to save to \"";
message += filename;
+ message += "\".";
}
mkDialog (message.c_str());
projects / flightgear.git / blobdiff