Merge branch 'pentool' into brushtool

Conflicts:
	imports/codemirror/mode/scheme/scheme.js
	js/tools/BrushTool.js

30 files changed, 878 insertions, 1 deletions

diff --git a/assets/shaders/Basic.vert.glsl b/assets/shaders/Basic.vert.glsl
index 028786d1..0d5b8d63 100644..100755
--- a/assets/shaders/Basic.vert.glsl
+++ b/assets/shaders/Basic.vert.glsl
@@ -12,7 +12,7 @@ precision highp float;
 
 // attributes
 attribute vec3 a_pos;
-
+attribute vec2 texcoord;
 
 
 // matrix uniforms
diff --git a/assets/shaders/Deform.frag.glsl b/assets/shaders/Deform.frag.glsl
new file mode 100644
index 00000000..1dbe45a0
--- /dev/null
+++ b/assets/shaders/Deform.frag.glsl
@@ -0,0 +1,29 @@
+#ifdef GL_ES
+precision highp float;
+#endif
+
+uniform float u_time;
+uniform vec2 u_resolution;
+//uniform vec4 mouse;
+uniform sampler2D u_tex0;
+
+void main(void)
+{
+    vec2 p = -1.0 + 2.0 * gl_FragCoord.xy / u_resolution.xy;
+    //vec2 m = -1.0 + 2.0 * mouse.xy / u_resolution.xy;
+        vec2 m = vec2(-.8, .8);
+
+    float a1 = atan(p.y-m.y,p.x-m.x);
+    float r1 = sqrt(dot(p-m,p-m));
+    float a2 = atan(p.y+m.y,p.x+m.x);
+    float r2 = sqrt(dot(p+m,p+m));
+
+    vec2 uv;
+    uv.x = 0.2*u_time + (r1-r2)*0.25;
+    uv.y = sin(2.0*(a1-a2));
+
+    float w = r1*r2*0.8;
+    vec3 col = texture2D(u_tex0,uv).xyz;
+
+    gl_FragColor = vec4(col/(.1+w),1.0);
+}
\ No newline at end of file
diff --git a/assets/shaders/Flag.vert.glsl b/assets/shaders/Flag.vert.glsl
new file mode 100644
index 00000000..7dc932a7
--- /dev/null
+++ b/assets/shaders/Flag.vert.glsl
@@ -0,0 +1,35 @@
+/* <copyright>
+This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+</copyright> */
+
+
+#ifdef GL_ES
+precision highp float;
+#endif
+
+
+// attributes
+attribute vec3 a_pos;
+attribute vec2 texcoord;
+
+// scalar uniforms
+uniform float u_time;
+
+// matrix uniforms
+uniform mat4 u_mvMatrix;
+uniform mat4 u_projMatrix;
+uniform mat4 u_worldMatrix;
+
+void main()
+{
+        float angle = (u_time%360)*2;
+
+        a_pos.z  = sin( a_pos.x + angle);
+        a_pos.z += sin( a_pos.y/2 + angle);
+        a_pos.z *= a_pos.x * 0.09;
+        gl_Position = u_projMatrix * u_mvMatrix * vec4(a_pos,1.0) ;
+
+        gl_FragColor = v_color;
+}
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);
+}
diff --git a/assets/shaders/Julia.frag.glsl b/assets/shaders/Julia.frag.glsl
new file mode 100644
index 00000000..68cda703
--- /dev/null
+++ b/assets/shaders/Julia.frag.glsl
@@ -0,0 +1,25 @@
+#ifdef GL_ES
+precision highp float;
+#endif
+
+uniform vec2 u_resolution;
+uniform float u_time;
+
+void main(void)
+{
+    vec2 p = -1.0 + 2.0 * gl_FragCoord.xy / u_resolution.xy;
+    vec2 cc = vec2( cos(.25*u_time), sin(.25*u_time*1.423) );
+
+    float dmin = 1000.0;
+    vec2 z  = p*vec2(1.33,1.0);
+    for( int i=0; i<64; i++ )
+    {
+        z = cc + vec2( z.x*z.x - z.y*z.y, 2.0*z.x*z.y );
+        float m2 = dot(z,z);
+        if( m2>100.0 ) break;
+        dmin=min(dmin,m2);
+        }
+
+    float color = sqrt(sqrt(dmin))*0.7;
+    gl_FragColor = vec4(color,color,color,1.0);
+}
\ No newline at end of file
diff --git a/assets/shaders/Keleidoscope.frag.glsl b/assets/shaders/Keleidoscope.frag.glsl
new file mode 100644
index 00000000..7d1bdb17
--- /dev/null
+++ b/assets/shaders/Keleidoscope.frag.glsl
@@ -0,0 +1,25 @@
+#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 a = atan(p.y,p.x);
+    float r = sqrt(dot(p,p));
+
+    uv.x =          7.0*a/3.1416;
+    uv.y = -u_time+ sin(7.0*r+u_time) + .7*cos(u_time+7.0*a);
+
+    float w = .5+.5*(sin(u_time+7.0*r)+ .7*cos(u_time+7.0*a));
+
+    vec3 col =  texture2D(u_tex0,uv*.5).xyz;
+
+    gl_FragColor = vec4(col*w,1.0);
+}
\ No newline at end of file
diff --git a/assets/shaders/Mandel.frag.glsl b/assets/shaders/Mandel.frag.glsl
new file mode 100644
index 00000000..6465899d
--- /dev/null
+++ b/assets/shaders/Mandel.frag.glsl
@@ -0,0 +1,55 @@
+#ifdef GL_ES
+precision highp float;
+#endif
+
+uniform vec2 u_resolution;
+uniform float u_time;
+
+void main(void)
+{
+    vec2 p = -1.0 + 2.0 * gl_FragCoord.xy / u_resolution.xy;
+    p.x *= u_resolution.x/u_resolution.y;
+
+    float zoo = .62+.38*sin(.1*u_time);
+    float coa = cos( 0.1*(1.0-zoo)*u_time );
+    float sia = sin( 0.1*(1.0-zoo)*u_time );
+    zoo = pow( zoo,8.0);
+    vec2 xy = vec2( p.x*coa-p.y*sia, p.x*sia+p.y*coa);
+    vec2 cc = vec2(-.745,.186) + xy*zoo;
+
+    vec2 z  = vec2(0.0);
+    vec2 z2 = z*z;
+    float m2;
+    float co = 0.0;
+
+
+    // chrome/angelproject/nvidia/glslES don't seem to like to "break" a loop...
+    // so we have to rewrite it in another way
+/*
+    for( int i=0; i<256; i++ )