diff options
Diffstat (limited to 'slideshow/opengl/staticFragmentShader.glsl')
| -rw-r--r-- | slideshow/opengl/staticFragmentShader.glsl | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/slideshow/opengl/staticFragmentShader.glsl b/slideshow/opengl/staticFragmentShader.glsl index c3cb6693ab21..cd47c5ad6fd7 100644 --- a/slideshow/opengl/staticFragmentShader.glsl +++ b/slideshow/opengl/staticFragmentShader.glsl @@ -53,8 +53,6 @@ void main() { gl_FragColor = ((time-START)/(PART - START))*vec4(sn, sn, sn, 1.0) + (1.0 - (time - START)/(PART - START))*texture2D(leavingSlideTexture, v_texturePosition); else gl_FragColor = texture2D(leavingSlideTexture, v_texturePosition); - } else if ( time < PART ) { - gl_FragColor = texture2D(leavingSlideTexture, v_texturePosition); } else if ( time > END ) { gl_FragColor = ((1.0 - time)/(1.0 - END))*vec4(sn, sn, sn, 1.0) + ((time - END)/(1.0 - END))*texture2D(enteringSlideTexture, v_texturePosition); } else |