mesh-avatar 0.5.0 → 0.6.0

package/dist/index.js

@@ -69,14 +69,14 @@ function Tn(t) {
 }
 const le = (t, e, n) => {
   (typeof t != "number" || !Number.isFinite(t)) && n.push(`${e}: expected a finite number`);
-}, Ae = (t, e, n) => {
+}, we = (t, e, n) => {
   le(t, e, n), typeof t == "number" && t <= 0 && n.push(`${e}: must be positive`);
 }, De = (t, e, n) => {
   le(t, e, n), typeof t == "number" && t < 0 && n.push(`${e}: must be nonnegative`);
 }, Gn = (t, e, n) => {
   De(t, e, n), typeof t == "number" && (!Number.isInteger(t) || t > 8) && n.push(`${e}: expected an integer from 0 to 8`);
 }, _e = (t, e, n) => {
-  Ae(t, e, n), typeof t == "number" && !Number.isInteger(t) && n.push(`${e}: expected an integer`);
+  we(t, e, n), typeof t == "number" && !Number.isInteger(t) && n.push(`${e}: expected an integer`);
 }, ot = (t, e, n) => {
   le(t, e, n), typeof t == "number" && !Number.isInteger(t) && n.push(`${e}: expected an integer`);
 }, yt = (t, e, n) => {
@@ -87,7 +87,7 @@ const le = (t, e, n) => {
     return;
   }
   (r.length < e || r.length > n) && a.push(`${o}: expected ${e}..${n} items`), r.forEach((i, u) => t(i, `${o}[${u}]`, a));
-}, me = Oe(le, 2, 2), Me = (t, e, n) => {
+}, me = Oe(le, 2, 2), Ae = (t, e, n) => {
   me(t, e, n), Array.isArray(t) && t.length === 2 && t[0] >= t[1] && n.push(`${e}: start must be less than end`);
 }, he = (t, e = []) => (n, r, o) => {
   if (!n || typeof n != "object" || Array.isArray(n)) {
@@ -97,7 +97,7 @@ const le = (t, e, n) => {
   const a = n;
   for (const [i, u] of Object.entries(t))
     a[i] === void 0 && e.includes(i) || u(a[i], `${r}.${i}`, o);
-}, ft = { cx: le, cy: le, rx: Ae, ry: Ae }, Ue = he(ft), at = Oe(me, 3), Xe = Oe(me, 2), Je = (t, e, n) => {
+}, ft = { cx: le, cy: le, rx: we, ry: we }, Ue = he(ft), at = Oe(me, 3), Xe = Oe(me, 2), Je = (t, e, n) => {
   le(t, e, n), typeof t == "number" && (t < 0 || t > 1) && n.push(`${e}: must be between 0 and 1`);
 }, qn = (t) => he({
   version: (e, n, r) => {
@@ -111,18 +111,18 @@ const le = (t, e, n) => {
     pivotX: le,
     pivotY: le,
     maxRoll: le,
-    weightBand: Me,
-    turnBand: Me
+    weightBand: Ae,
+    turnBand: Ae
   }),
   body: he({
     pivotX: le,
     pivotY: le,
     maxRoll: le,
-    breathBand: Me,
-    rollBand: Me,
+    breathBand: Ae,
+    rollBand: Ae,
     chest: Ue,
     shoulders: Oe(Ue),
-    hip: he({ shift: le, band: Me })
+    hip: he({ shift: le, band: Ae })
   }, ["hip"]),
   face: he({
     nose: Ue,
@@ -131,8 +131,8 @@ const le = (t, e, n) => {
     eyeB: Ue,
     earL: Ue,
     earR: Ue,
-    brow: he({ ...ft, band: Me }),
-    jaw: he({ ...ft, band: Me })
+    brow: he({ ...ft, band: Ae }),
+    jaw: he({ ...ft, band: Ae })
   }),
   buns: he({ bunL: Ue, bunR: Ue }, ["bunL", "bunR"]),
   eyes: Oe(he({
@@ -147,12 +147,12 @@ const le = (t, e, n) => {
     cx: le,
     cy: le,
     angle: le,
-    halfLen: Ae,
+    halfLen: we,
     bow: le,
     area: he({ ...ft, angle: le })
   }),
   cheeks: Oe(me, 2, 2),
-  strands: Oe(he({ name: yt, nodes: Xe, sigma: Ae, k: Ae, max: Ae })),
+  strands: Oe(he({ name: yt, nodes: Xe, sigma: we, k: we, max: we })),
   accessories: Oe(he({
     name: yt,
     pivot: me,
@@ -164,19 +164,19 @@ const le = (t, e, n) => {
   hand: he({
     outline: at,
     jaw: Xe,
-    jawRange: Me,
+    jawRange: Ae,
     background: at,
     elbow: me,
     wrist: me,
     knuckle: me,
     contact: me,
     forearmShare: Je,
-    armBand: Me,
-    wristBand: Me,
-    handBand: Me,
-    fingerXBand: Me,
-    fingerYBand: Me,
-    pinBand: Me
+    armBand: Ae,
+    wristBand: Ae,
+    handBand: Ae,
+    fingerXBand: Ae,
+    fingerYBand: Ae,
+    pinBand: Ae
   }),
   cloth: Oe(he({
     name: yt,
@@ -185,13 +185,13 @@ const le = (t, e, n) => {
     hem: Xe,
     columns: _e,
     rows: _e,
-    stiffness: Ae,
-    damping: Ae,
-    max: Ae,
-    tierGain: Ae,
-    highModeDamping: Ae,
-    responseGain: Ae,
-    swing: Ae,
+    stiffness: we,
+    damping: we,
+    max: we,
+    tierGain: we,
+    highModeDamping: we,
+    responseGain: we,
+    swing: we,
     follow: Je,
     cohesion: Gn,
     wind: De,
@@ -199,7 +199,7 @@ const le = (t, e, n) => {
       typeof e != "boolean" && r.push(`${n}: expected a boolean`);
     },
     parent: yt,
-    scale: Ae,
+    scale: we,
     seams: Oe(Xe, 0, 64),
     tiers: Oe(Xe, 0, 8)
   }, ["tierGain", "highModeDamping", "seams", "tiers", "responseGain", "columns", "rows", "stiffness", "damping", "max", "swing", "follow", "cohesion", "wind", "behind", "parent", "scale"])),
@@ -211,7 +211,7 @@ const le = (t, e, n) => {
     shift: De,
     tilt: De,
     bend: De,
-    band: Me,
+    band: Ae,
     split: Xe,
     left: he({ hip: me, knee: me, ankle: me }),
     right: he({ hip: me, knee: me, ankle: me })
@@ -239,7 +239,7 @@ const le = (t, e, n) => {
     spriteCell: _e,
     clothCell: _e
   }, ["clothCell"]),
-  view: he({ padTop: le, padSide: le, gazeCenter: me }, ["gazeCenter"])
+  view: he({ padTop: le, padSide: le, gazeCenter: me, irisTravel: we }, ["gazeCenter", "irisTravel"])
 }, ["buns", "strands", "accessories", "hand", "cloth", "legs", "arms"]);
 function Rn(t, e = {}) {
   const n = [];
@@ -1521,9 +1521,9 @@ function wr(t, e) {
           }
           const q = (ee, oe, S, R = 1) => {
             for (let P = 0; P < w; P++) {
-              const ae = x.grid.joints[P], ie = x.grid.seams[P], pe = x.grid.lengths[P], be = N * 0.1 * Math.tanh(j[P] * S / (N * 0.1)), xe = 2 * Math.asin(Math.min(0.95, (N - Math.abs(be)) / (2 * pe))), Be = x.pendulums[P].angles[0], Ee = x.pendulums[P].angles.map((K) => {
+              const ae = x.grid.joints[P], ie = x.grid.seams[P], pe = x.grid.lengths[P], be = N * 0.1 * Math.tanh(j[P] * S / (N * 0.1)), Me = 2 * Math.asin(Math.min(0.95, (N - Math.abs(be)) / (2 * pe))), Be = x.pendulums[P].angles[0], Ee = x.pendulums[P].angles.map((K) => {
                 const ce = R === 1 ? K : Be + (K - Be) * R;
-                return xe * Math.tanh(ce * S / xe);
+                return Me * Math.tanh(ce * S / Me);
               }), de = [Array.from(oe.slice(P * 2, P * 2 + 2))];
               for (let K = 0; K < Ee.length; K++) {
                 const ce = qe(ie, ae[K]), ue = qe(ie, ae[K + 1]), ke = ue[0] - ce[0], Se = ue[1] - ce[1], ye = Ee[K];
@@ -1544,7 +1544,7 @@ function wr(t, e) {
         for (let $ = 0; $ < b; $++) {
           const Z = this.time + ($ + 1) * s, _ = (Math.sin(Z * 1.1) * 0.6 + Math.sin(Z * 2.3) * 0.4) * N * X;
           for (let D = 0; D < w; D++) {
-            const q = D * 2, ee = ((A - 1) * w + D) * 2, oe = Math.max(1, Math.hypot(L[ee] - L[q], L[ee + 1] - L[q + 1])), S = Math.max(x.gravity * 0.1, x.gravity - M[q + 1]), R = i * oe / 2, P = S / R * E * E, ae = Math.sqrt(P), ie = o.zeta * H, pe = ae * Math.sqrt(2 - Math.SQRT2), be = ae * Math.sqrt(2 + Math.SQRT2), xe = 2 * ie * pe * be / (pe + be), Be = 2 * ie / (pe + be), Ee = I[D] - T[D], de = Math.cos(Ee), K = Math.sin(Ee), ce = U[D], ue = F[D], Se = (Math.max(-8 * x.gravity, Math.min(8 * x.gravity, M[q])) - S * _ / oe) / R, ye = xe * (2 * ce + de * ue) + Be * 2 * P * ce, Le = xe * (de * ce + ue) + Be * P * ue, $e = -2 * P * Math.sin(I[D]) - K * ue * ue - 2 * Se * Math.cos(I[D]) - ye, nt = -P * Math.sin(T[D]) + K * ce * ce - Se * Math.cos(T[D]) - Le, rt = 2 - de * de;
+            const q = D * 2, ee = ((A - 1) * w + D) * 2, oe = Math.max(1, Math.hypot(L[ee] - L[q], L[ee + 1] - L[q + 1])), S = Math.max(x.gravity * 0.1, x.gravity - M[q + 1]), R = i * oe / 2, P = S / R * E * E, ae = Math.sqrt(P), ie = o.zeta * H, pe = ae * Math.sqrt(2 - Math.SQRT2), be = ae * Math.sqrt(2 + Math.SQRT2), Me = 2 * ie * pe * be / (pe + be), Be = 2 * ie / (pe + be), Ee = I[D] - T[D], de = Math.cos(Ee), K = Math.sin(Ee), ce = U[D], ue = F[D], Se = (Math.max(-8 * x.gravity, Math.min(8 * x.gravity, M[q])) - S * _ / oe) / R, ye = Me * (2 * ce + de * ue) + Be * 2 * P * ce, Le = Me * (de * ce + ue) + Be * P * ue, $e = -2 * P * Math.sin(I[D]) - K * ue * ue - 2 * Se * Math.cos(I[D]) - ye, nt = -P * Math.sin(T[D]) + K * ce * ce - Se * Math.cos(T[D]) - Le, rt = 2 - de * de;
             U[D] += ($e - de * nt) / rt * s, F[D] += (2 * nt - de * $e) / rt * s, I[D] += U[D] * s, T[D] += F[D] * s, C[D] += (-O * O * j[D] - 2 * O * C[D] - M[q + 1] * 0.15) * s, j[D] += C[D] * s;
           }
         }
@@ -1554,10 +1554,10 @@ function wr(t, e) {
         }
         const k = ($, Z, _) => {
           for (let D = 0; D < w; D++) {
-            const q = D * 2, ee = ((A - 1) * w + D) * 2, oe = Math.max(1, Math.hypot(L[ee] - L[q], L[ee + 1] - L[q + 1])), S = N * 0.1 * Math.tanh(j[D] * _ / (N * 0.1)), R = 2 * Math.asin(Math.min(0.95, (N - Math.abs(S)) / (2 * oe))), P = R * Math.tanh(I[D] * _ / R), ae = R * Math.tanh(T[D] * _ / R), ie = 0.1 * (1 - Q), pe = (L[ee] - L[q]) / 2, be = (L[ee + 1] - L[q + 1]) / 2, xe = Z[q] + pe * Math.cos(P) + be * Math.sin(P), Be = Z[q + 1] - pe * Math.sin(P) + be * Math.cos(P);
+            const q = D * 2, ee = ((A - 1) * w + D) * 2, oe = Math.max(1, Math.hypot(L[ee] - L[q], L[ee + 1] - L[q + 1])), S = N * 0.1 * Math.tanh(j[D] * _ / (N * 0.1)), R = 2 * Math.asin(Math.min(0.95, (N - Math.abs(S)) / (2 * oe))), P = R * Math.tanh(I[D] * _ / R), ae = R * Math.tanh(T[D] * _ / R), ie = 0.1 * (1 - Q), pe = (L[ee] - L[q]) / 2, be = (L[ee + 1] - L[q + 1]) / 2, Me = Z[q] + pe * Math.cos(P) + be * Math.sin(P), Be = Z[q + 1] - pe * Math.sin(P) + be * Math.cos(P);
             for (let Ee = 0; Ee < A; Ee++) {
               const de = Ee / (A - 1), K = (Ee * w + D) * 2, ce = de <= 0.5, ue = ce ? de * 2 : (de - 0.5) * 2, ke = (ce ? P : ae) * (1 - ie + ie * ue), Se = Math.cos(ke), ye = Math.sin(ke), Le = pe * ue, $e = be * ue;
-              $[K] = (ce ? Z[q] : xe) + Le * Se + $e * ye, $[K + 1] = (ce ? Z[q + 1] : Be) - Le * ye + $e * Se + S * de;
+              $[K] = (ce ? Z[q] : Me) + Le * Se + $e * ye, $[K + 1] = (ce ? Z[q + 1] : Be) - Le * ye + $e * Se + S * de;
             }
           }
         };
@@ -2613,7 +2613,7 @@ async function Vr(t, e) {
   a.forEach((S, R) => {
     for (const P of wn) {
       const ae = `eye${R}_${P}`, ie = p(F[ae], P === "ball" ? n.mesh.eyeBallCell : n.mesh.eyeCell, Ze(Y[ae]), Y[ae].width), pe = [];
-      for (let xe = 0; xe < ie.rest.length / 2; xe++) pe.push(i(ie.rest[xe * 2], ie.rest[xe * 2 + 1], 0));
+      for (let Me = 0; Me < ie.rest.length / 2; Me++) pe.push(i(ie.rest[Me * 2], ie.rest[Me * 2 + 1], 0));
       const be = T.addLayer(ae, Y[ae], ie, { eyeBall: P === "ball" ? R : void 0 });
       N.push({ e: S, eye: R, part: P, mesh: ie, W: pe, layer: be });
     }
@@ -2676,11 +2676,11 @@ async function Vr(t, e) {
     const be = ne?.update(R, P, S, Mr(O.name, W.mode === "manual" ? null : W.expr));
     if (be) for (const K of N) be.eyes[K.eye] && (K.layer.alpha = 0);
     Q?.update(R, P, u, k);
-    const xe = X.pos, Be = X.rest, Ee = l(R);
+    const Me = X.pos, Be = X.rest, Ee = l(R);
     for (let K = 0; K < G.length; K++)
-      c(Be[K * 2], Be[K * 2 + 1], G[K], R, Ee, k), xe[K * 2] = k[0], xe[K * 2 + 1] = k[1];
+      c(Be[K * 2], Be[K * 2 + 1], G[K], R, Ee, k), Me[K * 2] = k[0], Me[K * 2 + 1] = k[1];
     re.chains.forEach((K, ce) => Hr(K, J[ce].mesh)), s.length && (j.step(R, S, P), j.deform());
-    const de = 7;
+    const de = n.view.irisTravel ?? 7;
     T.draw({
       angleX: R.angleX,
       angleY: R.angleY,
@@ -3096,9 +3096,9 @@ var Gr = /* @__PURE__ */ Ne(Ve, 9, 0), qr = /* @__PURE__ */ Ne(Ve, 9, 1), Jr = /
   "stream finishing",
   "invalid zip data"
   // determined by unknown compression method
-], we = function(t, e, n) {
+], xe = function(t, e, n) {
   var r = new Error(e || Qr[t]);
-  if (r.code = t, Error.captureStackTrace && Error.captureStackTrace(r, we), !n)
+  if (r.code = t, Error.captureStackTrace && Error.captureStackTrace(r, xe), !n)
     throw r;
   return r;
 }, eo = function(t, e, n, r) {
@@ -3142,18 +3142,18 @@ var Gr = /* @__PURE__ */ Ne(Ve, 9, 0), qr = /* @__PURE__ */ Ne(Ve, 9, 1), Jr = /
           var N = Y.subarray(0, A), ne = Y.subarray(A);
           p = It(N), g = It(ne), f = Ne(N, p, 1), h = Ne(ne, g, 1);
         } else
-          we(1);
+          xe(1);
       else {
         var d = an(l) + 4, x = t[d - 4] | t[d - 3] << 8, w = d + x;
         if (w > o) {
-          y && we(0);
+          y && xe(0);
           break;
         }
         u && v(c + x), n.set(t.subarray(d, w), c), e.b = c += x, e.p = l = w * 8, e.f = m;
         continue;
       }
       if (l > b) {
-        y && we(0);
+        y && xe(0);
         break;
       }
     }
@@ -3161,10 +3161,10 @@ var Gr = /* @__PURE__ */ Ne(Ve, 9, 0), qr = /* @__PURE__ */ Ne(Ve, 9, 1), Jr = /
     for (var Q = (1 << p) - 1, J = (1 << g) - 1, X = l; ; X = l) {
       var B = f[Nt(t, l) & Q], G = B >> 4;
       if (l += B & 15, l > b) {
-        y && we(0);
+        y && xe(0);
         break;
       }
-      if (B || we(2), G < 256)
+      if (B || xe(2), G < 256)
         n[c++] = G;
       else if (G == 256) {
         X = l, f = null;
@@ -3176,21 +3176,21 @@ var Gr = /* @__PURE__ */ Ne(Ve, 9, 0), qr = /* @__PURE__ */ Ne(Ve, 9, 1), Jr = /
           re = je(t, l, (1 << W) - 1) + Nn[U], l += W;
         }
         var te = h[Nt(t, l) & J], se = te >> 4;
-        te || we(3), l += te & 15;
+        te || xe(3), l += te & 15;
         var ne = Wr[se];
         if (se > 3) {
           var W = Tt[se];
           ne += Nt(t, l) & (1 << W) - 1, l += W;
         }
         if (l > b) {
-          y && we(0);
+          y && xe(0);
           break;
         }
         u && v(c + 131072);
         var V = c + re;
         if (c < ne) {
           var M = a - ne, E = Math.min(ne, V);
-          for (M + c < 0 && we(3); c < E; ++c)
+          for (M + c < 0 && xe(3); c < E; ++c)
             n[c] = r[M + c];
         }
         for (; c < V; ++c)
@@ -3465,7 +3465,7 @@ function ho(t, e) {
     if (Wt)
       return Wt.decode(t);
     var o = co(t), a = o.s, n = o.r;
-    return n.length && we(8), a;
+    return n.length && xe(8), a;
   }
 }
 var uo = function(t, e) {
@@ -3484,7 +3484,7 @@ var uo = function(t, e) {
           v ? zt(t, e + 4 + 8 * (y + u)) : i,
           1
         ];
-    r < 2 && we(13);
+    r < 2 && xe(13);
   }
   return [o, a, i, 0];
 }, Gt = function(t) {
@@ -3492,14 +3492,14 @@ var uo = function(t, e) {
   if (t)
     for (var n in t) {
       var r = t[n].length;
-      r > 65535 && we(9), e += r + 4;
+      r > 65535 && xe(9), e += r + 4;
     }
   return e;
 }, On = function(t, e, n, r, o, a, i, u) {
   var y = r.length, v = n.extra, m = u && u.length, l = Gt(v);
   ve(t, e, i != null ? 33639248 : 67324752), e += 4, i != null && (t[e++] = 20, t[e++] = n.os), t[e] = 20, e += 2, t[e++] = n.flag << 1 | (a < 0 && 8), t[e++] = o && 8, t[e++] = n.compression & 255, t[e++] = n.compression >> 8;
   var c = new Date(n.mtime == null ? Date.now() : n.mtime), f = c.getFullYear() - 1980;
-  if ((f < 0 || f > 119) && we(10), ve(t, e, f << 25 | c.getMonth() + 1 << 21 | c.getDate() << 16 | c.getHours() << 11 | c.getMinutes() << 5 | c.getSeconds() >> 1), e += 4, a != -1 && (ve(t, e, n.crc), ve(t, e + 4, a < 0 ? -a - 2 : a), ve(t, e + 8, n.size)), ve(t, e + 12, y), ve(t, e + 14, l), e += 16, i != null && (ve(t, e, m), ve(t, e + 6, n.attrs), ve(t, e + 10, i), e += 14), t.set(r, e), e += y, l)
+  if ((f < 0 || f > 119) && xe(10), ve(t, e, f << 25 | c.getMonth() + 1 << 21 | c.getDate() << 16 | c.getHours() << 11 | c.getMinutes() << 5 | c.getSeconds() >> 1), e += 4, a != -1 && (ve(t, e, n.crc), ve(t, e + 4, a < 0 ? -a - 2 : a), ve(t, e + 8, n.size)), ve(t, e + 12, y), ve(t, e + 14, l), e += 16, i != null && (ve(t, e, m), ve(t, e + 6, n.attrs), ve(t, e + 10, i), e += 14), t.set(r, e), e += y, l)
     for (var h in v) {
       var p = v[h], g = p.length;
       ve(t, e, +h), ve(t, e + 2, g), t.set(p, e + 4), e += 4 + g;
@@ -3515,7 +3515,7 @@ function go(t, e) {
   var o = 0, a = 0;
   for (var i in n) {
     var u = n[i], y = u[0], v = u[1], m = v.level == 0 ? 0 : 8, l = Sn(i), c = l.length, f = v.comment, h = f && Sn(f), p = h && h.length, g = Gt(v.extra);
-    c > 65535 && we(11);
+    c > 65535 && xe(11);
     var b = m ? so(y, v) : y, s = b.length, d = oo();
     d.p(y), r.push(Dn(v, {
       size: y.length,
@@ -3538,7 +3538,7 @@ function go(t, e) {
 }
 function yo(t, e) {
   for (var n = {}, r = t.length - 22; Fe(t, r) != 101010256; --r)
-    (!r || t.length - r > 65558) && we(13);
+    (!r || t.length - r > 65558) && xe(13);
   var o = Ie(t, r + 8);
   if (!o)
     return {};
@@ -3554,7 +3554,7 @@ function yo(t, e) {
       size: c,
       originalSize: f,
       compression: l
-    })) && (l ? l == 8 ? n[h] = io(t.subarray(b, b + c), { out: new ge(f) }) : we(14, "unknown compression type " + l) : n[h] = gt(t, b, b + c));
+    })) && (l ? l == 8 ? n[h] = io(t.subarray(b, b + c), { out: new ge(f) }) : xe(14, "unknown compression type " + l) : n[h] = gt(t, b, b + c));
   }
   return n;
 }

package/dist/rig/types.d.ts

@@ -190,5 +190,6 @@ export interface Rig {
         padTop: number;
         padSide: number;
         gazeCenter?: Point;
+        irisTravel?: number;
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mesh-avatar",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "type": "module",
   "license": "MIT",
   "description": "A browser WebGL runtime for 2D mesh avatars, with .mavatar archive and folder loading.",