diff --git a/inspector/src/HuginnFieldCanvas.tsx b/inspector/src/HuginnFieldCanvas.tsx index 2052af4..08a3881 100644 --- a/inspector/src/HuginnFieldCanvas.tsx +++ b/inspector/src/HuginnFieldCanvas.tsx @@ -816,7 +816,7 @@ async function startGpuParticleField(canvas: HTMLCanvasElement, sample: FieldSam const detailController = attachDetailController(canvas, (nextDetail) => { targetDetail = nextDetail; }); - const envelopeListener = attachNodeEnvelopeListener(canvas, nodeEnvelopeState, device, nodeEnvelopeBuffer); + const envelopeListener = attachNodeEnvelopeListener(canvas, nodeEnvelopeState, device, nodeEnvelopeBuffer, transformState); const transformListener = attachViewportTransformListener(canvas, transformState); const frame = (time: number) => { @@ -834,10 +834,11 @@ async function startGpuParticleField(canvas: HTMLCanvasElement, sample: FieldSam x: 0, y: 0, scale: 1, - bounds: { x: 0, y: 0, width: canvas.width, height: canvas.height }, + bounds: fallbackGraphBounds(canvas), }; const bounds = fitArtworkBounds(graphTransform.bounds); - const activeParticleCount = estimateVisibleParticleCount(graphTransform, bounds, canvas, detail, PARTICLE_COUNT); + const renderTransform = scaleViewportTransformForCanvas(canvas, graphTransform); + const activeParticleCount = estimateVisibleParticleCount(renderTransform, bounds, canvas, detail, PARTICLE_COUNT); device.queue.writeBuffer(uniformBuffer, 0, new Float32Array([ time / 1000, dt, @@ -853,9 +854,9 @@ async function startGpuParticleField(canvas: HTMLCanvasElement, sample: FieldSam bounds.y, bounds.width, bounds.height, - graphTransform.x, - graphTransform.y, - graphTransform.scale, + renderTransform.x, + renderTransform.y, + renderTransform.scale, 0, ])); @@ -975,6 +976,7 @@ function attachNodeEnvelopeListener( state: { data: Float32Array; count: number }, device: any, buffer: any, + transformState: { received: boolean; current: GraphViewportTransform }, ): () => void { const target = canvas.parentElement ?? canvas; const onEnvelopes = (event: Event) => { @@ -984,12 +986,18 @@ function attachNodeEnvelopeListener( } state.data.fill(0); state.count = Math.min(MAX_NODE_ENVELOPES, envelopes.length); + const viewport = canvas.getBoundingClientRect(); + const graphTransform = transformState.current; + const artworkBounds = fitArtworkBounds(graphTransform.bounds); for (let index = 0; index < state.count; index += 1) { const envelope = envelopes[index]; const offset = index * 4; - state.data[offset] = clamp01(envelope.x); - state.data[offset + 1] = clamp01(envelope.y); - state.data[offset + 2] = Math.max(0.006, Math.min(0.32, envelope.radius)); + const uv = transformState.received + ? screenEnvelopeToArtworkUv(envelope, viewport, graphTransform, artworkBounds) + : { x: clamp01(envelope.x), y: clamp01(envelope.y), radius: Math.max(0.006, Math.min(0.32, envelope.radius)) }; + state.data[offset] = uv.x; + state.data[offset + 1] = uv.y; + state.data[offset + 2] = uv.radius; state.data[offset + 3] = Math.max(0, Math.min(1.6, envelope.strength)); } device.queue.writeBuffer(buffer, 0, state.data); @@ -998,6 +1006,25 @@ function attachNodeEnvelopeListener( return () => target.removeEventListener("epiphanygraph-node-envelopes", onEnvelopes as EventListener); } +function screenEnvelopeToArtworkUv( + envelope: NodeEnvelope, + viewport: DOMRect, + transform: GraphViewportTransform, + bounds: ReturnType, +) { + const scale = Math.max(0.0001, transform.scale); + const screenX = envelope.x * Math.max(1, viewport.width); + const screenY = envelope.y * Math.max(1, viewport.height); + const worldX = (screenX - transform.x) / scale; + const worldY = (screenY - transform.y) / scale; + const radiusWorld = envelope.radius * Math.max(1, Math.min(viewport.width, viewport.height)) / scale; + return { + x: clamp01((worldX - bounds.x) / bounds.width), + y: clamp01((worldY - bounds.y) / bounds.height), + radius: Math.max(0.006, Math.min(0.32, radiusWorld / Math.max(bounds.width, bounds.height))), + }; +} + function attachViewportTransformListener( canvas: HTMLCanvasElement, state: { received: boolean; current: GraphViewportTransform }, @@ -1049,6 +1076,30 @@ function fitArtworkBounds(bounds: GraphViewportTransform["bounds"]) { }; } +function fallbackGraphBounds(canvas: HTMLCanvasElement): GraphViewportTransform["bounds"] { + const rect = canvas.getBoundingClientRect(); + return { + x: 0, + y: 0, + width: Math.max(1, rect.width), + height: Math.max(1, rect.height), + }; +} + +function scaleViewportTransformForCanvas( + canvas: HTMLCanvasElement, + transform: GraphViewportTransform, +): GraphViewportTransform { + const rect = canvas.getBoundingClientRect(); + const pixelRatio = canvas.width / Math.max(1, rect.width); + return { + x: transform.x * pixelRatio, + y: transform.y * pixelRatio, + scale: transform.scale * pixelRatio, + bounds: transform.bounds, + }; +} + function estimateVisibleParticleCount( transform: GraphViewportTransform, bounds: ReturnType, diff --git a/package-lock.json b/package-lock.json index 5b5ce41..019893e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "cultcache-ts", - "version": "0.13.2", + "version": "0.13.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "cultcache-ts", - "version": "0.13.2", + "version": "0.13.3", "license": "MIT", "dependencies": { "@msgpack/msgpack": "^3.1.3", diff --git a/package.json b/package.json index a5f5061..63f81a7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cultcache-ts", - "version": "0.13.2", + "version": "0.13.3", "description": "CultCache-style typed persistence for TypeScript with schema-backed polymorphic MessagePack storage.", "main": "dist/index.js", "types": "dist/index.d.ts",