diff --git a/shader.glsl b/shader.glsl index 875f3e4..cd9dd0c 100644 --- a/shader.glsl +++ b/shader.glsl @@ -224,7 +224,7 @@ float gStartTime = 0.; float gPrevTime = -0.1; vec4 waveTexture(vec2 uv) { - uv.y = sin(uv.x*5. + time)/25. + uv.y; + uv.y = sin(uv.x*16. + time)/32. + uv.y-0.03; uv.x -= (time-gStartTime)*0.2; vec4 tex = texture2D(texts, uv); if (tex.y > 0. && (gPrevTime != gStartTime)) { @@ -235,16 +235,16 @@ vec4 waveTexture(vec2 uv) { } -void TextScroller(out vec4 fragColor, in vec2 fragCoord ) +void TextScroller(out vec4 fragColor, in vec2 fragCoord) { // Normalized pixel coordinates (from -1 to 1, origo at 0,0) - vec2 uv = (fragCoord*2. - resolution) / resolution; + vec2 uv = (fragCoord.xy * 2. - resolution.xy) / min(resolution.x, resolution.y); vec3 col = vec3(0., 0.4, 0.6); col += wave(uv, 0., 1., 3., 1., sin(time+0.3)*90.); col += wave(uv, sin(time), 0., 3., -1., sin(time-1.2)*120.); col += wave(uv, -3., 0., 3., 1., sin(time+0.5)*90.); vec4 outBuf = waveTexture(uv * 0.1); - fragColor = mainImage2(fragCoord)*0.5 + (vec4(col, 1.0)*outBuf); // + vec4(random(uv*2.), 1.0); + fragColor = max(mainImage2(gl_FragCoord.xy)*0.2, vec4(col*outBuf.xyz, 1.0)); // + vec4(random(uv*2.), 1.0); } diff --git a/timings_and_texts.inc b/timings_and_texts.inc index 8eb333e..a524586 100644 --- a/timings_and_texts.inc +++ b/timings_and_texts.inc @@ -54,8 +54,8 @@ section .textstr2 data text_string_timings: ;______TIMINGS_START______ DEFINE_TIMING TIMING_TIME(0,0.00000,0) TIMING_ALIAS('') TIMING_CUSTOM(0) TIMING_STRING(0,_string0) ; -DEFINE_TIMING TIMING_TIME(5,0.50000,437684) TIMING_ALIAS('') TIMING_CUSTOM(0) TIMING_STRING(0,_string1) ; -DEFINE_TIMING TIMING_TIME(9,0.00000,716210) TIMING_ALIAS('') TIMING_CUSTOM(0) TIMING_STRING(0,_string2) ; +DEFINE_TIMING TIMING_TIME(5,0.00000,397894) TIMING_ALIAS('') TIMING_CUSTOM(0) TIMING_STRING(0,_string1) ; +DEFINE_TIMING TIMING_TIME(10,0.00000,795789) TIMING_ALIAS('') TIMING_CUSTOM(0) TIMING_STRING(0,_string2) ; DEFINE_TIMING TIMING_TIME(20,0.00000,1591578) TIMING_ALIAS('END_TIME') TIMING_CUSTOM(0) TIMING_STRING(0,_string2) ; ;______TIMINGS_END______ dd 0xFFFFFFFF ; end-of-time