@ikijs/editor 0.25.0 → 0.26.0

package/dist/index.js

@@ -2287,15 +2287,16 @@ function gridMesh(cols, rows) {
   return { vertices, uvs, indices };
 }
 function columnMesh(b, grid) {
-  const { xs } = grid;
-  const rows = grid.ys.length - 1;
+  const { xs, ys } = grid;
+  const rows = ys.length - 1;
   const vertices = [];
   const uvs = [];
   for (let r = 0; r <= rows; r++) {
+    const v = (ys[0] - ys[r]) / (ys[0] - ys[rows]);
     for (const x of xs) {
       const u = (x - b.x0) / bw(b);
-      vertices.push(roundTo(u - 0.5, 1e-5), roundTo(0.5 - r / rows, 1e-5));
-      uvs.push(roundTo(u, 1e-5), roundTo(r / rows, 1e-5));
+      vertices.push(roundTo(u - 0.5, 1e-5), roundTo(0.5 - v, 1e-5));
+      uvs.push(roundTo(u, 1e-5), roundTo(v, 1e-5));
     }
   }
   const n = xs.length;
@@ -4557,7 +4558,17 @@ function hairFrontField(m) {
     );
     return core + (m.hairOuter - core) * out;
   };
-  const ride = outerRide(m, inner, coreAt, followAt, eyeY + 1.5 * eyeH);
+  const ride = outerRide(
+    m,
+    inner,
+    coreAt,
+    followAt,
+    eyeY + 1.5 * eyeH,
+    eyeY + eyeH / 2,
+    Math.max(
+      ...[m.boxes.iris_L, m.boxes.iris_R].map((b) => b?.y1 ?? -Infinity)
+    )
+  );
   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 crown = crownRide(m, cap, (x, y, s) => followOf(x, y, s) + drift);
@@ -4584,9 +4595,12 @@ function crownBlend(m, y) {
 }
 function gridRow(ys, y, snap = false) {
   const n = ys.length;
-  let v = clamp((ys[0] - y) / (ys[0] - ys[n - 1]) * (n - 1), 0, n - 1);
+  const yc = clamp(y, ys[n - 1], ys[0]);
+  let r = 0;
+  while (r < n - 2 && ys[r + 1] >= yc) r++;
+  let v = r + (ys[r] - yc) / (ys[r] - ys[r + 1]);
   if (snap && Math.abs(v - Math.round(v)) < 1e-3) v = Math.round(v);
-  const r = Math.min(n - 2, Math.floor(v));
+  r = Math.min(n - 2, Math.floor(v));
   return { r, t: v - r };
 }
 function gridCol(xs, x) {
@@ -4676,7 +4690,7 @@ function paints(runs, px) {
   }
   return false;
 }
-function outerRide(m, inner, coreAt, followAt, capLimit) {
+function outerRide(m, inner, coreAt, followAt, capLimit, eyeTop, irisTop) {
   const f = m.frame;
   const grid = m.hairFrontGrid;
   if (grid === void 0) return void 0;
@@ -4863,10 +4877,25 @@ function outerRide(m, inner, coreAt, followAt, capLimit) {
   }
   for (let j = 0; j < 2; j++) {
     for (let r = n - 2; r >= 0; r--) {
-      if (wr[r] < 1)
+      if (r <= last || wr[r] < 1)
         blend[r * 2 + j] = Math.max(blend[r * 2 + j], blend[(r + 1) * 2 + j]);
     }
   }
+  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 j = 0; j < 2 && last < n - 1; j++) {
+    for (let r = 1; r < zero; r++) {
+      for (let q = 0; q < r && q <= last; q++) {
+        if (wr[q] < 1) continue;
+        blend[r * 2 + j] = Math.max(
+          blend[r * 2 + j],
+          blend[q * 2 + j] * (ys[r] - endY) / (ys[q] - endY)
+        );
+      }
+    }
+  }
   const cutRow = (r, j, x) => r > last ? 0 : along(cuts.subarray((r * 2 + j) * nc, (r * 2 + j + 1) * nc), x);
   return {
     lift: liftAt,
@@ -6147,7 +6176,7 @@ function generateIkiFromLayerSet(layers, canvas, options = {}) {
   const solveFrame = buildHeadFrame(layers, frameOptions);
   const ctx = solveContext(solveFrame, byRole, turnOptions, hasNose);
   const boxes = Object.fromEntries(
-    ["eye_L", "eye_R", "brow_L", "brow_R"].filter(has).map((r) => [r, box(r)])
+    ["eye_L", "eye_R", "iris_L", "iris_R", "brow_L", "brow_R"].filter(has).map((r) => [r, box(r)])
   );
   const landmarks = {
     boxes,
@@ -6507,6 +6536,8 @@ function buildPart(spec, b, order, frame, byRole, style, frontGrid, lips) {
     headStart
   };
 }
+var RAMP_ROWS = 3;
+var MIN_RAMP_CELL = 4;
 function hairFrontGrid(b, frame, boxes) {
   const cells = MESH_CELLS.hair_front;
   const px = Math.min(cells.px, meshScale("hair_front", frame));
@@ -6531,6 +6562,24 @@ function hairFrontGrid(b, frame, boxes) {
     { length: rows + 1 },
     (_, r) => b.y1 - bh(b) * r / rows
   );
+  const eyes = [boxes.eye_L, boxes.eye_R].filter((e) => e !== void 0);
+  const irises = [boxes.iris_L, boxes.iris_R].filter((e) => e !== void 0);
+  if (eyes.length > 0 && irises.length > 0) {
+    const eyeY = eyes.reduce((t, e) => t + (e.y0 + e.y1) / 2, 0) / eyes.length;
+    const eyeH = eyes.reduce((t, e) => t + (e.y1 - e.y0), 0) / eyes.length;
+    const hi = Math.min(eyeY + 1.5 * eyeH, b.y1);
+    const lo = Math.max(Math.max(...irises.map((e) => e.y1)) - 0.5, b.y0);
+    for (; ; ) {
+      const edges = [hi, ...ys.filter((y) => y < hi && y > lo), lo];
+      if (edges.length - 2 >= RAMP_ROWS) break;
+      let gap = 0;
+      for (let i = 1; i + 1 < edges.length; i++)
+        if (edges[i] - edges[i + 1] > edges[gap] - edges[gap + 1]) gap = i;
+      if (edges[gap] - edges[gap + 1] < 2 * MIN_RAMP_CELL) break;
+      ys.push((edges[gap] + edges[gap + 1]) / 2);
+      ys.sort((p, q) => q - p);
+    }
+  }
   return { xs, ys };
 }
 function meshScale(role, frame) {
@@ -6589,22 +6638,22 @@ function deformers(frame, grids, bodyWarp, arms, byRole) {
   return out;
 }
 function hairPhysics() {
+  const spring = { mass: 1, stiffness: 77, damping: 4.4 };
   return [
     {
       id: "hairSway",
-      input: { parameter: import_format12.StandardParameter.AngleX, weight: 1 },
-      output: { parameter: import_format12.StandardParameter.HairSwayX, scale: 5 },
-      mass: 1,
-      stiffness: 30,
-      damping: 3
+      inputs: [
+        { parameter: import_format12.StandardParameter.AngleX, weight: 1, mode: "lag" },
+        { parameter: import_format12.StandardParameter.AmbientSway, weight: 0.25 }
+      ],
+      output: { parameter: import_format12.StandardParameter.HairSwayX, scale: 14 },
+      ...spring
     },
     {
       id: "hairTilt",
-      input: { parameter: import_format12.StandardParameter.AngleZ, weight: 1 },
-      output: { parameter: import_format12.StandardParameter.HairSwayZ, scale: 8 },
-      mass: 1,
-      stiffness: 25,
-      damping: 2.5
+      input: { parameter: import_format12.StandardParameter.AngleZ, weight: 1, mode: "lag" },
+      output: { parameter: import_format12.StandardParameter.HairSwayZ, scale: 9 },
+      ...spring
     }
   ];
 }
@@ -6660,6 +6709,7 @@ function declareParameters(roles) {
   if (roles.has("hair_front")) {
     add(import_format12.StandardParameter.HairSwayX, "Hair Sway X", -SWAY_RANGE, SWAY_RANGE, 0);
     add(import_format12.StandardParameter.HairSwayZ, "Hair Sway Z", -SWAY_RANGE, SWAY_RANGE, 0);
+    add(import_format12.StandardParameter.AmbientSway, "Ambient Sway", -1, 1, 0);
   }
   return out;
 }