@ikijs/engine 0.2.0 → 0.3.1

package/README.md

@@ -38,15 +38,16 @@ clamped to the declared range; unknown ids and non-finite values are ignored.
 
 ## API
 
-| Export                                           | What it is                                                                                              |
-| ------------------------------------------------ | ------------------------------------------------------------------------------------------------------- |
-| `IkiPlayer`                                      | The renderer: `load` / `start` / `stop` / `setParameter` / `getParameter` / `getParameters` / `destroy` |
-| `IkiLoadResult`                                  | `{ failedTextures, superseded }` returned by `load()`                                                   |
-| `ParameterStore`                                 | The clamped parameter map the player drives                                                             |
-| `IdleMotion`                                     | Auto-blink / breath / gaze-drift driver                                                                 |
-| `PhysicsMotion`                                  | Spring-mass-damper secondary motion (`model.physics`)                                                   |
-| `HairChainMotion`                                | Multi-segment angular chain with gravity (`model.physicsChains`)                                        |
-| `translate` `rotate` `scale` `multiply` `toMat3` | The 2D affine helpers the engine itself uses                                                            |
+| Export                                           | What it is                                                                                                 |
+| ------------------------------------------------ | ---------------------------------------------------------------------------------------------------------- |
+| `IkiPlayer`                                      | The renderer: `load` / `start` / `stop` / `setParameter` / `getParameter` / `getParameters` / `destroy`    |
+| `IkiLoadResult`                                  | `{ failedTextures, superseded }` returned by `load()`                                                      |
+| `ParameterStore`                                 | The clamped parameter map the player drives                                                                |
+| `IkiMotion`                                      | The three drivers below, built from a model and stepped as one; `drivenParameterIds` lists what they write |
+| `IdleMotion`                                     | Auto-blink / breath / gaze-drift driver                                                                    |
+| `PhysicsMotion`                                  | Spring-mass-damper secondary motion (`model.physics`)                                                      |
+| `HairChainMotion`                                | Multi-segment angular chain with gravity (`model.physicsChains`)                                           |
+| `translate` `rotate` `scale` `multiply` `toMat3` | The 2D affine helpers the engine itself uses                                                               |
 
 ## Motion drivers
 
@@ -56,37 +57,30 @@ per frame, and each writes through a sink you supply. That keeps them testable
 and lets a host override or omit any of them.
 
 ```ts
-import { HairChainMotion, IdleMotion, PhysicsMotion } from "@ikijs/engine";
+import { IkiMotion } from "@ikijs/engine";
 
 // The drivers read the live pose and write the next one, both through the
 // player — no host-side copy of the parameter state to keep in sync.
-const drive = (id: string, value: number) => player.setParameter(id, value);
-const read = (id: string) => player.getParameter(id);
-
-const idle = new IdleMotion(drive);
-const physics = new PhysicsMotion(
-  model.physics ?? [],
-  model.parameters,
-  read,
-  drive,
-);
-const chains = new HairChainMotion(
-  model.physicsChains ?? [],
-  model.parameters,
-  model.deformers ?? [],
-  read,
-  drive,
+const motion = new IkiMotion(
+  model,
+  (id) => player.getParameter(id),
+  (id, value) => player.setParameter(id, value),
 );
 
 const tick = (now: number) => {
-  idle.update(now);
-  physics.update(now); // reads what idle just wrote
-  chains.update(now);
+  motion.update(now); // idle, then physics (lags what idle just wrote), then chains
   requestAnimationFrame(tick);
 };
 requestAnimationFrame(tick);
 ```
 
+To stop, stop calling `update()` — the drivers leave the pose where it was,
+and `motion.drivenParameterIds` lists every parameter they wrote for a host
+that wants to restore it. The three drivers are also exported individually
+(`IdleMotion`, `PhysicsMotion`, `HairChainMotion`): the two physics drivers
+take the same `read`/`sink` pair, `IdleMotion` only the `sink`, and each is
+stepped with `update(nowMs)` in that order.
+
 Both physics drivers integrate on a fixed 1/60 s sub-step with a clamped frame
 delta, so a backgrounded tab or a long hitch cannot snap the rig.
 

package/dist/index.d.mts

@@ -189,7 +189,7 @@ interface IdleMotionOptions {
     rng?: () => number;
 }
 /**
- * Pure-logic idle-animation driver. Animates the seven "life" parameters
+ * Pure-logic idle-animation driver. Animates the eight "life" parameters
  * (eyes, breath, gaze, head sway) on an internal clock so tab-backgrounding
  * or irregular frame delivery can't produce teleports or snap-close blinks.
  *
@@ -201,6 +201,13 @@ interface IdleMotionOptions {
  * The host is responsible for scheduling; this class has no timers or rAF.
  */
 declare class IdleMotion {
+    /**
+     * Every parameter id {@link update} and `emitRestingPose` write, in write
+     * order. Published so a host (or IkiMotion) can restore them after it
+     * stops driving — keep in step with those two methods; the test suite
+     * pins this list to the actual emissions.
+     */
+    readonly drivenParameterIds: readonly string[];
     private readonly sink;
     private readonly rng;
     private clockMs;
@@ -262,6 +269,8 @@ declare class IdleMotion {
  * updated params on its own render loop (drivers and rendering are decoupled).
  */
 declare class PhysicsMotion {
+    /** The output parameter of every rig, in rig order — what `emit` writes. */
+    readonly drivenParameterIds: readonly string[];
     private readonly rigs;
     private readonly read;
     private readonly sink;
@@ -317,6 +326,8 @@ declare class PhysicsMotion {
  * The host schedules updates; this class has no timers, rAF, DOM, or Date.now.
  */
 declare class HairChainMotion {
+    /** Every segment's output, chain by chain — what `emitSegment` writes. */
+    readonly drivenParameterIds: readonly string[];
     private readonly chainData;
     private readonly params;
     private readonly deformers;
@@ -372,4 +383,49 @@ declare class HairChainMotion {
     private emitSegment;
 }
 
-export { type Affine, HairChainMotion, IdleMotion, type IdleMotionOptions, type IkiLoadResult, IkiPlayer, ParameterStore, PhysicsMotion, multiply, rotate, scale, toMat3, translate };
+/**
+ * Bundles the three motion drivers — {@link IdleMotion}, {@link PhysicsMotion},
+ * {@link HairChainMotion} — into the one loop every host otherwise hand-builds:
+ * construct all three from the model, step them in the order physics and
+ * chains depend on, and know what they wrote.
+ *
+ * Usage:
+ *   const motion = new IkiMotion(
+ *     model,
+ *     (id) => player.getParameter(id),
+ *     (id, value) => player.setParameter(id, value),
+ *   );
+ *   // inside your rAF loop:
+ *   motion.update(performance.now());
+ *
+ * The host schedules; this class has no timers, rAF, DOM, or Date.now.
+ *
+ * Stopping is the host's too: stop calling update(). The drivers leave the
+ * pose where it was — a host that wants it back writes its own resting values
+ * to `drivenParameterIds`.
+ */
+declare class IkiMotion {
+    /**
+     * Idle ids, then rig outputs, then chain-segment outputs, deduplicated and
+     * insertion-ordered. May name ids the model lacks (the player silently
+     * drops writes to unknown ids) — intersect with the model's parameters if
+     * you mirror into your own store.
+     */
+    readonly drivenParameterIds: readonly string[];
+    private readonly idle;
+    private readonly physics;
+    private readonly chains;
+    constructor(model: IkiModel, read: (id: string) => number, sink: (id: string, value: number) => void);
+    /**
+     * Advance idle, then physics, then chains to the same wall-clock timestamp
+     * (milliseconds). Order is load-bearing: `PhysicsMotion` reads its input
+     * parameters (typically `ParamAngleX/Z`) through `read`, and the head sway
+     * idle wrote THIS frame is what the springs must lag behind; `HairChainMotion`
+     * then resolves its anchor deformer's world rotation from that same
+     * just-written pose (which may include a physics output). One timestamp for
+     * all three keeps their dt in lockstep.
+     */
+    update(nowMs: number): void;
+}
+
+export { type Affine, HairChainMotion, IdleMotion, type IdleMotionOptions, type IkiLoadResult, IkiMotion, IkiPlayer, ParameterStore, PhysicsMotion, multiply, rotate, scale, toMat3, translate };

package/dist/index.d.ts

@@ -189,7 +189,7 @@ interface IdleMotionOptions {
     rng?: () => number;
 }
 /**
- * Pure-logic idle-animation driver. Animates the seven "life" parameters
+ * Pure-logic idle-animation driver. Animates the eight "life" parameters
  * (eyes, breath, gaze, head sway) on an internal clock so tab-backgrounding
  * or irregular frame delivery can't produce teleports or snap-close blinks.
  *
@@ -201,6 +201,13 @@ interface IdleMotionOptions {
  * The host is responsible for scheduling; this class has no timers or rAF.
  */
 declare class IdleMotion {
+    /**
+     * Every parameter id {@link update} and `emitRestingPose` write, in write
+     * order. Published so a host (or IkiMotion) can restore them after it
+     * stops driving — keep in step with those two methods; the test suite
+     * pins this list to the actual emissions.
+     */
+    readonly drivenParameterIds: readonly string[];
     private readonly sink;
     private readonly rng;
     private clockMs;
@@ -262,6 +269,8 @@ declare class IdleMotion {
  * updated params on its own render loop (drivers and rendering are decoupled).
  */
 declare class PhysicsMotion {
+    /** The output parameter of every rig, in rig order — what `emit` writes. */
+    readonly drivenParameterIds: readonly string[];
     private readonly rigs;
     private readonly read;
     private readonly sink;
@@ -317,6 +326,8 @@ declare class PhysicsMotion {
  * The host schedules updates; this class has no timers, rAF, DOM, or Date.now.
  */
 declare class HairChainMotion {
+    /** Every segment's output, chain by chain — what `emitSegment` writes. */
+    readonly drivenParameterIds: readonly string[];
     private readonly chainData;
     private readonly params;
     private readonly deformers;
@@ -372,4 +383,49 @@ declare class HairChainMotion {
     private emitSegment;
 }
 
-export { type Affine, HairChainMotion, IdleMotion, type IdleMotionOptions, type IkiLoadResult, IkiPlayer, ParameterStore, PhysicsMotion, multiply, rotate, scale, toMat3, translate };
+/**
+ * Bundles the three motion drivers — {@link IdleMotion}, {@link PhysicsMotion},
+ * {@link HairChainMotion} — into the one loop every host otherwise hand-builds:
+ * construct all three from the model, step them in the order physics and
+ * chains depend on, and know what they wrote.
+ *
+ * Usage:
+ *   const motion = new IkiMotion(
+ *     model,
+ *     (id) => player.getParameter(id),
+ *     (id, value) => player.setParameter(id, value),
+ *   );
+ *   // inside your rAF loop:
+ *   motion.update(performance.now());
+ *
+ * The host schedules; this class has no timers, rAF, DOM, or Date.now.
+ *
+ * Stopping is the host's too: stop calling update(). The drivers leave the
+ * pose where it was — a host that wants it back writes its own resting values
+ * to `drivenParameterIds`.
+ */
+declare class IkiMotion {
+    /**
+     * Idle ids, then rig outputs, then chain-segment outputs, deduplicated and
+     * insertion-ordered. May name ids the model lacks (the player silently
+     * drops writes to unknown ids) — intersect with the model's parameters if
+     * you mirror into your own store.
+     */
+    readonly drivenParameterIds: readonly string[];
+    private readonly idle;
+    private readonly physics;
+    private readonly chains;
+    constructor(model: IkiModel, read: (id: string) => number, sink: (id: string, value: number) => void);
+    /**
+     * Advance idle, then physics, then chains to the same wall-clock timestamp
+     * (milliseconds). Order is load-bearing: `PhysicsMotion` reads its input
+     * parameters (typically `ParamAngleX/Z`) through `read`, and the head sway
+     * idle wrote THIS frame is what the springs must lag behind; `HairChainMotion`
+     * then resolves its anchor deformer's world rotation from that same
+     * just-written pose (which may include a physics output). One timestamp for
+     * all three keeps their dt in lockstep.
+     */
+    update(nowMs: number): void;
+}
+
+export { type Affine, HairChainMotion, IdleMotion, type IdleMotionOptions, type IkiLoadResult, IkiMotion, IkiPlayer, ParameterStore, PhysicsMotion, multiply, rotate, scale, toMat3, translate };

package/dist/index.js

@@ -22,6 +22,7 @@ var index_exports = {};
 __export(index_exports, {
   HairChainMotion: () => HairChainMotion,
   IdleMotion: () => IdleMotion,
+  IkiMotion: () => IkiMotion,
   IkiPlayer: () => IkiPlayer,
   ParameterStore: () => ParameterStore,
   PhysicsMotion: () => PhysicsMotion,
@@ -1072,7 +1073,10 @@ var FixedStepClock = class {
 // src/idle-motion.ts
 var BLINK_INTERVAL_MIN_MS = 1500;
 var BLINK_INTERVAL_MAX_MS = 6e3;
-var BLINK_DURATION_MS = 120;
+var BLINK_CLOSE_MS = 60;
+var BLINK_HOLD_MS = 20;
+var BLINK_OPEN_MS = 100;
+var BLINK_DURATION_MS = BLINK_CLOSE_MS + BLINK_HOLD_MS + BLINK_OPEN_MS;
 var BREATH_PERIOD_MS = 3500;
 var GAZE_RADIUS = 0.3;
 var GAZE_RETARGET_MIN_MS = 1200;
@@ -1090,7 +1094,18 @@ function lerp(a, b, t) {
   return a + (b - a) * t;
 }
 function blinkEnvelope(phase) {
-  return 2 * Math.abs(phase - 0.5);
+  const ms = phase * BLINK_DURATION_MS;
+  if (ms <= 0) return 1;
+  if (ms < BLINK_CLOSE_MS) {
+    const t = ms / BLINK_CLOSE_MS;
+    return 1 - t * t * (3 - 2 * t);
+  }
+  if (ms <= BLINK_CLOSE_MS + BLINK_HOLD_MS) return 0;
+  if (ms < BLINK_DURATION_MS) {
+    const t = (ms - BLINK_CLOSE_MS - BLINK_HOLD_MS) / BLINK_OPEN_MS;
+    return 1 - (1 - t) * (1 - t);
+  }
+  return 1;
 }
 function randomInDisk(rng, radius) {
   const r = Math.sqrt(rng()) * radius;
@@ -1098,6 +1113,22 @@ function randomInDisk(rng, radius) {
   return [r * Math.cos(theta), r * Math.sin(theta)];
 }
 var IdleMotion = class {
+  /**
+   * Every parameter id {@link update} and `emitRestingPose` write, in write
+   * order. Published so a host (or IkiMotion) can restore them after it
+   * stops driving — keep in step with those two methods; the test suite
+   * pins this list to the actual emissions.
+   */
+  drivenParameterIds = [
+    import_format.StandardParameter.EyeOpenLeft,
+    import_format.StandardParameter.EyeOpenRight,
+    import_format.StandardParameter.Breath,
+    import_format.StandardParameter.EyeballX,
+    import_format.StandardParameter.EyeballY,
+    import_format.StandardParameter.AngleX,
+    import_format.StandardParameter.AngleY,
+    import_format.StandardParameter.AngleZ
+  ];
   sink;
   rng;
   // Internal clock: advances by clamped dt, NOT by raw wall-clock jumps.
@@ -1230,6 +1261,8 @@ function signedNormalized(value, param) {
   return clamp((value - rest) / den, -1, 1);
 }
 var PhysicsMotion = class {
+  /** The output parameter of every rig, in rig order — what `emit` writes. */
+  drivenParameterIds;
   rigs;
   read;
   sink;
@@ -1243,6 +1276,7 @@ var PhysicsMotion = class {
     this.sink = sink;
     this.params = new Map(params.map((p) => [p.id, p]));
     this.state = rigs.map(() => ({ x: 0, v: 0 }));
+    this.drivenParameterIds = rigs.map((rig) => rig.output.parameter);
   }
   /**
    * Advance every rig to the given wall-clock timestamp (milliseconds).
@@ -1313,6 +1347,8 @@ var PhysicsMotion = class {
 var DEG2RAD = Math.PI / 180;
 var RAD2DEG = 180 / Math.PI;
 var HairChainMotion = class {
+  /** Every segment's output, chain by chain — what `emitSegment` writes. */
+  drivenParameterIds;
   chainData;
   params;
   deformers;
@@ -1333,6 +1369,9 @@ var HairChainMotion = class {
       ),
       state: chain.segments.map(() => ({ angle: 0, angularVelocity: 0 }))
     }));
+    this.drivenParameterIds = chains.flatMap(
+      (c) => c.segments.map((s) => s.output.parameter)
+    );
   }
   /**
    * Advance every chain to the given wall-clock timestamp (milliseconds).
@@ -1445,10 +1484,59 @@ var HairChainMotion = class {
     );
   }
 };
+
+// src/iki-motion.ts
+var IkiMotion = class {
+  /**
+   * Idle ids, then rig outputs, then chain-segment outputs, deduplicated and
+   * insertion-ordered. May name ids the model lacks (the player silently
+   * drops writes to unknown ids) — intersect with the model's parameters if
+   * you mirror into your own store.
+   */
+  drivenParameterIds;
+  idle;
+  physics;
+  chains;
+  constructor(model, read, sink) {
+    const rigs = model.physics ?? [];
+    const chains = model.physicsChains ?? [];
+    this.idle = new IdleMotion(sink);
+    this.physics = new PhysicsMotion(rigs, model.parameters, read, sink);
+    this.chains = new HairChainMotion(
+      chains,
+      model.parameters,
+      model.deformers ?? [],
+      read,
+      sink
+    );
+    this.drivenParameterIds = [
+      .../* @__PURE__ */ new Set([
+        ...this.idle.drivenParameterIds,
+        ...this.physics.drivenParameterIds,
+        ...this.chains.drivenParameterIds
+      ])
+    ];
+  }
+  /**
+   * Advance idle, then physics, then chains to the same wall-clock timestamp
+   * (milliseconds). Order is load-bearing: `PhysicsMotion` reads its input
+   * parameters (typically `ParamAngleX/Z`) through `read`, and the head sway
+   * idle wrote THIS frame is what the springs must lag behind; `HairChainMotion`
+   * then resolves its anchor deformer's world rotation from that same
+   * just-written pose (which may include a physics output). One timestamp for
+   * all three keeps their dt in lockstep.
+   */
+  update(nowMs) {
+    this.idle.update(nowMs);
+    this.physics.update(nowMs);
+    this.chains.update(nowMs);
+  }
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   HairChainMotion,
   IdleMotion,
+  IkiMotion,
   IkiPlayer,
   ParameterStore,
   PhysicsMotion,