diff options
| author | Christoph Helma <helma@in-silico.ch> | 2017-07-18 16:49:45 +0200 |
|---|---|---|
| committer | Christoph Helma <helma@in-silico.ch> | 2017-07-18 16:49:45 +0200 |
| commit | 10a19b6381d24c4de0ff07836131dc7f809c65cc (patch) | |
| tree | 203793b05adc5c6e2234c58bfd3407e3a37bc80d /shader.frag | |
| parent | ceca3527ef89f4b6eea14b1fcc4c68d0b235778f (diff) | |
multiple textures
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.)); } |