@aura3d/engine 4.1.3 → 4.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +3 -3
- package/dist/aura3d-cli/cli-help.d.ts.map +1 -1
- package/dist/aura3d-cli/cli-help.js +4 -2
- package/dist/aura3d-cli/cli-help.js.map +1 -1
- package/dist/aura3d-cli/cli.d.ts.map +1 -1
- package/dist/aura3d-cli/cli.js +129 -19
- package/dist/aura3d-cli/cli.js.map +1 -1
- package/dist/aura3d-cli/commands/assets/index.js +2 -2
- package/dist/aura3d-cli/commands/assets/index.js.map +1 -1
- package/dist/aura3d-cli/commands/meshyLedger.d.ts +125 -14
- package/dist/aura3d-cli/commands/meshyLedger.d.ts.map +1 -1
- package/dist/aura3d-cli/commands/meshyLedger.js +262 -35
- package/dist/aura3d-cli/commands/meshyLedger.js.map +1 -1
- package/dist/aura3d-cli/commands/prd13/run.js +19 -16
- package/dist/aura3d-cli/commands/prd13/run.js.map +1 -1
- package/dist/aura3d-cli/index.d.ts +8 -0
- package/dist/aura3d-cli/index.d.ts.map +1 -1
- package/dist/aura3d-cli/index.js +12 -0
- package/dist/aura3d-cli/index.js.map +1 -1
- package/dist/aura3d-cli/pull-bridge/adapters.d.ts +9 -1
- package/dist/aura3d-cli/pull-bridge/adapters.d.ts.map +1 -1
- package/dist/aura3d-cli/pull-bridge/adapters.js +30 -7
- package/dist/aura3d-cli/pull-bridge/adapters.js.map +1 -1
- package/dist/aura3d-cli/pull-bridge/search.d.ts +5 -0
- package/dist/aura3d-cli/pull-bridge/search.d.ts.map +1 -1
- package/dist/aura3d-cli/pull-bridge/search.js +7 -1
- package/dist/aura3d-cli/pull-bridge/search.js.map +1 -1
- package/dist/aura3d-cli/pull-bridge.js +1 -1
- package/dist/aura3d-cli/pull-bridge.js.map +1 -1
- package/dist/aura3d-cli/resolve-ladder.d.ts +123 -0
- package/dist/aura3d-cli/resolve-ladder.d.ts.map +1 -0
- package/dist/aura3d-cli/resolve-ladder.js +410 -0
- package/dist/aura3d-cli/resolve-ladder.js.map +1 -0
- package/dist/aura3d-cli/skin/analysis.d.ts +137 -0
- package/dist/aura3d-cli/skin/analysis.d.ts.map +1 -0
- package/dist/aura3d-cli/skin/analysis.js +382 -0
- package/dist/aura3d-cli/skin/analysis.js.map +1 -0
- package/dist/aura3d-cli/skin/command.d.ts +71 -0
- package/dist/aura3d-cli/skin/command.d.ts.map +1 -0
- package/dist/aura3d-cli/skin/command.js +186 -0
- package/dist/aura3d-cli/skin/command.js.map +1 -0
- package/dist/aura3d-cli/skin/glbEdit.d.ts +14 -0
- package/dist/aura3d-cli/skin/glbEdit.d.ts.map +1 -0
- package/dist/aura3d-cli/skin/glbEdit.js +152 -0
- package/dist/aura3d-cli/skin/glbEdit.js.map +1 -0
- package/dist/aura3d-cli/skin/gltf.d.ts +159 -0
- package/dist/aura3d-cli/skin/gltf.d.ts.map +1 -0
- package/dist/aura3d-cli/skin/gltf.js +379 -0
- package/dist/aura3d-cli/skin/gltf.js.map +1 -0
- package/dist/aura3d-cli/skin/rebuildLimbs.d.ts +31 -0
- package/dist/aura3d-cli/skin/rebuildLimbs.d.ts.map +1 -0
- package/dist/aura3d-cli/skin/rebuildLimbs.js +326 -0
- package/dist/aura3d-cli/skin/rebuildLimbs.js.map +1 -0
- package/dist/aura3d-cli/skin/repair.d.ts +41 -0
- package/dist/aura3d-cli/skin/repair.d.ts.map +1 -0
- package/dist/aura3d-cli/skin/repair.js +180 -0
- package/dist/aura3d-cli/skin/repair.js.map +1 -0
- package/dist/create-aura3d/index.js +1 -1
- package/dist/debug/index.d.ts +2 -2
- package/dist/debug/index.d.ts.map +1 -1
- package/dist/debug/index.js +1 -1
- package/dist/debug/index.js.map +1 -1
- package/dist/debug/safety/frameBoundary.d.ts +33 -0
- package/dist/debug/safety/frameBoundary.d.ts.map +1 -0
- package/dist/debug/safety/frameBoundary.js +40 -0
- package/dist/debug/safety/frameBoundary.js.map +1 -0
- package/dist/debug/safety/index.d.ts +1 -0
- package/dist/debug/safety/index.d.ts.map +1 -1
- package/dist/debug/safety/index.js +1 -0
- package/dist/debug/safety/index.js.map +1 -1
- package/dist/engine/agent-api/app/actorBoneMatrixLookup.d.ts +22 -0
- package/dist/engine/agent-api/app/actorBoneMatrixLookup.d.ts.map +1 -0
- package/dist/engine/agent-api/app/actorBoneMatrixLookup.js +24 -0
- package/dist/engine/agent-api/app/actorBoneMatrixLookup.js.map +1 -0
- package/dist/engine/agent-api/app/canvas.d.ts +16 -0
- package/dist/engine/agent-api/app/canvas.d.ts.map +1 -1
- package/dist/engine/agent-api/app/canvas.js +15 -0
- package/dist/engine/agent-api/app/canvas.js.map +1 -1
- package/dist/engine/agent-api/app/createAuraApp.d.ts.map +1 -1
- package/dist/engine/agent-api/app/createAuraApp.js +21 -3
- package/dist/engine/agent-api/app/createAuraApp.js.map +1 -1
- package/dist/engine/agent-api/app/frameLoop.d.ts.map +1 -1
- package/dist/engine/agent-api/app/frameLoop.js +21 -3
- package/dist/engine/agent-api/app/frameLoop.js.map +1 -1
- package/dist/engine/agent-api/app/mountFailure.d.ts +6 -0
- package/dist/engine/agent-api/app/mountFailure.d.ts.map +1 -0
- package/dist/engine/agent-api/app/mountFailure.js +9 -0
- package/dist/engine/agent-api/app/mountFailure.js.map +1 -0
- package/dist/engine/agent-api/app/parentFit.d.ts +35 -0
- package/dist/engine/agent-api/app/parentFit.d.ts.map +1 -0
- package/dist/engine/agent-api/app/parentFit.js +36 -0
- package/dist/engine/agent-api/app/parentFit.js.map +1 -0
- package/dist/engine/agent-api/compiler/customMaterial.d.ts.map +1 -1
- package/dist/engine/agent-api/compiler/customMaterial.js +15 -3
- package/dist/engine/agent-api/compiler/customMaterial.js.map +1 -1
- package/dist/engine/agent-api/nodes/batched.d.ts +10 -0
- package/dist/engine/agent-api/nodes/batched.d.ts.map +1 -1
- package/dist/engine/agent-api/nodes/batched.js +7 -5
- package/dist/engine/agent-api/nodes/batched.js.map +1 -1
- package/dist/engine/agent-api/nodes/builder.d.ts +13 -0
- package/dist/engine/agent-api/nodes/builder.d.ts.map +1 -1
- package/dist/engine/agent-api/nodes/builder.js +7 -3
- package/dist/engine/agent-api/nodes/builder.js.map +1 -1
- package/dist/engine/agent-api/nodes/instancedMesh.d.ts +10 -0
- package/dist/engine/agent-api/nodes/instancedMesh.d.ts.map +1 -1
- package/dist/engine/agent-api/nodes/instancedMesh.js +7 -5
- package/dist/engine/agent-api/nodes/instancedMesh.js.map +1 -1
- package/dist/engine/agent-api/nodes/types.d.ts +6 -0
- package/dist/engine/agent-api/nodes/types.d.ts.map +1 -1
- package/dist/engine/lanes/prd06.d.ts.map +1 -1
- package/dist/engine/lanes/prd06.js +1 -16
- package/dist/engine/lanes/prd06.js.map +1 -1
- package/dist/engine/qa/fixedStepLoop.d.ts +2 -0
- package/dist/engine/qa/fixedStepLoop.d.ts.map +1 -1
- package/dist/engine/qa/fixedStepLoop.js +3 -0
- package/dist/engine/qa/fixedStepLoop.js.map +1 -1
- package/dist/game/evidence/textureStatus.d.ts +24 -0
- package/dist/game/evidence/textureStatus.d.ts.map +1 -0
- package/dist/game/evidence/textureStatus.js +27 -0
- package/dist/game/evidence/textureStatus.js.map +1 -0
- package/dist/game/index.d.ts +5 -0
- package/dist/game/index.d.ts.map +1 -1
- package/dist/game/index.js +3 -0
- package/dist/game/index.js.map +1 -1
- package/dist/game/motion/boneAttach.d.ts +42 -0
- package/dist/game/motion/boneAttach.d.ts.map +1 -0
- package/dist/game/motion/boneAttach.js +166 -0
- package/dist/game/motion/boneAttach.js.map +1 -0
- package/dist/game/motion/cameraClear.d.ts +35 -0
- package/dist/game/motion/cameraClear.d.ts.map +1 -0
- package/dist/game/motion/cameraClear.js +64 -0
- package/dist/game/motion/cameraClear.js.map +1 -0
- package/dist/game/motion/doubleFrame.d.ts +37 -0
- package/dist/game/motion/doubleFrame.d.ts.map +1 -0
- package/dist/game/motion/doubleFrame.js +59 -0
- package/dist/game/motion/doubleFrame.js.map +1 -0
- package/dist/game/motion/footSlide.d.ts +32 -0
- package/dist/game/motion/footSlide.d.ts.map +1 -0
- package/dist/game/motion/footSlide.js +59 -0
- package/dist/game/motion/footSlide.js.map +1 -0
- package/dist/game/motion/handBounce.d.ts +206 -0
- package/dist/game/motion/handBounce.d.ts.map +1 -0
- package/dist/game/motion/handBounce.js +267 -0
- package/dist/game/motion/handBounce.js.map +1 -0
- package/dist/game/motion/impact.d.ts +113 -0
- package/dist/game/motion/impact.d.ts.map +1 -0
- package/dist/game/motion/impact.js +233 -0
- package/dist/game/motion/impact.js.map +1 -0
- package/dist/game/motion/index.d.ts +21 -0
- package/dist/game/motion/index.d.ts.map +1 -0
- package/dist/game/motion/index.js +11 -0
- package/dist/game/motion/index.js.map +1 -0
- package/dist/game/motion/locomotion.d.ts +55 -0
- package/dist/game/motion/locomotion.d.ts.map +1 -0
- package/dist/game/motion/locomotion.js +107 -0
- package/dist/game/motion/locomotion.js.map +1 -0
- package/dist/game/motion/motionGate.d.ts +41 -0
- package/dist/game/motion/motionGate.d.ts.map +1 -0
- package/dist/game/motion/motionGate.js +71 -0
- package/dist/game/motion/motionGate.js.map +1 -0
- package/dist/game/motion/presenter.d.ts +37 -0
- package/dist/game/motion/presenter.d.ts.map +1 -0
- package/dist/game/motion/presenter.js +72 -0
- package/dist/game/motion/presenter.js.map +1 -0
- package/dist/game/motion/smoothing.d.ts +34 -0
- package/dist/game/motion/smoothing.d.ts.map +1 -0
- package/dist/game/motion/smoothing.js +92 -0
- package/dist/game/motion/smoothing.js.map +1 -0
- package/dist/game/session/warmPrograms.d.ts +75 -0
- package/dist/game/session/warmPrograms.d.ts.map +1 -0
- package/dist/game/session/warmPrograms.js +80 -0
- package/dist/game/session/warmPrograms.js.map +1 -0
- package/dist/physics/ensure.d.ts +2 -0
- package/dist/physics/ensure.d.ts.map +1 -0
- package/dist/physics/ensure.js +4 -0
- package/dist/physics/ensure.js.map +1 -0
- package/dist/physics/index.d.ts +1 -0
- package/dist/physics/index.d.ts.map +1 -1
- package/dist/physics/index.js +1 -0
- package/dist/physics/index.js.map +1 -1
- package/dist/physics/world.d.ts +1 -0
- package/dist/physics/world.d.ts.map +1 -1
- package/dist/physics/world.js +1 -0
- package/dist/physics/world.js.map +1 -1
- package/dist/physics-rapier/index.d.ts +2 -0
- package/dist/physics-rapier/index.d.ts.map +1 -1
- package/dist/physics-rapier/index.js +12 -10
- package/dist/physics-rapier/index.js.map +1 -1
- package/dist/physics-rapier/rapierInit.d.ts +6 -0
- package/dist/physics-rapier/rapierInit.d.ts.map +1 -0
- package/dist/physics-rapier/rapierInit.js +12 -0
- package/dist/physics-rapier/rapierInit.js.map +1 -0
- package/dist/physics-rapier/rapierInit.lazy.d.ts +6 -0
- package/dist/physics-rapier/rapierInit.lazy.d.ts.map +1 -0
- package/dist/physics-rapier/rapierInit.lazy.js +19 -0
- package/dist/physics-rapier/rapierInit.lazy.js.map +1 -0
- package/dist/rendering/DepthPass.d.ts.map +1 -1
- package/dist/rendering/DepthPass.js +30 -8
- package/dist/rendering/DepthPass.js.map +1 -1
- package/dist/rendering/ForwardPass.d.ts.map +1 -1
- package/dist/rendering/ForwardPass.js +7 -0
- package/dist/rendering/ForwardPass.js.map +1 -1
- package/dist/rendering/Renderer.d.ts +0 -2
- package/dist/rendering/Renderer.d.ts.map +1 -1
- package/dist/rendering/Renderer.js +6 -16
- package/dist/rendering/Renderer.js.map +1 -1
- package/dist/rendering/contracts/output.d.ts +9 -1
- package/dist/rendering/contracts/output.d.ts.map +1 -1
- package/dist/rendering/contracts/output.js.map +1 -1
- package/dist/rendering/environment/EnvironmentCache.d.ts.map +1 -1
- package/dist/rendering/environment/EnvironmentCache.js +6 -1
- package/dist/rendering/environment/EnvironmentCache.js.map +1 -1
- package/dist/rendering/environment/neutralEmbedded.d.ts +5 -0
- package/dist/rendering/environment/neutralEmbedded.d.ts.map +1 -0
- package/dist/rendering/environment/neutralEmbedded.js +1118 -0
- package/dist/rendering/environment/neutralEmbedded.js.map +1 -0
- package/dist/rendering/environment/neutralEmbeddedLoader.d.ts +5 -0
- package/dist/rendering/environment/neutralEmbeddedLoader.d.ts.map +1 -0
- package/dist/rendering/environment/neutralEmbeddedLoader.js +32 -0
- package/dist/rendering/environment/neutralEmbeddedLoader.js.map +1 -0
- package/dist/rendering/output/OutputPass.d.ts +2 -0
- package/dist/rendering/output/OutputPass.d.ts.map +1 -1
- package/dist/rendering/output/OutputPass.js +26 -3
- package/dist/rendering/output/OutputPass.js.map +1 -1
- package/dist/rendering/output/ToneMappingOperators.glsl.d.ts +3 -1
- package/dist/rendering/output/ToneMappingOperators.glsl.d.ts.map +1 -1
- package/dist/rendering/output/ToneMappingOperators.glsl.js +19 -1
- package/dist/rendering/output/ToneMappingOperators.glsl.js.map +1 -1
- package/dist/rendering/post/v2Stages.d.ts +2 -7
- package/dist/rendering/post/v2Stages.d.ts.map +1 -1
- package/dist/rendering/post/v2Stages.js +2 -17
- package/dist/rendering/post/v2Stages.js.map +1 -1
- package/dist/rendering/post/vignetteColor.d.ts +8 -0
- package/dist/rendering/post/vignetteColor.d.ts.map +1 -0
- package/dist/rendering/post/vignetteColor.js +18 -0
- package/dist/rendering/post/vignetteColor.js.map +1 -0
- package/dist/rendering/renderer/PostprocessExecution.d.ts +10 -0
- package/dist/rendering/renderer/PostprocessExecution.d.ts.map +1 -1
- package/dist/rendering/renderer/PostprocessExecution.js +38 -38
- package/dist/rendering/renderer/PostprocessExecution.js.map +1 -1
- package/dist/rendering/renderer/coreOutputPostRoute.d.ts +25 -17
- package/dist/rendering/renderer/coreOutputPostRoute.d.ts.map +1 -1
- package/dist/rendering/renderer/coreOutputPostRoute.js +27 -18
- package/dist/rendering/renderer/coreOutputPostRoute.js.map +1 -1
- package/dist/rendering/renderer/qrSubFlags.d.ts +1 -1
- package/dist/rendering/renderer/qrSubFlags.d.ts.map +1 -1
- package/dist/rendering/renderer/qrSubFlags.js +2 -8
- package/dist/rendering/renderer/qrSubFlags.js.map +1 -1
- package/dist/rendering/shaders/chunks/author/index.d.ts.map +1 -1
- package/dist/rendering/shaders/chunks/author/index.js +7 -0
- package/dist/rendering/shaders/chunks/author/index.js.map +1 -1
- package/dist/rendering/shaders/chunks/author/shadow.glsl.d.ts +11 -0
- package/dist/rendering/shaders/chunks/author/shadow.glsl.d.ts.map +1 -0
- package/dist/rendering/shaders/chunks/author/shadow.glsl.js +57 -0
- package/dist/rendering/shaders/chunks/author/shadow.glsl.js.map +1 -0
- package/dist/rendering/shadows/DirectionalCascadeFitter.d.ts +20 -0
- package/dist/rendering/shadows/DirectionalCascadeFitter.d.ts.map +1 -1
- package/dist/rendering/shadows/DirectionalCascadeFitter.js +80 -7
- package/dist/rendering/shadows/DirectionalCascadeFitter.js.map +1 -1
- package/dist/rendering/shadows/Prd02DepthShaderLibrary.d.ts.map +1 -1
- package/dist/rendering/shadows/Prd02DepthShaderLibrary.js +9 -1
- package/dist/rendering/shadows/Prd02DepthShaderLibrary.js.map +1 -1
- package/dist/rendering/shadows/ShadowSystem.d.ts.map +1 -1
- package/dist/rendering/shadows/ShadowSystem.js +7 -2
- package/dist/rendering/shadows/ShadowSystem.js.map +1 -1
- package/dist/rendering/webgl2/LdrPostprocessShader.d.ts +2 -0
- package/dist/rendering/webgl2/LdrPostprocessShader.d.ts.map +1 -1
- package/dist/rendering/webgl2/LdrPostprocessShader.js +25 -3
- package/dist/rendering/webgl2/LdrPostprocessShader.js.map +1 -1
- package/dist/rendering/webgl2/LegacyPost.d.ts +11 -2
- package/dist/rendering/webgl2/LegacyPost.d.ts.map +1 -1
- package/dist/rendering/webgl2/LegacyPost.js +191 -16
- package/dist/rendering/webgl2/LegacyPost.js.map +1 -1
- package/package.json +33 -26
- package/templates/cinematic-scene/package.json +2 -2
- package/templates/mini-game/package.json +2 -2
- package/templates/product-viewer/package.json +2 -2
- package/templates/production-asset-inspector/package.json +1 -1
- package/templates/production-material-studio/package.json +1 -1
- package/templates/production-product-configurator/package.json +1 -1
- package/templates/production-product-viewer/package.json +1 -1
|
@@ -0,0 +1,326 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* `assets repair-skin --rebuild-limbs`: rebuilds the legs of a humanoid athlete in the straight pose its skeleton assumes.
|
|
3
|
+
*
|
|
4
|
+
* Generalised from the Aura FC fix. A mesh modelled mid-stride (knee bent, thigh swung forward, thigh surface made of a few huge
|
|
5
|
+
* triangles) but bound to a straight skeleton rotates the limbs about joints 10 to 20 cm off the limb, and the shorts and thighs tear
|
|
6
|
+
* into shards. This removes the leg geometry from the skin, shorts and socks meshes, straightens the boots (least-height search),
|
|
7
|
+
* and builds thigh and shin skin tubes, thigh shorts tubes, a pelvis skirt and ankle socks around the real bone axes with smooth
|
|
8
|
+
* hip / knee / ankle weights. Absolute lengths scale with the rig (the FC rig's hip joint sits at 0.8996 m). Only opt in for a
|
|
9
|
+
* recognised humanoid; anything else gets guidance from `repair-skin`.
|
|
10
|
+
*/
|
|
11
|
+
import { GlbEditor } from "./glbEdit.js";
|
|
12
|
+
import { findHumanoidLegs } from "./analysis.js";
|
|
13
|
+
import { buildHierarchy, forward, loadSkins, localPose, qalign, qmul, qrot, readAccessor } from "./gltf.js";
|
|
14
|
+
const sub = (a, b) => [a[0] - b[0], a[1] - b[1], a[2] - b[2]];
|
|
15
|
+
const add = (a, b) => [a[0] + b[0], a[1] + b[1], a[2] + b[2]];
|
|
16
|
+
const mul = (a, s) => [a[0] * s, a[1] * s, a[2] * s];
|
|
17
|
+
const len = (a) => Math.hypot(a[0], a[1], a[2]);
|
|
18
|
+
const unit = (a) => { const l = len(a) || 1; return [a[0] / l, a[1] / l, a[2] / l]; };
|
|
19
|
+
const smooth = (a, b, x) => { const t = Math.max(0, Math.min(1, (x - a) / (b - a))); return t * t * (3 - 2 * t); };
|
|
20
|
+
/** FC reference proportions (metres at hip height 0.8996). */
|
|
21
|
+
const FC_HIP_JOINT_Y = 0.8996;
|
|
22
|
+
const FC = {
|
|
23
|
+
ringSegments: 24, ringStep: 0.025, hipTop: 0.99, hipBlendBottom: 0.7, kneeHalf: 0.14, ankleTop: 0.31, ankleBottom: 0.15,
|
|
24
|
+
hemY: 0.62, sockTop: 0.34, sockBottom: 0.09, skirtTop: 1.075, skirtBottom: 0.8, armCut: 0.97, bootTop: 0.45,
|
|
25
|
+
thighHip: 0.084, thighKnee: 0.058, calf: 0.054, ankle: 0.034, shortsExtra: 0.014, skirtRz: 0.112, skirtRxExtra: 0.105
|
|
26
|
+
};
|
|
27
|
+
export class RebuildLimbsUnsupported extends Error {
|
|
28
|
+
}
|
|
29
|
+
export function rebuildLimbs(glb, options = {}) {
|
|
30
|
+
const hierarchy = buildHierarchy(glb);
|
|
31
|
+
const legs = findHumanoidLegs(hierarchy);
|
|
32
|
+
if (!legs)
|
|
33
|
+
throw new RebuildLimbsUnsupported("Not a recognised humanoid: --rebuild-limbs needs Left/Right UpperLeg (or UpLeg/Thigh), LowerLeg (or Leg/Shin/Calf) and Foot bones. Rebuild the limbs in your DCC tool, or regenerate/re-rig the model in the pose its skeleton assumes.");
|
|
34
|
+
const skins = loadSkins(glb, hierarchy);
|
|
35
|
+
const skin = skins[0];
|
|
36
|
+
if (!skin)
|
|
37
|
+
throw new RebuildLimbsUnsupported("No skinned mesh to rebuild.");
|
|
38
|
+
const hipsPattern = options.hips ?? /^(mixamorig:?)?hips$/i;
|
|
39
|
+
const hipsNode = hierarchy.names.findIndex((n) => hipsPattern.test(n));
|
|
40
|
+
if (hipsNode < 0)
|
|
41
|
+
throw new RebuildLimbsUnsupported("No pelvis bone matching /hips/ found; pass the pelvis joint name pattern.");
|
|
42
|
+
const rest = forward(localPose(glb, null, 0, hierarchy), hierarchy);
|
|
43
|
+
const [legL, legR] = legs;
|
|
44
|
+
const hipY = rest.pos[legL.up][1];
|
|
45
|
+
const s = hipY / FC_HIP_JOINT_Y;
|
|
46
|
+
const o = Object.fromEntries(Object.entries(FC).map(([k, v]) => [k, k === "ringSegments" ? v : v * s]));
|
|
47
|
+
const roles = {
|
|
48
|
+
skin: options.materials?.skin ?? /skin/i,
|
|
49
|
+
shorts: options.materials?.shorts ?? /short/i,
|
|
50
|
+
socks: options.materials?.socks ?? /sock/i,
|
|
51
|
+
boots: options.materials?.boots ?? /dark|boot|shoe/i
|
|
52
|
+
};
|
|
53
|
+
const jointIndex = new Map(skin.joints.map((node, k) => [node, k]));
|
|
54
|
+
const J = (node) => {
|
|
55
|
+
const k = jointIndex.get(node);
|
|
56
|
+
if (k === undefined)
|
|
57
|
+
throw new RebuildLimbsUnsupported(`Bone ${hierarchy.names[node]} is not a joint of the skin.`);
|
|
58
|
+
return k;
|
|
59
|
+
};
|
|
60
|
+
const P = (node) => rest.pos[node];
|
|
61
|
+
const hipL = P(legL.up), hipR = P(legR.up), kneeL = P(legL.knee), footL = P(legL.foot);
|
|
62
|
+
const midX = (hipL[0] + hipR[0]) / 2;
|
|
63
|
+
const half = Math.abs(hipL[0] - hipR[0]) / 2;
|
|
64
|
+
const axisX = { L: midX + half * 0.62, R: midX - half * 0.62 };
|
|
65
|
+
const kneeY = kneeL[1];
|
|
66
|
+
void footL;
|
|
67
|
+
// descendant sets per leg, for "which side / is this vertex a leg or arm vertex"
|
|
68
|
+
const descendants = (root) => {
|
|
69
|
+
const out = new Set([root]);
|
|
70
|
+
let grew = true;
|
|
71
|
+
while (grew) {
|
|
72
|
+
grew = false;
|
|
73
|
+
for (let i = 0; i < hierarchy.parent.length; i += 1) {
|
|
74
|
+
const p = hierarchy.parent[i];
|
|
75
|
+
if (p >= 0 && out.has(p) && !out.has(i)) {
|
|
76
|
+
out.add(i);
|
|
77
|
+
grew = true;
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
return out;
|
|
82
|
+
};
|
|
83
|
+
const legNodes = { L: descendants(legL.up), R: descendants(legR.up) };
|
|
84
|
+
const isArmName = (node) => /arm|hand|shoulder|clav|finger|thumb/i.test(hierarchy.names[node] ?? "");
|
|
85
|
+
const nodeOfJoint = (j) => skin.joints[j];
|
|
86
|
+
const dominant = (prim, v) => {
|
|
87
|
+
let best = 0, joint = 0;
|
|
88
|
+
const w = prim.weights[v] ?? [], jj = prim.joints[v] ?? [];
|
|
89
|
+
for (let k = 0; k < 4; k += 1)
|
|
90
|
+
if ((w[k] ?? 0) > best) {
|
|
91
|
+
best = w[k] ?? 0;
|
|
92
|
+
joint = jj[k] ?? 0;
|
|
93
|
+
}
|
|
94
|
+
return nodeOfJoint(joint);
|
|
95
|
+
};
|
|
96
|
+
const isLegNode = (n) => legNodes.L.has(n) || legNodes.R.has(n);
|
|
97
|
+
const sideOf = (n) => (legNodes.L.has(n) ? "L" : legNodes.R.has(n) ? "R" : null);
|
|
98
|
+
const prims = skin.primitives;
|
|
99
|
+
const roleOf = (p) => (roles.skin.test(p.materialName) ? "skin" : roles.shorts.test(p.materialName) ? "shorts" : roles.socks.test(p.materialName) ? "socks" : roles.boots.test(p.materialName) ? "boots" : null);
|
|
100
|
+
if (!prims.some((p) => roleOf(p) === "skin"))
|
|
101
|
+
throw new RebuildLimbsUnsupported(`No skin material matched ${roles.skin}; pass --material-map skin=<pattern>.`);
|
|
102
|
+
// 1. straighten the boots
|
|
103
|
+
const footFix = {};
|
|
104
|
+
const bootPrim = prims.find((p) => roleOf(p) === "boots");
|
|
105
|
+
if (bootPrim) {
|
|
106
|
+
for (const side of ["L", "R"]) {
|
|
107
|
+
const bootAll = [];
|
|
108
|
+
for (let v = 0; v < bootPrim.pos.length; v += 1) {
|
|
109
|
+
const n = dominant(bootPrim, v);
|
|
110
|
+
if (sideOf(n) === side && bootPrim.pos[v][1] < o.bootTop)
|
|
111
|
+
bootAll.push(v);
|
|
112
|
+
}
|
|
113
|
+
if (bootAll.length < 12)
|
|
114
|
+
continue;
|
|
115
|
+
const boot = bootAll.map((v) => bootPrim.pos[v]);
|
|
116
|
+
const cen = (pts) => mul(pts.reduce((a, p) => add(a, p), [0, 0, 0]), 1 / pts.length);
|
|
117
|
+
const bc = cen(boot);
|
|
118
|
+
const M = [0, 0, 0, 0, 0, 0, 0, 0, 0];
|
|
119
|
+
for (const p of boot) {
|
|
120
|
+
const q = sub(p, bc);
|
|
121
|
+
for (let a = 0; a < 3; a += 1)
|
|
122
|
+
for (let b = 0; b < 3; b += 1)
|
|
123
|
+
M[a * 3 + b] = M[a * 3 + b] + q[a] * q[b];
|
|
124
|
+
}
|
|
125
|
+
let d = [0.1, 0.3, 0.9];
|
|
126
|
+
for (let i = 0; i < 80; i += 1)
|
|
127
|
+
d = unit([M[0] * d[0] + M[1] * d[1] + M[2] * d[2], M[3] * d[0] + M[4] * d[1] + M[5] * d[2], M[6] * d[0] + M[7] * d[1] + M[8] * d[2]]);
|
|
128
|
+
if (d[2] < 0)
|
|
129
|
+
d = mul(d, -1);
|
|
130
|
+
let R = qalign(d, [0, 0, 1]);
|
|
131
|
+
const spread = (q) => { let lo = 1e9, hi = -1e9; for (const p of boot) {
|
|
132
|
+
const y = qrot(q, sub(p, bc))[1];
|
|
133
|
+
lo = Math.min(lo, y);
|
|
134
|
+
hi = Math.max(hi, y);
|
|
135
|
+
} return hi - lo; };
|
|
136
|
+
let best = spread(R), bestR = R;
|
|
137
|
+
for (let pitch = -40; pitch <= 40; pitch += 4)
|
|
138
|
+
for (let roll = -60; roll <= 60; roll += 4) {
|
|
139
|
+
const qp = [Math.sin((pitch * Math.PI) / 360), 0, 0, Math.cos((pitch * Math.PI) / 360)];
|
|
140
|
+
const qr = [0, 0, Math.sin((roll * Math.PI) / 360), Math.cos((roll * Math.PI) / 360)];
|
|
141
|
+
const q = qmul(qp, qmul(qr, R));
|
|
142
|
+
const h = spread(q);
|
|
143
|
+
if (h < best - 1e-5) {
|
|
144
|
+
best = h;
|
|
145
|
+
bestR = q;
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
R = bestR;
|
|
149
|
+
const moved = boot.map((p) => qrot(R, sub(p, bc)));
|
|
150
|
+
let minY = 1e9, minZ = 1e9, maxZ = -1e9;
|
|
151
|
+
for (const p of moved) {
|
|
152
|
+
minY = Math.min(minY, p[1]);
|
|
153
|
+
minZ = Math.min(minZ, p[2]);
|
|
154
|
+
maxZ = Math.max(maxZ, p[2]);
|
|
155
|
+
}
|
|
156
|
+
const heel = moved.filter((p) => p[2] < minZ + (maxZ - minZ) * 0.33).sort((a, b) => b[1] - a[1]).slice(0, Math.max(10, Math.floor(moved.length * 0.03)));
|
|
157
|
+
const ankle = cen(heel);
|
|
158
|
+
const target = [axisX[side] - ankle[0], -minY, -ankle[2]];
|
|
159
|
+
const frozenR = R;
|
|
160
|
+
footFix[side] = { bootV: new Set(bootAll), apply: (p) => add(qrot(frozenR, sub(p, bc)), target), spread: best };
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
// 2. new geometry
|
|
164
|
+
const newVerts = { skin: [], shorts: [], socks: [] };
|
|
165
|
+
const newTris = { skin: [], shorts: [], socks: [] };
|
|
166
|
+
const wset = (pairs) => {
|
|
167
|
+
const top = pairs.filter(([, w]) => w > 1e-4).sort((a, b) => b[1] - a[1]).slice(0, 4);
|
|
168
|
+
const sum = top.reduce((a, [, w]) => a + w, 0) || 1;
|
|
169
|
+
return top.map(([j, w]) => [j, w / sum]);
|
|
170
|
+
};
|
|
171
|
+
const addTube = (target, rings, weightsAt) => {
|
|
172
|
+
const verts = newVerts[target], tris = newTris[target];
|
|
173
|
+
const base = verts.length;
|
|
174
|
+
const N = o.ringSegments;
|
|
175
|
+
for (const r of rings)
|
|
176
|
+
for (let k = 0; k < N; k += 1) {
|
|
177
|
+
const a = (k / N) * Math.PI * 2;
|
|
178
|
+
verts.push({ p: [r.cx + Math.cos(a) * r.rx, r.y, r.cz + Math.sin(a) * r.rz], w: wset(weightsAt(r.y)) });
|
|
179
|
+
}
|
|
180
|
+
for (let ri = 0; ri < rings.length - 1; ri += 1)
|
|
181
|
+
for (let k = 0; k < N; k += 1) {
|
|
182
|
+
const a = base + ri * N + k, b = base + ri * N + ((k + 1) % N), c = base + (ri + 1) * N + k, d = base + (ri + 1) * N + ((k + 1) % N);
|
|
183
|
+
tris.push([a, b, c], [b, d, c]);
|
|
184
|
+
}
|
|
185
|
+
};
|
|
186
|
+
const ringsFor = (fn, y0, y1) => {
|
|
187
|
+
const rings = [];
|
|
188
|
+
const n = Math.max(2, Math.ceil(Math.abs(y1 - y0) / o.ringStep));
|
|
189
|
+
for (let i = 0; i <= n; i += 1) {
|
|
190
|
+
const y = y0 + ((y1 - y0) * i) / n;
|
|
191
|
+
rings.push({ y, ...fn(y) });
|
|
192
|
+
}
|
|
193
|
+
return rings;
|
|
194
|
+
};
|
|
195
|
+
const weightsLeg = (leg) => (y) => {
|
|
196
|
+
const wHip = smooth(o.hipBlendBottom, o.hipTop, y) * 0.5;
|
|
197
|
+
const kneeT = smooth(kneeY - o.kneeHalf, kneeY + o.kneeHalf, y);
|
|
198
|
+
const ankleT = smooth(o.ankleBottom, o.ankleTop, y);
|
|
199
|
+
const wUp = (1 - wHip) * kneeT;
|
|
200
|
+
const wLow = (1 - wHip) * (1 - kneeT) * ankleT;
|
|
201
|
+
const wFoot = (1 - wHip) * (1 - kneeT) * (1 - ankleT);
|
|
202
|
+
return [[J(hipsNode), wHip], [J(leg.up), wUp], [J(leg.knee), wLow], [J(leg.foot), wFoot]];
|
|
203
|
+
};
|
|
204
|
+
const rSkin = (y) => {
|
|
205
|
+
if (y >= kneeY) {
|
|
206
|
+
const t = (y - kneeY) / (o.hipTop - kneeY);
|
|
207
|
+
return o.thighKnee + (o.thighHip - o.thighKnee) * Math.pow(t, 0.9);
|
|
208
|
+
}
|
|
209
|
+
const t = (y - o.ankleBottom) / (kneeY - o.ankleBottom);
|
|
210
|
+
return o.ankle + (o.calf - o.ankle) * Math.pow(Math.max(0, t), 0.8) + 0.008 * s * Math.sin(Math.PI * Math.min(1, Math.max(0, (t - 0.1) / 0.8)));
|
|
211
|
+
};
|
|
212
|
+
const rShorts = (y) => rSkin(y) + o.shortsExtra + 0.006 * s * smooth(o.hemY + 0.06 * s, o.hemY, y);
|
|
213
|
+
for (const side of ["L", "R"]) {
|
|
214
|
+
const leg = side === "L" ? legL : legR;
|
|
215
|
+
const x = axisX[side];
|
|
216
|
+
addTube("skin", ringsFor((y) => ({ cx: x, cz: 0, rx: rSkin(y) * 0.96, rz: rSkin(y) * 1.06 }), o.hipTop, o.ankleBottom), weightsLeg(leg));
|
|
217
|
+
addTube("shorts", ringsFor((y) => ({ cx: x, cz: 0, rx: rShorts(y) * 0.96, rz: rShorts(y) * 1.06 }), o.hipTop, o.hemY), weightsLeg(leg));
|
|
218
|
+
addTube("socks", ringsFor((y) => ({ cx: x, cz: 0, rx: rSkin(Math.max(y, o.ankleBottom)) * 0.96 + 0.007 * s, rz: rSkin(Math.max(y, o.ankleBottom)) * 1.06 + 0.007 * s }), o.sockTop, o.sockBottom), weightsLeg(leg));
|
|
219
|
+
}
|
|
220
|
+
addTube("shorts", ringsFor(() => ({ cx: midX, cz: 0, rx: half * 0.62 + o.skirtRxExtra, rz: o.skirtRz }), o.skirtTop, o.skirtBottom), () => [[J(hipsNode), 1]]);
|
|
221
|
+
// 3. rebuild each primitive
|
|
222
|
+
const editor = new GlbEditor(glb);
|
|
223
|
+
const report = [];
|
|
224
|
+
for (const prim of prims) {
|
|
225
|
+
const role = roleOf(prim);
|
|
226
|
+
if (!role)
|
|
227
|
+
continue;
|
|
228
|
+
const primitive = editor.primitive(prim.meshIndex, prim.primitiveIndex);
|
|
229
|
+
const dom = Array.from({ length: prim.pos.length }, (_, v) => dominant(prim, v));
|
|
230
|
+
const keepTri = [];
|
|
231
|
+
const centroidY = (t) => (prim.pos[prim.indices[t]][1] + prim.pos[prim.indices[t + 1]][1] + prim.pos[prim.indices[t + 2]][1]) / 3;
|
|
232
|
+
for (let t = 0; t < prim.indices.length; t += 3) {
|
|
233
|
+
const ids = [prim.indices[t], prim.indices[t + 1], prim.indices[t + 2]];
|
|
234
|
+
let drop = false;
|
|
235
|
+
if (role === "socks")
|
|
236
|
+
drop = true;
|
|
237
|
+
if (role === "skin" || role === "shorts") {
|
|
238
|
+
const arm = ids.some((v) => isArmName(dom[v]));
|
|
239
|
+
if (!arm && (role === "shorts" || centroidY(t) < o.armCut))
|
|
240
|
+
drop = true;
|
|
241
|
+
if (role === "skin" && ids.every((v) => isLegNode(dom[v])))
|
|
242
|
+
drop = true;
|
|
243
|
+
}
|
|
244
|
+
if (!drop)
|
|
245
|
+
keepTri.push(ids);
|
|
246
|
+
}
|
|
247
|
+
const positions = role === "boots"
|
|
248
|
+
? prim.pos.map((p, v) => { for (const side of ["L", "R"]) {
|
|
249
|
+
const f = footFix[side];
|
|
250
|
+
if (f?.bootV.has(v))
|
|
251
|
+
return f.apply(p);
|
|
252
|
+
} return p; })
|
|
253
|
+
: prim.pos;
|
|
254
|
+
const remap = new Map();
|
|
255
|
+
const outP = [], outJ = [], outW = [];
|
|
256
|
+
const srcOf = [];
|
|
257
|
+
const uvAccessor = editor.primitive(prim.meshIndex, prim.primitiveIndex).attributes.TEXCOORD_0;
|
|
258
|
+
const uvRows = uvAccessor !== undefined ? readAccessor(glb, uvAccessor).rows : null;
|
|
259
|
+
const useOld = (v) => {
|
|
260
|
+
let at = remap.get(v);
|
|
261
|
+
if (at === undefined) {
|
|
262
|
+
at = outP.length;
|
|
263
|
+
remap.set(v, at);
|
|
264
|
+
srcOf.push(v);
|
|
265
|
+
outP.push(positions[v]);
|
|
266
|
+
const pairs = [];
|
|
267
|
+
for (let k = 0; k < 4; k += 1)
|
|
268
|
+
if (((prim.weights[v] ?? [])[k] ?? 0) > 0)
|
|
269
|
+
pairs.push([prim.joints[v][k], prim.weights[v][k]]);
|
|
270
|
+
outJ.push(pairs.map((q) => q[0]));
|
|
271
|
+
outW.push(pairs.map((q) => q[1]));
|
|
272
|
+
}
|
|
273
|
+
return at;
|
|
274
|
+
};
|
|
275
|
+
const tris = keepTri.map((ids) => ids.map(useOld));
|
|
276
|
+
const nv = newVerts[role];
|
|
277
|
+
if (nv) {
|
|
278
|
+
const base = outP.length;
|
|
279
|
+
nv.forEach((v) => { srcOf.push(-1); outP.push(v.p); outJ.push(v.w.map((q) => q[0])); outW.push(v.w.map((q) => q[1])); });
|
|
280
|
+
for (const t of newTris[role])
|
|
281
|
+
tris.push([t[0] + base, t[1] + base, t[2] + base]);
|
|
282
|
+
}
|
|
283
|
+
const nV = outP.length;
|
|
284
|
+
const nrm = outP.map(() => [0, 0, 0]);
|
|
285
|
+
for (const [a, b, c] of tris) {
|
|
286
|
+
const u = sub(outP[b], outP[a]), w = sub(outP[c], outP[a]);
|
|
287
|
+
const fn = [u[1] * w[2] - u[2] * w[1], u[2] * w[0] - u[0] * w[2], u[0] * w[1] - u[1] * w[0]];
|
|
288
|
+
for (const v of [a, b, c]) {
|
|
289
|
+
const n = nrm[v];
|
|
290
|
+
n[0] += fn[0];
|
|
291
|
+
n[1] += fn[1];
|
|
292
|
+
n[2] += fn[2];
|
|
293
|
+
}
|
|
294
|
+
}
|
|
295
|
+
const flatJ = [], flatW = [], flatP = [], flatN = [];
|
|
296
|
+
for (let v = 0; v < nV; v += 1) {
|
|
297
|
+
for (let k = 0; k < 4; k += 1) {
|
|
298
|
+
flatJ.push(outJ[v][k] ?? 0);
|
|
299
|
+
flatW.push(outW[v][k] ?? 0);
|
|
300
|
+
}
|
|
301
|
+
flatP.push(...outP[v]);
|
|
302
|
+
flatN.push(...unit(nrm[v]));
|
|
303
|
+
}
|
|
304
|
+
primitive.attributes.POSITION = editor.addAccessor(flatP, 5126, "VEC3", 34962, true);
|
|
305
|
+
primitive.attributes.NORMAL = editor.addAccessor(flatN, 5126, "VEC3", 34962);
|
|
306
|
+
primitive.attributes.JOINTS_0 = editor.addAccessor(flatJ, 5123, "VEC4", 34962);
|
|
307
|
+
primitive.attributes.WEIGHTS_0 = editor.addAccessor(flatW, 5126, "VEC4", 34962);
|
|
308
|
+
// UVs follow the kept vertices (new tube vertices sample the middle of the map); other per-vertex attributes no longer match
|
|
309
|
+
for (const key of Object.keys(primitive.attributes))
|
|
310
|
+
if (/^(TEXCOORD_[1-9]|COLOR|TANGENT)/.test(key))
|
|
311
|
+
delete primitive.attributes[key];
|
|
312
|
+
if (uvRows) {
|
|
313
|
+
const flatUv = [];
|
|
314
|
+
for (let v = 0; v < nV; v += 1) {
|
|
315
|
+
const src = srcOf[v];
|
|
316
|
+
const row = src >= 0 ? uvRows[src] : undefined;
|
|
317
|
+
flatUv.push(row?.[0] ?? 0.5, row?.[1] ?? 0.5);
|
|
318
|
+
}
|
|
319
|
+
primitive.attributes.TEXCOORD_0 = editor.addAccessor(flatUv, 5126, "VEC2", 34962);
|
|
320
|
+
}
|
|
321
|
+
primitive.indices = editor.addAccessor(tris.flat(), 5125, "SCALAR", 34963);
|
|
322
|
+
report.push({ material: prim.materialName, vertices: nV, triangles: tris.length, removedTriangles: prim.indices.length / 3 - keepTri.length, addedTriangles: (newTris[role] ?? []).length });
|
|
323
|
+
}
|
|
324
|
+
return { glb: editor.finish(), report: { scale: Math.round(s * 1000) / 1000, primitives: report, bootHeights: Object.fromEntries(Object.entries(footFix).map(([k, f]) => [k, Math.round(f.spread * 1000) / 1000])) } };
|
|
325
|
+
}
|
|
326
|
+
//# sourceMappingURL=rebuildLimbs.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"rebuildLimbs.js","sourceRoot":"","sources":["../../../../../packages/aura3d-cli/src/skin/rebuildLimbs.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* `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:
|
|
3
|
+
* `normalize` (renormalise weights, drop non-finite and out-of-range influences, keep the strongest K), `pruneDistant` (drop influences
|
|
4
|
+
* from bones far from the vertex), `smoothBridges` (soften the weights around stretched bridging triangles so the patch deforms as one
|
|
5
|
+
* surface) and `cutStretch` (remove triangles that still stretch past a limit; leaves holes, so it is the last resort).
|
|
6
|
+
*/
|
|
7
|
+
import { type SkinReport } from "./analysis.js";
|
|
8
|
+
import { type GlbData, type SkinInfo } from "./gltf.js";
|
|
9
|
+
export interface RepairSkinOptions {
|
|
10
|
+
readonly normalize?: boolean;
|
|
11
|
+
/** Strongest influences kept per vertex (1 to 4; default 4). */
|
|
12
|
+
readonly maxInfluences?: number;
|
|
13
|
+
readonly pruneDistant?: boolean;
|
|
14
|
+
readonly smoothBridges?: boolean;
|
|
15
|
+
/** Triangles stretched past this multiple are the smoothing region (default 1.5). */
|
|
16
|
+
readonly smoothThreshold?: number;
|
|
17
|
+
/** Remove triangles stretched past this limit after the other steps (off by default). */
|
|
18
|
+
readonly cutStretch?: number;
|
|
19
|
+
readonly clips?: readonly string[];
|
|
20
|
+
readonly samples?: number;
|
|
21
|
+
readonly ignoreMaterials?: RegExp;
|
|
22
|
+
}
|
|
23
|
+
export interface RepairSkinReport {
|
|
24
|
+
readonly steps: readonly string[];
|
|
25
|
+
readonly primitives: readonly {
|
|
26
|
+
readonly material: string;
|
|
27
|
+
readonly normalizedVertices: number;
|
|
28
|
+
readonly prunedInfluences: number;
|
|
29
|
+
readonly smoothedVertices: number;
|
|
30
|
+
readonly removedTriangles: number;
|
|
31
|
+
}[];
|
|
32
|
+
readonly before: SkinReport;
|
|
33
|
+
readonly after: SkinReport;
|
|
34
|
+
readonly guidance: readonly string[];
|
|
35
|
+
}
|
|
36
|
+
export declare function repairSkin(glb: GlbData, options?: RepairSkinOptions): {
|
|
37
|
+
glb: GlbData;
|
|
38
|
+
report: RepairSkinReport;
|
|
39
|
+
};
|
|
40
|
+
export type { SkinInfo };
|
|
41
|
+
//# sourceMappingURL=repair.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
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,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,CAwGpH;AAaD,YAAY,EAAE,QAAQ,EAAE,CAAC"}
|
|
@@ -0,0 +1,180 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* `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:
|
|
3
|
+
* `normalize` (renormalise weights, drop non-finite and out-of-range influences, keep the strongest K), `pruneDistant` (drop influences
|
|
4
|
+
* from bones far from the vertex), `smoothBridges` (soften the weights around stretched bridging triangles so the patch deforms as one
|
|
5
|
+
* surface) and `cutStretch` (remove triangles that still stretch past a limit; leaves holes, so it is the last resort).
|
|
6
|
+
*/
|
|
7
|
+
import { analyzeSkin, DEFAULT_SKIN_THRESHOLDS, samplePoses, triangleStretch } from "./analysis.js";
|
|
8
|
+
import { GlbEditor } from "./glbEdit.js";
|
|
9
|
+
import { buildHierarchy, jointBindPositions, loadSkins, vdist } from "./gltf.js";
|
|
10
|
+
function dense(prim, v, jointCount) {
|
|
11
|
+
const m = new Map();
|
|
12
|
+
const w = prim.weights[v] ?? [], j = prim.joints[v] ?? [];
|
|
13
|
+
for (let k = 0; k < 4; k += 1) {
|
|
14
|
+
const wk = w[k] ?? 0, jk = j[k] ?? 0;
|
|
15
|
+
if (!(wk > 0) || !Number.isFinite(wk) || jk >= jointCount)
|
|
16
|
+
continue;
|
|
17
|
+
m.set(jk, (m.get(jk) ?? 0) + wk);
|
|
18
|
+
}
|
|
19
|
+
return m;
|
|
20
|
+
}
|
|
21
|
+
function adjacency(prim) {
|
|
22
|
+
const adj = Array.from({ length: prim.pos.length }, () => new Set());
|
|
23
|
+
for (let i = 0; i + 2 < prim.indices.length; i += 3) {
|
|
24
|
+
const a = prim.indices[i], b = prim.indices[i + 1], c = prim.indices[i + 2];
|
|
25
|
+
adj[a]?.add(b).add(c);
|
|
26
|
+
adj[b]?.add(a).add(c);
|
|
27
|
+
adj[c]?.add(a).add(b);
|
|
28
|
+
}
|
|
29
|
+
return adj;
|
|
30
|
+
}
|
|
31
|
+
export function repairSkin(glb, options = {}) {
|
|
32
|
+
const hierarchy = buildHierarchy(glb);
|
|
33
|
+
const skins = loadSkins(glb, hierarchy);
|
|
34
|
+
const editor = new GlbEditor(glb);
|
|
35
|
+
const steps = [];
|
|
36
|
+
const guidance = [];
|
|
37
|
+
const reports = [];
|
|
38
|
+
const analysisOptions = { clips: options.clips, samples: options.samples, ignoreMaterials: options.ignoreMaterials };
|
|
39
|
+
const before = analyzeSkin(glb, analysisOptions);
|
|
40
|
+
const K = Math.max(1, Math.min(4, Math.floor(options.maxInfluences ?? 4)));
|
|
41
|
+
if (options.normalize)
|
|
42
|
+
steps.push(`normalize (keep the strongest ${K} influences)`);
|
|
43
|
+
if (options.pruneDistant)
|
|
44
|
+
steps.push("prune-distant");
|
|
45
|
+
if (options.smoothBridges)
|
|
46
|
+
steps.push("smooth-bridges");
|
|
47
|
+
if (options.cutStretch !== undefined)
|
|
48
|
+
steps.push(`cut-stretch ${options.cutStretch}`);
|
|
49
|
+
const animations = glb.json.animations ?? [];
|
|
50
|
+
const clips = options.clips ? animations.filter((a) => options.clips?.includes(a.name ?? "")) : animations;
|
|
51
|
+
const needPoses = options.smoothBridges || options.cutStretch !== undefined;
|
|
52
|
+
const poses = needPoses ? samplePoses(glb, hierarchy, clips, Math.max(2, options.samples ?? 10)).poses : [];
|
|
53
|
+
for (const skin of skins) {
|
|
54
|
+
const bind = jointBindPositions(skin);
|
|
55
|
+
for (const prim of skin.primitives) {
|
|
56
|
+
if (options.ignoreMaterials?.test(prim.materialName))
|
|
57
|
+
continue;
|
|
58
|
+
const nV = prim.pos.length;
|
|
59
|
+
let weights = Array.from({ length: nV }, (_, v) => dense(prim, v, skin.joints.length));
|
|
60
|
+
let normalizedVertices = 0, prunedInfluences = 0, smoothedVertices = 0, removedTriangles = 0;
|
|
61
|
+
const height = (() => { let lo = Infinity, hi = -Infinity; for (const p of prim.pos) {
|
|
62
|
+
lo = Math.min(lo, p[1]);
|
|
63
|
+
hi = Math.max(hi, p[1]);
|
|
64
|
+
} return hi > lo ? hi - lo : 1; })();
|
|
65
|
+
if (options.pruneDistant) {
|
|
66
|
+
const limit = DEFAULT_SKIN_THRESHOLDS.distantFraction * height;
|
|
67
|
+
weights = weights.map((m, v) => {
|
|
68
|
+
const next = new Map();
|
|
69
|
+
for (const [j, w] of m) {
|
|
70
|
+
const at = bind[j];
|
|
71
|
+
if (at && w >= DEFAULT_SKIN_THRESHOLDS.distantMinWeight && vdist(prim.pos[v], at) > limit) {
|
|
72
|
+
prunedInfluences += 1;
|
|
73
|
+
continue;
|
|
74
|
+
}
|
|
75
|
+
next.set(j, w);
|
|
76
|
+
}
|
|
77
|
+
return next.size > 0 ? next : m;
|
|
78
|
+
});
|
|
79
|
+
}
|
|
80
|
+
let stretch = null;
|
|
81
|
+
if (needPoses)
|
|
82
|
+
stretch = triangleStretch(skin, prim, poses, Infinity, 0).worst;
|
|
83
|
+
if (options.smoothBridges && stretch) {
|
|
84
|
+
const adj = adjacency(prim);
|
|
85
|
+
let region = new Set();
|
|
86
|
+
const threshold = options.smoothThreshold ?? 1.5;
|
|
87
|
+
for (let t = 0; t < stretch.length; t += 1)
|
|
88
|
+
if (stretch[t] > threshold)
|
|
89
|
+
for (let k = 0; k < 3; k += 1)
|
|
90
|
+
region.add(prim.indices[t * 3 + k]);
|
|
91
|
+
for (let r = 0; r < 4; r += 1) {
|
|
92
|
+
const next = new Set(region);
|
|
93
|
+
for (const v of region)
|
|
94
|
+
for (const n of adj[v] ?? [])
|
|
95
|
+
next.add(n);
|
|
96
|
+
region = next;
|
|
97
|
+
}
|
|
98
|
+
for (let it = 0; it < 30; it += 1) {
|
|
99
|
+
const next = weights.map((m) => new Map(m));
|
|
100
|
+
for (const v of region) {
|
|
101
|
+
const nb = [...(adj[v] ?? [])];
|
|
102
|
+
if (nb.length === 0)
|
|
103
|
+
continue;
|
|
104
|
+
const avg = new Map();
|
|
105
|
+
for (const n of nb)
|
|
106
|
+
for (const [j, w] of weights[n])
|
|
107
|
+
avg.set(j, (avg.get(j) ?? 0) + w / nb.length);
|
|
108
|
+
const m = new Map();
|
|
109
|
+
for (const [j, w] of weights[v])
|
|
110
|
+
m.set(j, 0.2 * w);
|
|
111
|
+
for (const [j, w] of avg)
|
|
112
|
+
m.set(j, (m.get(j) ?? 0) + 0.8 * w);
|
|
113
|
+
next[v] = m;
|
|
114
|
+
}
|
|
115
|
+
weights = next;
|
|
116
|
+
}
|
|
117
|
+
smoothedVertices = region.size;
|
|
118
|
+
}
|
|
119
|
+
const changedWeights = Boolean(options.normalize || options.pruneDistant || options.smoothBridges);
|
|
120
|
+
let indices = prim.indices;
|
|
121
|
+
if (options.cutStretch !== undefined && stretch) {
|
|
122
|
+
// re-measure after the weight edits so the cut only removes what is still stretched
|
|
123
|
+
const keep = [];
|
|
124
|
+
const edited = changedWeights ? withWeights(prim, weights, K) : prim;
|
|
125
|
+
const again = triangleStretch(skin, edited, poses, Infinity, 0).worst;
|
|
126
|
+
for (let t = 0; t < again.length; t += 1) {
|
|
127
|
+
if (again[t] <= options.cutStretch)
|
|
128
|
+
keep.push(prim.indices[t * 3], prim.indices[t * 3 + 1], prim.indices[t * 3 + 2]);
|
|
129
|
+
else
|
|
130
|
+
removedTriangles += 1;
|
|
131
|
+
}
|
|
132
|
+
indices = keep;
|
|
133
|
+
}
|
|
134
|
+
if (changedWeights) {
|
|
135
|
+
const J = [], W = [];
|
|
136
|
+
for (let v = 0; v < nV; v += 1) {
|
|
137
|
+
const top = [...weights[v].entries()].sort((a, b) => b[1] - a[1]).slice(0, K);
|
|
138
|
+
const sum = top.reduce((a, [, w]) => a + w, 0) || 1;
|
|
139
|
+
if (top.length === 0)
|
|
140
|
+
normalizedVertices += 1;
|
|
141
|
+
if (Math.abs(((prim.weights[v] ?? []).reduce((a, b) => a + b, 0)) - 1) > DEFAULT_SKIN_THRESHOLDS.weightSumTolerance)
|
|
142
|
+
normalizedVertices += 1;
|
|
143
|
+
for (let k = 0; k < 4; k += 1) {
|
|
144
|
+
J.push(top[k]?.[0] ?? 0);
|
|
145
|
+
W.push(top[k] ? top[k][1] / sum : 0);
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
const primitive = editor.primitive(prim.meshIndex, prim.primitiveIndex);
|
|
149
|
+
primitive.attributes.JOINTS_0 = editor.addAccessor(J, 5123, "VEC4", 34962);
|
|
150
|
+
primitive.attributes.WEIGHTS_0 = editor.addAccessor(W, 5126, "VEC4", 34962);
|
|
151
|
+
}
|
|
152
|
+
if (removedTriangles > 0) {
|
|
153
|
+
const primitive = editor.primitive(prim.meshIndex, prim.primitiveIndex);
|
|
154
|
+
primitive.indices = editor.addAccessor(indices, nV > 65535 ? 5125 : 5123, "SCALAR", 34963);
|
|
155
|
+
}
|
|
156
|
+
reports.push({ material: prim.materialName, normalizedVertices, prunedInfluences, smoothedVertices, removedTriangles });
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
const repaired = editor.finish();
|
|
160
|
+
const after = analyzeSkin(repaired, analysisOptions);
|
|
161
|
+
if (before.bindMismatch.length > 0) {
|
|
162
|
+
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.`);
|
|
163
|
+
}
|
|
164
|
+
if (!after.ok && steps.length > 0)
|
|
165
|
+
guidance.push(`Still failing after ${steps.join(", ")}: ${after.reasonCodes.join(", ")}. Cutting stretched triangles opens holes; prefer --rebuild-limbs or re-rigging.`);
|
|
166
|
+
if (steps.length === 0)
|
|
167
|
+
guidance.push("No repair step selected. Pass --normalize, --prune-distant, --smooth-bridges, --cut-stretch <limit> or --rebuild-limbs.");
|
|
168
|
+
return { glb: repaired, report: { steps, primitives: reports, before, after, guidance } };
|
|
169
|
+
}
|
|
170
|
+
function withWeights(prim, weights, K) {
|
|
171
|
+
const joints = [], w = [];
|
|
172
|
+
for (let v = 0; v < prim.pos.length; v += 1) {
|
|
173
|
+
const top = [...weights[v].entries()].sort((a, b) => b[1] - a[1]).slice(0, K);
|
|
174
|
+
const sum = top.reduce((a, [, x]) => a + x, 0) || 1;
|
|
175
|
+
joints.push([0, 1, 2, 3].map((k) => top[k]?.[0] ?? 0));
|
|
176
|
+
w.push([0, 1, 2, 3].map((k) => (top[k] ? top[k][1] / sum : 0)));
|
|
177
|
+
}
|
|
178
|
+
return { ...prim, joints, weights: w };
|
|
179
|
+
}
|
|
180
|
+
//# sourceMappingURL=repair.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"repair.js","sourceRoot":"","sources":["../../../../../packages/aura3d-cli/src/skin/repair.ts"],"names":[],"mappings":"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"}
|
|
@@ -75,7 +75,7 @@ export function createA3DProject(options) {
|
|
|
75
75
|
const dependencies = { ...(packageJson.dependencies ?? {}) };
|
|
76
76
|
const auraDependencies = Object.keys(dependencies).filter((name) => name.startsWith("@aura3d/"));
|
|
77
77
|
if (auraDependencies.length === 0) {
|
|
78
|
-
dependencies["@aura3d/engine"] = options.packageVersion ?? "4.
|
|
78
|
+
dependencies["@aura3d/engine"] = options.packageVersion ?? "4.3.0";
|
|
79
79
|
}
|
|
80
80
|
else if (options.packageVersion) {
|
|
81
81
|
for (const dependency of auraDependencies)
|