From 45cb2f39f2fa3a3b3aa9b04bb5c311c29a3522a9 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Wed, 21 Dec 2011 13:06:45 +1000 Subject: [PATCH] Mac GL transitions fix #3 --- Graphs/gGraphView.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Graphs/gGraphView.cpp b/Graphs/gGraphView.cpp index 14a47cda..63fa2c6b 100644 --- a/Graphs/gGraphView.cpp +++ b/Graphs/gGraphView.cpp @@ -2485,7 +2485,7 @@ void gGraphView::paintGL() glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); bool numgraphs=true; - const int animTimeout=500; + const int animTimeout=800; float phase=0; int elapsed=0; @@ -2533,8 +2533,8 @@ void gGraphView::paintGL() glEnable(GL_BLEND); - //glDisable(GL_ALPHA_TEST); - //glAlphaFunc(GL_GREATER,0.0); + glDisable(GL_ALPHA_TEST); + glAlphaFunc(GL_GREATER,0.0); glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); glColor4f(aphase,aphase,aphase,aphase); @@ -2558,7 +2558,7 @@ void gGraphView::paintGL() glTexCoord2f(0.0f, 0.0f); glVertex2f(0,height()); glEnd(); - //glDisable(GL_ALPHA_TEST); + glDisable(GL_ALPHA_TEST); glDisable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBindTexture(GL_TEXTURE_2D,0);