biipadmin/Burn-My-Windows
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🔧 Work on lamp warping

Browse Source
This commit is contained in:
Simon Schneegans
2023-08-05 12:15:55 +02:00
parent 21dc4eac3d
commit b9901bad86
2 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/shaders/magic-lamp.frag
+33 -14
View File
@@ -20,31 +20,50 @@ uniform vec2 uCurrentPointerPos;
uniform vec2 uControlPointA;
uniform vec2 uControlPointB;
vec2 threeWayMix(float fac, vec2 a, vec2 b, vec2 c) {
if (fac < 0.5) {
return mix(a, b, smoothstep(0.0, 1.0, fac * 2.0));
}
return mix(b, c, smoothstep(0.0, 1.0, fac * 2.0 - 1.0));
}
void main() {
float progress = uForOpening ? 1.0 - uProgress : uProgress;
vec2 texcoord = iTexCoord.st;
texcoord = texcoord * uActorScale + 0.5 - uActorScale * 0.5;
vec2 warp = (texcoord - uInitialPointerPos) * progress / (1.0 - progress);
float circle = length((texcoord - uCurrentPointerPos) / uActorScale * 2.0);
float progress = uForOpening ? 1.0 - uProgress : uProgress;
progress = clamp(mix(max(0.0, uProgress*2.0 - circle), 2.0 * uProgress, uProgress), 0.0, 1.0);
// progress = smoothstep(0.0, 1.0, pow(2.0 * progress - circle, 0.5));
vec2 warpA = (texcoord - uControlPointA) * uProgress * progress / (1.0 - uProgress);
vec2 warpB = (texcoord - uControlPointB) * uProgress * progress / (1.0 - uProgress);
vec2 warpC = (texcoord - uCurrentPointerPos) * uProgress * progress / (1.0 - uProgress);
vec2 warp = threeWayMix(progress, warpA, warpB, warpC);
// vec2 warp = (warpA + warpB + warpC) / (progressA + progressB + progressC);
vec4 oColor = getInputColor(texcoord + warp);
if (length(texcoord - uInitialPointerPos) < 0.02) {
oColor = vec4(1.0);
}
// oColor = vec4(tritone(progress, vec3(1.0, 0.0, 0.0), vec3(0.0, 1.0, 0.0), vec3(0.0, 0.0, 1.0)), 1.0);
if (length(texcoord - uCurrentPointerPos) < 0.02) {
oColor = vec4(1.0, 0.0, 0.0, 1.0);
}
// if (length(texcoord - uInitialPointerPos) < 0.02) {
// oColor = vec4(1.0);
// }
if (length(texcoord - uControlPointA) < 0.02) {
oColor = vec4(0.0, 1.0, 0.0, 1.0);
}
// if (length(texcoord - uCurrentPointerPos) < 0.02) {
// oColor = vec4(1.0, 0.0, 0.0, 1.0);
// }
if (length(texcoord - uControlPointB) < 0.02) {
oColor = vec4(0.0, 0.0, 1.0, 1.0);
}
// if (length(texcoord - uControlPointA) < 0.02) {
// oColor = vec4(0.0, 1.0, 0.0, 1.0);
// }
// if (length(texcoord - uControlPointB) < 0.02) {
// oColor = vec4(0.0, 0.0, 1.0, 1.0);
// }
setOutputColor(oColor);
}