X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FGUI%2Fgui.cxx;h=f37b3792d6412ec8b0d2b2dd414a951f436f04d3;hb=02a5261797998841e2c3d8580385e68a5d319929;hp=b730270f51d042ca7a771e1ae03778a376fcdb35;hpb=580ebf637b991bbc5bb6b9632e8e62845d23ea43;p=flightgear.git

diff --git a/src/GUI/gui.cxx b/src/GUI/gui.cxx
index b730270f5..f37b3792d 100644
--- a/src/GUI/gui.cxx
+++ b/src/GUI/gui.cxx
@@ -30,10 +30,6 @@
 
 #include <simgear/compiler.h>
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
 #include <string>
 
 #include <simgear/structure/exception.hxx>
@@ -43,18 +39,20 @@
 
 #include <plib/pu.h>
 
-#include <Include/general.hxx>
 #include <Main/main.hxx>
 #include <Main/globals.hxx>
+#include <Main/locale.hxx>
 #include <Main/fg_props.hxx>
-#include <Main/WindowSystemAdapter.hxx>
+#include <Viewer/WindowSystemAdapter.hxx>
+#include <Viewer/CameraGroup.hxx>
 #include <GUI/new_gui.hxx>
+#include <GUI/FGFontCache.hxx>
 
 #include "gui.h"
-#include "gui_local.hxx"
 #include "layout.hxx"
 
-using namespace osg;
+#include <osg/GraphicsContext>
+
 using namespace flightgear;
 
 puFont guiFnt = 0;
@@ -72,7 +70,7 @@ public:
     GUIInitOperation() : GraphicsContextOperation(std::string("GUI init"))
     {
     }
-    void run(GraphicsContext* gc)
+    void run(osg::GraphicsContext* gc)
     {
         WindowSystemAdapter* wsa = WindowSystemAdapter::getWSA();
         wsa->puInitialize();
@@ -80,9 +78,9 @@ public:
         puSetDefaultColourScheme  (0.8, 0.8, 0.9, 1);
 
         FGFontCache *fc = globals->get_fontcache();
+        fc->initializeFonts();
         puFont *GuiFont
-            = fc->get(globals->get_locale()->getStringValue("font",
-                                                            "typewriter.txf"),
+            = fc->get(globals->get_locale()->getDefaultFont("typewriter.txf"),
                       15);
         puSetDefaultFonts(*GuiFont, *GuiFont);
         guiFnt = puGetDefaultLabelFont();
@@ -90,22 +88,7 @@ public:
         LayoutWidget::setDefaultFont(GuiFont, 15);
   
         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.
-            // XXX Not bloody likely in 2008...
-            if ( strstr ( general.get_glRenderer(), "Glide" ) ) {
-                // Test for the MESA_GLX_FX env variable
-                char *mesa_win_state = getenv( "MESA_GLX_FX" );
-                if (mesa_win_state  != NULL) {
-                    // test if we are fullscreen mesa/glide
-                    if ( (mesa_win_state[0] == 'f') ||
-                         (mesa_win_state[0] == 'F') ) {
-                        puShowCursor ();
-                    }
-                }
-            }
+            // no preference specified for mouse pointer
         } else if ( !fgGetBool("/sim/startup/mouse-pointer") ) {
             // don't show pointer
         } else {
@@ -115,25 +98,88 @@ public:
     }
 };
 
-ref_ptr<GUIInitOperation> initOp;
-}
+// Operation for querying OpenGL parameters. This must be done in a
+// valid OpenGL context, potentially in another thread.
 
-void guiStartInit()
+struct GeneralInitOperation : public GraphicsContextOperation
 {
-    initOp = new GUIInitOperation;
-    WindowSystemAdapter* wsa = WindowSystemAdapter::getWSA();
-    GraphicsContext* gc = wsa->getGUIGraphicsContext();
-    gc->add(initOp.get());
+    GeneralInitOperation()
+        : GraphicsContextOperation(std::string("General init"))
+    {
+    }
+    void run(osg::GraphicsContext* gc)
+    {
+        SGPropertyNode* simRendering = fgGetNode("/sim/rendering");
+
+        simRendering->setStringValue("gl-vendor", (char*) glGetString(GL_VENDOR));
+        SG_LOG( SG_GENERAL, SG_INFO, glGetString(GL_VENDOR));
+
+        simRendering->setStringValue("gl-renderer", (char*) glGetString(GL_RENDERER));
+        SG_LOG( SG_GENERAL, SG_INFO, glGetString(GL_RENDERER));
+
+        simRendering->setStringValue("gl-version", (char*) glGetString(GL_VERSION));
+        SG_LOG( SG_GENERAL, SG_INFO, glGetString(GL_VERSION));
+
+        // Old hardware without support for OpenGL 2.0 does not support GLSL and
+        // glGetString returns NULL for GL_SHADING_LANGUAGE_VERSION.
+        //
+        // See http://flightgear.org/forums/viewtopic.php?f=17&t=19670&start=15#p181945
+        const char* glsl_version = (const char*) glGetString(GL_SHADING_LANGUAGE_VERSION);
+        if( !glsl_version )
+          glsl_version = "UNSUPPORTED";
+        simRendering->setStringValue("gl-shading-language-version", glsl_version);
+        SG_LOG( SG_GENERAL, SG_INFO, glsl_version);
+
+        GLint tmp;
+        glGetIntegerv( GL_MAX_TEXTURE_SIZE, &tmp );
+        simRendering->setIntValue("max-texture-size", tmp);
+
+        glGetIntegerv( GL_DEPTH_BITS, &tmp );
+        simRendering->setIntValue("depth-buffer-bits", tmp);
+    }
+};
+
+osg::ref_ptr<GUIInitOperation> initOp;
+
 }
 
-bool guiFinishInit()
+/** Initializes GUI.
+ * Returns true when done, false when still busy (call again). */
+bool guiInit()
 {
-    if (!initOp.valid())
-        return false;
-    if (!initOp->isFinished())
-        return false;
-    initMouseQuat();
-    initOp = 0;
-    return true;
-}
+    static osg::ref_ptr<GeneralInitOperation> genOp;
 
+    if (!genOp.valid())
+    {
+        // Pick some window on which to do queries.
+        // XXX Perhaps all this graphics initialization code should be
+        // moved to renderer.cxx?
+        genOp = new GeneralInitOperation;
+        osg::Camera* guiCamera = getGUICamera(CameraGroup::getDefault());
+        WindowSystemAdapter* wsa = WindowSystemAdapter::getWSA();
+        osg::GraphicsContext* gc = 0;
+        if (guiCamera)
+            gc = guiCamera->getGraphicsContext();
+        if (gc) {
+            gc->add(genOp.get());
+            initOp = new GUIInitOperation;
+            gc->add(initOp.get());
+        } else {
+            wsa->windows[0]->gc->add(genOp.get());
+        }
+        return false; // not ready yet
+    }
+    else
+    {
+        if (!genOp->isFinished())
+            return false;
+        if (!initOp.valid())
+            return true;
+        if (!initOp->isFinished())
+            return false;
+        genOp = 0;
+        initOp = 0;
+        // we're done
+        return true;
+    }
+}