distark-render 1.1.4 → 1.1.6

package/dist/tests/test-torso-pivot.js

@@ -0,0 +1,265 @@
+/**
+ * Torso Pivot Test
+ * Verifies that the torso pivot point works correctly:
+ *   - rotationValues.torso rotates the entire upper body around root_torso
+ *   - All torso children (head, arms, thighs) follow the rotation
+ *   - Changing root_torso.y moves the pivot height, changing the rotation arc
+ *
+ * Saves visual outputs to test-outputs/ for manual inspection.
+ */
+import { SkiaRenderer } from '../modules/adapters/skiaRenderer.js';
+import { readFile, writeFile, mkdir } from 'fs/promises';
+// ─── canvas helpers ───────────────────────────────────────────────────────────
+async function saveCanvas(canvas, path) {
+    const buffer = await canvas.toBuffer('image/png');
+    await writeFile(path, buffer);
+    console.log(`    💾 Saved: ${path}`);
+}
+/**
+ * Annotate the rendered frame with text labels and a crosshair at the
+ * torso pivot world position (pulled from computedPivotPoints).
+ */
+function annotate(ctx, label, pivotX, pivotY) {
+    // Label
+    ctx.save();
+    ctx.fillStyle = 'rgba(0,0,0,0.65)';
+    ctx.fillRect(8, 8, 420, 40);
+    ctx.fillStyle = '#fff';
+    ctx.font = 'bold 22px monospace';
+    ctx.fillText(label, 16, 36);
+    ctx.restore();
+    // Crosshair at torso pivot
+    ctx.save();
+    ctx.strokeStyle = '#ff4400';
+    ctx.lineWidth = 2;
+    const r = 12;
+    ctx.beginPath();
+    ctx.moveTo(pivotX - r, pivotY);
+    ctx.lineTo(pivotX + r, pivotY);
+    ctx.moveTo(pivotX, pivotY - r);
+    ctx.lineTo(pivotX, pivotY + r);
+    ctx.stroke();
+    ctx.beginPath();
+    ctx.arc(pivotX, pivotY, r, 0, Math.PI * 2);
+    ctx.strokeStyle = '#ff4400';
+    ctx.stroke();
+    ctx.restore();
+}
+async function renderPose(renderer, baseRig, overrides, width, height, label, outPath) {
+    // Build a modified rig with requested overrides
+    const rig = {
+        ...baseRig,
+        rotationValues: {
+            ...(baseRig.rotationValues || {}),
+            torso: overrides.torsoRotation ?? 0
+        },
+        pivotPoints: {
+            ...(baseRig.pivotPoints || {}),
+            ...(overrides.root_torso ? { root_torso: overrides.root_torso } : {})
+        }
+    };
+    const canvas = await renderer.createCanvas(width, height);
+    const ctx = canvas.getContext('2d');
+    // Draw background
+    ctx.fillStyle = '#f0f0f0';
+    ctx.fillRect(0, 0, width, height);
+    // Render character (with pivot points visible)
+    renderer.renderToCanvas(canvas, rig, { canvasWidth: width, canvasHeight: height }, true);
+    // Find the root_torso pivot in computed pivot points
+    const renderData = renderer.compute(rig, { canvasWidth: width, canvasHeight: height });
+    const torsoPivot = renderData.pivotPoints.find(p => p.name === 'root_torso');
+    const pivotX = torsoPivot?.x ?? width / 2;
+    const pivotY = torsoPivot?.y ?? height / 2;
+    // Annotate
+    annotate(ctx, label, pivotX, pivotY);
+    await saveCanvas(canvas, outPath);
+    return { pivotX, pivotY };
+}
+// ─── test cases ───────────────────────────────────────────────────────────────
+async function testBaseline(renderer, rig, w, h) {
+    console.log('\n  Test 1: Baseline (torso = 0)');
+    console.log('  ' + '-'.repeat(40));
+    await renderPose(renderer, rig, { torsoRotation: 0 }, w, h, 'torso = 0 (baseline)', 'test-outputs/torso-pivot-1-baseline.png');
+    console.log('    Visual saved. Baseline always passes.');
+    return true;
+}
+/**
+ * Get world position of a named pivot from computed data.
+ */
+function getPivot(renderer, rig, pivotName, w, h) {
+    const data = renderer.compute(rig, { canvasWidth: w, canvasHeight: h });
+    return data.pivotPoints.find(p => p.name === pivotName) ?? { x: 0, y: 0 };
+}
+async function testLeanRight(renderer, rig, w, h) {
+    console.log('\n  Test 2: Lean Right (torso = +0.35 rad ≈ 20°)');
+    console.log('  ' + '-'.repeat(40));
+    // Save visuals
+    await renderPose(renderer, rig, { torsoRotation: 0 }, w, h, 'torso = 0 (ref)', 'test-outputs/torso-pivot-2-before.png');
+    await renderPose(renderer, rig, { torsoRotation: 0.35 }, w, h, 'torso = +0.35 rad (lean right)', 'test-outputs/torso-pivot-2-after.png');
+    // Use computed pivot positions — no images needed
+    const baseRig = { ...rig, rotationValues: { ...(rig.rotationValues || {}), torso: 0 } };
+    const leanRig = { ...rig, rotationValues: { ...(rig.rotationValues || {}), torso: 0.35 } };
+    const headBefore = getPivot(renderer, baseRig, 'torso_head', w, h);
+    const headAfter = getPivot(renderer, leanRig, 'torso_head', w, h);
+    const shift = headAfter.x - headBefore.x;
+    console.log(`    torso_head pivot X: ${headBefore.x.toFixed(1)} → ${headAfter.x.toFixed(1)}  (shift = ${shift.toFixed(1)} px)`);
+    const passed = shift > 5;
+    console.log(`    Result: ${passed ? '✅ PASS' : '❌ FAIL'} - Head pivot shifted right by ${shift.toFixed(1)} px`);
+    return passed;
+}
+async function testLeanLeft(renderer, rig, w, h) {
+    console.log('\n  Test 3: Lean Left (torso = -0.35 rad ≈ -20°)');
+    console.log('  ' + '-'.repeat(40));
+    // Save visuals
+    await renderPose(renderer, rig, { torsoRotation: 0 }, w, h, 'torso = 0 (ref)', 'test-outputs/torso-pivot-3-before.png');
+    await renderPose(renderer, rig, { torsoRotation: -0.35 }, w, h, 'torso = -0.35 rad (lean left)', 'test-outputs/torso-pivot-3-after.png');
+    // Use computed pivot positions
+    const baseRig = { ...rig, rotationValues: { ...(rig.rotationValues || {}), torso: 0 } };
+    const leanRig = { ...rig, rotationValues: { ...(rig.rotationValues || {}), torso: -0.35 } };
+    const headBefore = getPivot(renderer, baseRig, 'torso_head', w, h);
+    const headAfter = getPivot(renderer, leanRig, 'torso_head', w, h);
+    const shift = headBefore.x - headAfter.x; // leftward = positive
+    console.log(`    torso_head pivot X: ${headBefore.x.toFixed(1)} → ${headAfter.x.toFixed(1)}  (leftward shift = ${shift.toFixed(1)} px)`);
+    const passed = shift > 5;
+    console.log(`    Result: ${passed ? '✅ PASS' : '❌ FAIL'} - Head pivot shifted left by ${shift.toFixed(1)} px`);
+    return passed;
+}
+async function testTorsoMovesWithPivot(renderer, rig, w, h) {
+    console.log('\n  Test 4a: Torso Image Moves When root_torso Moves');
+    console.log('  ' + '-'.repeat(40));
+    await renderPose(renderer, rig, { torsoRotation: 0, root_torso: { x: 0, y: 0 } }, w, h, 'root_torso = (0, 0) — torso at feet', 'test-outputs/torso-pivot-4a-at-feet.png');
+    await renderPose(renderer, rig, { torsoRotation: 0, root_torso: { x: 0, y: -200 } }, w, h, 'root_torso = (0, -200) — torso lifted', 'test-outputs/torso-pivot-4a-lifted.png');
+    // The root_torso pivot world Y should differ by 200 px between the two rigs
+    const rigAtFeet = { ...rig, rotationValues: { ...(rig.rotationValues || {}), torso: 0 },
+        pivotPoints: { ...(rig.pivotPoints || {}), root_torso: { x: 0, y: 0 } } };
+    const rigLifted = { ...rig, rotationValues: { ...(rig.rotationValues || {}), torso: 0 },
+        pivotPoints: { ...(rig.pivotPoints || {}), root_torso: { x: 0, y: -200 } } };
+    const pivotAtFeet = getPivot(renderer, rigAtFeet, 'root_torso', w, h);
+    const pivotLifted = getPivot(renderer, rigLifted, 'root_torso', w, h);
+    const yShift = pivotAtFeet.y - pivotLifted.y; // should be ≈ 200
+    console.log(`    root_torso Y (at feet): ${pivotAtFeet.y.toFixed(1)}`);
+    console.log(`    root_torso Y (lifted):  ${pivotLifted.y.toFixed(1)}`);
+    console.log(`    Vertical shift: ${yShift.toFixed(1)} px  (expected ≈ 200)`);
+    const passed = Math.abs(yShift - 200) < 1;
+    console.log(`    Result: ${passed ? '✅ PASS' : '❌ FAIL'} — pivot (and torso bottom) moved by ${yShift.toFixed(1)} px`);
+    return passed;
+}
+async function testPivotHeightEffect(renderer, rig, w, h) {
+    console.log('\n  Test 4b: Pivot Height Changes Head Arc');
+    console.log('  ' + '-'.repeat(40));
+    const angle = 0.3;
+    // Save visuals
+    await renderPose(renderer, rig, { torsoRotation: angle, root_torso: { x: 19, y: -62 } }, w, h, `torso = +0.3 rad, root_torso.y = -62 (hip)`, 'test-outputs/torso-pivot-4-hip.png');
+    await renderPose(renderer, rig, { torsoRotation: angle, root_torso: { x: 19, y: -200 } }, w, h, `torso = +0.3 rad, root_torso.y = -200 (high)`, 'test-outputs/torso-pivot-4-high.png');
+    // Compare torso_head pivot positions using computed data
+    const rigHip = {
+        ...rig,
+        rotationValues: { ...(rig.rotationValues || {}), torso: angle },
+        pivotPoints: { ...(rig.pivotPoints || {}), root_torso: { x: 19, y: -62 } }
+    };
+    const rigHigh = {
+        ...rig,
+        rotationValues: { ...(rig.rotationValues || {}), torso: angle },
+        pivotPoints: { ...(rig.pivotPoints || {}), root_torso: { x: 19, y: -200 } }
+    };
+    const headHip = getPivot(renderer, rigHip, 'torso_head', w, h);
+    const headHigh = getPivot(renderer, rigHigh, 'torso_head', w, h);
+    const diff = Math.abs(headHigh.x - headHip.x) + Math.abs(headHigh.y - headHip.y);
+    console.log(`    torso_head (hip pivot):  (${headHip.x.toFixed(1)}, ${headHip.y.toFixed(1)})`);
+    console.log(`    torso_head (high pivot): (${headHigh.x.toFixed(1)}, ${headHigh.y.toFixed(1)})`);
+    console.log(`    Total distance: ${diff.toFixed(1)} px`);
+    // A higher pivot point at the same rotation angle should place the head pivot
+    // at a different world position.
+    const passed = diff > 1;
+    console.log(`    Result: ${passed ? '✅ PASS' : '❌ FAIL'} - Different pivot heights yield different head positions`);
+    return passed;
+}
+async function testLegsStayStill(renderer, rig, w, h) {
+    console.log('\n  Test 5: Legs Stay Still When Torso Rotates');
+    console.log('  ' + '-'.repeat(40));
+    await renderPose(renderer, rig, { torsoRotation: 0 }, w, h, 'torso = 0 — legs reference', 'test-outputs/torso-pivot-5-legs-baseline.png');
+    await renderPose(renderer, rig, { torsoRotation: 0.45 }, w, h, 'torso = +0.45 rad — legs should not move', 'test-outputs/torso-pivot-5-legs-rotated.png');
+    const baseRig = { ...rig, rotationValues: { ...(rig.rotationValues || {}), torso: 0 } };
+    const leanRig = { ...rig, rotationValues: { ...(rig.rotationValues || {}), torso: 0.45 } };
+    // Head SHOULD move
+    const headBase = getPivot(renderer, baseRig, 'torso_head', w, h);
+    const headLean = getPivot(renderer, leanRig, 'torso_head', w, h);
+    const headShift = Math.abs(headLean.x - headBase.x);
+    // Hips should NOT move
+    const lHipBase = getPivot(renderer, baseRig, 'torso_leftThigh', w, h);
+    const lHipLean = getPivot(renderer, leanRig, 'torso_leftThigh', w, h);
+    const rHipBase = getPivot(renderer, baseRig, 'torso_rightThigh', w, h);
+    const rHipLean = getPivot(renderer, leanRig, 'torso_rightThigh', w, h);
+    const lHipShift = Math.hypot(lHipLean.x - lHipBase.x, lHipLean.y - lHipBase.y);
+    const rHipShift = Math.hypot(rHipLean.x - rHipBase.x, rHipLean.y - rHipBase.y);
+    console.log(`    torso_head shift:       ${headShift.toFixed(1)} px  (expected > 5)`);
+    console.log(`    torso_leftThigh shift:  ${lHipShift.toFixed(2)} px  (expected = 0)`);
+    console.log(`    torso_rightThigh shift: ${rHipShift.toFixed(2)} px  (expected = 0)`);
+    const headMoved = headShift > 5;
+    const legsStill = lHipShift < 0.01 && rHipShift < 0.01;
+    console.log(`    Head moved:  ${headMoved ? '✅' : '❌'}`);
+    console.log(`    Legs still:  ${legsStill ? '✅' : '❌'}`);
+    const passed = headMoved && legsStill;
+    console.log(`    Result: ${passed ? '✅ PASS' : '❌ FAIL'}`);
+    return passed;
+}
+async function testSweep(renderer, rig, w, h) {
+    console.log('\n  Test 6: Rotation Sweep  (-0.5 to +0.5 rad, 5 frames)');
+    console.log('  ' + '-'.repeat(40));
+    const angles = [-0.5, -0.25, 0, 0.25, 0.5];
+    for (let i = 0; i < angles.length; i++) {
+        const deg = (angles[i] * 180 / Math.PI).toFixed(1);
+        await renderPose(renderer, rig, { torsoRotation: angles[i] }, w, h, `torso = ${angles[i].toFixed(2)} rad (${deg}°)`, `test-outputs/torso-pivot-6-sweep-${i}.png`);
+    }
+    console.log(`    Saved ${angles.length} sweep frames.`);
+    console.log('    Result: ✅ PASS');
+    return true;
+}
+// ─── main ─────────────────────────────────────────────────────────────────────
+async function runTorsoPivotTests(inputFile) {
+    console.log('\n🔄 Torso Pivot Test');
+    console.log('='.repeat(50));
+    console.log(`📦 Loading ${inputFile}...`);
+    const rig = JSON.parse(await readFile(inputFile, 'utf-8'));
+    const width = 900;
+    const height = 1100;
+    console.log('🎨 Setting up renderer and loading images...');
+    const renderer = new SkiaRenderer();
+    await renderer.loadImages(rig);
+    // Ensure output directory exists
+    await mkdir('test-outputs', { recursive: true });
+    console.log('\n🧪 Running torso pivot tests...\n');
+    const results = {
+        'Baseline render': await testBaseline(renderer, rig, width, height),
+        'Lean right': await testLeanRight(renderer, rig, width, height),
+        'Lean left': await testLeanLeft(renderer, rig, width, height),
+        'Torso moves with pivot': await testTorsoMovesWithPivot(renderer, rig, width, height),
+        'Pivot height effect': await testPivotHeightEffect(renderer, rig, width, height),
+        'Legs stay still': await testLegsStayStill(renderer, rig, width, height),
+        'Rotation sweep': await testSweep(renderer, rig, width, height),
+    };
+    console.log('\n' + '='.repeat(50));
+    console.log('📊 Test Summary:');
+    const passCount = Object.values(results).filter(Boolean).length;
+    const total = Object.keys(results).length;
+    console.log(`   ${passCount}/${total} tests passed`);
+    Object.entries(results).forEach(([name, ok]) => console.log(`   ${ok ? '✅' : '❌'} ${name}`));
+    const allPassed = passCount === total;
+    console.log(allPassed
+        ? '\n✅ All torso pivot tests PASSED\n'
+        : '\n❌ Some torso pivot tests FAILED\n');
+    return allPassed;
+}
+async function main() {
+    const inputFile = process.argv[2] || 'tank_truncated.json';
+    try {
+        const ok = await runTorsoPivotTests(inputFile);
+        process.exit(ok ? 0 : 1);
+    }
+    catch (err) {
+        console.error('❌ Test failed with error:', err);
+        process.exit(1);
+    }
+}
+main();
+//# sourceMappingURL=test-torso-pivot.js.map

package/dist/tests/test-torso-pivot.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "distark-render",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "description": "Rendering-agnostic character rig system with TypeScript",
   "type": "module",
   "main": "./dist/modules/renderRig.js",
@@ -52,6 +52,7 @@
     "build": "tsc",
     "check": "node dist/cli/distark-check.js",
     "test-cli": "npm run build && node dist/tests/test-cli.js",
+    "test-torso-pivot": "npm run build && node dist/tests/test-torso-pivot.js",
     "watch": "tsc --watch",
     "dev": "tsc --watch & http-server -p 8080",
     "clean": "rm -rf dist",

package/assets/presets/jumping-jack.json

@@ -1,194 +0,0 @@
-[
-  {
-    "rotationValues": {
-      "leftUpperArm": -3.141593,
-      "rightUpperArm": 3.141593,
-      "leftThigh": -3.141593,
-      "rightThigh": 3.141593
-    }
-  },
-  {
-    "rotationValues": {
-      "leftUpperArm": -3.325734,
-      "rightUpperArm": 3.325734,
-      "leftThigh": -3.088003,
-      "rightThigh": 3.088003
-    }
-  },
-  {
-    "rotationValues": {
-      "leftUpperArm": -3.828816,
-      "rightUpperArm": 3.828816,
-      "leftThigh": -2.941593,
-      "rightThigh": 2.941593
-    }
-  },
-  {
-    "rotationValues": {
-      "leftUpperArm": -4.516039,
-      "rightUpperArm": 4.516039,
-      "leftThigh": -2.741593,
-      "rightThigh": 2.741593
-    }
-  },
-  {
-    "rotationValues": {
-      "leftUpperArm": -5.203263,
-      "rightUpperArm": 5.203263,
-      "leftThigh": -2.541593,
-      "rightThigh": 2.541593
-    }
-  },
-  {
-    "rotationValues": {
-      "leftUpperArm": -5.706345,
-      "rightUpperArm": 5.706345,
-      "leftThigh": -2.395182,
-      "rightThigh": 2.395182
-    }
-  },
-  {
-    "rotationValues": {
-      "leftUpperArm": -5.890486,
-      "rightUpperArm": 5.890486,
-      "leftThigh": -2.341593,
-      "rightThigh": 2.341593
-    }
-  },
-  {
-    "rotationValues": {
-      "leftUpperArm": -5.706345,
-      "rightUpperArm": 5.706345,
-      "leftThigh": -2.395182,
-      "rightThigh": 2.395182
-    }
-  },
-  {
-    "rotationValues": {
-      "leftUpperArm": -5.203263,
-      "rightUpperArm": 5.203263,
-      "leftThigh": -2.541593,
-      "rightThigh": 2.541593
-    }
-  },
-  {
-    "rotationValues": {
-      "leftUpperArm": -4.516039,
-      "rightUpperArm": 4.516039,
-      "leftThigh": -2.741593,
-      "rightThigh": 2.741593
-    }
-  },
-  {
-    "rotationValues": {
-      "leftUpperArm": -3.828816,
-      "rightUpperArm": 3.828816,
-      "leftThigh": -2.941593,
-      "rightThigh": 2.941593
-    }
-  },
-  {
-    "rotationValues": {
-      "leftUpperArm": -3.325734,
-      "rightUpperArm": 3.325734,
-      "leftThigh": -3.088003,
-      "rightThigh": 3.088003
-    }
-  },
-  {
-    "rotationValues": {
-      "leftUpperArm": -3.141593,
-      "rightUpperArm": 3.141593,
-      "leftThigh": -3.141593,
-      "rightThigh": 3.141593
-    }
-  },
-  {
-    "rotationValues": {
-      "leftUpperArm": -3.325734,
-      "rightUpperArm": 3.325734,
-      "leftThigh": -3.088003,
-      "rightThigh": 3.088003
-    }
-  },
-  {
-    "rotationValues": {
-      "leftUpperArm": -3.828816,
-      "rightUpperArm": 3.828816,
-      "leftThigh": -2.941593,
-      "rightThigh": 2.941593
-    }
-  },
-  {
-    "rotationValues": {
-      "leftUpperArm": -4.516039,
-      "rightUpperArm": 4.516039,
-      "leftThigh": -2.741593,
-      "rightThigh": 2.741593
-    }
-  },
-  {
-    "rotationValues": {
-      "leftUpperArm": -5.203263,
-      "rightUpperArm": 5.203263,
-      "leftThigh": -2.541593,
-      "rightThigh": 2.541593
-    }
-  },
-  {
-    "rotationValues": {
-      "leftUpperArm": -5.706345,
-      "rightUpperArm": 5.706345,
-      "leftThigh": -2.395182,
-      "rightThigh": 2.395182
-    }
-  },
-  {
-    "rotationValues": {
-      "leftUpperArm": -5.890486,
-      "rightUpperArm": 5.890486,
-      "leftThigh": -2.341593,
-      "rightThigh": 2.341593
-    }
-  },
-  {
-    "rotationValues": {
-      "leftUpperArm": -5.706345,
-      "rightUpperArm": 5.706345,
-      "leftThigh": -2.395182,
-      "rightThigh": 2.395182
-    }
-  },
-  {
-    "rotationValues": {
-      "leftUpperArm": -5.203263,
-      "rightUpperArm": 5.203263,
-      "leftThigh": -2.541593,
-      "rightThigh": 2.541593
-    }
-  },
-  {
-    "rotationValues": {
-      "leftUpperArm": -4.516039,
-      "rightUpperArm": 4.516039,
-      "leftThigh": -2.741593,
-      "rightThigh": 2.741593
-    }
-  },
-  {
-    "rotationValues": {
-      "leftUpperArm": -3.828816,
-      "rightUpperArm": 3.828816,
-      "leftThigh": -2.941593,
-      "rightThigh": 2.941593
-    }
-  },
-  {
-    "rotationValues": {
-      "leftUpperArm": -3.325734,
-      "rightUpperArm": 3.325734,
-      "leftThigh": -3.088003,
-      "rightThigh": 3.088003
-    }
-  }
-]