chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 18:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mac GL transitions fix #3

Browse Source
This commit is contained in:
Mark Watkins 2011-12-21 13:06:45 +10:00
parent 3d860b7632
commit 45cb2f39f2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Graphs/gGraphView.cpp
View File

@ -2485,7 +2485,7 @@ void gGraphView::paintGL()
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
bool numgraphs=true; bool numgraphs=true;
const int animTimeout=500; const int animTimeout=800;
float phase=0; float phase=0;
int elapsed=0; int elapsed=0;
@ -2533,8 +2533,8 @@ void gGraphView::paintGL()
glEnable(GL_BLEND); glEnable(GL_BLEND);
//glDisable(GL_ALPHA_TEST); glDisable(GL_ALPHA_TEST);
//glAlphaFunc(GL_GREATER,0.0); glAlphaFunc(GL_GREATER,0.0);
glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
glColor4f(aphase,aphase,aphase,aphase); glColor4f(aphase,aphase,aphase,aphase);
@ -2558,7 +2558,7 @@ void gGraphView::paintGL()
glTexCoord2f(0.0f, 0.0f); glVertex2f(0,height()); glTexCoord2f(0.0f, 0.0f); glVertex2f(0,height());
glEnd(); glEnd();
//glDisable(GL_ALPHA_TEST); glDisable(GL_ALPHA_TEST);
glDisable(GL_BLEND); glDisable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glBindTexture(GL_TEXTURE_2D,0); glBindTexture(GL_TEXTURE_2D,0);