72 files changed, 1539 insertions, 6397 deletions
diff --git a/assets/images/irredecentENV.png b/assets/images/irredecentENV.png
deleted file mode 100644
index 21c1c9ce..00000000
--- a/assets/images/irredecentENV.png
+++ /dev/null
Binary files differ
diff --git a/assets/images/scales_normal.png b/assets/images/scales_normal.png
deleted file mode 100644
index 87cc77dc..00000000
--- a/assets/images/scales_normal.png
+++ /dev/null
Binary files differ
diff --git a/assets/images/stitchStroke.png b/assets/images/stitchStroke.png
deleted file mode 100644
index 7808e81f..00000000
--- a/assets/images/stitchStroke.png
+++ /dev/null
Binary files differ
diff --git a/assets/images/stitchStroke_N.png b/assets/images/stitchStroke_N.png
deleted file mode 100644
index 34fa97d4..00000000
--- a/assets/images/stitchStroke_N.png
+++ /dev/null
Binary files differ
diff --git a/assets/shaders/Basic.frag.glsl b/assets/shaders/Basic.frag.glsl
index c1f9a5c8..a2c21afa 100644
--- a/assets/shaders/Basic.frag.glsl
+++ b/assets/shaders/Basic.frag.glsl
@@ -11,9 +11,7 @@ precision highp float;
 uniform vec4 color;
-varying vec4 v_color;
 void main() {
-    gl_FragColor = v_color;
+    gl_FragColor = color;
-    //gl_FragColor = color;
 }
diff --git a/assets/shaders/Basic.vert.glsl b/assets/shaders/Basic.vert.glsl
index 40b97ad7..0d5b8d63 100644
--- a/assets/shaders/Basic.vert.glsl
+++ b/assets/shaders/Basic.vert.glsl
@@ -14,8 +14,6 @@ precision highp float;
 attribute vec3 a_pos;
 attribute vec2 texcoord;
-varying vec4 v_color;
 // matrix uniforms
 uniform mat4 u_mvMatrix;
@@ -24,6 +22,5 @@ uniform mat4 u_worldMatrix;
 void main(void)
 {
-        v_color = vec4(texcoord.x, texcoord.y, 0, 1);
        gl_Position = u_projMatrix * u_mvMatrix * vec4(a_pos,1.0) ;
 }
 \ No newline at end of file
diff --git a/assets/shaders/Deform.frag.glsl b/assets/shaders/Deform.frag.glsl
deleted file mode 100644
index 1dbe45a0..00000000
--- a/assets/shaders/Deform.frag.glsl
+++ /dev/null
@@ -1,29 +0,0 @@
-#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/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);
-}
diff --git a/assets/shaders/Julia.frag.glsl b/assets/shaders/Julia.frag.glsl
deleted file mode 100644
index 68cda703..00000000
--- a/assets/shaders/Julia.frag.glsl
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifdef GL_ES
-precision highp float;
-#endif
-uniform vec2 u_resolution;
-uniform float u_time;

diff --git a/assets/images/irredecentENV.png b/assets/images/irredecentENV.png deleted file mode 100644 index 21c1c9ce..00000000 --- a/assets/images/irredecentENV.png +++ /dev/null
Binary files differ


diff --git a/assets/images/scales_normal.png b/assets/images/scales_normal.png deleted file mode 100644 index 87cc77dc..00000000 --- a/assets/images/scales_normal.png +++ /dev/null
Binary files differ


diff --git a/assets/images/stitchStroke.png b/assets/images/stitchStroke.png deleted file mode 100644 index 7808e81f..00000000 --- a/assets/images/stitchStroke.png +++ /dev/null
Binary files differ


diff --git a/assets/images/stitchStroke_N.png b/assets/images/stitchStroke_N.png deleted file mode 100644 index 34fa97d4..00000000 --- a/assets/images/stitchStroke_N.png +++ /dev/null
Binary files differ


diff --git a/assets/shaders/Basic.frag.glsl b/assets/shaders/Basic.frag.glsl index c1f9a5c8..a2c21afa 100644 --- a/assets/shaders/Basic.frag.glsl +++ b/assets/shaders/Basic.frag.glsl
@@ -11,9 +11,7 @@ precision highp float;
11		11
12		12
13	uniform vec4 color;	13	uniform vec4 color;
14	varying vec4 v_color;
15		14
16	void main() {	15	void main() {
17	gl_FragColor = v_color;	16	gl_FragColor = color;
18	//gl_FragColor = color;
19	}	17	}


diff --git a/assets/shaders/Basic.vert.glsl b/assets/shaders/Basic.vert.glsl index 40b97ad7..0d5b8d63 100644 --- a/assets/shaders/Basic.vert.glsl +++ b/assets/shaders/Basic.vert.glsl
@@ -14,8 +14,6 @@ precision highp float;
14	attribute vec3 a_pos;	14	attribute vec3 a_pos;
15	attribute vec2 texcoord;	15	attribute vec2 texcoord;
16		16
17	varying vec4 v_color;
18
19		17
20	// matrix uniforms	18	// matrix uniforms
21	uniform mat4 u_mvMatrix;	19	uniform mat4 u_mvMatrix;
@@ -24,6 +22,5 @@ uniform mat4 u_worldMatrix;
24		22
25	void main(void)	23	void main(void)
26	{	24	{
27	v_color = vec4(texcoord.x, texcoord.y, 0, 1);
28	gl_Position = u_projMatrix * u_mvMatrix * vec4(a_pos,1.0) ;	25	gl_Position = u_projMatrix * u_mvMatrix * vec4(a_pos,1.0) ;
29	} \ No newline at end of file	26	} \ No newline at end of file


diff --git a/assets/shaders/Deform.frag.glsl b/assets/shaders/Deform.frag.glsl deleted file mode 100644 index 1dbe45a0..00000000 --- a/assets/shaders/Deform.frag.glsl +++ /dev/null
@@ -1,29 +0,0 @@
1	#ifdef GL_ES
2	precision highp float;
3	#endif
4
5	uniform float u_time;
6	uniform vec2 u_resolution;
7	//uniform vec4 mouse;
8	uniform sampler2D u_tex0;
9
10	void main(void)
11	{
12	vec2 p = -1.0 + 2.0 * gl_FragCoord.xy / u_resolution.xy;
13	//vec2 m = -1.0 + 2.0 * mouse.xy / u_resolution.xy;
14	vec2 m = vec2(-.8, .8);
15
16	float a1 = atan(p.y-m.y,p.x-m.x);
17	float r1 = sqrt(dot(p-m,p-m));
18	float a2 = atan(p.y+m.y,p.x+m.x);
19	float r2 = sqrt(dot(p+m,p+m));
20
21	vec2 uv;
22	uv.x = 0.2u_time + (r1-r2)0.25;
23	uv.y = sin(2.0*(a1-a2));
24
25	float w = r1r20.8;
26	vec3 col = texture2D(u_tex0,uv).xyz;
27
28	gl_FragColor = vec4(col/(.1+w),1.0);
29	} \ No newline at end of file


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 @@
1	#ifdef GL_ES
2	precision highp float;
3	#endif
4
5	uniform vec2 u_resolution;
6	uniform float u_time;
7	uniform sampler2D u_tex0;
8
9	void main(void)
10	{
11	vec2 p = -1.0 + 2.0 * gl_FragCoord.xy / u_resolution.xy;
12	vec2 uv;
13
14	float an = u_time*.25;
15
16	float x = p.xcos(an)-p.ysin(an);
17	float y = p.xsin(an)+p.ycos(an);
18
19	uv.x = .25*x/abs(y);
20	uv.y = .20*u_time + .25/abs(y);
21
22	gl_FragColor = vec4(texture2D(u_tex0,uv).xyz * y*y, 1.0);
23	}


diff --git a/assets/shaders/Julia.frag.glsl b/assets/shaders/Julia.frag.glsl deleted file mode 100644 index 68cda703..00000000 --- a/assets/shaders/Julia.frag.glsl +++ /dev/null
@@ -1,25 +0,0 @@
1	#ifdef GL_ES
2	precision highp float;
3	#endif
4
5	uniform vec2 u_resolution;
6	uniform float u_time;