@ikijs/editor 0.7.0 → 0.8.0

package/dist/index.mjs

@@ -1776,6 +1776,45 @@ function validateLayerInputs(layers, canvas) {
         }
       }
     }
+    if (layer.denseCore !== void 0) {
+      const where = `auto-rig: validateLayerInputs: role "${role}" denseCore`;
+      const core = layer.denseCore;
+      if (typeof core !== "object" || core === null || Array.isArray(core)) {
+        throw new Error(`${where} must be a plain object { x, y, w, h }`);
+      }
+      for (const field of ["x", "y", "w", "h"]) {
+        const v = core[field];
+        const size = field === "w" || field === "h";
+        if (typeof v !== "number" || !Number.isFinite(v) || size && v <= 0) {
+          throw new Error(
+            `${where}.${field} is ${String(v)}, not a finite number${size ? " > 0" : ""}`
+          );
+        }
+      }
+      const { x, y, w, h } = layer.denseCore;
+      const right = bbox.x + bbox.w;
+      const bottom = bbox.y + bbox.h;
+      if (x < bbox.x) {
+        throw new Error(
+          `${where}.x (${x}) lies left of the bbox's left edge (${bbox.x})`
+        );
+      }
+      if (y < bbox.y) {
+        throw new Error(
+          `${where}.y (${y}) lies above the bbox's top edge (${bbox.y})`
+        );
+      }
+      if (x + w > right) {
+        throw new Error(
+          `${where}.w (${w}) puts its right edge at ${x + w}, past the bbox's right edge (${right})`
+        );
+      }
+      if (y + h > bottom) {
+        throw new Error(
+          `${where}.h (${h}) puts its bottom edge at ${y + h}, past the bbox's bottom edge (${bottom})`
+        );
+      }
+    }
   }
 }
 function validateStrandEdges(layers, strandEdges) {
@@ -2330,12 +2369,17 @@ function resolveTurnTargets(targets = {}) {
     defaulted
   };
 }
+function noseDrawnBox(layer) {
+  return layer.denseCore ?? layer.bbox;
+}
 function turnLandmarks(layers, carriers) {
   const markOf = (role) => {
     const layer = layers.find((l) => l.role === role);
     if (!layer) return void 0;
-    const t = bboxToTransform(layer.bbox, layer.canvasW, layer.canvasH, role);
-    const mark = { x: t.x, y: t.y, w: layer.cropW };
+    const drawn = role === "nose" ? noseDrawnBox(layer) : layer.bbox;
+    const t = bboxToTransform(drawn, layer.canvasW, layer.canvasH, role);
+    const w = drawn === layer.bbox ? layer.cropW : drawn.w;
+    const mark = { x: t.x, y: t.y, w };
     const carrier = carriers?.get(role);
     if (carrier !== void 0) mark.carrier = carrier;
     return mark;
@@ -3286,6 +3330,7 @@ function solveTurnModel(targets, landmarks, lattice, faceCenterX, faceHalfWidth,
 var EYE_STACK_PREFIXES = ["eye_", "iris_", "pupil_", "highlight_"];
 var HAIR_FRONT_DEPTH = 0.1;
 var MOUTH_TURN_TILT_DEG = 5;
+var NOSE_TURN_TILT_DEG = 6;
 var NOD_TRAVEL = 30;
 var NOD_BEND = 0.5;
 var HAIR_BACK_NOD_DEPTH = -0.135;
@@ -3898,11 +3943,31 @@ function turnSetup(layers) {
     y: mouthAt.y,
     tiltDeg: MOUTH_TURN_TILT_DEG
   };
+  const noseLayer = layers.find((l) => l.role === "nose");
+  let noseAnchor;
+  if (noseLayer) {
+    const drawn = noseDrawnBox(noseLayer);
+    const at = bboxToTransform(
+      drawn,
+      noseLayer.canvasW,
+      noseLayer.canvasH,
+      "nose"
+    );
+    noseAnchor = {
+      x: at.x,
+      y: at.y + drawn.h / 2,
+      tiltDeg: NOSE_TURN_TILT_DEG
+    };
+  }
   const carriers = new Map(
-    members.map((m) => [
-      m.role,
-      m.group === "mouthWarp" ? { grid: groupGrids.get(m.group), part: m.part, anchor: mouthAnchor } : { grid: groupGrids.get(m.group), part: m.part }
-    ])
+    members.map((m) => {
+      const grid = groupGrids.get(m.group);
+      const anchor = m.group === "mouthWarp" ? mouthAnchor : m.group === "noseWarp" ? noseAnchor : void 0;
+      return [
+        m.role,
+        anchor === void 0 ? { grid, part: m.part } : { grid, part: m.part, anchor }
+      ];
+    })
   );
   const maxShift = Math.max(turnShift.eye, turnShift.nose, turnShift.mouth);
   let reach = 0;