@aura3d/engine 4.2.0 → 4.3.1

package/dist/aura3d-cli/skin/refitSkeleton.js

@@ -0,0 +1,288 @@
+/**
+ * `assets repair-skin --refit-skeleton`: moves the skeleton onto the mesh instead of the mesh onto the skeleton.
+ *
+ * An auto-rigged character whose mesh was modelled in one pose (a guard holding a rifle, a hound mid-stride) but bound to a template
+ * skeleton rotates every limb about a joint that is 10 to 30 cm off the limb, and the bridging triangles stretch into sails. This finds
+ * each joint where the mesh actually bends (the seam between the two segments the joint separates), re-orients the bones along the
+ * mesh's limbs, recomputes the inverse bind matrices so the mesh does not move at rest, and re-targets every clip by world-space
+ * delta so the shipped animations keep their motion about the corrected joints. The authored pose of the mesh becomes the rest pose.
+ */
+import { findHumanoidLegs } from "./analysis.js";
+import { GlbEditor } from "./glbEdit.js";
+import { buildHierarchy, clipDuration, forward, loadSkins, localPose, mat4Mul, qalign, qconj, qmul, qnorm, qrot, readAccessor, restTrs } from "./gltf.js";
+export class RefitUnsupported extends Error {
+}
+const sub = (a, b) => [a[0] - b[0], a[1] - b[1], a[2] - b[2]];
+const add = (a, b) => [a[0] + b[0], a[1] + b[1], a[2] + b[2]];
+const len = (a) => Math.hypot(a[0], a[1], a[2]);
+const ID = [0, 0, 0, 1];
+function worldRotations(trs, parent) {
+    const out = new Array(trs.length).fill(undefined);
+    const visit = (i) => {
+        const known = out[i];
+        if (known)
+            return known;
+        const p = parent[i] ?? -1;
+        const local = qnorm((trs[i]?.r ?? ID));
+        const q = p < 0 ? local : qnorm(qmul(visit(p), local));
+        out[i] = q;
+        return q;
+    };
+    for (let i = 0; i < trs.length; i += 1)
+        visit(i);
+    return out;
+}
+/** Inverse of a rigid (rotation + translation) column-major matrix. */
+function rigidInverse(q, t) {
+    const rt = qconj(q);
+    const x = qrot(rt, [1, 0, 0]), y = qrot(rt, [0, 1, 0]), z = qrot(rt, [0, 0, 1]);
+    const o = qrot(rt, [-t[0], -t[1], -t[2]]);
+    return [x[0], x[1], x[2], 0, y[0], y[1], y[2], 0, z[0], z[1], z[2], 0, o[0], o[1], o[2], 1];
+}
+export function refitSkeleton(glb, options = {}) {
+    const hierarchy = buildHierarchy(glb);
+    const skins = loadSkins(glb, hierarchy);
+    const skin = skins[0];
+    if (!skin)
+        throw new RefitUnsupported("No skinned mesh to refit.");
+    const skinJson = glb.json.skins?.[skin.index];
+    if (!skinJson)
+        throw new RefitUnsupported("Skin definition missing.");
+    const nodes = hierarchy.nodes;
+    for (const node of nodes) {
+        const s = restTrs(node).s;
+        if (Math.abs((s[0] ?? 1) - 1) > 1e-3 || Math.abs((s[1] ?? 1) - 1) > 1e-3 || Math.abs((s[2] ?? 1) - 1) > 1e-3)
+            throw new RefitUnsupported("Scaled nodes are not supported by --refit-skeleton: apply the scale to the skeleton first.");
+    }
+    const jointNodes = skin.joints;
+    const jointOf = new Map(jointNodes.map((n, k) => [n, k]));
+    const restLocal = nodes.map(restTrs);
+    const restWorld = forward(restLocal, hierarchy);
+    const restRot = worldRotations(restLocal, hierarchy.parent);
+    const P = (n) => restWorld.pos[n];
+    const minSeam = options.minSeamEdges ?? 6;
+    const fps = options.fps ?? 30;
+    // dominant joint per vertex, seams between a joint and its skeleton parent
+    const seamSum = new Map();
+    const seamCount = new Map();
+    let height = 0;
+    {
+        let lo = Infinity, hi = -Infinity;
+        for (const prim of skin.primitives)
+            for (const p of prim.pos) {
+                lo = Math.min(lo, p[1]);
+                hi = Math.max(hi, p[1]);
+            }
+        height = hi > lo ? hi - lo : 1;
+    }
+    for (const prim of skin.primitives) {
+        const dom = prim.pos.map((_, v) => {
+            let best = -1, bw = -1;
+            const w = prim.weights[v] ?? [], j = prim.joints[v] ?? [];
+            for (let k = 0; k < 4; k += 1)
+                if ((w[k] ?? 0) > bw) {
+                    bw = w[k] ?? 0;
+                    best = j[k] ?? 0;
+                }
+            return jointNodes[best] ?? -1;
+        });
+        for (let t = 0; t + 2 < prim.indices.length; t += 3) {
+            for (let e = 0; e < 3; e += 1) {
+                const a = prim.indices[t + e], b = prim.indices[t + ((e + 1) % 3)];
+                const da = dom[a], db = dom[b];
+                if (da === db || da < 0 || db < 0)
+                    continue;
+                const child = hierarchy.parent[db] === da ? db : hierarchy.parent[da] === db ? da : -1;
+                if (child < 0)
+                    continue;
+                const pa = prim.pos[a], pb = prim.pos[b];
+                const mid = [(pa[0] + pb[0]) / 2, (pa[1] + pb[1]) / 2, (pa[2] + pb[2]) / 2];
+                seamSum.set(child, add(seamSum.get(child) ?? [0, 0, 0], mid));
+                seamCount.set(child, (seamCount.get(child) ?? 0) + 1);
+            }
+        }
+    }
+    // new joint positions, parents first
+    const N = new Map();
+    const moved = [];
+    const fallback = [];
+    const order = [...jointNodes].sort((a, b) => depth(a) - depth(b));
+    function depth(n) { let d = 0; let p = hierarchy.parent[n] ?? -1; while (p >= 0) {
+        d += 1;
+        p = hierarchy.parent[p] ?? -1;
+    } return d; }
+    for (const n of order) {
+        const count = seamCount.get(n) ?? 0;
+        const parentNode = hierarchy.parent[n] ?? -1;
+        const parentShift = parentNode >= 0 && N.has(parentNode) ? sub(N.get(parentNode), P(parentNode)) : [0, 0, 0];
+        let at = null;
+        if (count >= minSeam) {
+            const s = seamSum.get(n);
+            const c = [s[0] / count, s[1] / count, s[2] / count];
+            if (len(sub(c, P(n))) <= 0.4 * height)
+                at = c;
+        }
+        if (at)
+            moved.push({ joint: hierarchy.names[n] ?? `node${n}`, offset: Number(len(sub(at, P(n))).toFixed(3)), seamEdges: count });
+        else {
+            at = add(P(n), parentShift);
+            fallback.push(hierarchy.names[n] ?? `node${n}`);
+        }
+        N.set(n, at);
+    }
+    // pelvis pivots between the two hip joints
+    const hipsNode = jointNodes.find((n) => /^(mixamorig:?)?hips$/i.test(hierarchy.names[n] ?? ""));
+    const legUps = jointNodes.filter((n) => /upper(leg)|upleg|thigh/i.test(hierarchy.names[n] ?? ""));
+    if (hipsNode !== undefined && legUps.length === 2) {
+        const a = N.get(legUps[0]), b = N.get(legUps[1]);
+        const mid = [(a[0] + b[0]) / 2, (a[1] + b[1]) / 2, (a[2] + b[2]) / 2];
+        if (len(sub(mid, P(hipsNode))) <= 0.4 * height)
+            N.set(hipsNode, mid);
+    }
+    // a knee never bends forward: keep it a little in front of the hip-ankle line (model forward is +Z)
+    for (const leg of findHumanoidLegs(hierarchy) ?? []) {
+        const hip = N.get(leg.up), kn = N.get(leg.knee), an = N.get(leg.foot);
+        if (!hip || !kn || !an)
+            continue;
+        const line = sub(an, hip);
+        const l2 = line[0] * line[0] + line[1] * line[1] + line[2] * line[2];
+        if (l2 < 1e-9)
+            continue;
+        const t = Math.max(0, Math.min(1, ((kn[0] - hip[0]) * line[0] + (kn[1] - hip[1]) * line[1] + (kn[2] - hip[2]) * line[2]) / l2));
+        const proj = [hip[0] + line[0] * t, hip[1] + line[1] * t, hip[2] + line[2] * t];
+        const minForward = 0.03 * Math.sqrt(l2);
+        if (kn[2] - proj[2] < minForward)
+            N.set(leg.knee, [kn[0], kn[1], proj[2] + minForward]);
+    }
+    // new world rotations: align each bone with the direction to its main child
+    const childrenOf = (n) => (nodes[n]?.children ?? []).filter((c) => jointOf.has(c));
+    const mainChild = (n) => {
+        const kids = childrenOf(n);
+        if (kids.length === 0)
+            return undefined;
+        if (kids.length === 1)
+            return kids[0];
+        const torso = kids.find((c) => /spine|chest|head|neck/i.test(hierarchy.names[c] ?? ""));
+        if (torso !== undefined)
+            return torso;
+        return [...kids].sort((a, b) => len(sub(P(b), P(n))) - len(sub(P(a), P(n))))[0];
+    };
+    const delta = new Map();
+    for (const n of order) {
+        const c = mainChild(n);
+        const parentNode = hierarchy.parent[n] ?? -1;
+        if (c === undefined) {
+            delta.set(n, delta.get(parentNode) ?? ID);
+            continue;
+        }
+        const d0 = sub(P(c), P(n)), d1 = sub(N.get(c), N.get(n));
+        delta.set(n, len(d0) > 1e-6 && len(d1) > 1e-6 ? qalign([d0[0] / len(d0), d0[1] / len(d0), d0[2] / len(d0)], [d1[0] / len(d1), d1[1] / len(d1), d1[2] / len(d1)]) : ID);
+    }
+    const newRot = new Map();
+    for (const n of order)
+        newRot.set(n, qnorm(qmul(delta.get(n), restRot[n])));
+    // rewrite node TRS (parents first)
+    const editor = new GlbEditor(glb);
+    const worldPosNew = new Map();
+    const worldRotNew = new Map();
+    const nodePosNew = (n) => (N.get(n) ?? worldPosNew.get(n) ?? P(n));
+    const nodeRotNew = (n) => (newRot.get(n) ?? worldRotNew.get(n) ?? restRot[n]);
+    for (const n of order) {
+        const parentNode = hierarchy.parent[n] ?? -1;
+        const pRot = parentNode >= 0 ? nodeRotNew(parentNode) : ID;
+        const pPos = parentNode >= 0 ? nodePosNew(parentNode) : [0, 0, 0];
+        const local = editor.json.nodes[n];
+        delete local.matrix;
+        local.rotation = qnorm(qmul(qconj(pRot), newRot.get(n)));
+        local.translation = qrot(qconj(pRot), sub(N.get(n), pPos));
+        if (!local.scale)
+            local.scale = [1, 1, 1];
+    }
+    // inverse bind matrices: the rest joint matrix must stay what it was
+    const ibmOld = skin.ibm;
+    const ibm = [];
+    jointNodes.forEach((n, k) => {
+        const oldWorld = restWorld.world[n];
+        const inv = rigidInverse(newRot.get(n), N.get(n));
+        const m = mat4Mul(inv, mat4Mul(oldWorld, ibmOld[k]));
+        ibm.push(...m);
+    });
+    const ibmAccessor = editor.addAccessor(ibm, 5126, "MAT4", undefined);
+    (editor.json.skins?.[skin.index]).inverseBindMatrices = ibmAccessor;
+    void skinJson;
+    // re-target every clip by world-space delta, baked at a fixed rate
+    const animations = glb.json.animations ?? [];
+    const outAnims = [];
+    for (const anim of animations) {
+        const dur = Math.max(clipDuration(glb, anim), 1 / fps);
+        const frames = Math.max(2, Math.round(dur * fps) + 1);
+        const times = [];
+        for (let f = 0; f < frames; f += 1)
+            times.push(Math.min(dur, f / fps));
+        const translated = new Set();
+        for (const ch of anim.channels)
+            if (ch.target.path === "translation" && ch.target.node !== undefined && jointOf.has(ch.target.node))
+                translated.add(ch.target.node);
+        const rot = new Map(), pos = new Map();
+        for (const n of jointNodes) {
+            rot.set(n, []);
+            if (translated.has(n))
+                pos.set(n, []);
+        }
+        for (const t of times) {
+            const trs = localPose(glb, anim, t, hierarchy);
+            const world = forward(trs, hierarchy);
+            const oldRot = worldRotations(trs, hierarchy.parent);
+            const newW = new Map();
+            const newP = new Map();
+            for (const n of order) {
+                const d = qmul(oldRot[n], qconj(restRot[n]));
+                const wq = qnorm(qmul(d, newRot.get(n)));
+                newW.set(n, wq);
+                const parentNode = hierarchy.parent[n] ?? -1;
+                const parentW = parentNode >= 0 ? (newW.get(parentNode) ?? oldRot[parentNode]) : ID;
+                const lq = qnorm(qmul(qconj(parentW), wq));
+                rot.get(n).push(lq[0], lq[1], lq[2], lq[3]);
+                const delta = sub(world.pos[n], P(n));
+                const wp = add(N.get(n), delta);
+                newP.set(n, wp);
+                if (translated.has(n)) {
+                    const parentPos = parentNode >= 0 ? (newP.get(parentNode) ?? world.pos[parentNode]) : [0, 0, 0];
+                    const lt = qrot(qconj(parentW), sub(wp, parentPos));
+                    pos.get(n).push(lt[0], lt[1], lt[2]);
+                }
+            }
+        }
+        const samplers = [];
+        const channels = [];
+        // keep channels that do not drive a joint
+        for (const ch of anim.channels) {
+            if (ch.target.node !== undefined && jointOf.has(ch.target.node) && (ch.target.path === "rotation" || ch.target.path === "translation"))
+                continue;
+            const old = anim.samplers[ch.sampler];
+            if (!old)
+                continue;
+            samplers.push({ input: old.input, output: old.output, ...(old.interpolation ? { interpolation: old.interpolation } : {}) });
+            channels.push({ sampler: samplers.length - 1, target: { ...ch.target } });
+        }
+        const timeAccessor = editor.addAccessor(times, 5126, "SCALAR", undefined);
+        const acc = editor.json.accessors[timeAccessor];
+        acc.min = [times[0]];
+        acc.max = [times[times.length - 1]];
+        for (const n of jointNodes) {
+            const r = editor.addAccessor(rot.get(n), 5126, "VEC4", undefined);
+            samplers.push({ input: timeAccessor, output: r, interpolation: "LINEAR" });
+            channels.push({ sampler: samplers.length - 1, target: { node: n, path: "rotation" } });
+            if (translated.has(n)) {
+                const p = editor.addAccessor(pos.get(n), 5126, "VEC3", undefined);
+                samplers.push({ input: timeAccessor, output: p, interpolation: "LINEAR" });
+                channels.push({ sampler: samplers.length - 1, target: { node: n, path: "translation" } });
+            }
+        }
+        outAnims.push({ ...(anim.name ? { name: anim.name } : {}), samplers, channels });
+    }
+    editor.json.animations = outAnims;
+    void readAccessor;
+    return { glb: editor.finish(), report: { moved, fallback, clips: outAnims.length } };
+}
+//# sourceMappingURL=refitSkeleton.js.map

package/dist/aura3d-cli/skin/refitSkeleton.js.map

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

package/dist/aura3d-cli/skin/repair.d.ts

@@ -0,0 +1,45 @@
+/**
+ * `assets repair-skin`: the generic, safe repairs for a skinned GLB. Every step is opt-in so a re-run changes only what you asked for:
+ * `normalize` (renormalise weights, drop non-finite and out-of-range influences, keep the strongest K), `pruneDistant` (drop influences
+ * from bones far from the vertex), `smoothBridges` (soften the weights around stretched bridging triangles so the patch deforms as one
+ * surface) and `cutStretch` (remove triangles that still stretch past a limit; leaves holes, so it is the last resort).
+ */
+import { type SkinReport } from "./analysis.js";
+import { type GlbData, type SkinInfo } from "./gltf.js";
+export interface RepairSkinOptions {
+    readonly normalize?: boolean;
+    /** Strongest influences kept per vertex (1 to 4; default 4). */
+    readonly maxInfluences?: number;
+    readonly pruneDistant?: boolean;
+    readonly smoothBridges?: boolean;
+    /** Triangles stretched past this multiple are the smoothing region (default 1.5). */
+    readonly smoothThreshold?: number;
+    /** Smoothing rounds: each re-measures the stretch with the new weights and smooths what is still stretched (default 1). */
+    readonly smoothRounds?: number;
+    /** How many rings of neighbouring vertices around a stretched triangle are smoothed (default 4). */
+    readonly smoothRings?: number;
+    /** Remove triangles stretched past this limit after the other steps (off by default). */
+    readonly cutStretch?: number;
+    readonly clips?: readonly string[];
+    readonly samples?: number;
+    readonly ignoreMaterials?: RegExp;
+}
+export interface RepairSkinReport {
+    readonly steps: readonly string[];
+    readonly primitives: readonly {
+        readonly material: string;
+        readonly normalizedVertices: number;
+        readonly prunedInfluences: number;
+        readonly smoothedVertices: number;
+        readonly removedTriangles: number;
+    }[];
+    readonly before: SkinReport;
+    readonly after: SkinReport;
+    readonly guidance: readonly string[];
+}
+export declare function repairSkin(glb: GlbData, options?: RepairSkinOptions): {
+    glb: GlbData;
+    report: RepairSkinReport;
+};
+export type { SkinInfo };
+//# sourceMappingURL=repair.d.ts.map

package/dist/aura3d-cli/skin/repair.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"repair.d.ts","sourceRoot":"","sources":["../../../../../packages/aura3d-cli/src/skin/repair.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAgG,KAAK,UAAU,EAAE,MAAM,eAAe,CAAC;AAE9I,OAAO,EAAwD,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAoC,MAAM,WAAW,CAAC;AAEhJ,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IAC7B,gEAAgE;IAChE,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;IACjC,qFAAqF;IACrF,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAClC,2HAA2H;IAC3H,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAC/B,oGAAoG;IACpG,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,yFAAyF;IACzF,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACnC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;CACnC;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,QAAQ,CAAC,UAAU,EAAE,SAAS;QAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC5M,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAC5B,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;CACtC;AAwBD,wBAAgB,UAAU,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,GAAE,iBAAsB,GAAG;IAAE,GAAG,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,gBAAgB,CAAA;CAAE,CAiHpH;AAaD,YAAY,EAAE,QAAQ,EAAE,CAAC"}

package/dist/aura3d-cli/skin/repair.js

@@ -0,0 +1,192 @@
+/**
+ * `assets repair-skin`: the generic, safe repairs for a skinned GLB. Every step is opt-in so a re-run changes only what you asked for:
+ * `normalize` (renormalise weights, drop non-finite and out-of-range influences, keep the strongest K), `pruneDistant` (drop influences
+ * from bones far from the vertex), `smoothBridges` (soften the weights around stretched bridging triangles so the patch deforms as one
+ * surface) and `cutStretch` (remove triangles that still stretch past a limit; leaves holes, so it is the last resort).
+ */
+import { analyzeSkin, DEFAULT_SKIN_THRESHOLDS, samplePoses, triangleStretch } from "./analysis.js";
+import { GlbEditor } from "./glbEdit.js";
+import { buildHierarchy, jointBindPositions, loadSkins, vdist } from "./gltf.js";
+function dense(prim, v, jointCount) {
+    const m = new Map();
+    const w = prim.weights[v] ?? [], j = prim.joints[v] ?? [];
+    for (let k = 0; k < 4; k += 1) {
+        const wk = w[k] ?? 0, jk = j[k] ?? 0;
+        if (!(wk > 0) || !Number.isFinite(wk) || jk >= jointCount)
+            continue;
+        m.set(jk, (m.get(jk) ?? 0) + wk);
+    }
+    return m;
+}
+function adjacency(prim) {
+    const adj = Array.from({ length: prim.pos.length }, () => new Set());
+    for (let i = 0; i + 2 < prim.indices.length; i += 3) {
+        const a = prim.indices[i], b = prim.indices[i + 1], c = prim.indices[i + 2];
+        adj[a]?.add(b).add(c);
+        adj[b]?.add(a).add(c);
+        adj[c]?.add(a).add(b);
+    }
+    return adj;
+}
+export function repairSkin(glb, options = {}) {
+    const hierarchy = buildHierarchy(glb);
+    const skins = loadSkins(glb, hierarchy);
+    const editor = new GlbEditor(glb);
+    const steps = [];
+    const guidance = [];
+    const reports = [];
+    const analysisOptions = { clips: options.clips, samples: options.samples, ignoreMaterials: options.ignoreMaterials };
+    const before = analyzeSkin(glb, analysisOptions);
+    const K = Math.max(1, Math.min(4, Math.floor(options.maxInfluences ?? 4)));
+    if (options.normalize)
+        steps.push(`normalize (keep the strongest ${K} influences)`);
+    if (options.pruneDistant)
+        steps.push("prune-distant");
+    if (options.smoothBridges)
+        steps.push("smooth-bridges");
+    if (options.cutStretch !== undefined)
+        steps.push(`cut-stretch ${options.cutStretch}`);
+    const animations = glb.json.animations ?? [];
+    const clips = options.clips ? animations.filter((a) => options.clips?.includes(a.name ?? "")) : animations;
+    const needPoses = options.smoothBridges || options.cutStretch !== undefined;
+    const poses = needPoses ? samplePoses(glb, hierarchy, clips, Math.max(2, options.samples ?? 10)).poses : [];
+    for (const skin of skins) {
+        const bind = jointBindPositions(skin);
+        for (const prim of skin.primitives) {
+            if (options.ignoreMaterials?.test(prim.materialName))
+                continue;
+            const nV = prim.pos.length;
+            let weights = Array.from({ length: nV }, (_, v) => dense(prim, v, skin.joints.length));
+            let normalizedVertices = 0, prunedInfluences = 0, smoothedVertices = 0, removedTriangles = 0;
+            const height = (() => { let lo = Infinity, hi = -Infinity; for (const p of prim.pos) {
+                lo = Math.min(lo, p[1]);
+                hi = Math.max(hi, p[1]);
+            } return hi > lo ? hi - lo : 1; })();
+            if (options.pruneDistant) {
+                const limit = DEFAULT_SKIN_THRESHOLDS.distantFraction * height;
+                weights = weights.map((m, v) => {
+                    const next = new Map();
+                    for (const [j, w] of m) {
+                        const at = bind[j];
+                        if (at && w >= DEFAULT_SKIN_THRESHOLDS.distantMinWeight && vdist(prim.pos[v], at) > limit) {
+                            prunedInfluences += 1;
+                            continue;
+                        }
+                        next.set(j, w);
+                    }
+                    return next.size > 0 ? next : m;
+                });
+            }
+            let stretch = null;
+            if (needPoses)
+                stretch = triangleStretch(skin, prim, poses, Infinity, 0).worst;
+            if (options.smoothBridges && stretch) {
+                const adj = adjacency(prim);
+                const threshold = options.smoothThreshold ?? 1.5;
+                const rounds = Math.max(1, Math.floor(options.smoothRounds ?? 1));
+                for (let round = 0; round < rounds; round += 1) {
+                    if (round > 0) {
+                        stretch = triangleStretch(skin, withWeights(prim, weights, K), poses, Infinity, 0).worst;
+                        let over = 0;
+                        for (let t = 0; t < stretch.length; t += 1)
+                            if (stretch[t] > DEFAULT_SKIN_THRESHOLDS.stretchLimit)
+                                over += 1;
+                        if (over <= Math.max(DEFAULT_SKIN_THRESHOLDS.stretchAllowTriangles, Math.floor(stretch.length * 0.001)))
+                            break;
+                    }
+                    let region = new Set();
+                    for (let t = 0; t < stretch.length; t += 1)
+                        if (stretch[t] > threshold)
+                            for (let k = 0; k < 3; k += 1)
+                                region.add(prim.indices[t * 3 + k]);
+                    for (let r = 0; r < Math.max(1, Math.floor(options.smoothRings ?? 4)); r += 1) {
+                        const next = new Set(region);
+                        for (const v of region)
+                            for (const n of adj[v] ?? [])
+                                next.add(n);
+                        region = next;
+                    }
+                    for (let it = 0; it < 30; it += 1) {
+                        const next = weights.map((m) => new Map(m));
+                        for (const v of region) {
+                            const nb = [...(adj[v] ?? [])];
+                            if (nb.length === 0)
+                                continue;
+                            const avg = new Map();
+                            for (const n of nb)
+                                for (const [j, w] of weights[n])
+                                    avg.set(j, (avg.get(j) ?? 0) + w / nb.length);
+                            const m = new Map();
+                            for (const [j, w] of weights[v])
+                                m.set(j, 0.2 * w);
+                            for (const [j, w] of avg)
+                                m.set(j, (m.get(j) ?? 0) + 0.8 * w);
+                            next[v] = m;
+                        }
+                        weights = next;
+                    }
+                    smoothedVertices = Math.max(smoothedVertices, region.size);
+                }
+            }
+            const changedWeights = Boolean(options.normalize || options.pruneDistant || options.smoothBridges);
+            let indices = prim.indices;
+            if (options.cutStretch !== undefined && stretch) {
+                // re-measure after the weight edits so the cut only removes what is still stretched
+                const keep = [];
+                const edited = changedWeights ? withWeights(prim, weights, K) : prim;
+                const again = triangleStretch(skin, edited, poses, Infinity, 0).worst;
+                for (let t = 0; t < again.length; t += 1) {
+                    if (again[t] <= options.cutStretch)
+                        keep.push(prim.indices[t * 3], prim.indices[t * 3 + 1], prim.indices[t * 3 + 2]);
+                    else
+                        removedTriangles += 1;
+                }
+                indices = keep;
+            }
+            if (changedWeights) {
+                const J = [], W = [];
+                for (let v = 0; v < nV; v += 1) {
+                    const top = [...weights[v].entries()].sort((a, b) => b[1] - a[1]).slice(0, K);
+                    const sum = top.reduce((a, [, w]) => a + w, 0) || 1;
+                    if (top.length === 0)
+                        normalizedVertices += 1;
+                    if (Math.abs(((prim.weights[v] ?? []).reduce((a, b) => a + b, 0)) - 1) > DEFAULT_SKIN_THRESHOLDS.weightSumTolerance)
+                        normalizedVertices += 1;
+                    for (let k = 0; k < 4; k += 1) {
+                        J.push(top[k]?.[0] ?? 0);
+                        W.push(top[k] ? top[k][1] / sum : 0);
+                    }
+                }
+                const primitive = editor.primitive(prim.meshIndex, prim.primitiveIndex);
+                primitive.attributes.JOINTS_0 = editor.addAccessor(J, 5123, "VEC4", 34962);
+                primitive.attributes.WEIGHTS_0 = editor.addAccessor(W, 5126, "VEC4", 34962);
+            }
+            if (removedTriangles > 0) {
+                const primitive = editor.primitive(prim.meshIndex, prim.primitiveIndex);
+                primitive.indices = editor.addAccessor(indices, nV > 65535 ? 5125 : 5123, "SCALAR", 34963);
+            }
+            reports.push({ material: prim.materialName, normalizedVertices, prunedInfluences, smoothedVertices, removedTriangles });
+        }
+    }
+    const repaired = editor.finish();
+    const after = analyzeSkin(repaired, analysisOptions);
+    if (before.bindMismatch.length > 0) {
+        guidance.push(`Bind-pose mismatch on ${before.bindMismatch.map((b) => b.bone).join(", ")}: the mesh was modelled in a different pose than the skeleton assumes. Weight smoothing and triangle cuts only mask it. For a recognised humanoid run repair-skin --rebuild-limbs (rebuilds the legs in the skeleton's pose); otherwise rebuild the limbs in your DCC tool or regenerate and re-rig the model in the pose the skeleton assumes.`);
+    }
+    if (!after.ok && steps.length > 0)
+        guidance.push(`Still failing after ${steps.join(", ")}: ${after.reasonCodes.join(", ")}. Cutting stretched triangles opens holes; prefer --rebuild-limbs or re-rigging.`);
+    if (steps.length === 0)
+        guidance.push("No repair step selected. Pass --normalize, --prune-distant, --smooth-bridges, --cut-stretch <limit> or --rebuild-limbs.");
+    return { glb: repaired, report: { steps, primitives: reports, before, after, guidance } };
+}
+function withWeights(prim, weights, K) {
+    const joints = [], w = [];
+    for (let v = 0; v < prim.pos.length; v += 1) {
+        const top = [...weights[v].entries()].sort((a, b) => b[1] - a[1]).slice(0, K);
+        const sum = top.reduce((a, [, x]) => a + x, 0) || 1;
+        joints.push([0, 1, 2, 3].map((k) => top[k]?.[0] ?? 0));
+        w.push([0, 1, 2, 3].map((k) => (top[k] ? top[k][1] / sum : 0)));
+    }
+    return { ...prim, joints, weights: w };
+}
+//# sourceMappingURL=repair.js.map

package/dist/aura3d-cli/skin/repair.js.map

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

package/dist/create-aura3d/index.js

@@ -75,7 +75,7 @@ export function createA3DProject(options) {
     const dependencies = { ...(packageJson.dependencies ?? {}) };
     const auraDependencies = Object.keys(dependencies).filter((name) => name.startsWith("@aura3d/"));
     if (auraDependencies.length === 0) {
-        dependencies["@aura3d/engine"] = options.packageVersion ?? "4.2.0";
+        dependencies["@aura3d/engine"] = options.packageVersion ?? "4.3.1";
     }
     else if (options.packageVersion) {
         for (const dependency of auraDependencies)

package/dist/engine/agent-api/camera/layers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"layers.d.ts","sourceRoot":"","sources":["../../../../../../packages/engine/src/agent-api/camera/layers.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,KAAK,EACV,eAAe,EAEf,gBAAgB,EAChB,cAAc,EACd,eAAe,EAChB,MAAM,2BAA2B,CAAC;AA8CnC,MAAM,WAAW,eAAgB,SAAQ,eAAe;IACtD,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5C,KAAK,IAAI,IAAI,CAAC;CACf;AAED,4EAA4E;AAC5E,wBAAgB,iBAAiB,CAAC,cAAc,SAAM,GAAG,eAAe,CAqBvE;AAED,6EAA6E;AAC7E,wBAAgB,gBAAgB,IAAI,cAAc,CAyCjD;AAED,sFAAsF;AACtF,wBAAgB,kBAAkB,CAAC,eAAe,SAAO,GAAG,gBAAgB,CAyB3E;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,IAAI,eAAe,CAoFnD"}
+{"version":3,"file":"layers.d.ts","sourceRoot":"","sources":["../../../../../../packages/engine/src/agent-api/camera/layers.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,KAAK,EACV,eAAe,EAEf,gBAAgB,EAChB,cAAc,EACd,eAAe,EAChB,MAAM,2BAA2B,CAAC;AA8CnC,MAAM,WAAW,eAAgB,SAAQ,eAAe;IACtD,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5C,KAAK,IAAI,IAAI,CAAC;CACf;AAED,4EAA4E;AAC5E,wBAAgB,iBAAiB,CAAC,cAAc,SAAM,GAAG,eAAe,CAqBvE;AAED,6EAA6E;AAC7E,wBAAgB,gBAAgB,IAAI,cAAc,CAyCjD;AAED,sFAAsF;AACtF,wBAAgB,kBAAkB,CAAC,eAAe,SAAO,GAAG,gBAAgB,CAyB3E;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,IAAI,eAAe,CAwFnD"}

package/dist/engine/agent-api/camera/layers.js

@@ -147,6 +147,7 @@ export function createTraumaLayer() {
     let maxRollDeg = 2.5;
     let frequency = 18;
     let decayPerSecond = 1.6;
+    let maxTrauma = 1;
     let noises = [
         createNoise1D(1001),
         createNoise1D(2002),
@@ -159,7 +160,7 @@ export function createTraumaLayer() {
     return {
         id: "trauma",
         add(amount) {
-            trauma = Math.min(1, Math.max(0, trauma + amount));
+            trauma = Math.min(maxTrauma, Math.max(0, trauma + amount));
         },
         configure(o) {
             if (o.maxOffset !== undefined)
@@ -179,6 +180,10 @@ export function createTraumaLayer() {
                 frequency = o.frequency;
             if (o.decayPerSecond !== undefined)
                 decayPerSecond = o.decayPerSecond;
+            if (o.maxTrauma !== undefined) {
+                maxTrauma = Math.min(1, Math.max(0, o.maxTrauma));
+                trauma = Math.min(trauma, maxTrauma);
+            }
             if (o.seed !== undefined) {
                 const s = o.seed;
                 noises = [0, 1, 2, 3, 4, 5].map((i) => createNoise1D(s + i * 1009));