mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-02-04 17:25:31 +00:00
Code Issues Projects Releases Wiki Activity

Make sweep transition compile.

Browse Source
This commit is contained in:
Kai Blaschke
2023-11-01 23:14:10 +01:00
parent 3b4149ef89
commit 1ba6b1a25f
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/libprojectM/Renderer/TransitionShaders/TransitionShaderBuiltInSweepGlsl330.frag
View File

@ -1,4 +1,13 @@
// Side-to-side sweep with random angle and transition zone width
float atan_y_over_x(float y, float x)
{
if (x > 0.0) return atan(y / x);
else if (x < 0.0 && y >= 0.0) return atan(y / x) + 3.14159265;
else if (x < 0.0 && y < 0.0) return atan(y / x) - 3.14159265;
else return 1.57079632 * sign(y);
}
void mainImage( out vec4 fragColor, in vec2 fragCoord )
{
vec2 uv = fragCoord / iResolution.xy;
@ -7,15 +16,15 @@ void mainImage( out vec4 fragColor, in vec2 fragCoord )
// Blending
float currentAngle = mod(float(iRandStatic.x), 360.);
float blendWidth = mod(float(iRandStatic.y), .25) + .05;
float blendWidth = mod(float(iRandStatic.y) * .001, .3) + .1;
uv -= .5;
float angle = radians(90.0) - radians(currentAngle) + atan(uv.y, uv.x);
float angle = radians(90.0) - radians(currentAngle) + atan_y_over_x(uv.y, uv.x);
float len = length(uv) / sqrt(2.);
uv = vec2(cos(angle) * len, sin(angle) * len) + .5;
vec3 col = mix(imgOld, imgNew, smoothstep(prog, prog + blendWidth, (uv.x / (1.0 + 2. * blendWidth)) + blendWidth));
vec3 col = mix(imgNew, imgOld, smoothstep(iProgressCosine, iProgressCosine + blendWidth, (uv.x / (1.0 + 2. * blendWidth)) + blendWidth));
// Output to screen
fragColor = vec4(col, 1.0);