@ikijs/editor 0.33.1 → 0.34.0

package/dist/index.mjs

@@ -1971,7 +1971,7 @@ var PROFILE_VALUES = {
   noseDepth: 2,
   hairFollow: 1,
   fore: 0.2,
-  backShare: 0.1,
+  backShare: 0.3,
   earFar: 0,
   earFore: 0.1,
   nodDown: 0.18,
@@ -2023,7 +2023,8 @@ function deriveProfile(v) {
      *  takes it only down to its root, `hairSideField`) 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
+    /** The head's outline at the eye row turns only as the back hair does
+     *  (`hairBack`, which this share never undercuts): 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
@@ -2032,8 +2033,8 @@ function deriveProfile(v) {
      *  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 back hair turns with the head, a share of the plate's slide. */
+    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,
@@ -3680,7 +3681,7 @@ function hairFrontField(m) {
     )
   );
   const followOf = (x, y, s) => followAt(x, y, s) + (ride === void 0 ? 0 : ride.lift(x, y, s));
-  const drift = Math.abs(m.hairBack);
+  const drift = -m.hairBack;
   const boundOf = (x, y, s) => {
     if (ride === void 0) return followOf(x, y, s);
     const b = ride.blend(x, y, s);
@@ -3847,7 +3848,7 @@ function outerRide(m, inner, coreAt, followAt, capLimit, eyeTop, irisTop) {
   if (f.hairRuns("hair_front", top) === void 0 || f.hairRuns("hair_back", top) === void 0) {
     return void 0;
   }
-  const drift = Math.abs(m.hairBack);
+  const drift = -m.hairBack;
   const sides = [-1, 1];
   const n = ys.length;
   const count = Math.round(top - ys[n - 1]);
@@ -3978,6 +3979,7 @@ function outerRide(m, inner, coreAt, followAt, capLimit, eyeTop, irisTop) {
   const cuts = new Float64Array(n * 2 * nc);
   const blend = new Float64Array(n * 2 * nc);
   const motion = new Array(n * 2);
+  const held = new Array(n * 2);
   const outward = sides.map((side) => {
     const cols = xs.map((_, c) => c).filter((c) => side * (xs[c] - f.axisX) >= 0);
     return side < 0 ? cols.reverse() : cols;
@@ -4034,22 +4036,24 @@ function outerRide(m, inner, coreAt, followAt, capLimit, eyeTop, irisTop) {
         }
       }
       motion[r * 2 + j] = after.map((v) => v + drift);
+      held[r * 2 + j] = today.map((v) => v + drift);
       for (let c = 0; c < nc; c++)
         cuts[(r * 2 + j) * nc + c] = after[c] - today[c];
     });
   }
+  const at = (r, j, c) => (r * 2 + j) * nc + c;
+  let zero = last + 1;
+  while (zero < n && ys[zero] > eyeTop) zero++;
+  while (zero > last + 1 && zero < n && ys[zero] < irisTop - 0.5) zero--;
+  const endY = zero < n ? ys[zero] : Math.min(Math.max(eyeTop, irisTop - 0.5), ys[n - 1] - 1);
   for (let r = 0; r < n; r++) {
     sides.forEach((s, j) => {
       motion[r * 2 + j] ??= xs.map(
         (x) => followAt(x, ys[r], s) + liftAt(x, ys[r], s) + drift
       );
+      held[r * 2 + j] ??= motion[r * 2 + j];
     });
   }
-  const at = (r, j, c) => (r * 2 + j) * nc + c;
-  let zero = last + 1;
-  while (zero < n && ys[zero] > eyeTop) zero++;
-  while (zero > last + 1 && zero < n && ys[zero] < irisTop - 0.5) zero--;
-  const endY = zero < n ? ys[zero] : Math.min(Math.max(eyeTop, irisTop - 0.5), ys[n - 1] - 1);
   for (let pass = 0; pass < 8; pass++) {
     const was = blend.slice();
     for (let j = 0; j < 2; j++) {
@@ -4067,11 +4071,15 @@ function outerRide(m, inner, coreAt, followAt, capLimit, eyeTop, irisTop) {
         for (let q = 0; q < r && q <= last; q++) {
           if (wr[q] < 1) continue;
           const k = (ys[r] - endY) / (ys[q] - endY);
-          for (let c = 0; c < nc; c++)
-            blend[at(r, j, c)] = Math.max(
-              blend[at(r, j, c)],
-              blend[at(q, j, c)] * k
-            );
+          const [mq, hq] = [motion[q * 2 + j], held[q * 2 + j]];
+          const [mr, hr] = [motion[r * 2 + j], held[r * 2 + j]];
+          for (let c = 0; c < nc; c++) {
+            const bq = blend[at(q, j, c)];
+            const ease = hq[c] > 0 ? clamp(1 - (1 - bq) * mq[c] / hq[c], 0, 1) : bq;
+            const want = ease * k;
+            const br = mr[c] > 0 && hr[c] > 0 ? 1 - (1 - want) * hr[c] / mr[c] : want;
+            blend[at(r, j, c)] = Math.max(blend[at(r, j, c)], br);
+          }
         }
       }
     }
@@ -4088,7 +4096,7 @@ function outerRide(m, inner, coreAt, followAt, capLimit, eyeTop, irisTop) {
     }
     if (blend.every((v, i) => v === was[i])) break;
   }
-  const cutRow = (r, j, x) => r > last ? 0 : along(cuts.subarray((r * 2 + j) * nc, (r * 2 + j + 1) * nc), x);
+  const cutRow = (r, j, x) => r > last ? 0 : along(cuts.subarray(at(r, j, 0), at(r, j, nc)), x);
   return {
     lift: liftAt,
     // Between vertex rows, as the render interpolates; a vertex reads its own
@@ -4572,6 +4580,7 @@ function buildTurn(frame, landmarks, q, turn) {
   const eyeHalf = eyes.reduce((sum, e) => sum + (e.x1 - e.x0) / 2, 0) / Math.max(1, eyes.length);
   const farScale = 1 + q.fore * A * (turn.eyeFarScale - 1);
   const farCorner = lead(turn.eyeFar) - (1 - farScale) * eyeHalf;
+  const shell = A * hh * turn.hairBack;
   return {
     frame,
     face,
@@ -4589,10 +4598,13 @@ function buildTurn(frame, landmarks, q, turn) {
     mouth: q.mouth ?? lead(turn.mouth),
     mouthWidth: 1 + A * (turn.mouthWidth - 1),
     tilt: A,
-    hairFront: q.follow * face,
-    hairFar: Math.max(q.follow * face, farCorner),
-    hairOuter: q.outline * face,
-    hairBack: A * hh * turn.hairBack,
+    // The front hair lies on the head in front of its shell: neither over
+    // the face nor at the outline it draws does it turn less than the back
+    // hair behind it.
+    hairFront: Math.max(q.follow * face, shell),
+    hairFar: Math.max(q.follow * face, shell, farCorner),
+    hairOuter: Math.max(q.outline * face, shell),
+    hairBack: shell,
     shellScale: q.shell,
     earFar: q.earFar,
     earFarScale: 1 + A * (turn.earFarScale - 1),
@@ -4714,7 +4726,7 @@ var RIG_PLAN_FIELDS = [
     fitBy: null,
     provisional: false,
     migratedFrom: "hairFollow",
-    what: "the front hair's share of the face's turn"
+    what: "the front hair's share of the face's turn (never less than the back hair's own turn, 0.3 of the face's: a share under that has no effect)"
   },
   {
     path: "hair.outlineFollow",
@@ -4731,7 +4743,7 @@ var RIG_PLAN_FIELDS = [
     fitBy: null,
     provisional: false,
     migratedFrom: "outlineFollow",
-    what: "the front hair's outer edge's share where it draws the head's outline (0: the outline holds, though where back hair paints behind it, it may ride further, as far as that back hair reaches; at hair.follow the front hair's side strands ride whole)"
+    what: "the front hair's outer edge's share where it draws the head's outline (never less than the back hair's own turn: at 0 the outline turns only as the back hair does, though where back hair paints behind it, it may ride further, as far as that back hair reaches; at hair.follow the front hair's side strands ride whole)"
   },
   {
     path: "hair.sway",