@ikijs/editor 0.2.0 → 0.2.1

package/dist/index.js

@@ -1838,23 +1838,22 @@ var HEAD_TURN_MAX_DEG = 30;
 function headTurnParallaxUnit(gridHalfWidth) {
   return gridHalfWidth * HEAD_CYLINDER_RADIUS_FACTOR * Math.sin(HEAD_TURN_MAX_DEG * (Math.PI / 180));
 }
+function gridReach(grid, axis, center) {
+  let reach = 0;
+  for (let i = axis; i < grid.points.length; i += 2) {
+    reach = Math.max(reach, Math.abs(grid.points[i] - center));
+  }
+  return reach;
+}
 function pinnedCylinderBend(local, radius, theta) {
   const alpha = Math.asin(Math.max(-1, Math.min(1, local / radius)));
   return radius * Math.sin(alpha + theta) - local - radius * Math.sin(theta);
 }
 function bakeHeadTurnGridWarp2DCentered(grid, parameterX, parameterY, centerX, centerY) {
   const STOPS = [-HEAD_TURN_MAX_DEG, 0, HEAD_TURN_MAX_DEG];
-  const halfWidth = (grid.points[grid.cols * 2] - grid.points[0]) / 2;
-  const RADIUS_X = halfWidth * HEAD_CYLINDER_RADIUS_FACTOR;
+  const RADIUS_X = gridReach(grid, 0, centerX) * HEAD_CYLINDER_RADIUS_FACTOR;
+  const RADIUS_Y = gridReach(grid, 1, centerY) * HEAD_CYLINDER_RADIUS_FACTOR;
   const pointCount = grid.points.length / 2;
-  let halfHeight = 0;
-  for (let i = 0; i < pointCount; i++) {
-    halfHeight = Math.max(
-      halfHeight,
-      Math.abs(grid.points[i * 2 + 1] - centerY)
-    );
-  }
-  const RADIUS_Y = halfHeight * HEAD_CYLINDER_RADIUS_FACTOR;
   const DEG_TO_RAD = Math.PI / 180;
   const keyforms2d = [];
   for (const angleY of STOPS) {
@@ -2063,6 +2062,7 @@ function bakeHairBackTurnWarp(mesh, parameter) {
 var HAIR_SWAY_TIP_FRACTION = 0.09;
 var HAIR_SWAY_CURL = 1.5;
 var HAIR_SWAY_RANGE = 20;
+var HAIR_SWAY_PEAK_FRACTION = 0.56;
 function bakeHairSwayWarp(mesh, parameter, tipShift, range) {
   let top = -Infinity;
   let bottom = Infinity;
@@ -2379,7 +2379,18 @@ function generateIkiFromLayerSet(layers, canvas) {
         part.bindings = roleBindings;
       }
       if ((role === "hair_front" || role === "hair_back") && hasHair) {
-        const tipShift = HAIR_SWAY_TIP_FRACTION * cropH;
+        let tipShift = HAIR_SWAY_TIP_FRACTION * cropH;
+        if (role === "hair_front") {
+          const shift = HAIR_FRONT_DEPTH * parallaxUnit;
+          const headroom = Math.min(
+            faceGridMaxX - (t.x + cropW / 2),
+            t.x - cropW / 2 - faceGridMinX
+          ) - shift;
+          tipShift = Math.min(
+            tipShift,
+            Math.max(0, headroom) / HAIR_SWAY_PEAK_FRACTION
+          );
+        }
         part.warps = [
           bakeHairSwayWarp(
             mesh,