tosijs-3d 0.12.3 → 0.12.4

package/CHANGELOG.md

@@ -12,9 +12,9 @@ Upgrading across a minor? Start with [Migration](/Migration/).
 
 ## Unreleased
 
-## 0.12.3
+## 0.12.4
 
-The latest release. Characters out to other engines (a GLB read with no engine, any rigged body as a skinned GLB that plays UAL's clips by name, springs as `VRMC_springBone`), the rig tool's fixes for AI-made meshes, draped cloth, and scenes as agent tools and for a screen reader. See [0.12.3](/v0.12.3/).
+The latest release. Tabbed settings panels and undo across the character builder, rig tool and tailor; pictures in materials (Poly Haven's fabric scans as cloth presets, a picture or a flat colour or grey for any input); the tailor always on the bar; grips per class of held item; Tonio's textured weapons and melee in the biped. See [0.12.4](/v0.12.4/).
 
 ## Every version
 

package/changelog/v0.12.4.md

@@ -0,0 +1,48 @@
+# 0.12.4
+
+<!--{ "parent": "CHANGELOG", "order": 9987996 }-->
+
+Tabbed settings panels and undo across the character builder, rig tool and tailor; pictures in materials (Poly Haven's fabric scans as cloth presets, a picture or a flat colour or grey for any input); the tailor always on the bar; grips per class of held item; Tonio's textured weapons and melee in the biped.
+
+Size: barrel (min, packages external) 1643.8 KB raw / 569.0 KB gz, up 47.8 KB / 14.0 KB gz (+3.0%) on 0.12.3: the material pictures and fabric presets, the drape's sliced runner, undo history, playback and hold grips are in the barrel.
+
+## Added
+
+- **Tabbed settings panels with icons**: `panelSections: 'tabs'` with an `icon` on each collapsible `label3d`. The character builder and the rig tool use it.
+- **`panelActions(el)`** on `<tosi-b3d>`: a page's own buttons on the settings panel's icon bar, at its right end. Icon bars take `{ spacer: true }` (an elastic gap); `tabs3d` takes `tools`, and in a tabbed panel `iconBar3d({ inTabs: true })` goes on the tab strip.
+- **Undo and redo** in the character builder and the rig tool (⌘Z / ⇧⌘Z). `undoHistory` is the pure history behind them.
+- **Panels rebuild once a resize settles.** The scene dispatches `resizeend`; `panelRoom(panelEl)` gives a system panel its room.
+- **Pictures in materials**: a material picker's colour, opacity, glow and bumps (and a cloth's colour, roughness and normal) can take a picture, kept by `material-pictures` and saved in a character file (`pictures`). Cloth and PBR take `tile` (metres per repeat).
+- **Photographed fabrics**: eleven of Poly Haven's CC0 fabric scans as cloth presets (`textiles`, `textiles-full`; `fabricTexturePresets`).
+- **Material previews** are drawn on Tonio's material test ball, on grey (a cube until it loads).
+- **Export a rigged body as a GLB** from the rig tool and the character builder (joint names, rest pose, height; the model's materials and springs).
+- **Character builder**: Hold uses Tonio's textured weapons with a manipulator on the grip; clips come from a smaller builder pack (`UAL_builder.glb`); `playback3d` (play, scrub, speed) in Motion; all four AI characters open on hand-placed rigs.
+- **Rig tool**: spread fingers, and hand modes (full, mitten, none); opened from the builder it shows the body it already wears.
+- **Biped melee**: `holdingWeapon` stands on guard in Sword_Idle and the right trigger swings (Sword_Attack). The biped playground carries Tonio's weapons.
+- **Material inputs that take a picture** are a heading and a row: choose a picture, clear it, a flat colour or grey instead (`colorPicker` icon), and a swatch of what it is now. `colorPicker3d` and `color3d` take `grey: true` (a black-to-white ramp and a ladder of greys).
+- **`slider3d` `notches`**: a press beside the handle steps to the next notch that way; dragging stays continuous. A material's `tile` is now **scale textures**, 1/32 to 4 on a log scale, notched at 1/n and whole numbers (`textureScaleNotches`), where pictures repeat whole.
+- **The tailor has undo and redo** on a bar pinned to the top of its panel (⌘Z / ⇧⌘Z in the builder while it is open), with cancel and done unless it is `persistent`.
+- **Grips per class of item** (`hold-grip`: `holdGrip`, `holdClassOf`, `HOLD_CLASSES`): pistols, rifles, heavy weapons, one- and two-handed blades, bows, shields. The character builder keeps an adjusted grip per class (placing one sword places every one-handed blade; per-item grips saved before are read as their class's), and the biped playground holds by class.
+- **The character builder's tailor is always on the bar** (scissors): pick a slot and a garment, and one you cut opens on its outline to edit, or start a new one; no done or cancel, it keeps the garment when you switch or close, and undo covers the edits. Export, import and forget moved into it; the Tailor tab is gone. `mountTailorTool` takes `panel`, `persistent` and `rows`; characters take `hideSlot` (one slot's garment off for a moment).
+- **Character builder clothes**: each slot is one row, the garment and its material swatch beside it; the "edit" picker is gone. `materialPicker3d` takes `name` (a title with no caption).
+- **Tailor drape**: edits no longer lock the page (debounced, sliced, interruptible: `drapeGarmentAsync`, `runSliced`, `drapeSteps`, `remeshSteps`); cloth goes over arms, shoulders and hips; anchored points are drawn in the new `--w3d-anchored` colour.
+
+## Changed
+
+- **Stroked-and-filled icons fill with `--w3d-icon-fill`** (a mid blue) instead of the button colour behind them. Pass `knockout` to `iconGlyph`, or set `--tosi-icon-knockout`, for the old look.
+- The rig tool's hosted "start over" is an icon beside undo and redo.
+- Material inputs are labelled **diffuse** (albedo), **normal map** (was bumps) and **colorize** (a cloth's recolour); the recipe keys are unchanged.
+- A material's `tile` input's range is now 1/32 to 4 (was 0.02 to 4), so a smaller saved value is clamped.
+- Cloth material previews show a colour the recipe names wholly (the preview has no texture for a recolour to keep).
+- The tailor's "export glTF" button reads "export GLB".
+
+## Fixed
+
+- Arrow keys and Space no longer scroll the page while you play a demo.
+- Tailor, cut from the skin: tidy, smoothed cut edges (no spikes or notches along a neckline).
+- Drape: edges well clear of the body are no longer pinned to it (rigid hems).
+- A held item's grip is measured on fresh world matrices (the pistol no longer circles the hand metres away); the launcher reads its `_grip` the same way.
+- Auto-rig: glove bumps are not read as fingers, and a knotted thumb is placed by proportion.
+- The rig tool casts shadows when hosted, and done on a body from a file no longer leaves it invisible.
+- Undoing a placed grip in the character builder moves the held item back (the numbers were restored, the item was not).
+- A stroked-and-filled icon's part drawn with `stroke:none` stays unstroked (tosijs-ui#251 worked round by `bin/icon-no-stroke.ts`).

package/dist/asset-url.d.ts

@@ -29,7 +29,7 @@ export declare function getAssetBase(): string;
  * he had. Three wrong diagnoses before someone looked at the actual bytes.
  *
  * So pass a version whenever you depend on content that has been republished:
- * `assetUrl('quaternius/UAL1_core.glb', 2)`. It changes the URL, which is the
+ * `assetUrl('quaternius/UAL1_core.glb', 3)`. It changes the URL, which is the
  * only thing an immutable cache respects.
  */
 export declare function assetUrl(path: string, version?: string | number): string;

package/dist/asset-url.js

@@ -52,7 +52,7 @@ export function getAssetBase() {
  * he had. Three wrong diagnoses before someone looked at the actual bytes.
  *
  * So pass a version whenever you depend on content that has been republished:
- * `assetUrl('quaternius/UAL1_core.glb', 2)`. It changes the URL, which is the
+ * `assetUrl('quaternius/UAL1_core.glb', 3)`. It changes the URL, which is the
  * only thing an immutable cache respects.
  */
 export function assetUrl(path, version) {

package/dist/b3d-biped.d.ts

@@ -22,28 +22,6 @@ export declare class AnimState {
     constructor(spec: AnimStateSpec);
     static buildList(...specs: AnimStateSpec[]): AnimState[];
 }
-/**
- * **Animation states for a Quaternius UAL rig** (the Universal Animation
- * Library, on `cdn.tosijs.net/quaternius/`).
- *
- * The biped drives states by NAME — `walk`, `run`, `sneak` — and a rig supplies
- * whatever its animator called them. This is the translation for UAL, so
- * adopting that library is one line:
- *
- * ```js
- * b3dBiped({
- *   url: assetUrl('quaternius/UAL1_core.glb', 2),
- *   animationStates: ualAnimationStates(),
- * })
- * ```
- *
- * Two things it buys beyond names. `walkBackwards` becomes a real
- * `Jog_Bwd_Loop` rather than the walk cycle played in reverse, and `sneak` gets
- * a crouch that holds at rest — both were fakes against the stock rig.
- *
- * Pass `extra` to add or override entries; a later entry with the same `name`
- * wins, so a project can retarget one state without restating the rest.
- */
 export declare function ualAnimationStates(extra?: AnimStateSpec[]): AnimState[];
 export declare class B3dBiped extends B3dControllable {
     static preferredTagName: string;
@@ -321,6 +299,16 @@ export declare class B3dBiped extends B3dControllable {
      * Unset, the button toggles `gunplay` as before.
      */
     whenWeapon: ((up: boolean) => void) | null;
+    /**
+     * A MELEE weapon is in hand (a sword): it stays visible with gunplay off
+     * (lowered weapons are otherwise hidden, see `_showWeapons`), standing still
+     * is `meleeIdle` (UAL's `Sword_Idle`), and the right trigger swings
+     * (`meleeAttack`, `Sword_Attack`, played through) instead of sprinting.
+     * JS only; the game sets it when what is in hand changes.
+     */
+    get holdingWeapon(): boolean;
+    set holdingWeapon(on: boolean);
+    private _holdingWeapon;
     /**
      * Put the weapon up or down.
      *
@@ -673,6 +661,15 @@ export declare class B3dBiped extends B3dControllable {
     private _blendStep;
     private _ease;
     private _paceBlends;
+    /**
+     * The melee version of a state: a swing in progress takes the whole body
+     * while on the ground (not mid-jump, swimming or climbing), and standing
+     * still is on guard. A rig without the clips keeps its own states.
+     */
+    private _meleeState;
+    /** Seconds left of the swing playing now. */
+    private _attackFor;
+    private _swing;
     setAnimationState(name: string, speed?: number): void;
     getCameraTarget(): BABYLON.Node | null;
     applyInput(input: ControlInput, dt: number): void;

package/dist/b3d-biped.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"b3d-biped.d.ts","sourceRoot":"","sources":["../src/b3d-biped.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"b3d-biped.d.ts","sourceRoot":"","sources":["../src/b3d-biped.ts"],"names":[],"mappings":"AAoTA,OAAO,KAAK,OAAO,MAAM,iBAAiB,CAAA;AAC1C,OAAO,EACL,OAAO,EAKR,MAAM,gBAAgB,CAAA;AAyBvB,OAAO,EAQL,KAAK,GAAG,EAET,MAAM,UAAU,CAAA;AACjB,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AAExC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AACvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAEtD,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,sBAAsB,CAAA;AAa7B,MAAM,MAAM,aAAa,GAAG;IAC1B,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB,CAAA;AAED,qBAAa,SAAS;IACpB,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,OAAO,CAAA;IACb,QAAQ,EAAE,OAAO,CAAA;IACjB,SAAS,EAAE,OAAO,CAAA;gBAEN,IAAI,EAAE,aAAa;IAQ/B,MAAM,CAAC,SAAS,CAAC,GAAG,KAAK,EAAE,aAAa,EAAE,GAAG,SAAS,EAAE;CAGzD;AAuCD,wBAAgB,kBAAkB,CAAC,KAAK,GAAE,aAAa,EAAO,GAAG,SAAS,EAAE,CA8E3E;AAoDD,qBAAa,QAAS,SAAQ,eAAe;IAC3C,MAAM,CAAC,gBAAgB,SAAmB;IAElC,GAAG,EAAE,MAAM,CAAA;IACX,MAAM,EAAE,OAAO,CAAA;IACf,YAAY,EAAE,MAAM,CAAA;IAE5B,MAAM,CAAC,cAAc;;;;;;;;;;;;;;;;;;;;;;QAqDnB,0DAA0D;;QAE1D;;;;;;;;;;;;;;;;WAgBG;gBACc,IAAI,GAAG,KAAK;QAC7B,+EAA+E;;QAiB/E,8DAA8D;;QAE9D,gDAAgD;;QAiBhD;;;;;;WAMG;;QAEH;;;;;;;;WAQG;qBACmB,IAAI,GAAG,KAAK;QAClC;;;;;WAKG;;QAEH;;;;;WAKG;;QAGH,gDAAgD;;QAEhD,+EAA+E;;QAE/E;;;;;;;;;;;WAWG;QACH;;;;;;;;;WASG;;QAEH;;;;;;;;;;;;;;;;;;;WAmBG;;;QAGH;;;;;;;;;;;;;;;;WAgBG;;;;;;;;;MAEJ;IAED,OAAO,CAAC,EAAE,OAAO,CAAC,mBAAmB,CAAA;IACrC,MAAM,CAAC,EAAE,OAAO,CAAC,MAAM,CAAA;IACvB;;6EAEyE;IACzE,UAAU,EAAE,OAAO,GAAG,KAAK,CAAU;IACrC,OAAO,CAAC,SAAS,CAAkC;IACnD,OAAO,CAAC,QAAQ,CAAqC;IACrD,OAAO,CAAC,cAAc,CAAQ;IAC9B,OAAO,CAAC,UAAU,CAA6B;IAE/C;;gFAE4E;IAC5E,WAAW,SAAM;IACjB,aAAa,SAAM;IACnB,OAAO,CAAC,OAAO,CAAwB;IACvC;;;;;;;;;;;4EAWwE;IACxE,eAAe,CAAC,YAAY,SAAI,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI;IA0BzD,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,OAAO,CAAC,eAAe,CAAC,CAAiB;IACzC,cAAc,CAAC,EAAE,SAAS,CAAA;IAC1B,cAAc,CAAC,EAAE,OAAO,CAAC,cAAc,CAAA;IACvC,kFAAkF;IAClF,OAAO,CAAC,UAAU,CAGf;IACH,0FAA0F;IAC1F,OAAO,CAAC,QAAQ,CAAI;IACpB;;;;OAIG;IACH,kFAAkF;IAClF,OAAO,CAAC,cAAc,CAAI;IAC1B,OAAO,CAAC,OAAO,CAQA;IACf,0EAA0E;IAC1E,OAAO,CAAC,UAAU,CAQH;IACf,6FAA6F;IAC7F,OAAO,CAAC,aAAa,CAIN;IACf,cAAc,CAAC,EAAE,cAAc,CAAA;IAE/B;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAI;IACpB,8EAA8E;IAC9E,OAAO,CAAC,SAAS,CAAQ;IACzB,2EAA2E;IAC3E,OAAO,CAAC,QAAQ,CAAI;IACpB,uEAAuE;IACvE,OAAO,CAAC,UAAU,CAAI;IACtB,8EAA8E;IAC9E,OAAO,CAAC,eAAe,CAAQ;IAC/B,uEAAuE;IACvE,OAAO,CAAC,QAAQ,CAAI;IACpB;;;OAGG;IACH,OAAO,CAAC,UAAU,CAAI;IACtB,qEAAqE;IACrE,OAAO,CAAC,IAAI,CAAI;IAChB,uEAAuE;IACvE,IAAI,gBAAgB,IAAI,OAAO,CAE9B;IACD;;;;;OAKG;IACH,OAAO,CAAC,IAAI,CAAkC;IAE9C;;;;;;;;;;;;OAYG;IACH;;;;;;;;;;;OAWG;IACH,OAAO,UAAQ;IACf,OAAO,CAAC,gBAAgB,CAAQ;IAChC;;;;;OAKG;IACH,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,OAAO,KAAK,IAAI,CAAC,GAAG,IAAI,CAAO;IACjD;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,OAAO,CAE3B;IACD,IAAI,aAAa,CAAC,EAAE,EAAE,OAAO,EAG5B;IACD,OAAO,CAAC,cAAc,CAAQ;IAE9B;;;;;OAKG;IACH,UAAU,CAAC,EAAE,EAAE,OAAO,GAAG,IAAI;IAc7B;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,YAAY;IAKpB;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,OAAO,CAAC,WAAW;IAwCnB;;;;;;;;;;;;OAYG;IACH,YAAY,GAAI,KAAK,cAAc,EAAE,IAAI,MAAM,KAAG,YAAY,CAEF;IAC5D,WAAW,gDAAgC;IAE3C;;;;;;;;;;;OAWG;IACH,OAAO,KAAK,SAAS,GAEpB;IAcD,OAAO,CAAC,YAAY,CAIb;IACP,OAAO,CAAC,eAAe,CAAW;IAClC,OAAO,CAAC,QAAQ;IAahB;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,OAAO,CAAC,QAAQ,CAA4B;IAC5C,OAAO,CAAC,eAAe,CAGtB;IAED,OAAO,CAAC,cAAc;IAsHtB,OAAO,CAAC,OAAO,CAId;IACD,OAAO,CAAC,OAAO,CAAyB;IACxC,OAAO,CAAC,UAAU,CAAuB;IAEzC;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,YAAY;IAgBpB;;;;;;;OAOG;IACH,OAAO,CAAC,SAAS;IAQjB,uEAAuE;IACvE,OAAO,CAAC,OAAO,CAA2D;IAC1E,2EAA2E;IAC3E,OAAO,CAAC,aAAa,CAAQ;IAC7B,OAAO,CAAC,OAAO,CAId;IAED;;;;;;;;;OASG;IACH,OAAO,CAAC,kBAAkB;IAmC1B;;;;;;;;;;OAUG;IACH,OAAO,CAAC,WAAW;IAWnB,iFAAiF;IACjF,IAAI,GAAG,IAAI,GAAG,CAEb;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,OAAO,CAAC,OAAO,CAQlC;IAED;;;;;;;OAOG;IACH,IAAI,SAAS,IAAI,OAAO,CAAC,OAAO,CAO/B;IACD,OAAO,CAAC,SAAS,CAAQ;IACzB,0EAA0E;IAC1E,OAAO,CAAC,UAAU,CAAQ;IAC1B,yEAAyE;IACzE,OAAO,CAAC,YAAY,CAAQ;IAC5B,0EAA0E;IAC1E,OAAO,CAAC,MAAM,CAAQ;IACtB,OAAO,CAAC,SAAS,CAAkC;IACnD;;;;;OAKG;IACH,OAAO,CAAC,SAAS,CAAyC;IAC1D,OAAO,CAAC,UAAU,CAAI;IAEtB;;;;;;;OAOG;IACH,OAAO,CAAC,YAAY;IAoBpB,OAAO,CAAC,SAAS,CAAQ;IACzB,uFAAuF;IACvF,OAAO,CAAC,WAAW,CAAK;IACxB,OAAO,CAAC,WAAW,CAAI;IACvB,6EAA6E;IAC7E,OAAO,CAAC,QAAQ,CAAI;IACpB,OAAO,CAAC,QAAQ,CAMH;IACb,+EAA+E;IAC/E,OAAO,CAAC,QAAQ,CAAkB;IAElC;;;;;;;OAOG;IACH,OAAO,CAAC,cAAc;IAStB,OAAO,CAAC,SAAS,CAAO;IAExB,eAAe,cAkBd;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA6BG;IACH,OAAO,CAAC,WAAW;IAqCnB;;;OAGG;IACH,OAAO,CAAC,WAAW;IAYnB;;;;;;;;;;;;;;;;;OAiBG;IACH,OAAO,CAAC,YAAY;IAiDpB;;;;;;;;;;;;;;;;;;;;;;;;;;;OA2BG;IACH,OAAO,CAAC,cAAc;IAatB;;;;;;;;;OASG;IACH,OAAO,CAAC,UAAU;IAiGlB;;;OAGG;IACH,OAAO,CAAC,UAAU;IA8ClB;;;;;;;;OAQG;IACH,OAAO,CAAC,aAAa;IA4BrB,OAAO,CAAC,OAAO,CAAoB;IACnC,OAAO,CAAC,SAAS;IAMjB,OAAO,CAAC,QAAQ;IAKhB;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,SAAS,CAAgC;IACjD,OAAO,CAAC,YAAY,CAAK;IAEzB,OAAO,CAAC,eAAe;IAiDvB,8CAA8C;IAC9C,OAAO,CAAC,SAAS,CAAI;IAcrB,OAAO,CAAC,MAAM,CAAoC;IAClD,OAAO,CAAC,UAAU,CAAI;IAEtB,OAAO,CAAC,KAAK;IAOb,OAAO,CAAC,WAAW;IASnB;;;;OAIG;IACH,OAAO,CAAC,WAAW;IAKnB,6CAA6C;IAC7C,OAAO,CAAC,UAAU,CAAI;IACtB,OAAO,CAAC,MAAM;IAWd,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,SAAI;IAkFzC,eAAe,IAAI,OAAO,CAAC,IAAI,GAAG,IAAI;IAItC,UAAU,CAAC,KAAK,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM;IAyvC1C,OAAO,CAAC,YAAY;IASd,aAAa;IA2JnB,eAAe;IAKT,iBAAiB;IAwDvB;;;mDAG+C;IAC/C,aAAa,CAAC,IAAI,EAAE,OAAO,GAAG,KAAK;IAyBnC;;;;+EAI2E;IAC3E,OAAO,CAAC,aAAa;IAUrB,iBAAiB;IAoBjB;;mDAE+C;IAC/C,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAmB5B,OAAO,CAAC,SAAS,CAAiD;IAElE;;;;;OAKG;IACH,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI;IAoB1C,6CAA6C;IAC7C,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAQ/B,8EAA8E;IAC9E,YAAY,EAAE,OAAO,CAAO;IAC5B,4FAA4F;IAC5F,MAAM,EAAE,GAAG,CAAO;IAElB,UAAU,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK;YAmC7B,cAAc;YAYd,cAAc;IAkI5B,OAAO,CAAC,WAAW;IAkFnB,YAAY;IAyCZ,MAAM;CA6BP;AAED,eAAO,MAAM,QAAQ,2CAA4B,CAAA"}

package/dist/b3d-biped.js

@@ -82,7 +82,7 @@ const gun = b3dLauncher({
 // on a figure half the intended size.
 const hero = b3dBiped(
   {
-    url: assetUrl('quaternius/UAL1_core.glb', 2),
+    url: assetUrl('quaternius/UAL1_core.glb', 3),
     animationStates: ualAnimationStates(),
     player: true, cameraType: 'follow', aiming: 'on', aimFreeYaw: 45,
   },
@@ -353,7 +353,7 @@ export class AnimState {
  *
  * ```js
  * b3dBiped({
- *   url: assetUrl('quaternius/UAL1_core.glb', 2),
+ *   url: assetUrl('quaternius/UAL1_core.glb', 3),
  *   animationStates: ualAnimationStates(),
  * })
  * ```
@@ -365,6 +365,20 @@ export class AnimState {
  * Pass `extra` to add or override entries; a later entry with the same `name`
  * wins, so a project can retarget one state without restating the rest.
  */
+/** The states a melee swing may take over: on the ground, not in the air or water. */
+const MELEE_GROUND = new Set([
+    'idle',
+    'walk',
+    'run',
+    'sprint',
+    'walkBackwards',
+    'strafeLeft',
+    'strafeRight',
+    'sneak',
+    'sneakIdle',
+    'sneakLeft',
+    'sneakRight',
+]);
 export function ualAnimationStates(extra = []) {
     const base = [
         { name: 'idle', animation: 'Idle_Loop', loop: true },
@@ -433,6 +447,10 @@ export function ualAnimationStates(extra = []) {
         { name: 'aimDown', animation: 'Pistol_Aim_Down', loop: true },
         { name: 'shoot', animation: 'Pistol_Shoot', loop: false },
         { name: 'reload', animation: 'Pistol_Reload', loop: false },
+        // MELEE, with a weapon held but not raised (see `holdingWeapon`): standing
+        // still on guard, and one swing per pull of the trigger.
+        { name: 'meleeIdle', animation: 'Sword_Idle', loop: true },
+        { name: 'meleeAttack', animation: 'Sword_Attack', loop: false },
     ];
     const byName = new Map();
     for (const spec of [...base, ...extra]) {
@@ -833,6 +851,21 @@ export class B3dBiped extends B3dControllable {
      * Unset, the button toggles `gunplay` as before.
      */
     whenWeapon = null;
+    /**
+     * A MELEE weapon is in hand (a sword): it stays visible with gunplay off
+     * (lowered weapons are otherwise hidden, see `_showWeapons`), standing still
+     * is `meleeIdle` (UAL's `Sword_Idle`), and the right trigger swings
+     * (`meleeAttack`, `Sword_Attack`, played through) instead of sprinting.
+     * JS only; the game sets it when what is in hand changes.
+     */
+    get holdingWeapon() {
+        return this._holdingWeapon;
+    }
+    set holdingWeapon(on) {
+        this._holdingWeapon = on;
+        this._showWeapons(this.gunplay);
+    }
+    _holdingWeapon = false;
     /**
      * Put the weapon up or down.
      *
@@ -868,8 +901,9 @@ export class B3dBiped extends B3dControllable {
      * walk — and that is already on the list.
      */
     _showWeapons(visible) {
+        const shown = visible || this._holdingWeapon;
         for (const w of this._weapons())
-            w.mesh?.setEnabled(visible);
+            w.mesh?.setEnabled(shown);
     }
     /**
      * POINT THE WEAPON WHERE THE SHOT GOES.
@@ -938,7 +972,9 @@ export class B3dBiped extends B3dControllable {
      * (TS2611). An arrow field binds `this` and reads the mode live, which is all
      * the getter was for.
      */
-    inputMapping = (pad, dt) => bipedMapping(pad, dt, this.gunplay);
+    inputMapping = (pad, dt) => 
+    // A melee weapon takes the trigger too: it swings rather than sprints.
+    bipedMapping(pad, dt, this.gunplay || this._holdingWeapon);
     inputLabels = bipedMappingDescriptor.labels;
     /**
      * Aiming right now.
@@ -1630,6 +1666,8 @@ export class B3dBiped extends B3dControllable {
      * layer instead, because a walk cycle is still a walk cycle.
      */
     _gunplayState(name) {
+        if (!this.gunplay && this._holdingWeapon)
+            return this._meleeState(name);
         if (!this.gunplay)
             return name;
         if (name !== 'idle')
@@ -1765,8 +1803,33 @@ export class B3dBiped extends B3dControllable {
         for (const group of this._eased)
             group.blendingSpeed = step;
     }
+    /**
+     * The melee version of a state: a swing in progress takes the whole body
+     * while on the ground (not mid-jump, swimming or climbing), and standing
+     * still is on guard. A rig without the clips keeps its own states.
+     */
+    _meleeState(name) {
+        if (this._attackFor > 0 && MELEE_GROUND.has(name))
+            return 'meleeAttack';
+        if (name === 'idle' && this._hasClip('Sword_Idle'))
+            return 'meleeIdle';
+        return name;
+    }
+    /** Seconds left of the swing playing now. */
+    _attackFor = 0;
+    _swing() {
+        if (!this._hasClip('Sword_Attack')) {
+            this._warnOnce(`b3d-biped: melee attack, but ${this.url || 'this rig'} has no ` +
+                `Sword_Attack clip. If it should, the asset is probably cached.`);
+            return;
+        }
+        this._attackFor = this._clipSeconds('Sword_Attack') || 1;
+    }
     setAnimationState(name, speed = 1) {
         name = this._gunplayState(name);
+        // A swing and the guard play at their own speed, not the gait's.
+        if (name === 'meleeAttack' || name === 'meleeIdle')
+            speed = 1;
         if (name == null) {
             throw new Error('setAnimationState failed, no animation name specified.');
         }
@@ -2340,6 +2403,13 @@ export class B3dBiped extends B3dControllable {
             // holstered character who fires anyway is worse than one who cannot.
             if (this.gunplay && (input.shoot ?? 0) > 0.5)
                 this._fireWeapons();
+            // A melee weapon swings, once per swing: held, it swings again after.
+            this._attackFor = Math.max(0, this._attackFor - dt);
+            if (!this.gunplay &&
+                this._holdingWeapon &&
+                this._attackFor === 0 &&
+                (input.shoot ?? 0) > 0.5)
+                this._swing();
             // After the shot, so the ring sits where THIS frame's aim points rather
             // than lagging it by one.
             if (this.owner != null)
@@ -3373,6 +3443,10 @@ export class B3dBiped extends B3dControllable {
         if (changes.length)
             console.warn('<tosi-b3d-biped>: the character file, read with changes', changes);
         const settings = c.settings;
+        // The pictures its materials use (a print chosen from disk), by key.
+        const { registerPicture } = await import('./material-pictures.js');
+        for (const [key, b64] of Object.entries(c.pictures ?? {}))
+            registerPicture(key, b64);
         // A mesh body comes from the page's sources, or from where the file says
         // (a URL, or the mesh itself inside the file).
         const sources = { ...CHARACTER_SOURCES };
@@ -3410,7 +3484,7 @@ export class B3dBiped extends B3dControllable {
             return;
         }
         // The clips the states name, from the library, retargeted and named as they were.
-        const library = await BABYLON.LoadAssetContainerAsync(attrs.animations || assetUrl('quaternius/UAL1_core.glb', 2), scene);
+        const library = await BABYLON.LoadAssetContainerAsync(attrs.animations || assetUrl('quaternius/UAL1_core.glb', 3), scene);
         library.addAllToScene();
         for (const g of library.animationGroups)
             g.stop();