From 96a0a8c916533eb5625816192ed38488f639326d Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Wed, 22 Feb 2012 11:00:20 -0800 Subject: Integrating canvas-2d drawing and WebGL fixes, including adding back WebGL materials. Signed-off-by: Nivesh Rajbhandari --- assets/shaders/Fly.frag.glsl | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 assets/shaders/Fly.frag.glsl (limited to 'assets/shaders/Fly.frag.glsl') diff --git a/assets/shaders/Fly.frag.glsl b/assets/shaders/Fly.frag.glsl new file mode 100644 index 00000000..f99b5ab8 --- /dev/null +++ b/assets/shaders/Fly.frag.glsl @@ -0,0 +1,23 @@ +#ifdef GL_ES +precision highp float; +#endif + +uniform vec2 u_resolution; +uniform float u_time; +uniform sampler2D u_tex0; + +void main(void) +{ + vec2 p = -1.0 + 2.0 * gl_FragCoord.xy / u_resolution.xy; + vec2 uv; + + float an = u_time*.25; + + float x = p.x*cos(an)-p.y*sin(an); + float y = p.x*sin(an)+p.y*cos(an); + + uv.x = .25*x/abs(y); + uv.y = .20*u_time + .25/abs(y); + + gl_FragColor = vec4(texture2D(u_tex0,uv).xyz * y*y, 1.0); +} -- cgit v1.2.3 From f775fb752cac57a0c1f6c42c8c60f5ff329eab32 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Wed, 22 Feb 2012 11:36:19 -0800 Subject: Revert "Integrating canvas-2d drawing and WebGL fixes, including adding back WebGL materials." This reverts commit 96a0a8c916533eb5625816192ed38488f639326d. --- assets/shaders/Fly.frag.glsl | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 assets/shaders/Fly.frag.glsl (limited to 'assets/shaders/Fly.frag.glsl') diff --git a/assets/shaders/Fly.frag.glsl b/assets/shaders/Fly.frag.glsl deleted file mode 100644 index f99b5ab8..00000000 --- a/assets/shaders/Fly.frag.glsl +++ /dev/null @@ -1,23 +0,0 @@ -#ifdef GL_ES -precision highp float; -#endif - -uniform vec2 u_resolution; -uniform float u_time; -uniform sampler2D u_tex0; - -void main(void) -{ - vec2 p = -1.0 + 2.0 * gl_FragCoord.xy / u_resolution.xy; - vec2 uv; - - float an = u_time*.25; - - float x = p.x*cos(an)-p.y*sin(an); - float y = p.x*sin(an)+p.y*cos(an); - - uv.x = .25*x/abs(y); - uv.y = .20*u_time + .25/abs(y); - - gl_FragColor = vec4(texture2D(u_tex0,uv).xyz * y*y, 1.0); -} -- cgit v1.2.3 From d5b216d9d6d2b8cb93106e8f8ca351089d05b41d Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Wed, 22 Feb 2012 11:52:31 -0800 Subject: Integrating canvas-2d and WebGL drawing fixes. Also adding back WebGL materials. Signed-off-by: Nivesh Rajbhandari --- assets/shaders/Fly.frag.glsl | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 assets/shaders/Fly.frag.glsl (limited to 'assets/shaders/Fly.frag.glsl') diff --git a/assets/shaders/Fly.frag.glsl b/assets/shaders/Fly.frag.glsl new file mode 100644 index 00000000..f99b5ab8 --- /dev/null +++ b/assets/shaders/Fly.frag.glsl @@ -0,0 +1,23 @@ +#ifdef GL_ES +precision highp float; +#endif + +uniform vec2 u_resolution; +uniform float u_time; +uniform sampler2D u_tex0; + +void main(void) +{ + vec2 p = -1.0 + 2.0 * gl_FragCoord.xy / u_resolution.xy; + vec2 uv; + + float an = u_time*.25; + + float x = p.x*cos(an)-p.y*sin(an); + float y = p.x*sin(an)+p.y*cos(an); + + uv.x = .25*x/abs(y); + uv.y = .20*u_time + .25/abs(y); + + gl_FragColor = vec4(texture2D(u_tex0,uv).xyz * y*y, 1.0); +} -- cgit v1.2.3