@ikijs/editor 0.25.1 → 0.27.0

package/dist/index.mjs

@@ -1958,7 +1958,7 @@ var PROFILE_VALUES = {
   mouthWiden: 1.2,
   brow: 0.15,
   breath: 0.03,
-  sway: 0.08,
+  sway: 0.24,
   blushRest: 0.4,
   bodySlide: 0.1,
   bodyNarrow: 0.05,
@@ -6244,7 +6244,7 @@ function generateIkiFromLayerSet(layers, canvas, options = {}) {
     parameters,
     parts,
     deformers: deformers(frame, grids, bodyWarp?.deformer, arms, byRole),
-    ...has("hair_front") ? { physics: hairPhysics() } : {},
+    ...has("hair_front") ? { physics: hairPhysics(has("hair_back")) } : {},
     expressions: defaultExpressions(new Set(parameters.map((p) => p.id))),
     motions: defaultMotions(new Set(parameters.map((p) => p.id)))
   };
@@ -6451,10 +6451,14 @@ function buildPart(spec, b, order, frame, byRole, style, frontGrid, lips) {
     case "hair_back":
       if (byRole.has("hair_front")) {
         const amp = style.sway * AMPLITUDE.sway * hh;
-        warps.push(
-          hairSway(P10.HairSwayX, mesh, b, amp),
-          hairSway(P10.HairSwayZ, mesh, b, amp)
-        );
+        if (spec.role === "hair_front") {
+          warps.push(
+            hairSway(P10.HairSwayX, mesh, b, amp),
+            hairSway(P10.HairSwayZ, mesh, b, amp)
+          );
+        } else {
+          warps.push(hairSway(P10.HairBackSway, mesh, b, amp));
+        }
       }
       warps.push(tiltHang(mesh, b, pivot, hairHangWeight(frame.chinY, b.y0)));
       break;
@@ -6569,25 +6573,40 @@ function deformers(frame, grids, bodyWarp, arms, byRole) {
   }
   return out;
 }
-function hairPhysics() {
-  return [
+function hairPhysics(hasBack) {
+  const spring = { mass: 1, stiffness: 77, damping: 7 };
+  const rigs = [
     {
       id: "hairSway",
-      input: { parameter: P10.AngleX, weight: 1 },
-      output: { parameter: P10.HairSwayX, scale: 5 },
-      mass: 1,
-      stiffness: 30,
-      damping: 3
+      inputs: [
+        { parameter: P10.AngleX, weight: 1, mode: "lag" },
+        { parameter: P10.AmbientSway, weight: 0.25 }
+      ],
+      output: { parameter: P10.HairSwayX, scale: 14 },
+      ...spring
     },
     {
       id: "hairTilt",
-      input: { parameter: P10.AngleZ, weight: 1 },
-      output: { parameter: P10.HairSwayZ, scale: 8 },
-      mass: 1,
-      stiffness: 25,
-      damping: 2.5
+      input: { parameter: P10.AngleZ, weight: 1, mode: "lag" },
+      output: { parameter: P10.HairSwayZ, scale: 9 },
+      ...spring
     }
   ];
+  if (hasBack) {
+    rigs.push({
+      id: "hairBack",
+      inputs: [
+        { parameter: P10.AngleX, weight: 1, mode: "lag" },
+        { parameter: P10.AngleZ, weight: 0.4, mode: "lag" },
+        { parameter: P10.AmbientSway, weight: 1.73, mode: "lag" }
+      ],
+      output: { parameter: P10.HairBackSway, scale: 7 },
+      mass: 1,
+      stiffness: 32,
+      damping: 4.5
+    });
+  }
+  return rigs;
 }
 function declareParameters(roles) {
   const out = [];
@@ -6641,6 +6660,10 @@ function declareParameters(roles) {
   if (roles.has("hair_front")) {
     add(P10.HairSwayX, "Hair Sway X", -SWAY_RANGE, SWAY_RANGE, 0);
     add(P10.HairSwayZ, "Hair Sway Z", -SWAY_RANGE, SWAY_RANGE, 0);
+    if (roles.has("hair_back")) {
+      add(P10.HairBackSway, "Hair Back Sway", -SWAY_RANGE, SWAY_RANGE, 0);
+    }
+    add(P10.AmbientSway, "Ambient Sway", -1, 1, 0);
   }
   return out;
 }