@ikijs/editor 0.12.2 → 0.14.0

package/dist/index.mjs

@@ -1890,14 +1890,155 @@ function createDefaultWarpDeformer(model) {
   };
 }
 
+// src/auto-rig/profile.ts
+var PROFILE_VALUES = {
+  slide: 0.12,
+  lead: 0.1,
+  noseDepth: 2,
+  hairFollow: 1,
+  fore: 0.2,
+  backShare: 0.1,
+  earFar: 0.5,
+  nodDown: 0.18,
+  nodUp: 0.1,
+  nodLead: 0.06,
+  chinShare: 0.75,
+  rollDeg: 14,
+  gaze: 0.2,
+  blink: 0.6,
+  mouthOpen: 0.8,
+  mouthWiden: 1.2,
+  brow: 0.15,
+  breath: 0.03,
+  sway: 0.08
+};
+function deriveProfile(v) {
+  const farLead = v.lead * (1 - v.fore / 2);
+  const nearLead = v.lead * (1 + v.fore / 2);
+  const turn = {
+    /** The face plate's translation. */
+    face: v.slide,
+    /** The chin tip's lead over the plate. */
+    chinLead: v.lead,
+    /** The plate's width at full turn: eye and cheek rows, then the jaw. The
+     *  plate translates; it does not narrow. */
+    widthUpper: 1,
+    widthJaw: 1,
+    eyeFar: v.slide + farLead,
+    eyeNear: v.slide + nearLead,
+    /** Each eye's width at full turn, about its own centre. */
+    eyeFarScale: 1 - v.fore,
+    eyeNearScale: 1 + v.fore / 2,
+    browFar: v.slide + farLead,
+    browNear: v.slide + nearLead,
+    nose: v.slide + v.noseDepth * v.lead,
+    mouth: v.slide + v.lead,
+    mouthWidth: 1,
+    /** The mouth's far corner rises (its near end drops) by this much: it
+     *  stays level. */
+    mouthTiltDeg: 0,
+    /** The front hair (bangs and side locks) rides the face at this share of
+     *  its translation. */
+    hairFollow: v.hairFollow,
+    /** The head's outline at the eye row holds: where the front hair draws
+     *  it, its outer edge follows the face this much on a row where no back
+     *  hair paints behind that edge. Where back hair does, the edge rides
+     *  further, as far as that back hair stays behind it through the turn and
+     *  the nod, up to the face's follow there (`hairFollow`; over the far
+     *  eye's rows, as far as that eye's outer corner goes). On the cap (the
+     *  rows above the eyes) it follows less where the turn would otherwise
+     *  carry it further outside its back hair than the nod alone does. */
+    outlineFollow: 0,
+    /** The back hair's slight counter-motion. */
+    hairBack: -v.backShare * v.slide,
+    /** The ears lag the plate: the far one's outer edge moves this share of
+     *  its slide; the near one rides the head. */
+    earFar: v.earFar,
+    earNear: 1,
+    /** The far ear's width at full turn, about its outer edge, where the head
+     *  leaves it room; less where it does not. */
+    earFarScale: 1 - v.fore
+  };
+  const mid = v.nodDown * (1 + v.chinShare) / 2;
+  const feature = (depth) => ({
+    up: -(v.nodUp + depth * v.nodLead),
+    down: mid + depth * v.nodLead
+  });
+  const nod = {
+    faceTop: { up: -v.nodUp, down: v.nodDown },
+    chin: { up: -v.nodUp, down: v.chinShare * v.nodDown },
+    eye: feature(1),
+    /** Eye height at the extreme, about the eye's centre: it holds. */
+    eyeHeight: { up: 1, down: 1 },
+    brow: feature(1),
+    nose: feature(v.noseDepth),
+    mouth: feature(1),
+    hairFront: { up: -v.hairFollow * v.nodUp, down: v.hairFollow * v.nodDown },
+    /** The front hair's cap top: half the plate's rise looking up; looking
+     *  down the plate's top, which the rig slides only as far as the back
+     *  hair covers the crown behind it. */
+    hairFrontTop: { up: -v.nodUp / 2, down: v.nodDown },
+    hairBack: { up: -v.backShare * v.nodUp, down: v.backShare * v.nodDown }
+  };
+  const amplitude = {
+    /** Iris travel, in iris widths. */
+    gazeX: v.gaze,
+    gazeY: v.gaze / 2,
+    /** How far the upper lid comes down, over the eye's height. */
+    blink: v.blink,
+    /** A single mouth drawing opens to this height over its rest width. */
+    mouthOpenHeight: v.mouthOpen,
+    /** The mouth widens this much open. */
+    mouthOpenWidth: v.mouthWiden,
+    /** Brow raise / lower, hh. */
+    brow: v.brow,
+    /** Breath lifts the shoulders and the head, hh. */
+    breathBody: v.breath,
+    breathHead: v.breath * 2 / 3,
+    /** Hair tip travel at full sway (±20), hh. */
+    sway: v.sway,
+    /** The neck under the face reaches this far above the jaw, hh — what the
+     *  chin uncovers as it slides off it: half again the chin's full-turn
+     *  slide, to the next 0.05. */
+    hiddenNeck: Math.ceil(30 * (v.slide + v.lead) - 1e-9) / 20
+  };
+  return { TURN: turn, NOD: nod, ROLL_DEG: v.rollDeg, AMPLITUDE: amplitude };
+}
+var { TURN, NOD, ROLL_DEG, AMPLITUDE } = deriveProfile(PROFILE_VALUES);
+var STYLE_KNOBS = [
+  "turn",
+  "featureLead",
+  "hairFollow",
+  "outlineFollow",
+  "blink",
+  "sway"
+];
+function resolveStyle(style, check) {
+  const s = style ?? {};
+  const get = (key, def, lo, hi) => s[key] === void 0 ? def : check(`style.${key}`, s[key], lo, hi);
+  return {
+    turn: get("turn", 1, 0, 3),
+    featureLead: get("featureLead", 1, 0, 3),
+    hairFollow: get("hairFollow", TURN.hairFollow, 0, 2),
+    outlineFollow: get("outlineFollow", TURN.outlineFollow, 0, 2),
+    blink: get("blink", AMPLITUDE.blink, 0.1, 1),
+    sway: get("sway", 1, 0, 5)
+  };
+}
+
 // src/auto-rig/types.ts
+var round2 = (v) => Math.round(v * 100) / 100;
 var TurnTargetError = class extends Error {
   constructor(message) {
     super(message);
     this.name = "TurnTargetError";
   }
 };
-var DEFAULT_TURN_TARGETS = Object.freeze({ eyeShift: 0.22, farEyeRatio: 0.78, silhouetteRatio: 1 });
+var DEFAULT_TURN_TARGETS = Object.freeze({
+  eyeShift: round2((TURN.eyeFar + TURN.eyeNear) / 2 - TURN.hairBack),
+  farEyeRatio: round2(TURN.eyeFarScale / TURN.eyeNearScale),
+  silhouetteRatio: 1
+});
 
 // src/auto-rig/roles.ts
 var ROLE_TABLE = [
@@ -1917,6 +2058,8 @@ var ROLE_TABLE = [
   { role: "pupil_R", family: "eye_R" },
   { role: "highlight_L", family: "eye_L" },
   { role: "highlight_R", family: "eye_R" },
+  { role: "lash_lower_L", family: "eye_L" },
+  { role: "lash_lower_R", family: "eye_R" },
   { role: "lash_L", family: "eye_L" },
   { role: "lash_R", family: "eye_R" },
   { role: "brow_L", family: "brow_L" },
@@ -2358,117 +2501,6 @@ function land(l, offsets, x, y) {
   return [topX + (botX - topX) * t, topY + (botY - topY) * t];
 }
 
-// src/auto-rig/profile.ts
-var HH_PER_EYE_TO_CHIN = 1.017;
-var TURN = {
-  /** The face plate's translation (its cheek edges, 0.118 / 0.126). */
-  face: 0.118,
-  /** The chin tip's lead over the plate (it moves 0.194). */
-  chinLead: 0.076,
-  /** The plate's width at full turn: eye and cheek rows, then the jaw. */
-  widthUpper: 0.985,
-  widthJaw: 0.96,
-  eyeFar: 0.192,
-  eyeNear: 0.23,
-  /** Each eye's width at full turn, about its own centre. */
-  eyeFarScale: 0.85,
-  eyeNearScale: 1.085,
-  browFar: 0.213,
-  browNear: 0.243,
-  nose: 0.301,
-  mouth: 0.213,
-  mouthWidth: 0.975,
-  /** The mouth's far corner rises (its near end drops) by this much. */
-  mouthTiltDeg: 4.4,
-  /** The front hair (bangs and side locks) rides the face at this share of
-   *  its translation (bangs 1.18×, side locks at the eye row ≈ 1.0×). */
-  hairFollow: 1.1,
-  /** The head's outline at the eye row holds (−0.014 / −0.004 hh): where the
-   *  front hair draws it, its outer edge follows the face this much on a row
-   *  where no back hair paints behind that edge. Where back hair does, the
-   *  edge rides further, as far as that back hair stays behind it through
-   *  the turn and the nod, up to the face's follow there (`hairFollow`;
-   *  over the far eye's rows, as far as that eye's outer corner goes). On
-   *  the cap (the rows above the eyes) it follows less where the turn would
-   *  otherwise carry it further outside its back hair than the nod alone
-   *  does. */
-  outlineFollow: 0,
-  /** The back hair's slight counter-motion. */
-  hairBack: -0.027,
-  /** The ears lag the plate: the far one's outer edge moves this share of
-   *  its slide, the near one this at its widest reach, its root riding the
-   *  head (the samples' parallax ratios, 0.44 and 0.87). */
-  earFar: 0.44,
-  earNear: 0.87,
-  /** The far ear's width at full turn, about its outer edge, where the head
-   *  leaves it room (the samples' median: Haru 0.81 / 0.91, Hiyori 0.90 /
-   *  0.85, Mao 0.77 / 0.79; none fades); less where it does not. */
-  earFarScale: 0.83
-};
-var NOD = {
-  faceTop: { up: -0.081, down: 0.178 },
-  chin: { up: -0.0875, down: 0.109 },
-  eye: { up: -0.167, down: 0.202 },
-  /** Eye height at the extreme, about the eye's centre. */
-  eyeHeight: { up: 0.994, down: 0.96 },
-  brow: { up: -0.167, down: 0.223 },
-  nose: { up: -0.207, down: 0.193 },
-  mouth: { up: -0.172, down: 0.177 },
-  hairFront: { up: -0.11, down: 0.189 },
-  /** The front hair's cap top. The samples' cap top moves 1.215× their face's
-   *  centroid looking down (Mao 1.236, Haru 1.626, Hiyori 1.194, Natori
-   *  0.730) and 0.415× looking up (0.385, 0.430, 0.400, 0.487); each ratio
-   *  times the plate's own nod halfway between its top and the chin (0.1435
-   *  down, 0.084 up). Looking down, the rig slides it only as far as the
-   *  back hair covers the crown behind it. */
-  hairFrontTop: { up: -0.035, down: 0.174 },
-  hairBack: { up: -0.011, down: 0.025 }
-};
-var ROLL_DEG = 10;
-var AMPLITUDE = {
-  /** Iris travel, in iris widths (X 0.045 hh, Y 0.031 hh on the samples). */
-  gazeX: 0.17,
-  gazeY: 0.11,
-  /** How far the upper lid comes down, over the eye's height (Haru 0.30,
-   *  Mao 0.58, Hiyori 0.67). */
-  blink: 0.58,
-  /** A single mouth drawing opens to this height over its rest width. */
-  mouthOpenHeight: 0.77,
-  /** The mouth widens this much open. */
-  mouthOpenWidth: 1.15,
-  /** Brow raise / lower, hh. */
-  brow: 0.089,
-  /** Breath lifts the shoulders and the head, hh. */
-  breathBody: 0.025,
-  breathHead: 0.016,
-  /** Hair tip travel at full sway (±20), hh (the keyform ranges at ±1 have a
-   *  median of 0.05–0.06 hh). */
-  sway: 0.06,
-  /** The neck under the face reaches this far above the jaw, hh — what the
-   *  chin uncovers as it slides off it. */
-  hiddenNeck: 0.3
-};
-var STYLE_KNOBS = [
-  "turn",
-  "featureLead",
-  "hairFollow",
-  "outlineFollow",
-  "blink",
-  "sway"
-];
-function resolveStyle(style, check) {
-  const s = style ?? {};
-  const get = (key, def, lo, hi) => s[key] === void 0 ? def : check(`style.${key}`, s[key], lo, hi);
-  return {
-    turn: get("turn", 1, 0, 3),
-    featureLead: get("featureLead", 1, 0, 3),
-    hairFollow: get("hairFollow", TURN.hairFollow, 0, 2),
-    outlineFollow: get("outlineFollow", TURN.outlineFollow, 0, 2),
-    blink: get("blink", AMPLITUDE.blink, 0.1, 1),
-    sway: get("sway", 1, 0, 5)
-  };
-}
-
 // src/auto-rig/head.ts
 function outerEdge(runs, axisX, side) {
   if (runs.length === 0) return void 0;
@@ -2681,7 +2713,7 @@ function buildHeadFrame(layers, opts) {
         return face.y1;
       };
       const chin = chinY;
-      const shade = JAW_SHADE * HH_PER_EYE_TO_CHIN * Math.max(1, eyeY - chin);
+      const shade = JAW_SHADE * Math.max(1, eyeY - chin);
       const reach = opts.chinSlide === void 0 ? nk.waist : clamp(
         nk.waist - opts.chinSlide - CUT_MARGIN - (CUT_LOW + 1),
         0,
@@ -2730,7 +2762,7 @@ function buildHeadFrame(layers, opts) {
       }
     }
   }
-  const hh = HH_PER_EYE_TO_CHIN * Math.max(1, eyeY - chinY);
+  const hh = Math.max(1, eyeY - chinY);
   const headHalf = opts.headHalfWidth;
   const hairShell = headHalf !== void 0;
   let shellLeft = axisX - plateHalf;
@@ -4361,12 +4393,12 @@ function motionReach(warps, mesh, box, extra = [0, 0]) {
   }
   return out;
 }
-function blinkFold(param, mesh, eye, travel) {
+function blinkFold(param, mesh, box, travel, eye = box) {
   const yc = eye.y1 - travel * bh(eye);
   return localWarp(
     param,
     mesh,
-    eye,
+    box,
     [0, 1],
     ([, y], v) => v === 1 ? [0, 0] : [0, yc - y]
   );
@@ -4715,6 +4747,10 @@ function buildPart(spec, b, order, frame, byRole, style, frontGrid) {
     case "eye_R":
       warps.push(blinkFold(eyeOpen, mesh, b, style.blink));
       break;
+    case "lash_lower_L":
+    case "lash_lower_R":
+      warps.push(blinkFold(eyeOpen, mesh, b, style.blink, box(`eye_${side}`)));
+      break;
     case "lash_L":
     case "lash_R":
       warps.push(lashFold(eyeOpen, mesh, b, box(`eye_${side}`), style.blink));