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

Better day transition.. a cross-over fade

Browse Source
This commit is contained in:
Mark Watkins 2011-12-20 22:32:56 +10:00
parent 5eff786db9
commit 64c4143848
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Graphs/gGraphView.cpp
View File

@ -2497,33 +2497,41 @@ void gGraphView::paintGL()
// bindTexture(previous_day_snapshot); // bindTexture(previous_day_snapshot);
} else if (m_fadingIn) { } else if (m_fadingIn) {
int offset,offset2; int offset,offset2;
if (m_fadedir) { // forwards float aphase;
offset2=-width(); aphase=1.0-phase;
offset=0; /*if (m_fadedir) { // forwards
//offset2=-width();
//offset=0;
aphase=phase;
phase=1.0-phase; phase=1.0-phase;
} else { // backwards } else { // backwards
phase=phase; aphase=phase;
offset=-width(); phase=phase
offset2=0;//-width(); //offset=-width();
} //offset2=0;//-width();
}*/
offset=0; offset2=0;
glEnable(GL_BLEND); glEnable(GL_BLEND);
glColor4f(255,255,255,255); glColor4f(1.0,1.0,1.0,aphase);
bindTexture(previous_day_snapshot); bindTexture(previous_day_snapshot);
glBegin(GL_QUADS); glBegin(GL_QUADS);
glTexCoord2f(0.0f, 1.0f); glVertex2f(width()*phase+offset2,0); glTexCoord2f(0.0f, 1.0f); glVertex2f(0,0);
glTexCoord2f(1.0f, 1.0f); glVertex2f(width()+width()*phase+offset2,0); glTexCoord2f(1.0f, 1.0f); glVertex2f(width(),0);
glTexCoord2f(1.0f, 0.0f); glVertex2f(width()+width()*phase+offset2,height()); glTexCoord2f(1.0f, 0.0f); glVertex2f(width(),height());
glTexCoord2f(0.0f, 0.0f); glVertex2f(width()*phase+offset2,height()); glTexCoord2f(0.0f, 0.0f); glVertex2f(0,height());
glEnd(); glEnd();
glColor4f(1.0,1.0,1.0,phase);
bindTexture(current_day_snapshot); bindTexture(current_day_snapshot);
glBegin(GL_QUADS); glBegin(GL_QUADS);
glTexCoord2f(0.0f, 1.0f); glVertex2f(width()*phase+offset,0); glTexCoord2f(0.0f, 1.0f); glVertex2f(0,0);
glTexCoord2f(1.0f, 1.0f); glVertex2f(width()+width()*phase+offset,0); glTexCoord2f(1.0f, 1.0f); glVertex2f(width(),0);
glTexCoord2f(1.0f, 0.0f); glVertex2f(width()+width()*phase+offset,height()); glTexCoord2f(1.0f, 0.0f); glVertex2f(width(),height());
glTexCoord2f(0.0f, 0.0f); glVertex2f(width()*phase+offset,height()); glTexCoord2f(0.0f, 0.0f); glVertex2f(0,height());
glEnd(); glEnd();
glDisable(GL_BLEND); glDisable(GL_BLEND);