distark-render 1.1.14 → 1.1.16

package/dist/tests/test-eye-system-reset.js

@@ -0,0 +1,148 @@
+/**
+ * EyeSystem resetTiming guard tests
+ *
+ * Guards against the regression where update() called resetTiming() on every
+ * frame while currentTime < 0.1, causing randomEyeMovement() to fire at ~50%
+ * of frames (every ~16 ms) instead of the intended ~750 ms interval.
+ *
+ * Specifically covers:
+ *  - First call initialises timing correctly (resetTiming fires once)
+ *  - Subsequent early frames do NOT re-call resetTiming (no burst movement)
+ *  - A genuine timeline loop (time jumping from > 0.1 back to ~0) DOES reset
+ *  - detectReset (time going backward during playback) still resets correctly
+ */
+import { createEyeSystem } from '../modules/eyeSystem.js';
+import { assert, printSummary } from './helpers.js';
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+function makeEyeData() {
+    return {
+        leftIrisXCoor: 10,
+        leftIrisYCoor: -50,
+        rightIrisXCoor: -10,
+        rightIrisYCoor: -50,
+        leftIrisWidth: 20,
+        leftIrisHeight: 20,
+        rightIrisWidth: 20,
+        rightIrisHeight: 20,
+        leftIrisWidthRatio: 1,
+        leftIrisHeightRatio: 1,
+        rightIrisWidthRatio: 1,
+        rightIrisHeightRatio: 1,
+    };
+}
+// Control Math.random so that eye movement ALWAYS fires (< 0.5) and
+// look-at-speaker always fires (< 0.7) — makes test deterministic.
+const originalRandom = Math.random;
+function alwaysMove() { Math.random = () => 0.1; } // always fires movement
+function neverMove() { Math.random = () => 0.9; } // never fires movement
+function restoreRandom() { Math.random = originalRandom; }
+// ---------------------------------------------------------------------------
+// 1. Startup: resetTiming fires exactly once at t=0 (not on t=0.033, 0.066)
+// ---------------------------------------------------------------------------
+console.log('\n--- Test: resetTiming fires once on startup ---');
+{
+    alwaysMove();
+    const sys = createEyeSystem('char', makeEyeData());
+    // Frame 1 (t=0): first-ever call → resetTiming fires, then movement fires
+    sys.update(0.0, true);
+    const pos1 = sys.getIrisPositions();
+    // Frame 2 (t=0.033): still in startup window but eyeLastUpdatedTime was set to 0.0
+    // → no reset, no movement (0.033 < 0.75 elapsed)
+    sys.update(0.033, true);
+    const pos2 = sys.getIrisPositions();
+    // Frame 3 (t=0.066): same — no reset, no movement
+    sys.update(0.066, true);
+    const pos3 = sys.getIrisPositions();
+    assert(pos1.left.x === pos2.left.x && pos1.left.y === pos2.left.y, 'Frame 2 iris position unchanged from frame 1 (no spurious reset on t=0.033)');
+    assert(pos2.left.x === pos3.left.x && pos2.left.y === pos3.left.y, 'Frame 3 iris position unchanged from frame 2 (no spurious reset on t=0.066)');
+    restoreRandom();
+}
+// ---------------------------------------------------------------------------
+// 2. After the startup window, movement fires on the normal 0.75 s cadence
+// ---------------------------------------------------------------------------
+console.log('\n--- Test: movement fires at correct 0.75 s interval after startup ---');
+{
+    // Queue of Math.random() return values, consumed in call order:
+    //   [0] constructor: eyeLidUpdateInterval = 3 + 0.5*2 = 4.0
+    //   [1] constructor: nextBlinkOffset      = 0.5*0.5  = 0.25
+    //   [2] resetTiming: nextBlinkOffset      = 0.5*0.5  = 0.25
+    //   [3] update(t=0)  movement check: 0.3 < 0.5 → fires
+    //   [4] update(t=0)  direction: floor(0.2*9)=1 → 'right'  (iris offset: +5, 0)
+    //   t=0.5 guard returns early; no Math.random calls
+    //   [5] update(t=0.76) movement check: 0.3 < 0.5 → fires
+    //   [6] update(t=0.76) direction: floor(0.7*9)=6 → 'up-right' (iris offset: +3.2, -1.6)
+    const _q = [0.5, 0.5, 0.5, 0.3, 0.2, 0.3, 0.7, 0.5, 0.5];
+    let _qi = 0;
+    Math.random = () => _q[Math.min(_qi++, _q.length - 1)];
+    const sys = createEyeSystem('char', makeEyeData());
+    sys.update(0.0, true); // reset fires, then movement picks 'right'
+    const posA = sys.getIrisPositions(); // left.x = base(10) + 5 = 15
+    sys.update(0.5, true); // 0.5 s since last movement — guard fires, no move
+    const posB = sys.getIrisPositions();
+    assert(posA.left.x === posB.left.x && posA.left.y === posB.left.y, 'No movement at t=0.5 (only 0.5 s since last movement, < 0.75 s interval)');
+    sys.update(0.76, true); // 0.76 s elapsed — fires, picks 'up-right' (different offset)
+    const posC = sys.getIrisPositions(); // left.x = base(10) + 3.2 = 13.2
+    assert(posC.left.x !== posA.left.x || posC.left.y !== posA.left.y, 'Movement fires at t=0.76 s (>= 0.75 s interval, direction changed → iris moved)');
+    restoreRandom();
+}
+// ---------------------------------------------------------------------------
+// 3. Timeline loop: time jumps from a late value back to ~0 → reset fires
+// ---------------------------------------------------------------------------
+console.log('\n--- Test: timeline loop triggers resetTiming ---');
+{
+    alwaysMove();
+    const sys = createEyeSystem('char', makeEyeData());
+    // Simulate 2 seconds of playback so eyeLastUpdatedTime is well past 0.1
+    sys.update(0.0, true);
+    sys.update(0.76, true);
+    sys.update(1.52, true);
+    sys.update(2.28, true);
+    sys.getIrisPositions(); // consume late position (used to advance internal state)
+    // Loop back to t=0 — should trigger resetTiming via isEarlyJumpBack
+    sys.update(0.0, true);
+    const posLoop = sys.getIrisPositions();
+    // After reset, movement should have fired (eyeLastUpdatedTime set to -0.75 → timeSinceUpdate = 0.75)
+    // The new iris position may or may not match posLate — just check it exists
+    assert(typeof posLoop.left.x === 'number' && typeof posLoop.right.x === 'number', 'After timeline loop reset, getIrisPositions() returns valid positions');
+    restoreRandom();
+}
+// ---------------------------------------------------------------------------
+// 4. Backward scrub during playback (detectReset path) triggers resetTiming
+// ---------------------------------------------------------------------------
+console.log('\n--- Test: backward scrub (detectReset) triggers resetTiming ---');
+{
+    alwaysMove();
+    const sys = createEyeSystem('char', makeEyeData());
+    sys.update(0.0, true);
+    sys.update(2.0, true); // normal playback at 2 s (eyeLastUpdatedTime ≈ 2.0)
+    // Scrub backward: t=1.5 — detectReset should fire, resetTiming called
+    sys.update(1.5, true);
+    const posAfter = sys.getIrisPositions();
+    // Just verify the system is still responsive (positions are valid numbers)
+    assert(Number.isFinite(posAfter.left.x) && Number.isFinite(posAfter.right.x), 'After backward scrub, getIrisPositions() returns finite positions');
+    restoreRandom();
+}
+// ---------------------------------------------------------------------------
+// 5. isPlaying=false: iris position unchanged even across the startup window
+// ---------------------------------------------------------------------------
+console.log('\n--- Test: isPlaying=false keeps iris frozen across startup frames ---');
+{
+    neverMove(); // extra safety — but shouldn't matter since !isPlaying returns early
+    const sys = createEyeSystem('char', makeEyeData());
+    const initial = sys.getIrisPositions();
+    sys.update(0.0, false);
+    sys.update(0.033, false);
+    sys.update(0.066, false);
+    sys.update(0.750, false); // even past the movement interval — still frozen
+    const after = sys.getIrisPositions();
+    assert(after.left.x === initial.left.x &&
+        after.left.y === initial.left.y &&
+        after.right.x === initial.right.x &&
+        after.right.y === initial.right.y, 'Iris stays frozen across early frames and past 0.75 s when isPlaying=false');
+    restoreRandom();
+}
+// ---------------------------------------------------------------------------
+printSummary();
+//# sourceMappingURL=test-eye-system-reset.js.map

package/dist/tests/test-eye-system-reset.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"test-eye-system-reset.js","sourceRoot":"","sources":["../../tests/test-eye-system-reset.ts"],"names":[],"mappings":"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"}

package/dist/tests/test-svg-rerasterization.js

@@ -30,10 +30,12 @@ class MockImage {
         }, 0);
     }
 }
-function makeSvgDataUrl() {
-    const svg = `<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10" fill="black" /></svg>`;
+function svgDataUrl(svg) {
     return `data:image/svg+xml;charset=utf-8,${encodeURIComponent(svg)}`;
 }
+function makeSvgDataUrl() {
+    return svgDataUrl(`<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><rect x="0" y="0" width="24" height="24" fill="black" /></svg>`);
+}
 function makeRig(svgPath, torsoWidth, torsoHeight) {
     return {
         imagePaths: {
@@ -71,7 +73,8 @@ async function main() {
     const initialAsset = loadedImages[svgPath];
     assert(!!initialAsset?.__distarkSvgSource, 'Initial SVG asset keeps original SVG source');
     assert(initialAsset?.width === 24 && initialAsset?.height === 24, 'Initial SVG raster matches initial rendered size');
-    const largeRig = makeRig(svgPath, 25, 25);
+    // Use 50×50 — a 2× jump from the 24px initial raster, well above the 5% hysteresis band.
+    const largeRig = makeRig(svgPath, 50, 50);
     const firstLargeRender = renderer.computeCharacterRigData(largeRig, {
         canvasWidth: 400,
         canvasHeight: 400,
@@ -81,13 +84,200 @@ async function main() {
     await loader.waitForPendingImageUpgrades();
     const upgradedAsset = loadedImages[svgPath];
     assert(upgradedAsset !== initialAsset, 'Upscaling swaps in a regenerated SVG raster asset');
-    assert(upgradedAsset?.width >= 25 && upgradedAsset?.height >= 25, 'Any upscale immediately regenerates a larger SVG raster');
+    assert(upgradedAsset?.width >= 50 && upgradedAsset?.height >= 50, 'Any upscale immediately regenerates a larger SVG raster');
     const secondLargeRender = renderer.computeCharacterRigData(largeRig, {
         canvasWidth: 400,
         canvasHeight: 400,
         loadedImages,
     });
     assert(secondLargeRender.objects[0]?.imageData === upgradedAsset, 'Subsequent renders use the upgraded SVG raster');
+    const mmSvgPath = svgDataUrl(`<svg xmlns="http://www.w3.org/2000/svg" width="25.4mm" height="1in" viewBox="0 0 25.4 25.4"><rect x="0" y="0" width="25.4" height="25.4" fill="black" /></svg>`);
+    const mmLoadedImages = await loader.loadAllRigImages(makeRig(mmSvgPath, 24, 24), false);
+    const mmAsset = mmLoadedImages[mmSvgPath];
+    assert(mmAsset?.width === 96 && mmAsset?.height === 96, 'SVG physical units rasterize to CSS pixels');
+    const loosePartSvgPath = svgDataUrl(`<svg xmlns="http://www.w3.org/2000/svg" width="50.8mm" height="46.566666mm" viewBox="0 0 50.8 46.566665"><g transform="translate(-98.248611,-138.2007)"><ellipse cx="104.81959" cy="148.46378" rx="5.8557706" ry="9.6129332" fill="black"/><image width="13.052777" height="20.461111" x="98.248611" y="138.2007" style="display:none"/><ellipse cx="106.75509" cy="144.67407" rx="1.6606208" ry="2.1973581" fill="white"/></g></svg>`);
+    const partLoadedImages = await loader.loadAllRigImages(makeRig(loosePartSvgPath, 24, 24), false);
+    const partInitial = partLoadedImages[loosePartSvgPath];
+    assert(!!partInitial?.__distarkSvgSource, 'SVG part retains original raw source after initial load');
+    assert(!(partInitial?.__distarkSvgSource || '').includes('<g transform="matrix('), 'Raw source stored in cache has no injected fit-matrix transform');
+    renderer.computeCharacterRigData(makeRig(loosePartSvgPath, 24, 24), {
+        canvasWidth: 400,
+        canvasHeight: 400,
+        loadedImages: partLoadedImages,
+    });
+    await loader.waitForPendingImageUpgrades();
+    const partAsset = partLoadedImages[loosePartSvgPath];
+    // Guard 1 (<=): requesting 24×24 on a canvas that is already >= 24 on both sides
+    // serves the existing raster without a downgrade.  The renderer draws it scaled
+    // into the 24×24 display region at the correct visual size — no re-rasterization needed.
+    assert((partAsset?.width ?? 0) >= 24 && (partAsset?.height ?? 0) >= 24, 'SVG part raster is at least as large as the requested rig dimensions (no downgrade)');
+    // ── Monotonic upgrade / anti-oscillation tests ─────────────────────────────
+    // Regression for commit 20182eb which changed both size guards from `<=` to
+    // `===` and removed the `Math.max` for __distarkRequestedRasterWidth.  That
+    // change allowed DOWNGRADE requests: when desiredSize dipped below the cached
+    // raster size a new smaller canvas was triggered; the following frame needing
+    // the original larger size triggered another upgrade; creating perpetual
+    // oscillation ("shaky dimensions").  These tests pin the correct behaviour.
+    const oscLoader = new ImageLoader('http://example.test');
+    const oscSvgPath = makeSvgDataUrl();
+    let oscUpgradeCount = 0;
+    const OrigCreateSvgCanvas = oscLoader.createSvgCanvas.bind(oscLoader);
+    oscLoader.createSvgCanvas = async (...args) => {
+        oscUpgradeCount++;
+        return OrigCreateSvgCanvas(...args);
+    };
+    // Seed loadedImages with the SVG at its intrinsic size (24×24).
+    const oscImages = await oscLoader.loadAllRigImages(makeRig(oscSvgPath, 24, 24), false);
+    oscUpgradeCount = 0; // reset counter — we only care about requestImageForSize calls
+    // Frame 1: request at 100×100 → should trigger exactly ONE upgrade.
+    oscLoader.requestImageForSize(oscSvgPath, 100, 100, oscImages);
+    await oscLoader.waitForPendingImageUpgrades();
+    assert(oscUpgradeCount === 1, 'Upscale from intrinsic triggers exactly one rasterization');
+    assert(oscImages[oscSvgPath]?.width >= 100, 'Canvas after first upgrade is at least 100 wide');
+    oscUpgradeCount = 0;
+    // Frame 2: same size request → must NOT trigger a new rasterization.
+    oscLoader.requestImageForSize(oscSvgPath, 100, 100, oscImages);
+    await oscLoader.waitForPendingImageUpgrades();
+    assert(oscUpgradeCount === 0, 'Identical size request does not re-rasterize (Guard 1 <=)');
+    // Frame 3: slightly SMALLER request (95×95, 5% below current 100×100).
+    // Guard 1 (<=): 95 <= 100 → should return the 100×100 canvas without re-rasterizing.
+    oscLoader.requestImageForSize(oscSvgPath, 95, 95, oscImages);
+    await oscLoader.waitForPendingImageUpgrades();
+    assert(oscUpgradeCount === 0, 'Smaller request served by existing larger raster (no downgrade)');
+    assert(oscImages[oscSvgPath]?.width >= 100, 'Canvas stays at 100 after smaller request');
+    // Oscillation simulation: alternate 95 ↔ 110 for 10 frames.
+    // With the old buggy code each alternation triggered a new rasterization.
+    // With the fix, the raster grows to 110 on the first 110 request and stays
+    // there for all subsequent requests (both 95 and 110 pass Guard 1 afterwards).
+    const oscImages2 = await oscLoader.loadAllRigImages(makeRig(oscSvgPath, 24, 24), false);
+    oscUpgradeCount = 0;
+    for (let i = 0; i < 10; i++) {
+        const size = i % 2 === 0 ? 95 : 110;
+        oscLoader.requestImageForSize(oscSvgPath, size, size, oscImages2);
+        await oscLoader.waitForPendingImageUpgrades();
+    }
+    assert(oscUpgradeCount <= 2, `Oscillating size requests trigger at most 2 rasterizations (got ${oscUpgradeCount}), not one per frame`);
+    assert(oscImages2[oscSvgPath]?.width >= 95, 'Canvas after oscillation is still valid');
+    // __distarkIntrinsicWidth must survive through the upgrade so it can still be
+    // used as a fallback when desiredWidth is 0.
+    const intrLoader = new ImageLoader('http://example.test');
+    const intrImages = await intrLoader.loadAllRigImages(makeRig(makeSvgDataUrl(), 24, 24), false);
+    const intrKey = Object.keys(intrImages)[0];
+    const intrinsicBefore = intrImages[intrKey].__distarkIntrinsicWidth;
+    intrLoader.requestImageForSize(intrKey, 80, 80, intrImages);
+    await intrLoader.waitForPendingImageUpgrades();
+    const intrinsicAfter = intrImages[intrKey].__distarkIntrinsicWidth;
+    assert(intrinsicAfter === intrinsicBefore, `__distarkIntrinsicWidth preserved through upgrade (${intrinsicBefore} → ${intrinsicAfter})`);
+    // ── preserveAspectRatio="none" → non-uniform fill (no letterboxing) ────────
+    // When Body.js stores an Inkscape SVG it adds preserveAspectRatio="none" so
+    // that future upgrade rasters stretch the content to fill the target box.
+    // Without the fix, normalizeSvgToVisibleBounds uses uniform min-scale fit and
+    // centres the content with padding — causing a visible dimension jump the
+    // first time the raster is upgraded after the attribute is added.
+    //
+    // Geometry of this test:
+    //   SVG viewBox 10×20 (tall, aspect 0.5), target 200×100 (wide, aspect 2.0)
+    //   Uniform fit  → fitScale = min(200/10, 100/20) = 5 → matrix(5 0 0 5 75 0)
+    //                  content is only 50 px wide inside a 200 px canvas (75 px padding each side)
+    //   Non-uniform fill → scaleX = 200/10 = 20, scaleY = 100/20 = 5 → matrix(20 0 0 5 0 0)
+    //                  content fills the entire 200×100 canvas with no padding
+    class NormalizeTester extends ImageLoader {
+        static expose(svg, w, h) {
+            return ImageLoader.normalizeSvgToVisibleBounds(svg, w, h);
+        }
+    }
+    const tallSvgWithFill = '<svg xmlns="http://www.w3.org/2000/svg" width="10" height="20" viewBox="0 0 10 20" preserveAspectRatio="none"><rect width="10" height="20"/></svg>';
+    const tallSvgNoHint = '<svg xmlns="http://www.w3.org/2000/svg" width="10" height="20" viewBox="0 0 10 20"><rect width="10" height="20"/></svg>';
+    const wideTarget = { w: 200, h: 100 };
+    const normalizedFill = NormalizeTester.expose(tallSvgWithFill, wideTarget.w, wideTarget.h);
+    const normalizedFit = NormalizeTester.expose(tallSvgNoHint, wideTarget.w, wideTarget.h);
+    // With preserveAspectRatio="none": fill → scaleX 20, scaleY 5, no centering offset
+    assert(normalizedFill.includes('matrix(20'), `preserveAspectRatio="none" SVG should use fill scaleX=20 (got: ${normalizedFill.match(/matrix\([^)]+\)/)?.[0] ?? 'no matrix'})`);
+    assert(!normalizedFill.includes('matrix(5 0 0 5 75'), 'preserveAspectRatio="none" SVG must NOT produce a uniform-fit pillarboxed matrix');
+    // Without preserveAspectRatio: uniform fit → existing behaviour preserved
+    assert(normalizedFit.includes('matrix(5 0 0 5'), `SVG without preserveAspectRatio hint should still use uniform fit scaleX=scaleY=5 (got: ${normalizedFit.match(/matrix\([^)]+\)/)?.[0] ?? 'no matrix'})`);
+    // Verify mm SVG: after Body.js patches __distarkSvgSource with preserveAspectRatio="none",
+    // a subsequent requestImageForSize upgrade must produce a canvas whose content fills the
+    // target box without pillarboxing.
+    //
+    // Olivia head: mm SVG intrinsic ~390×525 px, dimensionValues 208×232.
+    // The aspect ratio mismatch (0.897 vs 0.743) would produce heavy pillarboxing under
+    // the old uniform-fit code.  With fill mode the matrix scaleX/scaleY differ, confirming
+    // non-uniform (stretch) rendering.
+    const oliviaHeadSvg = '<svg xmlns="http://www.w3.org/2000/svg" width="103.1875mm" height="138.90625mm" viewBox="0 0 103.1875 138.90625" preserveAspectRatio="none"><rect width="103.1875" height="138.90625"/></svg>';
+    const oliviaNormalized = NormalizeTester.expose(oliviaHeadSvg, 208, 232);
+    // scaleUU_X = 208 / 103.1875 ≈ 2.016, scaleUU_Y = 232 / 138.90625 ≈ 1.670 — must differ
+    const oliviaMatrixMatch = oliviaNormalized.match(/matrix\(([\d.]+)\s+0\s+0\s+([\d.]+)/);
+    const oliviaScaleX = parseFloat(oliviaMatrixMatch?.[1] ?? '0');
+    const oliviaScaleY = parseFloat(oliviaMatrixMatch?.[2] ?? '0');
+    assert(Math.abs(oliviaScaleX - oliviaScaleY) > 0.1, `Olivia mm SVG with preserveAspectRatio="none" must use non-uniform scaling (scaleX=${oliviaScaleX.toFixed(3)}, scaleY=${oliviaScaleY.toFixed(3)})`);
+    // ── prepareSvgCanvases: pre-rasterize all SVG parts at dimensionValues sizes ──
+    // Before playback starts, every SVG part in loadedImages must have a canvas
+    // that is already the exact size dictated by dimensionValues.  Without this,
+    // the first rendered frame uses the intrinsic-size canvas (often much larger
+    // than the display slot), then an async requestImageForSize upgrade fires —
+    // causing the visible "flash then correct size" artefact.
+    //
+    // prepareSvgCanvases(rigData, loadedImages) must:
+    //   1. Read dimensionValues[partName] for each SVG imagePath
+    //   2. Create a canvas at exactly that size using the (already-normalized) source
+    //   3. Mark the canvas __distarkSvgNormalized = true so Body.js doesn't re-normalize
+    //   4. Update both imageCache and loadedImages in-place
+    const prepLoader = new ImageLoader('http://example.test');
+    // Simple SVG — full viewBox is filled, no offset transform.
+    // preserveAspectRatio="none" is already set so normalizeSvgToVisibleBounds fills.
+    const simpleSvgForPrep = `<svg xmlns="http://www.w3.org/2000/svg" width="100" height="120" viewBox="0 0 100 120" preserveAspectRatio="none"><rect x="0" y="0" width="100" height="120" fill="black"/></svg>`;
+    const prepPath = svgDataUrl(simpleSvgForPrep);
+    const prepRig = makeRig(prepPath, 60, 80);
+    // Load at intrinsic size (100×120)
+    const prepImages = await prepLoader.loadAllRigImages(prepRig, false);
+    assert(prepImages[prepPath]?.width === 100 && prepImages[prepPath]?.height === 120, `Before prepareSvgCanvases: canvas at intrinsic 100×120 (got ${prepImages[prepPath]?.width}×${prepImages[prepPath]?.height})`);
+    // prepareSvgCanvases must exist and be callable
+    assert(typeof prepLoader.prepareSvgCanvases === 'function', 'prepareSvgCanvases is a public method on ImageLoader');
+    await prepLoader.prepareSvgCanvases(prepRig, prepImages);
+    // After: canvas must be at the dimensionValues size (60×80) with default pixelDensity=1
+    assert(prepImages[prepPath]?.width === 60 && prepImages[prepPath]?.height === 80, `prepareSvgCanvases resizes canvas to dimensionValues 60×80 (got ${prepImages[prepPath]?.width}×${prepImages[prepPath]?.height})`);
+    // With pixelDensity=2 the canvas must be at 120×160 (dimensionValues × 2)
+    const prepLoader2 = new ImageLoader('http://example.test');
+    const prepImages2 = await prepLoader2.loadAllRigImages(prepRig, false);
+    await prepLoader2.prepareSvgCanvases(prepRig, prepImages2, { pixelDensity: 2 });
+    assert(prepImages2[prepPath]?.width === 120 && prepImages2[prepPath]?.height === 160, `prepareSvgCanvases with pixelDensity=2 resizes to 120×160 (got ${prepImages2[prepPath]?.width}×${prepImages2[prepPath]?.height})`);
+    // Fractional camera scales must be preserved.  Rounding 1.25 to 1 would
+    // leave playback undersized and trigger requestImageForSize on frame 1.
+    const prepLoader125 = new ImageLoader('http://example.test');
+    const prepImages125 = await prepLoader125.loadAllRigImages(prepRig, false);
+    await prepLoader125.prepareSvgCanvases(prepRig, prepImages125, { pixelDensity: 1.25 });
+    assert(prepImages125[prepPath]?.width === 75 && prepImages125[prepPath]?.height === 100, `prepareSvgCanvases preserves fractional scale 1.25 → 75×100 (got ${prepImages125[prepPath]?.width}×${prepImages125[prepPath]?.height})`);
+    // A later lower-resolution loadImages call must not downgrade a canvas that
+    // playback precompute already warmed at a higher camera/capture scale.
+    await prepLoader125.prepareSvgCanvases(prepRig, prepImages125, { pixelDensity: 1 });
+    assert(prepImages125[prepPath]?.width === 75 && prepImages125[prepPath]?.height === 100, `prepareSvgCanvases must not downgrade 75×100 cache back to 60×80 (got ${prepImages125[prepPath]?.width}×${prepImages125[prepPath]?.height})`);
+    // Canvas must be marked so Body.js rememberOriginalSvgImage skips re-normalization
+    assert(prepImages[prepPath]?.__distarkSvgNormalized === true, 'Canvas produced by prepareSvgCanvases is marked __distarkSvgNormalized');
+    // imageCache must also point to the new canvas
+    assert(prepLoader.getCachedImage(prepPath)?.width === 60, 'imageCache updated to the target-sized canvas after prepareSvgCanvases');
+    // Runtime playback lock: once the app has precomputed the fixed-size SVG
+    // manifest, requestImageForSize must not create/swap a larger canvas.
+    globalThis.__distarkSvgRuntimeUpgradeLocked = true;
+    const lockedBefore = prepImages[prepPath];
+    const lockedReturned = prepLoader.requestImageForSize(prepPath, 500, 500, prepImages);
+    await new Promise(resolve => setTimeout(resolve, 20));
+    assert(lockedReturned === lockedBefore, 'locked requestImageForSize returns existing canvas');
+    assert(prepImages[prepPath] === lockedBefore, 'locked requestImageForSize does not replace loadedImages entry');
+    assert(prepImages[prepPath]?.width === 60 && prepImages[prepPath]?.height === 80, 'locked requestImageForSize does not resize canvas');
+    globalThis.__distarkSvgRuntimeUpgradeLocked = false;
+    // ── loadImageWithCache: public alias for loadImage ──────────────────────────
+    // cacheVariationImages in RigCharacterControl calls loadImageWithCache().
+    // That method does not exist on ImageLoader/P5ImageLoader, so the pre-caching
+    // silently fails (TypeError).  Adding it as a public alias makes pre-caching work.
+    const aliasLoader = new ImageLoader('http://example.test');
+    assert(typeof aliasLoader.loadImageWithCache === 'function', 'loadImageWithCache is a public method on ImageLoader (alias for loadImage)');
+    let aliasCalled = false;
+    aliasLoader.loadImageWithCache(prepPath, prepPath, (_key, _img) => { aliasCalled = true; }, (_key, _err) => { });
+    // Allow async loadImage to complete
+    await new Promise(resolve => setTimeout(resolve, 50));
+    assert(aliasCalled, 'loadImageWithCache triggers loadImage and fires onLoad callback');
+    assert(aliasLoader.getCachedImage(prepPath) !== undefined, 'loadImageWithCache populates imageCache');
     printSummary();
 }
 main().catch((error) => {

package/dist/tests/test-svg-rerasterization.js.map

@@ -1 +1 @@
-{"version":3,"file":"test-svg-rerasterization.js","sourceRoot":"","sources":["../../tests/test-svg-rerasterization.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"test-svg-rerasterization.js","sourceRoot":"","sources":["../../tests/test-svg-rerasterization.ts"],"names":[],"mappings":"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"}

package/dist/tests/test-teen-tank-rig.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Integration test: Teen Tank SVG rig
+ *
+ * Verifies:
+ *  1. All expected body parts load with images
+ *  2. Every part's rendered bounding box stays within the canvas (no clipping)
+ *  3. Every part's rendered dimensions match dimensionValues (no squash/stretch)
+ *  4. Every joint-connected part pair has overlapping or adjacent bounding boxes
+ *     (ensures joints connect visually, not floating apart)
+ */
+export {};
+//# sourceMappingURL=test-teen-tank-rig.d.ts.map

package/dist/tests/test-teen-tank-rig.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"test-teen-tank-rig.d.ts","sourceRoot":"","sources":["../../tests/test-teen-tank-rig.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG"}

package/dist/tests/test-teen-tank-rig.js

@@ -0,0 +1,122 @@
+/**
+ * Integration test: Teen Tank SVG rig
+ *
+ * Verifies:
+ *  1. All expected body parts load with images
+ *  2. Every part's rendered bounding box stays within the canvas (no clipping)
+ *  3. Every part's rendered dimensions match dimensionValues (no squash/stretch)
+ *  4. Every joint-connected part pair has overlapping or adjacent bounding boxes
+ *     (ensures joints connect visually, not floating apart)
+ */
+import { readFile } from 'fs/promises';
+import { SkiaRenderer } from '../modules/adapters/skiaRenderer.js';
+import { assert, printSummary } from './helpers.js';
+// The parts we expect to be present and have loaded images
+const EXPECTED_BODY_PARTS = [
+    'head',
+    'torso',
+    'leftUpperArm', 'leftForearm', 'leftHand',
+    'rightUpperArm', 'rightForearm', 'rightHand',
+    'leftThigh', 'leftLeg',
+    'rightThigh', 'rightLeg',
+];
+// Joint connections: [parent, child] — their bounding boxes must touch or overlap
+const JOINT_CONNECTIONS = [
+    ['torso', 'head'],
+    ['torso', 'leftUpperArm'],
+    ['leftUpperArm', 'leftForearm'],
+    ['leftForearm', 'leftHand'],
+    ['torso', 'rightUpperArm'],
+    ['rightUpperArm', 'rightForearm'],
+    ['rightForearm', 'rightHand'],
+    ['torso', 'leftThigh'],
+    ['leftThigh', 'leftLeg'],
+    ['torso', 'rightThigh'],
+    ['rightThigh', 'rightLeg'],
+];
+// Tolerance in pixels for joint proximity check (parts can be slightly apart due to anchor math)
+const JOINT_PROXIMITY_PX = 80;
+// Tolerance ratio: rendered dimension must be within this fraction of the declared dimension
+const DIMENSION_TOLERANCE = 0.02; // 2%
+function getBounds(obj) {
+    const left = obj.x - obj.width * obj.anchorX;
+    const top = obj.y - obj.height * obj.anchorY;
+    return { left, top, right: left + obj.width, bottom: top + obj.height };
+}
+function boxesTouching(a, b, tolerance) {
+    return (a.right + tolerance >= b.left &&
+        b.right + tolerance >= a.left &&
+        a.bottom + tolerance >= b.top &&
+        b.bottom + tolerance >= a.top);
+}
+async function main() {
+    console.log('\n=== Teen Tank SVG Rig Integration Tests ===\n');
+    const rigPath = 'C:\\Users\\kirag\\Downloads\\teen_tank_Svg.json';
+    const rigData = JSON.parse(await readFile(rigPath, 'utf-8'));
+    const dimensions = rigData.dimensionValues || {};
+    const origLog = console.log;
+    console.log = (...a) => process.stderr.write(a.join(' ') + '\n');
+    const renderer = new SkiaRenderer();
+    await renderer.loadImages(rigData);
+    const canvasWidth = 1200;
+    const canvasHeight = 2000;
+    const renderData = renderer.compute(rigData, {
+        canvasWidth,
+        canvasHeight,
+    });
+    console.log = origLog;
+    const objects = renderData.objects;
+    const byName = new Map(objects.map(o => [o.name, o]));
+    // ── 1. All expected parts loaded with images ───────────────────────────────
+    console.log('--- Part presence & image loading ---');
+    for (const part of EXPECTED_BODY_PARTS) {
+        const obj = byName.get(part);
+        assert(!!obj, `Part '${part}' is present in render data`);
+        assert(!!obj?.imageData, `Part '${part}' has a loaded image`);
+    }
+    // ── 2. No part clips outside canvas bounds ─────────────────────────────────
+    console.log('\n--- Canvas bounds (no clipping) ---');
+    for (const part of EXPECTED_BODY_PARTS) {
+        const obj = byName.get(part);
+        if (!obj)
+            continue;
+        const b = getBounds(obj);
+        const withinCanvas = b.left >= -1 &&
+            b.top >= -1 &&
+            b.right <= canvasWidth + 1 &&
+            b.bottom <= canvasHeight + 1;
+        assert(withinCanvas, `Part '${part}' stays within canvas (left=${Math.round(b.left)} top=${Math.round(b.top)} right=${Math.round(b.right)} bottom=${Math.round(b.bottom)})`);
+    }
+    // ── 3. Rendered dimensions match dimensionValues ───────────────────────────
+    console.log('\n--- Rendered dimensions match dimensionValues ---');
+    for (const part of EXPECTED_BODY_PARTS) {
+        const obj = byName.get(part);
+        const decl = dimensions[part];
+        if (!obj || !decl)
+            continue;
+        const wDiff = Math.abs(obj.width - decl.width) / decl.width;
+        const hDiff = Math.abs(obj.height - decl.height) / decl.height;
+        assert(wDiff <= DIMENSION_TOLERANCE, `Part '${part}' width ${Math.round(obj.width)} ≈ declared ${decl.width} (diff ${(wDiff * 100).toFixed(1)}%)`);
+        assert(hDiff <= DIMENSION_TOLERANCE, `Part '${part}' height ${Math.round(obj.height)} ≈ declared ${decl.height} (diff ${(hDiff * 100).toFixed(1)}%)`);
+    }
+    // ── 4. Joint connections — parts must touch or nearly overlap ──────────────
+    console.log('\n--- Joint connectivity ---');
+    for (const [parentName, childName] of JOINT_CONNECTIONS) {
+        const parent = byName.get(parentName);
+        const child = byName.get(childName);
+        if (!parent || !child) {
+            assert(false, `Cannot check joint ${parentName}→${childName}: part missing`);
+            continue;
+        }
+        const pb = getBounds(parent);
+        const cb = getBounds(child);
+        const touching = boxesTouching(pb, cb, JOINT_PROXIMITY_PX);
+        assert(touching, `Joint ${parentName}→${childName} bounding boxes are adjacent/overlapping (within ${JOINT_PROXIMITY_PX}px)`);
+    }
+    printSummary();
+}
+main().catch(err => {
+    console.error(err);
+    process.exit(1);
+});
+//# sourceMappingURL=test-teen-tank-rig.js.map

package/dist/tests/test-teen-tank-rig.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"test-teen-tank-rig.js","sourceRoot":"","sources":["../../tests/test-teen-tank-rig.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAEnE,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEpD,2DAA2D;AAC3D,MAAM,mBAAmB,GAAG;IACxB,MAAM;IACN,OAAO;IACP,cAAc,EAAE,aAAa,EAAE,UAAU;IACzC,eAAe,EAAE,cAAc,EAAE,WAAW;IAC5C,WAAW,EAAE,SAAS;IACtB,YAAY,EAAE,UAAU;CAC3B,CAAC;AAEF,kFAAkF;AAClF,MAAM,iBAAiB,GAA4B;IAC/C,CAAC,OAAO,EAAS,MAAM,CAAC;IACxB,CAAC,OAAO,EAAS,cAAc,CAAC;IAChC,CAAC,cAAc,EAAE,aAAa,CAAC;IAC/B,CAAC,aAAa,EAAG,UAAU,CAAC;IAC5B,CAAC,OAAO,EAAS,eAAe,CAAC;IACjC,CAAC,eAAe,EAAC,cAAc,CAAC;IAChC,CAAC,cAAc,EAAE,WAAW,CAAC;IAC7B,CAAC,OAAO,EAAS,WAAW,CAAC;IAC7B,CAAC,WAAW,EAAK,SAAS,CAAC;IAC3B,CAAC,OAAO,EAAS,YAAY,CAAC;IAC9B,CAAC,YAAY,EAAI,UAAU,CAAC;CAC/B,CAAC;AAEF,iGAAiG;AACjG,MAAM,kBAAkB,GAAG,EAAE,CAAC;AAE9B,6FAA6F;AAC7F,MAAM,mBAAmB,GAAG,IAAI,CAAC,CAAC,KAAK;AAEvC,SAAS,SAAS,CAAC,GAAiB;IAChC,MAAM,IAAI,GAAG,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC;IAC7C,MAAM,GAAG,GAAI,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC;IAC9C,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,GAAG,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC;AAC5E,CAAC;AAED,SAAS,aAAa,CAClB,CAA+D,EAC/D,CAA+D,EAC/D,SAAiB;IAEjB,OAAO,CACH,CAAC,CAAC,KAAK,GAAI,SAAS,IAAI,CAAC,CAAC,IAAI;QAC9B,CAAC,CAAC,KAAK,GAAI,SAAS,IAAI,CAAC,CAAC,IAAI;QAC9B,CAAC,CAAC,MAAM,GAAG,SAAS,IAAI,CAAC,CAAC,GAAG;QAC7B,CAAC,CAAC,MAAM,GAAG,SAAS,IAAI,CAAC,CAAC,GAAG,CAChC,CAAC;AACN,CAAC;AAED,KAAK,UAAU,IAAI;IACf,OAAO,CAAC,GAAG,CAAC,iDAAiD,CAAC,CAAC;IAE/D,MAAM,OAAO,GAAG,iDAAiD,CAAC;IAClE,MAAM,OAAO,GAAY,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IACtE,MAAM,UAAU,GAAG,OAAO,CAAC,eAAe,IAAI,EAAE,CAAC;IAEjD,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;IAC5B,OAAO,CAAC,GAAG,GAAG,CAAC,GAAG,CAAY,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;IAE5E,MAAM,QAAQ,GAAG,IAAI,YAAY,EAAE,CAAC;IACpC,MAAM,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAEnC,MAAM,WAAW,GAAI,IAAI,CAAC;IAC1B,MAAM,YAAY,GAAG,IAAI,CAAC;IAE1B,MAAM,UAAU,GAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE;QACzC,WAAW;QACX,YAAY;KACf,CAAC,CAAC;IAEH,OAAO,CAAC,GAAG,GAAG,OAAO,CAAC;IAEtB,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;IACnC,MAAM,MAAM,GAAG,IAAI,GAAG,CAAuB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAE5E,8EAA8E;IAE9E,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC;IACrD,KAAK,MAAM,IAAI,IAAI,mBAAmB,EAAE,CAAC;QACrC,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC7B,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,SAAS,IAAI,6BAA6B,CAAC,CAAC;QAC1D,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,SAAS,EAAE,SAAS,IAAI,sBAAsB,CAAC,CAAC;IAClE,CAAC;IAED,8EAA8E;IAE9E,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC;IACrD,KAAK,MAAM,IAAI,IAAI,mBAAmB,EAAE,CAAC;QACrC,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC7B,IAAI,CAAC,GAAG;YAAE,SAAS;QACnB,MAAM,CAAC,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;QACzB,MAAM,YAAY,GACd,CAAC,CAAC,IAAI,IAAM,CAAC,CAAC;YACd,CAAC,CAAC,GAAG,IAAO,CAAC,CAAC;YACd,CAAC,CAAC,KAAK,IAAK,WAAW,GAAI,CAAC;YAC5B,CAAC,CAAC,MAAM,IAAI,YAAY,GAAG,CAAC,CAAC;QACjC,MAAM,CACF,YAAY,EACZ,SAAS,IAAI,+BAA+B,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CACzJ,CAAC;IACN,CAAC;IAED,8EAA8E;IAE9E,OAAO,CAAC,GAAG,CAAC,qDAAqD,CAAC,CAAC;IACnE,KAAK,MAAM,IAAI,IAAI,mBAAmB,EAAE,CAAC;QACrC,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC7B,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;QAC9B,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI;YAAE,SAAS;QAE5B,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,GAAI,IAAI,CAAC,KAAK,CAAC,GAAI,IAAI,CAAC,KAAK,CAAC;QAC9D,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;QAE/D,MAAM,CACF,KAAK,IAAI,mBAAmB,EAC5B,SAAS,IAAI,WAAW,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,eAAe,IAAI,CAAC,KAAK,UAAU,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAC/G,CAAC;QACF,MAAM,CACF,KAAK,IAAI,mBAAmB,EAC5B,SAAS,IAAI,YAAY,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,eAAe,IAAI,CAAC,MAAM,UAAU,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAClH,CAAC;IACN,CAAC;IAED,8EAA8E;IAE9E,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;IAC5C,KAAK,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,IAAI,iBAAiB,EAAE,CAAC;QACtD,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACtC,MAAM,KAAK,GAAI,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACrC,IAAI,CAAC,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;YACpB,MAAM,CAAC,KAAK,EAAE,sBAAsB,UAAU,IAAI,SAAS,gBAAgB,CAAC,CAAC;YAC7E,SAAS;QACb,CAAC;QACD,MAAM,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;QAC7B,MAAM,EAAE,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;QAC5B,MAAM,QAAQ,GAAG,aAAa,CAAC,EAAE,EAAE,EAAE,EAAE,kBAAkB,CAAC,CAAC;QAC3D,MAAM,CACF,QAAQ,EACR,SAAS,UAAU,IAAI,SAAS,oDAAoD,kBAAkB,KAAK,CAC9G,CAAC;IACN,CAAC;IAED,YAAY,EAAE,CAAC;AACnB,CAAC;AAED,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;IACf,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACnB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACpB,CAAC,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "distark-render",
-  "version": "1.1.14",
+  "version": "1.1.16",
   "description": "Rendering-agnostic character rig system with TypeScript",
   "type": "module",
   "main": "./dist/modules/renderRig.js",