Skip to content

fix: bound Liquid and Frost input queues #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NMinhNam wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: bound Liquid and Frost input queues #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions src/lib/Frost/FrostVanilla.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -845,7 +845,9 @@ export function createFrost(
let prevPointerY = 0.5;
let lastScrollX = 0;
let lastScrollY = 0;
let queuedMelts: Array<[number, number]> = [];
const MAX_PENDING_MELTS = 32;
const MAX_MELTS_PER_FRAME = 4;
const queuedMelts: Array<[number, number]> = [];

function renderPointer() {
if (!pointer) return;
Expand Down Expand Up @@ -885,7 +887,9 @@ export function createFrost(
config.meltEdges ? 0 : config.edgeFade,
);
if (queuedMelts.length > 0) {
for (const [mx, my] of queuedMelts) {
const count = Math.min(queuedMelts.length, MAX_MELTS_PER_FRAME);
for (let i = 0; i < count; i++) {
const [mx, my] = queuedMelts.shift()!;
gl!.uniform2f(pointerProgram.uniforms.uPoint, mx, 1 - my);
gl!.uniform2f(pointerProgram.uniforms.uPrevPoint, mx, 1 - my);
gl!.uniform1f(pointerProgram.uniforms.uTouching, 1);
Expand All @@ -897,7 +901,6 @@ export function createFrost(
);
gl!.uniform2f(pointerProgram.uniforms.uBackShift, 0, 0);
}
queuedMelts = [];
} else {
gl!.uniform2f(pointerProgram.uniforms.uPoint, pointerX, 1 - pointerY);
gl!.uniform2f(
Expand Down Expand Up @@ -1048,7 +1051,8 @@ export function createFrost(
now < activeUntil ||
now < introStart + Math.max(config.introDuration, 0) * 1000 + 120 ||
contentDirty ||
config.shimmer > 0.001;
config.shimmer > 0.001 ||
queuedMelts.length > 0;
if (!animating) {
running = false;
return;
Expand All @@ -1062,6 +1066,13 @@ export function createFrost(
raf = requestAnimationFrame(frame);
}

function enqueueMelt(x: number, y: number) {
if (destroyed || !visible) return false;
if (queuedMelts.length >= MAX_PENDING_MELTS) queuedMelts.shift();
queuedMelts.push([x, y]);
return true;
}

wake = start;
start();

Expand Down Expand Up @@ -1118,13 +1129,14 @@ export function createFrost(
const intersection = new IntersectionObserver((entries) => {
visible = entries[entries.length - 1]?.isIntersecting ?? true;
if (visible) start();
else queuedMelts.length = 0;
});
intersection.observe(output);

return {
melt(x, y) {
if (reducedMotion) return;
queuedMelts.push([x, y]);
if (!enqueueMelt(x, y)) return;
activeUntil = performance.now() + refreezeDelayMs();
start();
},
Expand Down
20 changes: 15 additions & 5 deletions src/lib/Liquid/LiquidVanilla.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -790,6 +790,8 @@ export function createLiquid(
blit(null);
}

const MAX_PENDING_SPLATS = 64;
const MAX_SPLATS_PER_FRAME = 8;
const queued: Array<[number, number, number, number]> = [];

let raf = 0;
Expand All @@ -815,8 +817,9 @@ export function createLiquid(
lastTime = now;
if (queued.length > 0) {
idleAt = now + idleDelayMs();
while (queued.length > 0) {
const [x, y, dx, dy] = queued.pop()!;
const count = Math.min(queued.length, MAX_SPLATS_PER_FRAME);
for (let i = 0; i < count; i++) {
const [x, y, dx, dy] = queued.shift()!;
applySplat(x, y, dx, dy);
}
}
Expand All @@ -829,6 +832,12 @@ export function createLiquid(
raf = requestAnimationFrame(frame);
}

function enqueueSplat(x: number, y: number, dx: number, dy: number) {
if (destroyed || !visible) return;
if (queued.length >= MAX_PENDING_SPLATS) queued.shift();
queued.push([x, y, dx, dy]);
}

function start() {
if (destroyed || running || !visible) return;
running = true;
Expand Down Expand Up @@ -864,7 +873,7 @@ export function createLiquid(
if (!previous) return;
const dx = (px - previous.x) * config.force;
const dy = -(py - previous.y) * config.force;
queued.push([px / rect.width, 1 - py / rect.height, dx, dy]);
enqueueSplat(px / rect.width, 1 - py / rect.height, dx, dy);
start();
}

Expand All @@ -875,7 +884,7 @@ export function createLiquid(
const y = event.clientY - rect.top;
if (x < 0 || x > rect.width || y < 0 || y > rect.height) return;
pointers.set(event.pointerId, { x, y });
queued.push([x / rect.width, 1 - y / rect.height, 1, 1]);
enqueueSplat(x / rect.width, 1 - y / rect.height, 1, 1);
start();
}

Expand Down Expand Up @@ -911,13 +920,14 @@ export function createLiquid(
const intersection = new IntersectionObserver((entries) => {
visible = entries[entries.length - 1]?.isIntersecting ?? true;
if (visible) start();
else queued.length = 0;
});
intersection.observe(output);

return {
splat(x, y, dx, dy) {
if (reducedMotion) return;
queued.push([x, y, dx, dy]);
enqueueSplat(x, y, dx, dy);
start();
},
setOptions(next) {
Expand Down
Loading