mesh-avatar 0.5.0 → 0.6.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/engine/expression-overlay.d.ts +2 -0
- package/dist/index.js +59 -58
- package/dist/rig/types.d.ts +1 -0
- package/package.json +1 -1
|
@@ -7,6 +7,7 @@ export function overlayTarget(name: any): {
|
|
|
7
7
|
browY: any;
|
|
8
8
|
browAngle: any;
|
|
9
9
|
mouthOpen: any;
|
|
10
|
+
mouthForm: any;
|
|
10
11
|
gx: any;
|
|
11
12
|
gy: any;
|
|
12
13
|
pitch: any;
|
|
@@ -36,6 +37,7 @@ export class ExpressionOverlay {
|
|
|
36
37
|
browY: 0;
|
|
37
38
|
browAngle: 0;
|
|
38
39
|
mouthOpen: 0;
|
|
40
|
+
mouthForm: 0;
|
|
39
41
|
gx: 0;
|
|
40
42
|
gy: 0;
|
|
41
43
|
pitch: 0;
|
package/dist/index.js
CHANGED
|
@@ -69,14 +69,14 @@ function Tn(t) {
|
|
|
69
69
|
}
|
|
70
70
|
const le = (t, e, n) => {
|
|
71
71
|
(typeof t != "number" || !Number.isFinite(t)) && n.push(`${e}: expected a finite number`);
|
|
72
|
-
},
|
|
72
|
+
}, we = (t, e, n) => {
|
|
73
73
|
le(t, e, n), typeof t == "number" && t <= 0 && n.push(`${e}: must be positive`);
|
|
74
74
|
}, De = (t, e, n) => {
|
|
75
75
|
le(t, e, n), typeof t == "number" && t < 0 && n.push(`${e}: must be nonnegative`);
|
|
76
76
|
}, Gn = (t, e, n) => {
|
|
77
77
|
De(t, e, n), typeof t == "number" && (!Number.isInteger(t) || t > 8) && n.push(`${e}: expected an integer from 0 to 8`);
|
|
78
78
|
}, _e = (t, e, n) => {
|
|
79
|
-
|
|
79
|
+
we(t, e, n), typeof t == "number" && !Number.isInteger(t) && n.push(`${e}: expected an integer`);
|
|
80
80
|
}, ot = (t, e, n) => {
|
|
81
81
|
le(t, e, n), typeof t == "number" && !Number.isInteger(t) && n.push(`${e}: expected an integer`);
|
|
82
82
|
}, yt = (t, e, n) => {
|
|
@@ -87,7 +87,7 @@ const le = (t, e, n) => {
|
|
|
87
87
|
return;
|
|
88
88
|
}
|
|
89
89
|
(r.length < e || r.length > n) && a.push(`${o}: expected ${e}..${n} items`), r.forEach((i, u) => t(i, `${o}[${u}]`, a));
|
|
90
|
-
}, me = Oe(le, 2, 2),
|
|
90
|
+
}, me = Oe(le, 2, 2), Ae = (t, e, n) => {
|
|
91
91
|
me(t, e, n), Array.isArray(t) && t.length === 2 && t[0] >= t[1] && n.push(`${e}: start must be less than end`);
|
|
92
92
|
}, he = (t, e = []) => (n, r, o) => {
|
|
93
93
|
if (!n || typeof n != "object" || Array.isArray(n)) {
|
|
@@ -97,7 +97,7 @@ const le = (t, e, n) => {
|
|
|
97
97
|
const a = n;
|
|
98
98
|
for (const [i, u] of Object.entries(t))
|
|
99
99
|
a[i] === void 0 && e.includes(i) || u(a[i], `${r}.${i}`, o);
|
|
100
|
-
}, ft = { cx: le, cy: le, rx:
|
|
100
|
+
}, ft = { cx: le, cy: le, rx: we, ry: we }, Ue = he(ft), at = Oe(me, 3), Xe = Oe(me, 2), Je = (t, e, n) => {
|
|
101
101
|
le(t, e, n), typeof t == "number" && (t < 0 || t > 1) && n.push(`${e}: must be between 0 and 1`);
|
|
102
102
|
}, qn = (t) => he({
|
|
103
103
|
version: (e, n, r) => {
|
|
@@ -111,18 +111,18 @@ const le = (t, e, n) => {
|
|
|
111
111
|
pivotX: le,
|
|
112
112
|
pivotY: le,
|
|
113
113
|
maxRoll: le,
|
|
114
|
-
weightBand:
|
|
115
|
-
turnBand:
|
|
114
|
+
weightBand: Ae,
|
|
115
|
+
turnBand: Ae
|
|
116
116
|
}),
|
|
117
117
|
body: he({
|
|
118
118
|
pivotX: le,
|
|
119
119
|
pivotY: le,
|
|
120
120
|
maxRoll: le,
|
|
121
|
-
breathBand:
|
|
122
|
-
rollBand:
|
|
121
|
+
breathBand: Ae,
|
|
122
|
+
rollBand: Ae,
|
|
123
123
|
chest: Ue,
|
|
124
124
|
shoulders: Oe(Ue),
|
|
125
|
-
hip: he({ shift: le, band:
|
|
125
|
+
hip: he({ shift: le, band: Ae })
|
|
126
126
|
}, ["hip"]),
|
|
127
127
|
face: he({
|
|
128
128
|
nose: Ue,
|
|
@@ -131,8 +131,8 @@ const le = (t, e, n) => {
|
|
|
131
131
|
eyeB: Ue,
|
|
132
132
|
earL: Ue,
|
|
133
133
|
earR: Ue,
|
|
134
|
-
brow: he({ ...ft, band:
|
|
135
|
-
jaw: he({ ...ft, band:
|
|
134
|
+
brow: he({ ...ft, band: Ae }),
|
|
135
|
+
jaw: he({ ...ft, band: Ae })
|
|
136
136
|
}),
|
|
137
137
|
buns: he({ bunL: Ue, bunR: Ue }, ["bunL", "bunR"]),
|
|
138
138
|
eyes: Oe(he({
|
|
@@ -147,12 +147,12 @@ const le = (t, e, n) => {
|
|
|
147
147
|
cx: le,
|
|
148
148
|
cy: le,
|
|
149
149
|
angle: le,
|
|
150
|
-
halfLen:
|
|
150
|
+
halfLen: we,
|
|
151
151
|
bow: le,
|
|
152
152
|
area: he({ ...ft, angle: le })
|
|
153
153
|
}),
|
|
154
154
|
cheeks: Oe(me, 2, 2),
|
|
155
|
-
strands: Oe(he({ name: yt, nodes: Xe, sigma:
|
|
155
|
+
strands: Oe(he({ name: yt, nodes: Xe, sigma: we, k: we, max: we })),
|
|
156
156
|
accessories: Oe(he({
|
|
157
157
|
name: yt,
|
|
158
158
|
pivot: me,
|
|
@@ -164,19 +164,19 @@ const le = (t, e, n) => {
|
|
|
164
164
|
hand: he({
|
|
165
165
|
outline: at,
|
|
166
166
|
jaw: Xe,
|
|
167
|
-
jawRange:
|
|
167
|
+
jawRange: Ae,
|
|
168
168
|
background: at,
|
|
169
169
|
elbow: me,
|
|
170
170
|
wrist: me,
|
|
171
171
|
knuckle: me,
|
|
172
172
|
contact: me,
|
|
173
173
|
forearmShare: Je,
|
|
174
|
-
armBand:
|
|
175
|
-
wristBand:
|
|
176
|
-
handBand:
|
|
177
|
-
fingerXBand:
|
|
178
|
-
fingerYBand:
|
|
179
|
-
pinBand:
|
|
174
|
+
armBand: Ae,
|
|
175
|
+
wristBand: Ae,
|
|
176
|
+
handBand: Ae,
|
|
177
|
+
fingerXBand: Ae,
|
|
178
|
+
fingerYBand: Ae,
|
|
179
|
+
pinBand: Ae
|
|
180
180
|
}),
|
|
181
181
|
cloth: Oe(he({
|
|
182
182
|
name: yt,
|
|
@@ -185,13 +185,13 @@ const le = (t, e, n) => {
|
|
|
185
185
|
hem: Xe,
|
|
186
186
|
columns: _e,
|
|
187
187
|
rows: _e,
|
|
188
|
-
stiffness:
|
|
189
|
-
damping:
|
|
190
|
-
max:
|
|
191
|
-
tierGain:
|
|
192
|
-
highModeDamping:
|
|
193
|
-
responseGain:
|
|
194
|
-
swing:
|
|
188
|
+
stiffness: we,
|
|
189
|
+
damping: we,
|
|
190
|
+
max: we,
|
|
191
|
+
tierGain: we,
|
|
192
|
+
highModeDamping: we,
|
|
193
|
+
responseGain: we,
|
|
194
|
+
swing: we,
|
|
195
195
|
follow: Je,
|
|
196
196
|
cohesion: Gn,
|
|
197
197
|
wind: De,
|
|
@@ -199,7 +199,7 @@ const le = (t, e, n) => {
|
|
|
199
199
|
typeof e != "boolean" && r.push(`${n}: expected a boolean`);
|
|
200
200
|
},
|
|
201
201
|
parent: yt,
|
|
202
|
-
scale:
|
|
202
|
+
scale: we,
|
|
203
203
|
seams: Oe(Xe, 0, 64),
|
|
204
204
|
tiers: Oe(Xe, 0, 8)
|
|
205
205
|
}, ["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) => {
|
|
|
211
211
|
shift: De,
|
|
212
212
|
tilt: De,
|
|
213
213
|
bend: De,
|
|
214
|
-
band:
|
|
214
|
+
band: Ae,
|
|
215
215
|
split: Xe,
|
|
216
216
|
left: he({ hip: me, knee: me, ankle: me }),
|
|
217
217
|
right: he({ hip: me, knee: me, ankle: me })
|
|
@@ -239,7 +239,7 @@ const le = (t, e, n) => {
|
|
|
239
239
|
spriteCell: _e,
|
|
240
240
|
clothCell: _e
|
|
241
241
|
}, ["clothCell"]),
|
|
242
|
-
view: he({ padTop: le, padSide: le, gazeCenter: me }, ["gazeCenter"])
|
|
242
|
+
view: he({ padTop: le, padSide: le, gazeCenter: me, irisTravel: we }, ["gazeCenter", "irisTravel"])
|
|
243
243
|
}, ["buns", "strands", "accessories", "hand", "cloth", "legs", "arms"]);
|
|
244
244
|
function Rn(t, e = {}) {
|
|
245
245
|
const n = [];
|
|
@@ -1521,9 +1521,9 @@ function wr(t, e) {
|
|
|
1521
1521
|
}
|
|
1522
1522
|
const q = (ee, oe, S, R = 1) => {
|
|
1523
1523
|
for (let P = 0; P < w; P++) {
|
|
1524
|
-
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)),
|
|
1524
|
+
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) => {
|
|
1525
1525
|
const ce = R === 1 ? K : Be + (K - Be) * R;
|
|
1526
|
-
return
|
|
1526
|
+
return Me * Math.tanh(ce * S / Me);
|
|
1527
1527
|
}), de = [Array.from(oe.slice(P * 2, P * 2 + 2))];
|
|
1528
1528
|
for (let K = 0; K < Ee.length; K++) {
|
|
1529
1529
|
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) {
|
|
|
1544
1544
|
for (let $ = 0; $ < b; $++) {
|
|
1545
1545
|
const Z = this.time + ($ + 1) * s, _ = (Math.sin(Z * 1.1) * 0.6 + Math.sin(Z * 2.3) * 0.4) * N * X;
|
|
1546
1546
|
for (let D = 0; D < w; D++) {
|
|
1547
|
-
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),
|
|
1547
|
+
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;
|
|
1548
1548
|
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;
|
|
1549
1549
|
}
|
|
1550
1550
|
}
|
|
@@ -1554,10 +1554,10 @@ function wr(t, e) {
|
|
|
1554
1554
|
}
|
|
1555
1555
|
const k = ($, Z, _) => {
|
|
1556
1556
|
for (let D = 0; D < w; D++) {
|
|
1557
|
-
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,
|
|
1557
|
+
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);
|
|
1558
1558
|
for (let Ee = 0; Ee < A; Ee++) {
|
|
1559
1559
|
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;
|
|
1560
|
-
$[K] = (ce ? Z[q] :
|
|
1560
|
+
$[K] = (ce ? Z[q] : Me) + Le * Se + $e * ye, $[K + 1] = (ce ? Z[q + 1] : Be) - Le * ye + $e * Se + S * de;
|
|
1561
1561
|
}
|
|
1562
1562
|
}
|
|
1563
1563
|
};
|
|
@@ -2493,7 +2493,7 @@ const rn = {
|
|
|
2493
2493
|
angry: "angryTalk",
|
|
2494
2494
|
sad: "sadTalk",
|
|
2495
2495
|
wink: "wink"
|
|
2496
|
-
}, Xr = { sad: { pitch: -6, gy: -0.45 } }, lt = (t, e, n) => Math.max(e, Math.min(n, t)), ct = Object.freeze({ eyeOpen: 1, eyeOpenL: 1, eyeSmile: 0, eyeSmileL: 0, blush: 0, browY: 0, browAngle: 0, mouthOpen: 0, gx: 0, gy: 0, pitch: 0 });
|
|
2496
|
+
}, Xr = { sad: { pitch: -6, gy: -0.45 } }, lt = (t, e, n) => Math.max(e, Math.min(n, t)), ct = Object.freeze({ eyeOpen: 1, eyeOpenL: 1, eyeSmile: 0, eyeSmileL: 0, blush: 0, browY: 0, browAngle: 0, mouthOpen: 0, mouthForm: 0, gx: 0, gy: 0, pitch: 0 });
|
|
2497
2497
|
function zr(t) {
|
|
2498
2498
|
const e = jn[rn[t]]?.p ?? {}, n = Xr[t] ?? {};
|
|
2499
2499
|
return {
|
|
@@ -2505,6 +2505,7 @@ function zr(t) {
|
|
|
2505
2505
|
browY: e.browY ?? 0,
|
|
2506
2506
|
browAngle: e.browAngle ?? 0,
|
|
2507
2507
|
mouthOpen: e.mouthOpen ?? 0,
|
|
2508
|
+
mouthForm: e.mouthForm ?? 0,
|
|
2508
2509
|
gx: e.glance?.[0] ?? 0,
|
|
2509
2510
|
gy: n.gy ?? e.glance?.[1] ?? 0,
|
|
2510
2511
|
pitch: n.pitch ?? 0
|
|
@@ -2512,7 +2513,7 @@ function zr(t) {
|
|
|
2512
2513
|
}
|
|
2513
2514
|
function Cr(t, e) {
|
|
2514
2515
|
const n = { ...t };
|
|
2515
|
-
return n.eyeROpen = (t.eyeROpen ?? 1) * e.eyeOpen, n.eyeLOpen = (t.eyeLOpen ?? 1) * e.eyeOpenL, n.eyeSmile = Math.max(t.eyeSmile ?? 0, e.eyeSmile), n.eyeSmileL = Math.max(t.eyeSmileL ?? t.eyeSmile ?? 0, e.eyeSmileL), n.blush = Math.max(t.blush ?? 0, e.blush), n.browY = lt((t.browY ?? 0) + e.browY, -1, 1), n.browAngle = lt((t.browAngle ?? 0) + e.browAngle, -1, 1), n.mouthOpen = Math.max(t.mouthOpen ?? 0, e.mouthOpen), n.gazeX = lt((t.gazeX ?? 0) + e.gx, -1, 1), n.gazeY = lt((t.gazeY ?? 0) + e.gy, -1, 1), n.angleY = lt((t.angleY ?? 0) + e.pitch, -30, 30), n;
|
|
2516
|
+
return n.eyeROpen = (t.eyeROpen ?? 1) * e.eyeOpen, n.eyeLOpen = (t.eyeLOpen ?? 1) * e.eyeOpenL, n.eyeSmile = Math.max(t.eyeSmile ?? 0, e.eyeSmile), n.eyeSmileL = Math.max(t.eyeSmileL ?? t.eyeSmile ?? 0, e.eyeSmileL), n.blush = Math.max(t.blush ?? 0, e.blush), n.browY = lt((t.browY ?? 0) + e.browY, -1, 1), n.browAngle = lt((t.browAngle ?? 0) + e.browAngle, -1, 1), n.mouthOpen = Math.max(t.mouthOpen ?? 0, e.mouthOpen), e.mouthOpen > (t.mouthOpen ?? 0) && (n.mouthForm = e.mouthForm), n.gazeX = lt((t.gazeX ?? 0) + e.gx, -1, 1), n.gazeY = lt((t.gazeY ?? 0) + e.gy, -1, 1), n.angleY = lt((t.angleY ?? 0) + e.pitch, -30, 30), n;
|
|
2516
2517
|
}
|
|
2517
2518
|
class Dr {
|
|
2518
2519
|
/** @type {keyof typeof OVERLAY_EXPRESSIONS} */
|
|
@@ -2613,7 +2614,7 @@ async function Vr(t, e) {
|
|
|
2613
2614
|
a.forEach((S, R) => {
|
|
2614
2615
|
for (const P of wn) {
|
|
2615
2616
|
const ae = `eye${R}_${P}`, ie = p(F[ae], P === "ball" ? n.mesh.eyeBallCell : n.mesh.eyeCell, Ze(Y[ae]), Y[ae].width), pe = [];
|
|
2616
|
-
for (let
|
|
2617
|
+
for (let Me = 0; Me < ie.rest.length / 2; Me++) pe.push(i(ie.rest[Me * 2], ie.rest[Me * 2 + 1], 0));
|
|
2617
2618
|
const be = T.addLayer(ae, Y[ae], ie, { eyeBall: P === "ball" ? R : void 0 });
|
|
2618
2619
|
N.push({ e: S, eye: R, part: P, mesh: ie, W: pe, layer: be });
|
|
2619
2620
|
}
|
|
@@ -2676,11 +2677,11 @@ async function Vr(t, e) {
|
|
|
2676
2677
|
const be = ne?.update(R, P, S, Mr(O.name, W.mode === "manual" ? null : W.expr));
|
|
2677
2678
|
if (be) for (const K of N) be.eyes[K.eye] && (K.layer.alpha = 0);
|
|
2678
2679
|
Q?.update(R, P, u, k);
|
|
2679
|
-
const
|
|
2680
|
+
const Me = X.pos, Be = X.rest, Ee = l(R);
|
|
2680
2681
|
for (let K = 0; K < G.length; K++)
|
|
2681
|
-
c(Be[K * 2], Be[K * 2 + 1], G[K], R, Ee, k),
|
|
2682
|
+
c(Be[K * 2], Be[K * 2 + 1], G[K], R, Ee, k), Me[K * 2] = k[0], Me[K * 2 + 1] = k[1];
|
|
2682
2683
|
re.chains.forEach((K, ce) => Hr(K, J[ce].mesh)), s.length && (j.step(R, S, P), j.deform());
|
|
2683
|
-
const de = 7;
|
|
2684
|
+
const de = n.view.irisTravel ?? 7;
|
|
2684
2685
|
T.draw({
|
|
2685
2686
|
angleX: R.angleX,
|
|
2686
2687
|
angleY: R.angleY,
|
|
@@ -3096,9 +3097,9 @@ var Gr = /* @__PURE__ */ Ne(Ve, 9, 0), qr = /* @__PURE__ */ Ne(Ve, 9, 1), Jr = /
|
|
|
3096
3097
|
"stream finishing",
|
|
3097
3098
|
"invalid zip data"
|
|
3098
3099
|
// determined by unknown compression method
|
|
3099
|
-
],
|
|
3100
|
+
], xe = function(t, e, n) {
|
|
3100
3101
|
var r = new Error(e || Qr[t]);
|
|
3101
|
-
if (r.code = t, Error.captureStackTrace && Error.captureStackTrace(r,
|
|
3102
|
+
if (r.code = t, Error.captureStackTrace && Error.captureStackTrace(r, xe), !n)
|
|
3102
3103
|
throw r;
|
|
3103
3104
|
return r;
|
|
3104
3105
|
}, eo = function(t, e, n, r) {
|
|
@@ -3142,18 +3143,18 @@ var Gr = /* @__PURE__ */ Ne(Ve, 9, 0), qr = /* @__PURE__ */ Ne(Ve, 9, 1), Jr = /
|
|
|
3142
3143
|
var N = Y.subarray(0, A), ne = Y.subarray(A);
|
|
3143
3144
|
p = It(N), g = It(ne), f = Ne(N, p, 1), h = Ne(ne, g, 1);
|
|
3144
3145
|
} else
|
|
3145
|
-
|
|
3146
|
+
xe(1);
|
|
3146
3147
|
else {
|
|
3147
3148
|
var d = an(l) + 4, x = t[d - 4] | t[d - 3] << 8, w = d + x;
|
|
3148
3149
|
if (w > o) {
|
|
3149
|
-
y &&
|
|
3150
|
+
y && xe(0);
|
|
3150
3151
|
break;
|
|
3151
3152
|
}
|
|
3152
3153
|
u && v(c + x), n.set(t.subarray(d, w), c), e.b = c += x, e.p = l = w * 8, e.f = m;
|
|
3153
3154
|
continue;
|
|
3154
3155
|
}
|
|
3155
3156
|
if (l > b) {
|
|
3156
|
-
y &&
|
|
3157
|
+
y && xe(0);
|
|
3157
3158
|
break;
|
|
3158
3159
|
}
|
|
3159
3160
|
}
|
|
@@ -3161,10 +3162,10 @@ var Gr = /* @__PURE__ */ Ne(Ve, 9, 0), qr = /* @__PURE__ */ Ne(Ve, 9, 1), Jr = /
|
|
|
3161
3162
|
for (var Q = (1 << p) - 1, J = (1 << g) - 1, X = l; ; X = l) {
|
|
3162
3163
|
var B = f[Nt(t, l) & Q], G = B >> 4;
|
|
3163
3164
|
if (l += B & 15, l > b) {
|
|
3164
|
-
y &&
|
|
3165
|
+
y && xe(0);
|
|
3165
3166
|
break;
|
|
3166
3167
|
}
|
|
3167
|
-
if (B ||
|
|
3168
|
+
if (B || xe(2), G < 256)
|
|
3168
3169
|
n[c++] = G;
|
|
3169
3170
|
else if (G == 256) {
|
|
3170
3171
|
X = l, f = null;
|
|
@@ -3176,21 +3177,21 @@ var Gr = /* @__PURE__ */ Ne(Ve, 9, 0), qr = /* @__PURE__ */ Ne(Ve, 9, 1), Jr = /
|
|
|
3176
3177
|
re = je(t, l, (1 << W) - 1) + Nn[U], l += W;
|
|
3177
3178
|
}
|
|
3178
3179
|
var te = h[Nt(t, l) & J], se = te >> 4;
|
|
3179
|
-
te ||
|
|
3180
|
+
te || xe(3), l += te & 15;
|
|
3180
3181
|
var ne = Wr[se];
|
|
3181
3182
|
if (se > 3) {
|
|
3182
3183
|
var W = Tt[se];
|
|
3183
3184
|
ne += Nt(t, l) & (1 << W) - 1, l += W;
|
|
3184
3185
|
}
|
|
3185
3186
|
if (l > b) {
|
|
3186
|
-
y &&
|
|
3187
|
+
y && xe(0);
|
|
3187
3188
|
break;
|
|
3188
3189
|
}
|
|
3189
3190
|
u && v(c + 131072);
|
|
3190
3191
|
var V = c + re;
|
|
3191
3192
|
if (c < ne) {
|
|
3192
3193
|
var M = a - ne, E = Math.min(ne, V);
|
|
3193
|
-
for (M + c < 0 &&
|
|
3194
|
+
for (M + c < 0 && xe(3); c < E; ++c)
|
|
3194
3195
|
n[c] = r[M + c];
|
|
3195
3196
|
}
|
|
3196
3197
|
for (; c < V; ++c)
|
|
@@ -3465,7 +3466,7 @@ function ho(t, e) {
|
|
|
3465
3466
|
if (Wt)
|
|
3466
3467
|
return Wt.decode(t);
|
|
3467
3468
|
var o = co(t), a = o.s, n = o.r;
|
|
3468
|
-
return n.length &&
|
|
3469
|
+
return n.length && xe(8), a;
|
|
3469
3470
|
}
|
|
3470
3471
|
}
|
|
3471
3472
|
var uo = function(t, e) {
|
|
@@ -3484,7 +3485,7 @@ var uo = function(t, e) {
|
|
|
3484
3485
|
v ? zt(t, e + 4 + 8 * (y + u)) : i,
|
|
3485
3486
|
1
|
|
3486
3487
|
];
|
|
3487
|
-
r < 2 &&
|
|
3488
|
+
r < 2 && xe(13);
|
|
3488
3489
|
}
|
|
3489
3490
|
return [o, a, i, 0];
|
|
3490
3491
|
}, Gt = function(t) {
|
|
@@ -3492,14 +3493,14 @@ var uo = function(t, e) {
|
|
|
3492
3493
|
if (t)
|
|
3493
3494
|
for (var n in t) {
|
|
3494
3495
|
var r = t[n].length;
|
|
3495
|
-
r > 65535 &&
|
|
3496
|
+
r > 65535 && xe(9), e += r + 4;
|
|
3496
3497
|
}
|
|
3497
3498
|
return e;
|
|
3498
3499
|
}, On = function(t, e, n, r, o, a, i, u) {
|
|
3499
3500
|
var y = r.length, v = n.extra, m = u && u.length, l = Gt(v);
|
|
3500
3501
|
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;
|
|
3501
3502
|
var c = new Date(n.mtime == null ? Date.now() : n.mtime), f = c.getFullYear() - 1980;
|
|
3502
|
-
if ((f < 0 || f > 119) &&
|
|
3503
|
+
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)
|
|
3503
3504
|
for (var h in v) {
|
|
3504
3505
|
var p = v[h], g = p.length;
|
|
3505
3506
|
ve(t, e, +h), ve(t, e + 2, g), t.set(p, e + 4), e += 4 + g;
|
|
@@ -3515,7 +3516,7 @@ function go(t, e) {
|
|
|
3515
3516
|
var o = 0, a = 0;
|
|
3516
3517
|
for (var i in n) {
|
|
3517
3518
|
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);
|
|
3518
|
-
c > 65535 &&
|
|
3519
|
+
c > 65535 && xe(11);
|
|
3519
3520
|
var b = m ? so(y, v) : y, s = b.length, d = oo();
|
|
3520
3521
|
d.p(y), r.push(Dn(v, {
|
|
3521
3522
|
size: y.length,
|
|
@@ -3538,7 +3539,7 @@ function go(t, e) {
|
|
|
3538
3539
|
}
|
|
3539
3540
|
function yo(t, e) {
|
|
3540
3541
|
for (var n = {}, r = t.length - 22; Fe(t, r) != 101010256; --r)
|
|
3541
|
-
(!r || t.length - r > 65558) &&
|
|
3542
|
+
(!r || t.length - r > 65558) && xe(13);
|
|
3542
3543
|
var o = Ie(t, r + 8);
|
|
3543
3544
|
if (!o)
|
|
3544
3545
|
return {};
|
|
@@ -3554,7 +3555,7 @@ function yo(t, e) {
|
|
|
3554
3555
|
size: c,
|
|
3555
3556
|
originalSize: f,
|
|
3556
3557
|
compression: l
|
|
3557
|
-
})) && (l ? l == 8 ? n[h] = io(t.subarray(b, b + c), { out: new ge(f) }) :
|
|
3558
|
+
})) && (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));
|
|
3558
3559
|
}
|
|
3559
3560
|
return n;
|
|
3560
3561
|
}
|
package/dist/rig/types.d.ts
CHANGED