@ikijs/editor 0.32.0 → 0.33.0

package/dist/index.mjs

@@ -1972,7 +1972,8 @@ var PROFILE_VALUES = {
   hairFollow: 1,
   fore: 0.2,
   backShare: 0.1,
-  earFar: 0.5,
+  earFar: 0,
+  earFore: 0.1,
   nodDown: 0.18,
   nodUp: 0.1,
   nodLead: 0.06,
@@ -2039,7 +2040,7 @@ function deriveProfile(v) {
     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
+    earFarScale: 1 - v.earFore
   };
   const mid = v.nodDown * (1 + v.chinShare) / 2;
   const feature = (depth) => ({
@@ -2936,6 +2937,7 @@ function mouthAnchor(byRole) {
 }
 
 // src/auto-rig/head.ts
+var EAR_EDGE = 3;
 function outerEdge(runs, axisX, side) {
   if (runs.length === 0) return void 0;
   const x = side > 0 ? runs[runs.length - 1] : runs[0];
@@ -2969,7 +2971,11 @@ function findEars(raw, wMax, firstRow, lastRow, minRows, maxRows) {
     if (raw[t] - raw[t - EAR_ROWS] < step) continue;
     for (let b = t + minRows; b <= Math.min(lastRow, t + maxRows); b++) {
       if (raw[b - EAR_ROWS] - raw[b] >= step) {
-        return { top: t - EAR_ROWS, bottom: b };
+        let end = b;
+        for (let k = b + 1; k <= Math.min(lastRow, b + minRows); k++) {
+          if (raw[k - EAR_ROWS] - raw[k] >= step) end = k;
+        }
+        return { top: t - EAR_ROWS, bottom: end };
       }
     }
     return void 0;
@@ -3047,6 +3053,7 @@ function buildHeadFrame(layers, opts) {
       return rows[i] + (rows[j] - rows[i]) * clamp(r - i, 0, 1);
     };
     const rawRows = raw;
+    let earRows;
     const earless = (chin) => {
       const rowOf = (y) => Math.round(canvasH / 2 - y - faceLayer.bbox.y - 0.5);
       const span3 = Math.max(1, eyeY - chin);
@@ -3069,8 +3076,10 @@ function buildHeadFrame(layers, opts) {
         top: rowY(top) + 0.5,
         bottom: rowY(bottom) - 0.5,
         attachAt: (y) => attach(clamp(canvasH / 2 - y - faceLayer.bbox.y - 0.5, top, bottom)),
-        outer
+        outer,
+        edgeAt: (y) => attach(clamp(canvasH / 2 - y - faceLayer.bbox.y - 0.5, top, bottom)) + EAR_EDGE
       };
+      earRows = { top, bottom };
       return smoothProfile(
         rawRows.map((v, r) => r > top && r < bottom ? attach(r) : v)
       );
@@ -3192,9 +3201,13 @@ function buildHeadFrame(layers, opts) {
       headHalfAt = readRows(head);
       headMax = Math.max(...head);
       if (ears !== void 0) {
+        const band = earRows;
+        const edge = head.map(
+          (w, r) => r >= band.top && r <= band.bottom ? w + EAR_EDGE : w
+        );
         const bottomOf = (d) => {
-          for (let r = head.length - 1; r >= 0; r--) {
-            if (head[r] >= d) return rowY(r) - 0.5;
+          for (let r = edge.length - 1; r >= 0; r--) {
+            if (edge[r] >= d) return rowY(r) - 0.5;
           }
           return face.y1;
         };
@@ -3394,7 +3407,7 @@ function earField(m) {
     const attach = ears.attachAt(y);
     const span3 = Math.max(1, ears.outer - attach);
     if (sideOf(m, x, s) === "far") {
-      const rim2 = TURN.earFar * m.face;
+      const rim2 = m.earFar * m.face;
       const root2 = earRoot(m, face, y, s);
       const lead = Math.max(
         0,
@@ -3419,7 +3432,7 @@ function farEarCovered(m) {
   const ears = m.frame.ears;
   if (ears === void 0) return true;
   const face = faceField(m);
-  const rim = TURN.earFar * m.face;
+  const rim = m.earFar * m.face;
   const y0 = ears.bottom - 2;
   const y1 = ears.top + 2;
   const n = Math.max(1, Math.ceil(y1 - y0));
@@ -4260,6 +4273,7 @@ function fitTurn(ctx, targets, plan, build) {
     lead: plan.turn.featureLead,
     follow: plan.hair.follow,
     outline: plan.hair.outlineFollow,
+    earFar: plan.turn.farEar,
     fore: targets.farEyeRatio === void 0 ? plan.turn.eyeForeshorten : 1,
     shell: 1,
     noseLead: targets.noseShift !== void 0 || plan.turn.noseLead === 1 ? void 0 : plan.turn.noseLead
@@ -4496,6 +4510,7 @@ function buildTurn(frame, landmarks, q, turn) {
     hairOuter: q.outline * face,
     hairBack: A * hh * turn.hairBack,
     shellScale: q.shell,
+    earFar: q.earFar,
     earFarScale: 1 + A * (turn.earFarScale - 1),
     ...landmarks
   };
@@ -4583,6 +4598,23 @@ var RIG_PLAN_FIELDS = [
     migratedFrom: null,
     what: "how far the nose leads the face plate on the turn \u2014 turn only, the nod keeps the profile's nose depth"
   },
+  {
+    path: "turn.farEar",
+    group: "turn",
+    key: "farEar",
+    kind: "absolute",
+    unit: "share of the face plate's slide",
+    default: PROFILE.TURN.earFar,
+    range: [0, 1],
+    recommended: [0, 0.5],
+    step: 0.1,
+    poses: TURN_POSES,
+    cue: null,
+    fitBy: null,
+    provisional: false,
+    migratedFrom: null,
+    what: "how far the far ear's outer edge follows the face on the turn (0: it holds and the head slides over it, about half of a default-sized ear going under the face; 1: it rides with the face and stays whole)"
+  },
   {
     path: "hair.follow",
     group: "hair",
@@ -6681,6 +6713,11 @@ function buildFaceMesh(frame, b, head, neckCells) {
       frame.axisX - frame.headMax + 0.5,
       frame.axisX + frame.headMax - 0.5
     ];
+    const ears2 = frame.ears;
+    if (ears2 !== void 0 && neck2 === void 0) {
+      const d = ears2.edgeAt(ears2.bottom);
+      at.push(frame.axisX - d, frame.axisX + d);
+    }
     if (neck2 !== void 0) {
       at.push(
         frame.axisX,