@ikijs/editor 0.23.0 → 0.24.0

package/dist/index.mjs

@@ -1761,7 +1761,10 @@ function captureBindingEndpoint(channel, restValue, posedValue) {
 // src/atlas.ts
 var ATLAS_PADDING = 2;
 var UV_INSET_PX = 0.5;
-function packAtlas(sources, padding = ATLAS_PADDING) {
+function packAtlas(sources, padding = ATLAS_PADDING, maxSide) {
+  if (maxSide !== void 0 && !(isFinite(maxSide) && maxSide > 0)) {
+    throw new Error(`packAtlas: invalid maxSide ${maxSide}`);
+  }
   for (const src of sources) {
     if (!isFinite(src.width) || src.width <= 0) {
       throw new Error(
@@ -1782,42 +1785,50 @@ function packAtlas(sources, padding = ATLAS_PADDING) {
     (sum, s) => sum + (s.width + padding) * (s.height + padding),
     0
   );
-  const targetWidth = Math.max(
-    Math.ceil(Math.sqrt(totalArea)),
-    // Ensure at least the widest single source fits.
-    Math.max(...sorted.map((s) => s.width + padding))
-  );
-  const placements = [];
-  let shelfX = 0;
-  let shelfY = 0;
-  let shelfHeight = 0;
-  for (const src of sorted) {
-    const paddedW = src.width + padding;
-    const paddedH = src.height + padding;
-    if (shelfX > 0 && shelfX + paddedW > targetWidth) {
-      shelfY += shelfHeight;
-      shelfX = 0;
-      shelfHeight = 0;
-    }
-    placements.push({
-      id: src.id,
-      x: shelfX,
-      y: shelfY,
-      width: src.width,
-      height: src.height
-    });
-    shelfX += paddedW;
-    if (paddedH > shelfHeight) shelfHeight = paddedH;
+  const widest = Math.max(...sorted.map((s) => s.width + padding));
+  const firstWidth = Math.max(Math.ceil(Math.sqrt(totalArea)), widest);
+  const shelve = (targetWidth) => {
+    const placements = [];
+    let shelfX = 0;
+    let shelfY = 0;
+    let shelfHeight = 0;
+    for (const src of sorted) {
+      const paddedW = src.width + padding;
+      const paddedH = src.height + padding;
+      if (shelfX > 0 && shelfX + paddedW > targetWidth) {
+        shelfY += shelfHeight;
+        shelfX = 0;
+        shelfHeight = 0;
+      }
+      placements.push({
+        id: src.id,
+        x: shelfX,
+        y: shelfY,
+        width: src.width,
+        height: src.height
+      });
+      shelfX += paddedW;
+      if (paddedH > shelfHeight) shelfHeight = paddedH;
+    }
+    let pageWidth = 0;
+    let pageHeight = 0;
+    for (const p of placements) {
+      const right = p.x + p.width + padding;
+      const bottom = p.y + p.height + padding;
+      if (right > pageWidth) pageWidth = right;
+      if (bottom > pageHeight) pageHeight = bottom;
+    }
+    return { pageWidth, pageHeight, placements };
+  };
+  const first = shelve(firstWidth);
+  if (maxSide === void 0 || first.pageHeight <= maxSide || first.pageWidth > maxSide) {
+    return { ...first, padding };
   }
-  let pageWidth = 0;
-  let pageHeight = 0;
-  for (const p of placements) {
-    const right = p.x + p.width + padding;
-    const bottom = p.y + p.height + padding;
-    if (right > pageWidth) pageWidth = right;
-    if (bottom > pageHeight) pageHeight = bottom;
+  for (let w = widest; w <= maxSide; w++) {
+    const layout = shelve(w);
+    if (layout.pageHeight <= maxSide) return { ...layout, padding };
   }
-  return { pageWidth, pageHeight, placements, padding };
+  return { ...first, padding };
 }
 function uvRectFor(placement, page, insetPx = UV_INSET_PX) {
   const px = placement.x + insetPx;
@@ -2926,14 +2937,14 @@ function armParts(role, layer, g, order, poseSwitch) {
       },
       true
     ),
-    part(role, ids.armDeformer, order + 1, meshOf(band(0.5, seam), quad)),
     part(
       ids.forearm,
       ids.forearmDeformer,
-      order + 2,
+      order + 1,
       meshOf(band(seam, -0.5), quad),
       true
-    )
+    ),
+    part(role, ids.armDeformer, order + 2, meshOf(band(0.5, seam), quad))
   ];
 }
 var rotateBinding = (parameter, range, sign) => ({
@@ -3031,8 +3042,8 @@ var isLipInsideRole = (role) => LIP_INSIDE_ROLES.includes(role);
 var ROLE_TABLE = [
   { role: "hair_back", family: "hair_back" },
   { role: "body", family: "body" },
-  { role: "arm_L", family: "arm", parts: ["elbow_L", "arm_L", "forearm_L"] },
-  { role: "arm_R", family: "arm", parts: ["elbow_R", "arm_R", "forearm_R"] },
+  { role: "arm_L", family: "arm", parts: ["elbow_L", "forearm_L", "arm_L"] },
+  { role: "arm_R", family: "arm", parts: ["elbow_R", "forearm_R", "arm_R"] },
   { role: "face", family: "face", required: true },
   { role: "blush_L", family: "face" },
   { role: "blush_R", family: "face" },
@@ -3177,6 +3188,7 @@ function parseLayerRoles(fileNames) {
 
 // src/auto-rig/mouth.ts
 var UPPER_SHARE = 0.4;
+var CLOSED_SAG_MAX = 0.1;
 var UPPER_THIN = 0.7;
 var END_TAPER = 0.35;
 var END_TAPER_FROM = 0.7;
@@ -3243,10 +3255,15 @@ function mouthOpening(byRole) {
     for (let d = 0; (r = read(c - d) ?? read(c + d)) === void 0; d++) ;
     reads.push(r);
   }
+  const n = reads.length;
   const m = (x0 + x1) / 2;
-  let p = 0;
-  let q = 0;
-  if (reads.length >= 4) {
+  const centre = Math.round(m);
+  const smooth = reads.map((_, i) => {
+    const near = reads.slice(Math.max(0, i - 3), i + 4);
+    return near.reduce((s, r) => s + r.Tu, 0) / near.length;
+  });
+  let sag = 0;
+  if (n >= 4) {
     let s11 = 0;
     let s12 = 0;
     let s22 = 0;
@@ -3264,16 +3281,24 @@ function mouthOpening(byRole) {
       t2 += b2 * d;
     });
     const det = s11 * s22 - s12 * s12;
-    p = (t1 * s22 - t2 * s12) / det;
-    q = (s11 * t2 - s12 * t1) / det;
+    const p = (t1 * s22 - t2 * s12) / det;
+    const q = (s11 * t2 - s12 * t1) / det;
+    const c = centre - x0;
+    const D = c * (centre - x1) * (p + q * (centre - m));
+    const arc = (reads[0].Tu + reads[n - 1].Tu) / 2 - reads[c].Tu;
+    const t = c / (n - 1);
+    const k = 4 * t * (1 - t);
+    const offset = arc - (smooth[0] + (smooth[n - 1] - smooth[0]) * t - smooth[c]);
+    sag = Math.min(arc - D, CLOSED_SAG_MAX * n - Math.max(0, offset) / k);
   }
   const columns = reads.map((r, i) => {
-    const x = x0 + i;
-    return { ...r, seam: r.Tu + (x - x0) * (x - x1) * (p + q * (x - m)) };
+    if (n < 4) return { ...r, seam: r.Tu };
+    const t = i / (x1 - x0);
+    const parabola = smooth[0] + (smooth[n - 1] - smooth[0]) * t - sag * 4 * t * (1 - t);
+    return { ...r, seam: r.Tu + parabola - smooth[i] };
   });
   const clamp2 = (col) => Math.min(x1, Math.max(x0, col));
   const base = (col) => columns[clamp2(col) - x0];
-  const centre = Math.round((x0 + x1) / 2);
   const w = base(centre).lineH;
   const from = END_TAPER_FROM * ((x1 - x0 + 1) / 2);
   const squash = (col) => {