Moved some of the low level scene graph construction code over to simgear.

[flightgear.git] / src / GUI / gui_funcs.cxx

diff --git a/src/GUI/gui_funcs.cxx b/src/GUI/gui_funcs.cxx
index 100d34af7ce149798f77a2f6beda4b1ecb8dc924..8c17c1ebf640c5f1eac71a1dcf4fab0c3092992c 100644 (file)
--- a/src/GUI/gui_funcs.cxx
+++ b/src/GUI/gui_funcs.cxx
@@ -40,8 +40,7 @@
 #  include <windows.h>
 #endif
 
-#include <GL/glut.h>
-#include <GL/gl.h>
+#include GLUT_H
 
 #if defined(FX) && defined(XMESA)
 #  include <GL/xmesa.h>
@@ -97,14 +96,10 @@
 #include "sgVec3Slider.hxx"
 
 SG_USING_STD(string);
-
-#ifndef SG_HAVE_NATIVE_SGI_COMPILERS
 SG_USING_STD(cout);
-#endif
 
 // main.cxx hack, should come from an include someplace
 extern void fgInitVisuals( void );
-extern void fgReshape( int width, int height );
 extern void fgRenderFrame( void );
 
 extern void fgHUDalphaAdjust( puObject * );
@@ -123,8 +118,6 @@ extern void fgUpdateHUD( GLfloat x_start, GLfloat y_start,
                          GLfloat x_end, GLfloat y_end );
 #endif
 
-extern puMenuBar    *mainMenuBar;
-
 puDialogBox  *dialogBox = 0;
 puFrame      *dialogFrame = 0;
 puText       *dialogBoxMessage = 0;
@@ -249,26 +242,6 @@ void guiErrorMessage (const char *txt, const sg_throwable &throwable)
       mkDialog(msg.c_str());
 }
 
-// Toggle the Menu and Mouse display state
-void guiToggleMenu(void)
-{
-    if( gui_menu_on ) {
-        // printf("Hiding Menu\n");
-        mainMenuBar->hide  ();
-#if defined(WIN32_CURSOR_TWEAKS_OFF)
-        if( mouse_mode == MOUSE_POINTER )
-            TurnCursorOff();
-#endif // WIN32_CURSOR_TWEAKS_OFF
-    } else {
-        // printf("Showing Menu\n");
-        mainMenuBar->reveal();
-#ifdef WIN32
-        TurnCursorOn();
-#endif // WIN32
-    }
-    gui_menu_on = ~gui_menu_on;
-}
-
 // Intercept the Escape Key
 void ConfirmExitDialog(void)
 {
@@ -313,7 +286,7 @@ void SaveDialogOk(puObject*) {
     SaveDialogInput->getValue(&s);
 
     ofstream output(s);
-    cout << saveFile << endl;
+    // cout << saveFile << endl;
     if (output.good() && fgSaveFlight(output)) {
        output.close();
        mkDialog("Saved flight");
@@ -427,12 +400,6 @@ void guiTogglePanel(puObject *cb)
   fgReshape(fgGetInt("/sim/startup/xsize"),
            fgGetInt("/sim/startup/ysize"));
 }
-    
-//void MenuHideMenuCb(puObject *cb)
-void hideMenuCb (puObject *cb)
-{
-    guiToggleMenu();
-}
 
 void goodBye(puObject *)
 {
@@ -578,7 +545,6 @@ void fgHiResDump()
     FILE *f;
     string message;
     bool show_pu_cursor = false;
-    bool show_menu = false;
     char *filename = new char [24];
     static int count = 1;
 
@@ -590,11 +556,6 @@ void fgHiResDump()
         fgSetBool("/sim/freeze/master", true);
     }
 
-    if(gui_menu_on) {
-        show_menu = true;
-        guiToggleMenu();
-    }
-       
     if ( !puCursorIsHidden() ) {
         show_pu_cursor = true;
         puHideCursor();
@@ -690,8 +651,8 @@ void fgHiResDump()
     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;
+    GLfloat panel_col_step = globals->get_current_panel()->getWidth() / ncols;
+    GLfloat panel_row_step = globals->get_current_panel()->getHeight() / nrows;
        
     /* Draw tiles */
     int more = 1;
@@ -704,7 +665,8 @@ void fgHiResDump()
             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,
+            globals->get_current_panel()->update(
+                                   curColumn*panel_col_step, panel_col_step,
                                    curRow*panel_row_step,    panel_row_step );
         more = trEndTile(tr);
 
@@ -754,9 +716,6 @@ void fgHiResDump()
 
     delete [] filename;
 
-    if( show_menu )
-        guiToggleMenu();
-
     if ( show_pu_cursor ) {
         puShowCursor();
     }
@@ -815,7 +774,6 @@ void printScreen ( puObject *obj ) {
        puHideCursor();
     }
     // BusyCursor( 0 );
-    mainMenuBar->hide();
 
     CGlPrinter p( CGlPrinter::PRINT_BITMAP );
     int cur_width = fgGetInt("/sim/startup/xsize");
@@ -823,9 +781,6 @@ void printScreen ( puObject *obj ) {
     p.Begin( "FlightGear", cur_width*3, cur_height*3 );
        p.End( hiResScreenCapture(3) );
 
-    if( gui_menu_on ) {
-       mainMenuBar->reveal();
-    }
     // BusyCursor(1);
     if ( show_pu_cursor ) {
        puShowCursor();
@@ -860,7 +815,6 @@ void fgDumpSnapShot () {
         fgSetBool("/sim/freeze/master", true);
     }
 
-    mainMenuBar->hide();
     TurnCursorOff();
     if ( !puCursorIsHidden() ) {
        show_pu_cursor = true;
@@ -904,9 +858,6 @@ void fgDumpSnapShot () {
     }
 
     TurnCursorOn();
-    if( gui_menu_on ) {
-       mainMenuBar->reveal();
-    }
 
     if ( !freeze ) {
         fgSetBool("/sim/freeze/master", false);