@ikijs/editor 0.10.0 → 0.10.1

package/dist/index.js

@@ -2433,7 +2433,8 @@ var TURN = {
   /** The back hair's slight counter-motion. */
   hairBack: -0.027,
   /** The ears lag the plate: the far one moves this share of its slide, the
-   *  near one this (the samples' parallax ratios, 0.44 and 0.87). */
+   *  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
 };
@@ -2531,14 +2532,28 @@ function faceField(m) {
   };
 }
 function earField(m) {
+  const f = m.frame;
+  const ears = f.ears;
+  if (ears === void 0) return () => [0, 0];
   const face = faceField(m);
   return (x, y, ax, ay) => {
     const s = Math.sign(ax);
     const a = Math.abs(ax) / 30;
-    const share = sideOf(m, x, s) === "far" ? TURN.earFar : TURN.earNear;
-    return [s * a * share * m.face, face(x, y, 0, ay)[1]];
+    const dy = face(x, y, 0, ay)[1];
+    if (sideOf(m, x, s) === "far") return [s * a * TURN.earFar * m.face, dy];
+    const d = Math.abs(x - f.axisX);
+    const attach = ears.attachAt(y);
+    if (d <= attach) return [face(x, y, ax, 0)[0], dy];
+    const root = face(f.axisX + Math.sign(x - f.axisX) * attach, y, ax, 0)[0];
+    const rim = s * a * TURN.earNear * m.face;
+    const t = Math.min(1, (d - attach) / Math.max(1, ears.outer - attach));
+    return [root + (rim - root) * t, dy];
   };
 }
+function chinSlide(m) {
+  const f = m.frame;
+  return Math.abs(faceField(m)(f.axisX, f.chinY, 30, 0)[0]);
+}
 var NECK_SHADE_MAX = 0.45;
 var NECK_SHADE_FULL = 0.2;
 function neckField(m) {
@@ -2546,7 +2561,7 @@ function neckField(m) {
   const nk = f.neck;
   if (nk === void 0) return () => [0, 0];
   const face = faceField(m);
-  const full = Math.abs(face(f.axisX, f.chinY, 30, 0)[0]);
+  const full = chinSlide(m);
   const share = Math.min(1, NECK_SHADE_MAX * nk.waist / Math.max(1e-6, full));
   const bottom = f.face.y0;
   const tip = f.cutAt(f.axisX);
@@ -2885,7 +2900,8 @@ function boxSmooth(v, k) {
   });
 }
 var CUT_MARGIN = 2;
-function shadeAcross(d, nk) {
+var CUT_LOW = 3;
+function fadeToOutline(d, nk) {
   return Math.max(0, 1 - d / nk.waist);
 }
 var STROKE_RUN = 4;
@@ -3043,20 +3059,30 @@ function buildHeadFrame(layers, opts) {
       };
       const chin = chinY;
       const shade = JAW_SHADE * HH_PER_EYE_TO_CHIN * Math.max(1, eyeY - chin);
+      const reach = opts.chinSlide === void 0 ? nk.waist : clamp(
+        nk.waist - opts.chinSlide - CUT_MARGIN - (CUT_LOW + 1),
+        0,
+        nk.waist
+      );
+      let banded = -1;
       const cut = new Float64Array(faceLayer.cropW);
       for (let i = 0; i < faceLayer.cropW; i++) {
         const d = Math.abs(colX(i) - axisX);
         const stroke = d <= nk.half ? strokeAt(i) : void 0;
-        const y = stroke !== void 0 ? stroke - (shade + CUT_MARGIN) * shadeAcross(d, nk) : (d <= nk.half ? chin + (nk.topY - chin) * (d / Math.max(1, nk.half)) : outlineAt(d)) - CUT_MARGIN;
+        const band = reach > 0 ? Math.max(0, 1 - d / reach) : 0;
+        if (stroke !== void 0 && band > 0) banded = Math.max(banded, d);
+        const y = stroke !== void 0 ? stroke - shade * band - CUT_MARGIN * fadeToOutline(d, nk) : (d <= nk.half ? chin + (nk.topY - chin) * (d / Math.max(1, nk.half)) : outlineAt(d)) - CUT_MARGIN;
         cut[i] = y >= face.y1 ? face.y1 : y;
       }
       const low = cut.map((_, i) => {
         let m = Infinity;
-        for (let j = i - 3; j <= i + 3; j++) {
+        for (let j = i - CUT_LOW; j <= i + CUT_LOW; j++) {
           if (j >= 0 && j < cut.length) m = Math.min(m, cut[j]);
         }
         return m;
       });
+      if (opts.chinSlide !== void 0 && banded >= 0)
+        nk.bandEnd = banded + CUT_LOW + 1;
       cutAt = (x) => {
         const f = x - (faceLayer.bbox.x - canvasW / 2) - 0.5;
         const i = clamp(Math.floor(f), 0, low.length - 1);
@@ -3193,12 +3219,20 @@ function buildFaceMesh(frame, b, head, neckCells) {
         frame.axisX - neck2.waist,
         frame.axisX + neck2.waist
       );
+      if (neck2.bandEnd !== void 0)
+        at.push(frame.axisX - neck2.bandEnd, frame.axisX + neck2.bandEnd);
     }
+    const placed = /* @__PURE__ */ new Set();
     for (const k of at) {
       if (k <= x0 || k >= x1) continue;
-      const near = xs2.findIndex((x) => Math.abs(x - k) < 0.3 * step);
-      if (near >= 0 && near !== 0 && near !== xs2.length - 1) xs2[near] = k;
-      else if (near < 0) xs2.push(k);
+      if ([...placed].some((i) => Math.abs(xs2[i] - k) < 0.5)) continue;
+      const near = xs2.findIndex(
+        (x, i) => !placed.has(i) && Math.abs(x - k) < 0.3 * step
+      );
+      if (near > 0 && near < n) {
+        xs2[near] = k;
+        placed.add(near);
+      } else if (near < 0) placed.add(xs2.push(k) - 1);
     }
     return xs2.sort((a, b2) => a - b2);
   };
@@ -3214,7 +3248,7 @@ function buildFaceMesh(frame, b, head, neckCells) {
     );
     const sampleBelow = (x) => Math.max(
       1,
-      SAMPLE_BELOW * frame.hh * shadeAcross(Math.abs(x - frame.axisX), neck)
+      SAMPLE_BELOW * frame.hh * fadeToOutline(Math.abs(x - frame.axisX), neck)
     );
     let highest = -Infinity;
     for (const x of xs2) {
@@ -3666,8 +3700,7 @@ function eyesInPlate(ctx, m) {
 function chinOverNeck(ctx, m) {
   const { frame } = ctx;
   if (frame.neck === void 0) return true;
-  const f = familyField(m, "face");
-  return Math.abs(f(frame.axisX, frame.chinY, 30, 0)[0]) <= frame.neck.half;
+  return chinSlide(m) <= frame.neck.half;
 }
 function strandHeld(ctx, m) {
   const land2 = analyticLander(m);
@@ -3982,10 +4015,28 @@ function generateIkiFromLayerSet(layers, canvas, options = {}) {
   checkedKeys("turnTargets", options.turnTargets, TURN_TARGET_KEYS);
   const targets = hasNose ? resolveTurnTargets(options.turnTargets, plateHalf) : { given: /* @__PURE__ */ new Set() };
   const turnOptions = hasNose ? options : {};
-  const frame = buildHeadFrame(layers, {
+  const frameOptions = {
     headHalfWidth: targets.headHalfWidth,
     headEdges: targets.headHalfWidth !== void 0 ? options.headEdges : void 0
+  };
+  const solveFrame = buildHeadFrame(layers, frameOptions);
+  const ctx = solveContext(solveFrame, byRole, turnOptions, hasNose);
+  const landmarks = {
+    boxes: Object.fromEntries(
+      ["eye_L", "eye_R", "brow_L", "brow_R"].filter(has).map((r) => [r, box(r)])
+    ),
+    noseAt: ctx.noseAt,
+    noseTopY: ctx.noseBox?.y1,
+    mouthAt: ctx.mouthAt,
+    hairTop: has("hair_front") ? box("hair_front").y1 : solveFrame.face.y1
+  };
+  const build = (q) => buildTurn(solveFrame, landmarks, q);
+  const fit = fitTurn(ctx, targets, style, build);
+  const frame = buildHeadFrame(layers, {
+    ...frameOptions,
+    chinSlide: chinSlide(fit.model)
   });
+  const turn = { ...fit.model, frame };
   const parts = [];
   const reach = /* @__PURE__ */ new Map();
   let regionOf = [];
@@ -4008,19 +4059,6 @@ function generateIkiFromLayerSet(layers, canvas, options = {}) {
     reach.set(spec.role, built.reach);
     parts.push(built.part);
   }
-  const ctx = solveContext(frame, byRole, turnOptions, hasNose);
-  const landmarks = {
-    boxes: Object.fromEntries(
-      ["eye_L", "eye_R", "brow_L", "brow_R"].filter(has).map((r) => [r, box(r)])
-    ),
-    noseAt: ctx.noseAt,
-    noseTopY: ctx.noseBox?.y1,
-    mouthAt: ctx.mouthAt,
-    hairTop: has("hair_front") ? box("hair_front").y1 : frame.face.y1
-  };
-  const build = (q) => buildTurn(frame, landmarks, q);
-  const fit = fitTurn(ctx, targets, style, build);
-  const turn = fit.model;
   const grids = /* @__PURE__ */ new Map();
   for (const family of Object.keys(WARP_ID)) {
     const members = parts.filter((p) => roleSpec(p.id).family === family);