diff options
Diffstat (limited to 'shader.frag')
| -rw-r--r-- | shader.frag | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shader.frag b/shader.frag index 53db428..49740ac 100644 --- a/shader.frag +++ b/shader.frag @@ -26,7 +26,7 @@ void main (void) { vec4 i4 = texture2D(img3,st); i1 = mix(i1,i2,sin(time)); i2 = mix(i3,i4,cos(time)); - //gl_FragColor = mix(i1,i2,0.5); - gl_FragColor = i1; + gl_FragColor = mix(i1,i2,0.5); + gl_FragColor = i2; //gl_FragColor = texture2D(image1,st*sin(time*2.)); } |