nosignal/nosignal-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: blob sdf rect-rect edge sink

Browse source
This commit is contained in:
2 * r + 2 * t 2026-04-07 17:01:41 +10:00
parent ed33b3d8ff
commit 31e29c16a8
1 changed files with 37 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
plugin/src/Caelestia/Blobs/shaders/blob.frag
View file

@ -143,60 +143,56 @@ void main() {
d *= scale; d *= scale;
} }
// Rect-to-rect edge sink: indent this rect's edge where another // Rect-to-rect edge sinks: track the same edge of neighboring rects
// rect is slightly past it, fading once past threshold. {
if (rectCount > 1) { float rectSinkValue = 0.0;
vec2 iSh = sh.xy; vec2 iHalf = sh.xy;
float sinkT = smoothFactor * 0.75; float preOff = smoothFactor * (1.0/6.0);
float sinkOff = smoothFactor * (1.0 / 6.0);
float rectSinkVal = 0.0;
for (int j = 0; j < rectCount; j++) { for (int j = 0; j < rectCount; j++) {
if (j == i) continue; if (j == i) continue;
vec4 jR = rectData[j * 5]; vec4 jRect = rectData[j * 5];
vec4 jP = rectData[j * 5 + 1]; vec4 jProps = rectData[j * 5 + 1];
vec2 jSh = rectData[j * 5 + 3].xy; vec2 jSh = rectData[j * 5 + 3].xy;
vec2 jC = jR.xy + jP.yz; vec2 jCtr = jRect.xy + jProps.yz;
// Skip non-adjacent rects // Per-edge containment: the other rect's full span on the
float sinkRange = smoothFactor * 1.5; // perpendicular axis must be inside this rect for that edge.
if (abs(center.x - jC.x) > iSh.x + jSh.x + sinkRange || bool hInside = (jCtr.y - jSh.y) >= (center.y - iHalf.y) &&
abs(center.y - jC.y) > iSh.y + jSh.y + sinkRange) (jCtr.y + jSh.y) <= (center.y + iHalf.y);
continue; bool vInside = (jCtr.x - jSh.x) >= (center.x - iHalf.x) &&
(jCtr.x + jSh.x) <= (center.x + iHalf.x);
// Penetration of j past i's edges (positive = past) // Top/Bottom: other rect's height must be inside this rect
float pT = (jC.y + jSh.y) - (center.y - iSh.y) - sinkOff; float topPen = hInside ? clamp((center.y - iHalf.y) - (jCtr.y - jSh.y) - preOff, 0.0, smoothFactor) : 0.0;
float pB = (center.y + iSh.y) - (jC.y - jSh.y) - sinkOff; float botPen = hInside ? clamp((jCtr.y + jSh.y) - (center.y + iHalf.y) - preOff, 0.0, smoothFactor) : 0.0;
float pL = (jC.x + jSh.x) - (center.x - iSh.x) - sinkOff;
float pR = (center.x + iSh.x) - (jC.x - jSh.x) - sinkOff;
// Smooth bump: rises then falls, zero outside [0, sinkT] // Left/Right: other rect's width must be inside this rect
float aT = smoothstep(0.0, sinkT * 0.4, pT) * (1.0 - smoothstep(sinkT * 0.5, sinkT, pT)); float leftPen = vInside ? clamp((center.x - iHalf.x) - (jCtr.x - jSh.x) - preOff, 0.0, smoothFactor) : 0.0;
float aB = smoothstep(0.0, sinkT * 0.4, pB) * (1.0 - smoothstep(sinkT * 0.5, sinkT, pB)); float rightPen = vInside ? clamp((jCtr.x + jSh.x) - (center.x + iHalf.x) - preOff, 0.0, smoothFactor) : 0.0;
float aL = smoothstep(0.0, sinkT * 0.4, pL) * (1.0 - smoothstep(sinkT * 0.5, sinkT, pL));
float aR = smoothstep(0.0, sinkT * 0.4, pR) * (1.0 - smoothstep(sinkT * 0.5, sinkT, pR));
// Lateral falloff from rect j's extent // Lateral distance from pixel to other rect's extent along each edge
float hLat = max(abs(pixel.x - jC.x) - jSh.x, 0.0); float hLat = max(abs(pixel.x - jCtr.x) - jSh.x, 0.0);
float vLat = max(abs(pixel.y - jC.y) - jSh.y, 0.0); float vLat = max(abs(pixel.y - jCtr.y) - jSh.y, 0.0);
float latF = smoothFactor * 2.0;
// Perpendicular zone (near rect i's edge only) // Perpendicular proximity: full strength at edge, fade inside
float zT = 1.0 - smoothstep(center.y - iSh.y, center.y - iSh.y + smoothFactor, pixel.y); float topZone = 1.0 - smoothstep(center.y - iHalf.y, center.y - iHalf.y + smoothFactor, pixel.y);
float zB = smoothstep(center.y + iSh.y - smoothFactor, center.y + iSh.y, pixel.y); float botZone = smoothstep(center.y + iHalf.y - smoothFactor, center.y + iHalf.y, pixel.y);
float zL = 1.0 - smoothstep(center.x - iSh.x, center.x - iSh.x + smoothFactor, pixel.x); float leftZone = 1.0 - smoothstep(center.x - iHalf.x, center.x - iHalf.x + smoothFactor, pixel.x);
float zR = smoothstep(center.x + iSh.x - smoothFactor, center.x + iSh.x, pixel.x); float rightZone = smoothstep(center.x + iHalf.x - smoothFactor, center.x + iHalf.x, pixel.x);
float s = max( float s = smoothFactor * 2.0;
max(aT * smoothstep(latF, 0.0, hLat) * zT, float sink = max(
aB * smoothstep(latF, 0.0, hLat) * zB), max(topPen * smoothstep(s, 0.0, hLat) * topZone,
max(aL * smoothstep(latF, 0.0, vLat) * zL, botPen * smoothstep(s, 0.0, hLat) * botZone),
aR * smoothstep(latF, 0.0, vLat) * zR) max(leftPen * smoothstep(s, 0.0, vLat) * leftZone,
rightPen * smoothstep(s, 0.0, vLat) * rightZone)
); );
rectSinkVal = max(rectSinkVal, s); rectSinkValue = max(rectSinkValue, sink);
} }
d += rectSinkVal * smoothFactor * 0.25;
d -= rectSinkValue;
} }
mergedSdf = sminNoBulge(mergedSdf, d, smoothFactor); mergedSdf = sminNoBulge(mergedSdf, d, smoothFactor);