Cleaned up UI, merged atlases, added GLProfiling

This commit is contained in:
Anuken
2017-10-22 16:24:49 -04:00
parent 2ca4f8b90a
commit 70693ffdd3
130 changed files with 662 additions and 939 deletions

View File

@ -18,7 +18,7 @@ void main() {
vec2 T = v_texCoord.xy;
vec2 coords = (T * u_texsize) + u_offset;
float si = 1.0 + sin(u_time / 20.0 + (coords.x + coords.y) / 30.0) / 10.0;
float si = 1.0 + sin(u_time / 20.0 /*+ (coords.x + coords.y) / 30.0*/) / 8.0;
vec4 color = texture2D(u_texture, T) * vec4(si, si, si, 1.0);
@ -41,10 +41,10 @@ void main() {
//coords.x = float(int(coords.x));
if(color.a > 0.1){
if(mod(coords.x + coords.y + sin(coords.x / 5.0) * 3.0 + sin(coords.y / 5.0) * 3.0 + u_time / 4.0, 10.0) < 2.0){
color *= 1.5;
color *= 1.65;
}
color.a = 0.15;
color.a = 0.18;
}
gl_FragColor = color;