]> git.mxchange.org Git - flightgear.git/commitdiff
re-order gl commands for better rgba texture support
authormfranz <mfranz>
Sat, 28 Apr 2007 20:34:21 +0000 (20:34 +0000)
committermfranz <mfranz>
Sat, 28 Apr 2007 20:34:21 +0000 (20:34 +0000)
src/Main/splash.cxx

index 252efb720711c458108a89b42b9b97a5ed37a73c..19d7b5e1d71f40e0233a469398a0df6ffe0e3b12 100644 (file)
@@ -145,6 +145,7 @@ void fgSplashUpdate ( float alpha ) {
 
     glDisable(GL_DEPTH_TEST);
     glDisable(GL_LIGHTING);
+    glDisable(GL_CULL_FACE);
 
     // draw the background
     FGColor c(0.0, 0.0, 0.0);
@@ -157,6 +158,11 @@ void fgSplashUpdate ( float alpha ) {
     glVertex2f(0.0, screen_height);
     glEnd();
 
+    glEnable(GL_ALPHA_TEST);
+    glEnable(GL_BLEND);
+    glAlphaFunc(GL_GREATER, 0.1f);
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
     // now draw the logo
     if (fgGetBool("/sim/startup/splash-screen", true)) {
         glEnable(GL_TEXTURE_2D);
@@ -170,17 +176,10 @@ void fgSplashUpdate ( float alpha ) {
         glTexCoord2f(1.0, 1.0); glVertex2f(xmax, ymax);
         glTexCoord2f(0.0, 1.0); glVertex2f(xmin, ymax);
         glEnd();
+        glDisable(GL_TEXTURE_2D);
     }
 
-    glDisable(GL_TEXTURE_2D);
-
     if (progress_text && fgGetBool("/sim/startup/splash-progress", true)) {
-        glEnable(GL_ALPHA_TEST);
-        glEnable(GL_BLEND);
-        glAlphaFunc(GL_GREATER, 0.1f);
-        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-        glDisable(GL_CULL_FACE);
-
         puFont *fnt = globals->get_fontcache()->get(style->getNode("fonts/splash"));
 
         FGColor c(1.0, 0.9, 0.0);