Rooba
/
kivy
mirror of https://github.com/kivy/kivy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

screenmanager: change shader for fade transition to find bug in issue #570

This commit is contained in:
Thomas Hansen 2012-07-15 12:10:45 -05:00
parent 8868897c19
commit 422dc30dc2
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kivy/uix/screenmanager.py
View File

@ -484,9 +484,10 @@ class FadeTransition(ShaderTransition):
uniform sampler2D tex_out; uniform sampler2D tex_out;
void main(void) { void main(void) {
vec4 cin = texture2D(tex_in, tex_coord0); vec4 cin = vec4(texture2D(tex_in, tex_coord0.st));
vec4 cout = texture2D(tex_out, tex_coord0); vec4 cout = vec4(texture2D(tex_out, tex_coord0.st));
gl_FragColor = mix(cout, cin, t); vec4 frag_col = vec4(t*cout) + vec4((1.0-t)*cin);
gl_FragColor = frag_col;
} }
''' '''
fs = StringProperty(FADE_TRANSITION_FS) fs = StringProperty(FADE_TRANSITION_FS)