distark-render 1.1.15 → 1.1.17

package/dist/cli/distark-check.d.ts

@@ -5,6 +5,7 @@
  * Commands:
  *   render   <rig.json>                    Render rig to PNG + JSON report
  *   verify   <rig.json>                    Math-based sanity checks (no rendering)
+ *   explode  <rig.json>                    Render exploded rig-view PNG
  *   animate  <rig.json> <animation.json>   Render animation frames + manifest
  *   diff     <before.png> <after.png>      Pixel-diff two images
  *   query    <image|rig> --prompt "..."     Send to Gemini for visual analysis

package/dist/cli/distark-check.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"distark-check.d.ts","sourceRoot":"","sources":["../../cli/distark-check.ts"],"names":[],"mappings":";AACA;;;;;;;;;GASG"}
+{"version":3,"file":"distark-check.d.ts","sourceRoot":"","sources":["../../cli/distark-check.ts"],"names":[],"mappings":";AACA;;;;;;;;;;GAUG"}

package/dist/cli/distark-check.js

@@ -5,6 +5,7 @@
  * Commands:
  *   render   <rig.json>                    Render rig to PNG + JSON report
  *   verify   <rig.json>                    Math-based sanity checks (no rendering)
+ *   explode  <rig.json>                    Render exploded rig-view PNG
  *   animate  <rig.json> <animation.json>   Render animation frames + manifest
  *   diff     <before.png> <after.png>      Pixel-diff two images
  *   query    <image|rig> --prompt "..."     Send to Gemini for visual analysis
@@ -17,10 +18,12 @@ import { runQuery } from './query.js';
 import { runRecord } from './record.js';
 import { runTest } from './test.js';
 import { runScene } from './scene.js';
+import { runExplode } from './explode.js';
 const USAGE = `distark-check - CLI tool for LLM-driven rig testing
 
 Commands:
   render   <rig.json> [-o out.png] [--width N] [--height N] [--report]
+  explode  <rig.json> [-o out.png] [--strength N] [--padding N] [--gap N] [--width N] [--height N]
   verify   <rig.json> [--checks all|bounds,visibility,proportions,zorder]
   animate  <rig.json> <animation.json> [-o frames/] [--width N] [--height N]
   scene    <world.json> [--time 0] [--chars a.json,b.json] [-o out.png] [--report]
@@ -45,6 +48,9 @@ async function main() {
         case 'verify':
             await runVerify(commandArgs);
             break;
+        case 'explode':
+            await runExplode(commandArgs);
+            break;
         case 'animate':
             await runAnimate(commandArgs);
             break;

package/dist/cli/distark-check.js.map

@@ -1 +1 @@
-{"version":3,"file":"distark-check.js","sourceRoot":"","sources":["../../cli/distark-check.ts"],"names":[],"mappings":";AACA;;;;;;;;;GASG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,MAAM,KAAK,GAAG;;;;;;;;;;;;;;;;CAgBb,CAAC;AAEF,KAAK,UAAU,IAAI;IACf,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACnC,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IACxB,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAElC,QAAQ,OAAO,EAAE,CAAC;QACd,KAAK,QAAQ;YACT,MAAM,SAAS,CAAC,WAAW,CAAC,CAAC;YAC7B,MAAM;QACV,KAAK,QAAQ;YACT,MAAM,SAAS,CAAC,WAAW,CAAC,CAAC;YAC7B,MAAM;QACV,KAAK,SAAS;YACV,MAAM,UAAU,CAAC,WAAW,CAAC,CAAC;YAC9B,MAAM;QACV,KAAK,MAAM;YACP,MAAM,OAAO,CAAC,WAAW,CAAC,CAAC;YAC3B,MAAM;QACV,KAAK,OAAO;YACR,MAAM,QAAQ,CAAC,WAAW,CAAC,CAAC;YAC5B,MAAM;QACV,KAAK,OAAO;YACR,MAAM,QAAQ,CAAC,WAAW,CAAC,CAAC;YAC5B,MAAM;QACV,KAAK,QAAQ;YACT,MAAM,SAAS,CAAC,WAAW,CAAC,CAAC;YAC7B,MAAM;QACV,KAAK,MAAM;YACP,MAAM,OAAO,CAAC,WAAW,CAAC,CAAC;YAC3B,MAAM;QACV;YACI,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACnB,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACtC,CAAC;AACL,CAAC;AAED,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;IACf,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,CAAC;IAClC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACpB,CAAC,CAAC,CAAC"}
+{"version":3,"file":"distark-check.js","sourceRoot":"","sources":["../../cli/distark-check.ts"],"names":[],"mappings":";AACA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,KAAK,GAAG;;;;;;;;;;;;;;;;;CAiBb,CAAC;AAEF,KAAK,UAAU,IAAI;IACf,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACnC,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IACxB,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAElC,QAAQ,OAAO,EAAE,CAAC;QACd,KAAK,QAAQ;YACT,MAAM,SAAS,CAAC,WAAW,CAAC,CAAC;YAC7B,MAAM;QACV,KAAK,QAAQ;YACT,MAAM,SAAS,CAAC,WAAW,CAAC,CAAC;YAC7B,MAAM;QACV,KAAK,SAAS;YACV,MAAM,UAAU,CAAC,WAAW,CAAC,CAAC;YAC9B,MAAM;QACV,KAAK,SAAS;YACV,MAAM,UAAU,CAAC,WAAW,CAAC,CAAC;YAC9B,MAAM;QACV,KAAK,MAAM;YACP,MAAM,OAAO,CAAC,WAAW,CAAC,CAAC;YAC3B,MAAM;QACV,KAAK,OAAO;YACR,MAAM,QAAQ,CAAC,WAAW,CAAC,CAAC;YAC5B,MAAM;QACV,KAAK,OAAO;YACR,MAAM,QAAQ,CAAC,WAAW,CAAC,CAAC;YAC5B,MAAM;QACV,KAAK,QAAQ;YACT,MAAM,SAAS,CAAC,WAAW,CAAC,CAAC;YAC7B,MAAM;QACV,KAAK,MAAM;YACP,MAAM,OAAO,CAAC,WAAW,CAAC,CAAC;YAC3B,MAAM;QACV;YACI,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACnB,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACtC,CAAC;AACL,CAAC;AAED,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;IACf,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,CAAC;IAClC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACpB,CAAC,CAAC,CAAC"}

package/dist/cli/explode.d.ts

@@ -0,0 +1,8 @@
+/**
+ * explode command - Render an exploded rig view to PNG
+ *
+ * Usage:
+ *   distark-check explode <rig.json> [-o output.png] [--strength N] [--padding N] [--gap N] [--width N] [--height N]
+ */
+export declare function runExplode(args: string[]): Promise<void>;
+//# sourceMappingURL=explode.d.ts.map

package/dist/cli/explode.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"explode.d.ts","sourceRoot":"","sources":["../../cli/explode.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAkSH,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CA+C9D"}

package/dist/cli/explode.js

@@ -0,0 +1,282 @@
+/**
+ * explode command - Render an exploded rig view to PNG
+ *
+ * Usage:
+ *   distark-check explode <rig.json> [-o output.png] [--strength N] [--padding N] [--gap N] [--width N] [--height N]
+ */
+import { readFile } from 'fs/promises';
+import { SkiaRenderer } from '../modules/adapters/skiaRenderer.js';
+function computeBounds(objects) {
+    let minX = Infinity;
+    let minY = Infinity;
+    let maxX = -Infinity;
+    let maxY = -Infinity;
+    for (const obj of objects) {
+        const left = obj.x - obj.width * obj.anchorX;
+        const top = obj.y - obj.height * obj.anchorY;
+        const right = left + obj.width;
+        const bottom = top + obj.height;
+        if (left < minX)
+            minX = left;
+        if (top < minY)
+            minY = top;
+        if (right > maxX)
+            maxX = right;
+        if (bottom > maxY)
+            maxY = bottom;
+    }
+    return { minX, minY, maxX, maxY };
+}
+function getObjectCenter(obj) {
+    return {
+        x: obj.x + (0.5 - obj.anchorX) * obj.width,
+        y: obj.y + (0.5 - obj.anchorY) * obj.height,
+    };
+}
+function setObjectCenter(obj, cx, cy) {
+    return {
+        ...obj,
+        x: cx - (0.5 - obj.anchorX) * obj.width,
+        y: cy - (0.5 - obj.anchorY) * obj.height,
+    };
+}
+function isLegPart(name) {
+    return /thigh|leg|foot/i.test(name);
+}
+const LEVEL_ALIGNED_PAIRS = [
+    ['leftUpperArm', 'rightUpperArm'],
+    ['leftForearm', 'rightForearm'],
+    ['leftHand', 'rightHand'],
+    ['leftThigh', 'rightThigh'],
+    ['leftLeg', 'rightLeg'],
+];
+function createLevelLockedNameSet() {
+    const locked = new Set();
+    for (const [left, right] of LEVEL_ALIGNED_PAIRS) {
+        locked.add(left);
+        locked.add(right);
+    }
+    return locked;
+}
+function enforcePairLevelAlignment(objects, pairs) {
+    const byName = new Map();
+    objects.forEach((obj, idx) => byName.set(obj.name, idx));
+    for (const [leftName, rightName] of pairs) {
+        const leftIdx = byName.get(leftName);
+        const rightIdx = byName.get(rightName);
+        if (leftIdx === undefined || rightIdx === undefined)
+            continue;
+        const left = objects[leftIdx];
+        const right = objects[rightIdx];
+        const leftCenter = getObjectCenter(left);
+        const rightCenter = getObjectCenter(right);
+        const sharedY = (leftCenter.y + rightCenter.y) / 2;
+        objects[leftIdx] = setObjectCenter(left, leftCenter.x, sharedY);
+        objects[rightIdx] = setObjectCenter(right, rightCenter.x, sharedY);
+    }
+}
+function stackChainVertically(objectMap, names, centerX, startCenterY, gap, outputCenters) {
+    let cursorY = startCenterY;
+    for (let i = 0; i < names.length; i++) {
+        const current = objectMap.get(names[i]);
+        if (!current)
+            continue;
+        if (i > 0) {
+            const prev = objectMap.get(names[i - 1]);
+            if (prev) {
+                cursorY += prev.height / 2 + current.height / 2 + gap;
+            }
+        }
+        outputCenters.set(current.name, { x: centerX, y: cursorY });
+    }
+}
+function buildSemanticCenters(objects, strength, minGap) {
+    const byName = new Map(objects.map(obj => [obj.name, obj]));
+    const centers = new Map();
+    const torso = byName.get('torso');
+    const baseBounds = computeBounds(objects);
+    const globalCenterX = (baseBounds.minX + baseBounds.maxX) / 2;
+    const globalCenterY = (baseBounds.minY + baseBounds.maxY) / 2;
+    const torsoCenter = torso ? getObjectCenter(torso) : { x: globalCenterX, y: globalCenterY };
+    const torsoHalfW = torso?.width ? torso.width / 2 : (baseBounds.maxX - baseBounds.minX) * 0.2;
+    const torsoHalfH = torso?.height ? torso.height / 2 : (baseBounds.maxY - baseBounds.minY) * 0.2;
+    const torsoTop = torsoCenter.y - torsoHalfH;
+    const torsoBottom = torsoCenter.y + torsoHalfH;
+    const chainGap = minGap + strength * 0.08;
+    // Keep torso as anchor in the middle of the exploded diagram.
+    if (torso) {
+        centers.set('torso', torsoCenter);
+    }
+    // Head sits directly above torso.
+    const head = byName.get('head');
+    let newHeadCenter = null;
+    if (head) {
+        newHeadCenter = {
+            x: torsoCenter.x,
+            y: torsoTop - head.height / 2 - (minGap + strength * 0.25),
+        };
+        centers.set('head', newHeadCenter);
+    }
+    // Keep face parts aligned with head by preserving their original local offset.
+    if (head && newHeadCenter) {
+        const oldHeadCenter = getObjectCenter(head);
+        const faceParts = ['mouth', 'leftEye', 'rightEye', 'leftIris', 'rightIris', 'leftEyeLid', 'rightEyeLid'];
+        for (const name of faceParts) {
+            const part = byName.get(name);
+            if (!part)
+                continue;
+            const oldCenter = getObjectCenter(part);
+            centers.set(name, {
+                x: newHeadCenter.x + (oldCenter.x - oldHeadCenter.x),
+                y: newHeadCenter.y + (oldCenter.y - oldHeadCenter.y),
+            });
+        }
+    }
+    // Arms as two aligned vertical chains.
+    const leftArm = ['leftUpperArm', 'leftForearm', 'leftHand'];
+    const rightArm = ['rightUpperArm', 'rightForearm', 'rightHand'];
+    const armOffset = torsoHalfW + minGap + strength * 0.9;
+    const armStartY = torsoTop + (byName.get('leftUpperArm')?.height || byName.get('rightUpperArm')?.height || 120) / 2;
+    stackChainVertically(byName, leftArm, torsoCenter.x + armOffset, armStartY, chainGap, centers);
+    stackChainVertically(byName, rightArm, torsoCenter.x - armOffset, armStartY, chainGap, centers);
+    // Legs as two aligned vertical chains below torso.
+    const leftLeg = ['leftThigh', 'leftLeg'];
+    const rightLeg = ['rightThigh', 'rightLeg'];
+    const legOffset = Math.max(50, torsoHalfW * 0.4) + strength * 0.2;
+    const firstLegHeight = byName.get('leftThigh')?.height || byName.get('rightThigh')?.height || 160;
+    const legStartY = torsoBottom + minGap + strength * 0.3 + firstLegHeight / 2;
+    stackChainVertically(byName, leftLeg, torsoCenter.x - legOffset, legStartY, chainGap, centers);
+    stackChainVertically(byName, rightLeg, torsoCenter.x + legOffset, legStartY, chainGap, centers);
+    return centers;
+}
+function separateOverlaps(objects, minGap, iterations, levelLockedNames) {
+    const epsilon = 0.05;
+    for (let pass = 0; pass < iterations; pass++) {
+        let moved = false;
+        for (let i = 0; i < objects.length; i++) {
+            for (let j = i + 1; j < objects.length; j++) {
+                const a = objects[i];
+                const b = objects[j];
+                const ca = getObjectCenter(a);
+                const cb = getObjectCenter(b);
+                const dx = cb.x - ca.x;
+                const dy = cb.y - ca.y;
+                const requiredX = (a.width + b.width) / 2 + minGap;
+                const requiredY = (a.height + b.height) / 2 + minGap;
+                const penX = requiredX - Math.abs(dx);
+                const penY = requiredY - Math.abs(dy);
+                if (penX <= 0 || penY <= 0) {
+                    continue;
+                }
+                const preferVertical = (isLegPart(a.name) || isLegPart(b.name)) && penY > 0;
+                const yLocked = levelLockedNames.has(a.name) || levelLockedNames.has(b.name);
+                const resolveY = !yLocked && (preferVertical || penY < penX);
+                if (resolveY) {
+                    const dirY = dy === 0 ? (j % 2 === 0 ? 1 : -1) : Math.sign(dy);
+                    const shift = penY / 2 + epsilon;
+                    a.y -= dirY * shift;
+                    b.y += dirY * shift;
+                }
+                else {
+                    const dirX = dx === 0 ? (j % 2 === 0 ? 1 : -1) : Math.sign(dx);
+                    const shift = penX / 2 + epsilon;
+                    a.x -= dirX * shift;
+                    b.x += dirX * shift;
+                }
+                moved = true;
+            }
+        }
+        if (!moved) {
+            return;
+        }
+    }
+}
+function createExplodedLayout(objects, strength, padding, minGap) {
+    if (objects.length === 0) {
+        return {
+            objects: [],
+            canvasWidth: Math.max(1, Math.round(padding * 2)),
+            canvasHeight: Math.max(1, Math.round(padding * 2)),
+        };
+    }
+    const semanticCenters = buildSemanticCenters(objects, strength, minGap);
+    const levelLockedNames = createLevelLockedNameSet();
+    const exploded = objects.map((obj, index) => {
+        const target = semanticCenters.get(obj.name);
+        if (target) {
+            return setObjectCenter(obj, target.x, target.y);
+        }
+        // Fallback for unknown parts: radial spread away from global center.
+        const bounds = computeBounds(objects);
+        const centerX = (bounds.minX + bounds.maxX) / 2;
+        const centerY = (bounds.minY + bounds.maxY) / 2;
+        const current = getObjectCenter(obj);
+        const dx = current.x - centerX;
+        const dy = current.y - centerY;
+        const length = Math.hypot(dx, dy);
+        const angle = (Math.PI * 2 * index) / Math.max(1, objects.length);
+        const dirX = length > 0.0001 ? dx / length : Math.cos(angle);
+        const dirY = length > 0.0001 ? dy / length : Math.sin(angle);
+        return setObjectCenter(obj, current.x + dirX * strength, current.y + dirY * strength);
+    });
+    // Guarantee a minimum visual spacing between object AABBs.
+    separateOverlaps(exploded, minGap, 240, levelLockedNames);
+    enforcePairLevelAlignment(exploded, LEVEL_ALIGNED_PAIRS);
+    // Re-run with Y-lock to preserve left/right alignment while resolving residual overlaps.
+    separateOverlaps(exploded, minGap, 60, levelLockedNames);
+    const explodedBounds = computeBounds(exploded);
+    const translateX = padding - explodedBounds.minX;
+    const translateY = padding - explodedBounds.minY;
+    const translatedObjects = exploded.map(obj => ({
+        ...obj,
+        x: obj.x + translateX,
+        y: obj.y + translateY,
+    }));
+    return {
+        objects: translatedObjects,
+        canvasWidth: Math.max(1, Math.ceil(explodedBounds.maxX - explodedBounds.minX + padding * 2)),
+        canvasHeight: Math.max(1, Math.ceil(explodedBounds.maxY - explodedBounds.minY + padding * 2)),
+    };
+}
+export async function runExplode(args) {
+    const inputFile = args.find(a => !a.startsWith('-')) || '';
+    if (!inputFile) {
+        console.error('Usage: distark-check explode <rig.json> [-o output.png] [--strength N] [--padding N] [--gap N] [--width N] [--height N]');
+        process.exit(1);
+    }
+    const outputIdx = args.indexOf('-o');
+    const outputFile = outputIdx !== -1 ? args[outputIdx + 1] : inputFile.replace(/\.json$/, '.exploded.png');
+    const strength = parseFloat(args[args.indexOf('--strength') + 1]) || 60;
+    const padding = parseInt(args[args.indexOf('--padding') + 1], 10) || 40;
+    const minGap = parseInt(args[args.indexOf('--gap') + 1], 10) || 24;
+    const width = parseInt(args[args.indexOf('--width') + 1], 10) || 1000;
+    const height = parseInt(args[args.indexOf('--height') + 1], 10) || 1000;
+    const rigData = JSON.parse(await readFile(inputFile, 'utf-8'));
+    // Redirect console.log to stderr during image loading (SkiaImageLoader logs progress).
+    const origLog = console.log;
+    console.log = (...a) => console.error(...a);
+    try {
+        const renderer = new SkiaRenderer();
+        await renderer.loadImages(rigData);
+        const fit = renderer.computeAutoFit(rigData, {
+            canvasWidth: width,
+            canvasHeight: height,
+            loadedImages: renderer.getLoadedImages(),
+        });
+        const exploded = createExplodedLayout(fit.renderData.objects, strength, padding, minGap);
+        const canvas = await renderer.createCanvas(exploded.canvasWidth, exploded.canvasHeight);
+        const ctx = canvas.getContext('2d');
+        ctx.fillStyle = '#f0f0f0';
+        ctx.fillRect(0, 0, exploded.canvasWidth, exploded.canvasHeight);
+        renderer.renderObjects(ctx, exploded.objects, false, []);
+        const buffer = await canvas.toBuffer('image/png');
+        const fs = await import('fs/promises');
+        await fs.writeFile(outputFile, buffer);
+        console.error(`Exploded render: ${outputFile} (${exploded.canvasWidth}x${exploded.canvasHeight}, strength=${strength}, gap=${minGap})`);
+    }
+    finally {
+        // Restore console.log
+        console.log = origLog;
+    }
+}
+//# sourceMappingURL=explode.js.map

package/dist/cli/explode.js.map

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

package/dist/cli/scene.js

@@ -71,22 +71,22 @@ async function loadRigDataMap(world, charsArg) {
 export async function runScene(args) {
     const inputFile = args.find(a => !a.startsWith('-')) || '';
     if (!inputFile) {
-        console.error(`Usage:
-  distark-check scene <world.json> [--time 0] [-o output.png] [--report]
-  distark-check scene <world.json> --keyframes [--frames 5] [-o frames/]
-  distark-check scene <world.json> --video [-o output.mp4] [--fps 30]
-
-Options:
-  --time <seconds>     Time to evaluate (default: 0)
-  --chars <files>      Comma-separated rig files: id=path or path (optional if embedded)
-  --keyframes          Render key frames across scene duration
-  --video              Render all frames and assemble into MP4 via ffmpeg
-  --frames <count>     Key frame count (default: 5, used with --keyframes)
-  --fps <number>       Frames per second for --video (default: 30)
-  --width <pixels>     Output width (default: 2560)
-  --height <pixels>    Output height (default: 1440)
-  -o <path>            Output file or directory
-  --state              Print scene state as JSON (no rendering)
+        console.error(`Usage:
+  distark-check scene <world.json> [--time 0] [-o output.png] [--report]
+  distark-check scene <world.json> --keyframes [--frames 5] [-o frames/]
+  distark-check scene <world.json> --video [-o output.mp4] [--fps 30]
+
+Options:
+  --time <seconds>     Time to evaluate (default: 0)
+  --chars <files>      Comma-separated rig files: id=path or path (optional if embedded)
+  --keyframes          Render key frames across scene duration
+  --video              Render all frames and assemble into MP4 via ffmpeg
+  --frames <count>     Key frame count (default: 5, used with --keyframes)
+  --fps <number>       Frames per second for --video (default: 30)
+  --width <pixels>     Output width (default: 2560)
+  --height <pixels>    Output height (default: 1440)
+  -o <path>            Output file or directory
+  --state              Print scene state as JSON (no rendering)
   --report             Save report JSON alongside output`);
         process.exit(1);
     }

package/dist/modules/adapters/p5Renderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"p5Renderer.d.ts","sourceRoot":"","sources":["../../../modules/adapters/p5Renderer.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC5E,KAAK,gBAAgB,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;AAEhF;;;GAGG;AACH,qBAAa,aAAc,SAAQ,WAAW;IAC1C,OAAO,CAAC,EAAE,CAAM;gBAEJ,UAAU,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,MAAM;IAK9C;;;OAGG;IACH,SAAS,CACL,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,IAAI,EACxC,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,MAAM,KAAK,IAAI,GACvD,IAAI;IA8DP;;;;OAIG;IACG,gBAAgB,CAClB,OAAO,EAAE,OAAO,EAChB,QAAQ,GAAE,OAAc,EACxB,UAAU,CAAC,EAAE,gBAAgB,GAC9B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAwClC;AAED;;;;;;;;;;;;GAYG;AACH,qBAAa,UAAW,SAAQ,oBAAoB;IAChD,OAAO,CAAC,EAAE,CAAM;IAChB,OAAO,CAAC,YAAY,CAA2B;IAC/C,OAAO,CAAC,OAAO,CAAkB;gBAErB,UAAU,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,MAAM;IAM9C;;;OAGG;IACG,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAKjD;;;OAGG;IACH,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,aAAa;IAe1E;;;OAGG;IACH,aAAa,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,UAAU,GAAE,OAAe,EAAE,WAAW,CAAC,EAAE,GAAG,EAAE,GAAG,IAAI;IA6BrF;;;;;;OAMG;IACH,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,EAAE,UAAU,GAAE,OAAe,GAAG,IAAI;IAKhG;;OAEG;IACH,KAAK,IAAI,OAAO;IAIhB;;OAEG;IACH,eAAe,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;CAGzC"}
+{"version":3,"file":"p5Renderer.d.ts","sourceRoot":"","sources":["../../../modules/adapters/p5Renderer.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC5E,KAAK,gBAAgB,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;AAEhF;;;GAGG;AACH,qBAAa,aAAc,SAAQ,WAAW;IAC1C,OAAO,CAAC,EAAE,CAAM;gBAEJ,UAAU,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,MAAM;IAK9C;;;OAGG;IACH,SAAS,CACL,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,IAAI,EACxC,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,MAAM,KAAK,IAAI,GACvD,IAAI;IAyGP;;;;OAIG;IACG,gBAAgB,CAClB,OAAO,EAAE,OAAO,EAChB,QAAQ,GAAE,OAAc,EACxB,UAAU,CAAC,EAAE,gBAAgB,GAC9B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAwClC;AAED;;;;;;;;;;;;GAYG;AACH,qBAAa,UAAW,SAAQ,oBAAoB;IAChD,OAAO,CAAC,EAAE,CAAM;IAChB,OAAO,CAAC,YAAY,CAA2B;IAC/C,OAAO,CAAC,OAAO,CAAkB;gBAErB,UAAU,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,MAAM;IAM9C;;;OAGG;IACG,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAKjD;;;OAGG;IACH,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,aAAa;IAe1E;;;OAGG;IACH,aAAa,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,UAAU,GAAE,OAAe,EAAE,WAAW,CAAC,EAAE,GAAG,EAAE,GAAG,IAAI;IAyCrF;;;;;;OAMG;IACH,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,EAAE,UAAU,GAAE,OAAe,GAAG,IAAI;IAKhG;;OAEG;IACH,KAAK,IAAI,OAAO;IAIhB;;OAEG;IACH,eAAe,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;CAGzC"}

package/dist/modules/adapters/p5Renderer.js

@@ -35,11 +35,33 @@ export class P5ImageLoader extends ImageLoader {
             try {
                 const prepared = await this.prepareResolvedAsset(imageUrl);
                 if (prepared?.kind === 'svg') {
-                    const canvas = await this.createSvgCanvas(prepared.svgSource, prepared.intrinsicWidth, prepared.intrinsicHeight);
-                    this.attachSvgMetadata(canvas, prepared.svgSource, prepared.intrinsicWidth, prepared.intrinsicHeight, prepared.intrinsicWidth, prepared.intrinsicHeight);
-                    this.cacheImage(key, canvas);
-                    if (onLoad)
-                        onLoad(key, canvas);
+                    // Primary path: rasterize SVG to canvas so Body can attach pose handles.
+                    // If canvas creation fails (e.g. complex SVG, jsdom limitations), fall back
+                    // to p5.loadImage with an inline data URI so the SVG metadata is preserved
+                    // even when the offscreen-canvas route is unavailable.
+                    try {
+                        const canvas = await this.createSvgCanvas(prepared.svgSource, prepared.intrinsicWidth, prepared.intrinsicHeight);
+                        this.attachSvgMetadata(canvas, prepared.svgSource, prepared.intrinsicWidth, prepared.intrinsicHeight, prepared.intrinsicWidth, prepared.intrinsicHeight);
+                        this.cacheImage(key, canvas);
+                        if (onLoad)
+                            onLoad(key, canvas);
+                    }
+                    catch (svgCanvasErr) {
+                        // createSvgCanvas failed — fall back to p5.loadImage with a data URI
+                        // so the SVG source is preserved as __distarkSvgSource for pose morphing.
+                        console.warn(`createSvgCanvas failed for ${key}, falling back to p5.loadImage with SVG data URI:`, svgCanvasErr instanceof Error ? svgCanvasErr.message : svgCanvasErr);
+                        const svgDataUri = `data:image/svg+xml;charset=utf-8,${encodeURIComponent(prepared.svgSource)}`;
+                        this.p5.loadImage(svgDataUri, (img) => {
+                            this.attachSvgMetadata(img, prepared.svgSource, prepared.intrinsicWidth, prepared.intrinsicHeight, prepared.intrinsicWidth, prepared.intrinsicHeight);
+                            this.cacheImage(key, img);
+                            if (onLoad)
+                                onLoad(key, img);
+                        }, (p5SvgErr) => {
+                            console.error(`Failed to load SVG for ${key} via p5.loadImage:`, p5SvgErr);
+                            if (onError)
+                                onError(key, p5SvgErr);
+                        });
+                    }
                     return;
                 }
                 const loadUrl = prepared?.kind === 'blob' ? prepared.objectUrl : imageUrl;
@@ -50,19 +72,29 @@ export class P5ImageLoader extends ImageLoader {
                     }
                     if (onLoad)
                         onLoad(key, img);
-                }, (err) => {
+                }, (loadErr) => {
                     if (prepared?.kind === 'blob') {
                         URL.revokeObjectURL(prepared.objectUrl);
                     }
-                    console.error(`Failed to load ${key}:`, err);
+                    console.error(`Failed to load ${key}:`, loadErr);
                     if (onError)
-                        onError(key, err);
+                        onError(key, loadErr);
                 });
             }
             catch (err) {
-                console.error(`Failed to load ${key}:`, err);
-                if (onError)
-                    onError(key, err instanceof Error ? err.message : err);
+                // prepareResolvedAsset failed (e.g. fetch blocked by CORS on a CDN redirect).
+                // Fall back to p5.loadImage which uses a DOM Image element and may succeed
+                // where fetch() cannot (different CORS handling, SVG rendered by the browser).
+                console.warn(`prepareResolvedAsset failed for ${key}, falling back to p5.loadImage:`, err instanceof Error ? err.message : err);
+                this.p5.loadImage(imageUrl, (img) => {
+                    this.cacheImage(key, img);
+                    if (onLoad)
+                        onLoad(key, img);
+                }, (fallbackErr) => {
+                    console.error(`Failed to load ${key} (both fetch and p5.loadImage failed):`, fallbackErr);
+                    if (onError)
+                        onError(key, fallbackErr instanceof Error ? fallbackErr.message : fallbackErr);
+                });
             }
         })();
     }
@@ -163,7 +195,17 @@ export class P5Renderer extends CharacterRigRenderer {
             this.p5.scale(obj.scaleX, obj.scaleY);
             const drawX = -obj.width * obj.anchorX;
             const drawY = -obj.height * obj.anchorY;
-            this.p5.image(obj.imageData, drawX, drawY, obj.width, obj.height);
+            // p5.js v2 silently ignores raw HTMLCanvasElement / HTMLImageElement passed to
+            // p5.image(). Use the underlying 2D context directly — it inherits the current
+            // transform matrix already applied by translate/rotate/scale above.
+            const imgData = obj.imageData;
+            if ((typeof HTMLCanvasElement !== 'undefined' && imgData instanceof HTMLCanvasElement) ||
+                (typeof HTMLImageElement !== 'undefined' && imgData instanceof HTMLImageElement)) {
+                this.p5.drawingContext.drawImage(imgData, drawX, drawY, obj.width, obj.height);
+            }
+            else {
+                this.p5.image(imgData, drawX, drawY, obj.width, obj.height);
+            }
             this.p5.pop();
         });
         // Draw pivot points if requested