@ikijs/editor 0.3.0 → 0.4.0

package/dist/index.js

@@ -1900,8 +1900,58 @@ var HAIR_FRONT_DEPTH = 0.1;
 var HAIR_BACK_DEPTH = -0.08;
 var NOD_TRAVEL = 30;
 var NOD_BEND = 0.5;
-var HAIR_BACK_NOD_DEPTH = -0.07;
+var HAIR_BACK_NOD_DEPTH = -0.135;
+function headNodParallaxUnit(gridHalfHeight) {
+  return gridHalfHeight * HEAD_CYLINDER_RADIUS_FACTOR * Math.sin(HEAD_TURN_MAX_DEG * NOD_BEND * (Math.PI / 180));
+}
+var FEATURE_DEPTH = {
+  eye: 0.04,
+  iris: 0.04,
+  pupil: 0.04,
+  highlight: 0.04,
+  lash: 0.04,
+  brow: 0.04,
+  blush: 0.04,
+  mouth: 0.04,
+  mouth_open: 0.04,
+  nose: 0.08
+};
+var HAIR_FRONT_NOD_DEPTH = FEATURE_DEPTH.brow;
+function roleFamily(role) {
+  return role.replace(/_[LR]$/, "");
+}
+function featureParallaxBindings(role, options) {
+  if (!options.hasNose) return [];
+  const depth = FEATURE_DEPTH[roleFamily(role)];
+  if (depth === void 0) return [];
+  const bindings = [];
+  const shiftX = depth * (options.parallaxUnit ?? 0);
+  if (shiftX !== 0) {
+    bindings.push({
+      parameter: import_format3.StandardParameter.AngleX,
+      channel: "translateX",
+      from: -shiftX,
+      to: shiftX
+    });
+  }
+  const shiftY = depth * (options.parallaxUnitY ?? 0);
+  if (shiftY !== 0) {
+    bindings.push({
+      parameter: import_format3.StandardParameter.AngleY,
+      channel: "translateY",
+      from: -shiftY,
+      to: shiftY
+    });
+  }
+  return bindings;
+}
 function bindingsForRole(spec, role, cropW, cropH, options = {}) {
+  return [
+    ...roleOwnBindings(spec, role, cropW, cropH, options),
+    ...featureParallaxBindings(role, options)
+  ];
+}
+function roleOwnBindings(spec, role, cropW, cropH, options) {
   const isEyeStack = EYE_STACK_PREFIXES.some((p) => role.startsWith(p));
   if (isEyeStack && spec.eyeSide !== void 0) {
     const isGazeRole = role.startsWith("iris_") || role.startsWith("pupil_") || role.startsWith("highlight_");
@@ -2015,7 +2065,8 @@ function bindingsForRole(spec, role, cropW, cropH, options = {}) {
         });
       }
     }
-    const shiftY = (isFront ? 0 : HAIR_BACK_NOD_DEPTH) * (options.parallaxUnitY ?? 0);
+    const frontDepth = options.hasNose ? HAIR_FRONT_NOD_DEPTH : 0;
+    const shiftY = (isFront ? frontDepth : HAIR_BACK_NOD_DEPTH) * (options.parallaxUnitY ?? 0);
     if (shiftY !== 0) {
       parallax.push({
         parameter: import_format3.StandardParameter.AngleY,
@@ -2060,14 +2111,18 @@ function bakeHairBackTurnWarp(mesh, parameter) {
   const radius = halfWidth * HAIR_BACK_BEND_RADIUS_FACTOR;
   const bulge = HAIR_BACK_FAR_BULGE * halfWidth;
   const DEG_TO_RAD = Math.PI / 180;
-  const keyforms = [-HEAD_TURN_MAX_DEG, 0, HEAD_TURN_MAX_DEG].map((deg) => {
+  const keyforms = HEAD_TURN_STOPS.map((deg) => {
     const theta = deg * DEG_TO_RAD;
     const s = Math.sign(deg);
+    const turnFraction = Math.abs(deg) / HEAD_TURN_MAX_DEG;
+    const fullTheta = s * HEAD_TURN_MAX_DEG * DEG_TO_RAD;
+    const bulgeAtStop = bulge * deg / HEAD_TURN_MAX_DEG;
     const offsets = [];
     for (let i = 0; i < mesh.vertices.length; i += 2) {
       const x = mesh.vertices[i];
       const far = Math.max(0, -s * x / halfWidth);
-      offsets.push(pinnedCylinderBend(x, radius, theta) - s * bulge * far, 0);
+      const bend = far > 0 ? turnFraction * pinnedCylinderBend(x, radius, fullTheta) : pinnedCylinderBend(x, radius, theta);
+      offsets.push(bend - bulgeAtStop * far, 0);
     }
     return { value: deg, offsets };
   });
@@ -2107,6 +2162,7 @@ function generateIkiFromLayerSet(layers, canvas) {
   validateLayerInputs(layers, canvas);
   const hasHair = layers.some((l) => l.role === "hair_front");
   const hasMouthOpen = layers.some((l) => l.role === "mouth_open");
+  const hasNose = layers.some((l) => l.role === "nose");
   const bodyLayer = layers.find((l) => l.role === "body");
   const parameters = [
     {
@@ -2285,7 +2341,7 @@ function generateIkiFromLayerSet(layers, canvas) {
   const faceCenterY = faceTransform.y;
   const halfH = Math.max(faceCenterY - unionMinY, unionMaxY - faceCenterY);
   const parallaxUnit = headTurnParallaxUnit(halfW);
-  const parallaxUnitY = headTurnParallaxUnit(halfH);
+  const parallaxUnitY = headNodParallaxUnit(halfH);
   const faceBottom = faceTransform.y - faceCropH / 2;
   const neckPivot = {
     x: faceCenterX,
@@ -2406,7 +2462,8 @@ function generateIkiFromLayerSet(layers, canvas) {
     const roleBindings = bindingsForRole(spec, role, cropW, cropH, {
       hasMouthOpen,
       parallaxUnit,
-      parallaxUnitY
+      parallaxUnitY,
+      hasNose
     });
     const deformerId = spec.deformer === "none" ? void 0 : spec.deformer;
     if (spec.mesh) {