three-slicer-viewer 0.4.1 → 0.4.3
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/VIEWER.md +30 -4
- package/data/config-schema-lean.json +1 -1
- package/data/ui-tree-keys.json +1 -1
- package/dist/components.js +135 -118
- package/dist/index.js +6816 -5149
- package/dist/{model_loaders-kvOxEvFT.js → model_loaders-CuHlnAw6.js} +1 -1
- package/dist/model_loaders.js +2 -2
- package/dist/{parse_3mf-6PLUgcZp.js → parse_3mf-BCD9FIz5.js} +174 -173
- package/dist/parse_3mf.worker.js +1 -1
- package/dist/{sla_reconstruct-CRZ3TrI1.js → sla_reconstruct-MtrOJRWL.js} +1 -1
- package/dist/sla_reconstruct.worker.js +1 -1
- package/dist/sla_slice.worker.js +1 -1
- package/dist/{theme-2oyfMuvf.js → theme-BwyYoVl6.js} +15 -12
- package/dist/toolpath.js +169 -160
- package/package.json +1 -1
- package/src/settings/settings_core.js +4 -0
- package/types/settings-keys.d.ts +40 -40
- package/types/viewer.d.ts +10 -1
|
@@ -28,35 +28,35 @@ const Nt = [
|
|
|
28
28
|
function G(t, e, r) {
|
|
29
29
|
let o = e, n = !1;
|
|
30
30
|
o < r && (t[o] === 45 || t[o] === 43) && (n = t[o] === 45, o++);
|
|
31
|
-
let
|
|
31
|
+
let s = 0, a = -1, l = 0;
|
|
32
32
|
for (; o < r; o++) {
|
|
33
33
|
const f = t[o];
|
|
34
34
|
if (f >= 48 && f <= 57)
|
|
35
|
-
|
|
35
|
+
s = s * 10 + (f - 48), l++, a >= 0 && a++;
|
|
36
36
|
else if (f === 46 && a < 0) a = 0;
|
|
37
37
|
else return Number(U(t, e, r));
|
|
38
38
|
}
|
|
39
|
-
if (!l ||
|
|
40
|
-
let
|
|
41
|
-
return a > 0 && (
|
|
39
|
+
if (!l || s > 9007199254740991 || a > 22) return Number(U(t, e, r));
|
|
40
|
+
let i = s;
|
|
41
|
+
return a > 0 && (i = s / Nt[a]), n ? -i : i;
|
|
42
42
|
}
|
|
43
43
|
let F = 0;
|
|
44
44
|
function Q(t, e) {
|
|
45
45
|
let r = e, o = !1, n = t[r];
|
|
46
46
|
(n === 45 || n === 43) && (o = n === 45, n = t[++r]);
|
|
47
|
-
let
|
|
47
|
+
let s = 0, a = -1, l = 0;
|
|
48
48
|
for (; ; n = t[++r])
|
|
49
49
|
if (n >= 48 && n <= 57)
|
|
50
|
-
|
|
50
|
+
s = s * 10 + (n - 48), l++, a >= 0 && a++;
|
|
51
51
|
else if (n === 46 && a < 0) a = 0;
|
|
52
52
|
else break;
|
|
53
53
|
if (n !== 34) {
|
|
54
54
|
const f = t.indexOf(34, r);
|
|
55
55
|
return F = f + 1, Number(U(t, e, f));
|
|
56
56
|
}
|
|
57
|
-
if (F = r + 1, !l ||
|
|
58
|
-
let
|
|
59
|
-
return a > 0 && (
|
|
57
|
+
if (F = r + 1, !l || s > 9007199254740991 || a > 22) return Number(U(t, e, r));
|
|
58
|
+
let i = s;
|
|
59
|
+
return a > 0 && (i = s / Nt[a]), o ? -i : i;
|
|
60
60
|
}
|
|
61
61
|
const ct = (t, e, r) => t[e] === 32 && t[e + 1] === r && t[e + 2] === 61 && t[e + 3] === 34, lt = (t, e, r) => t[e] === 32 && t[e + 1] === 118 && t[e + 2] === r && t[e + 3] === 61 && t[e + 4] === 34, Z = (t) => t === 32 || t === 10 || t === 13 || t === 9, B = (t, e, r, o) => {
|
|
62
62
|
if (r - e !== o.length) return !1;
|
|
@@ -73,7 +73,7 @@ function Y(t, e, r) {
|
|
|
73
73
|
e++;
|
|
74
74
|
continue;
|
|
75
75
|
}
|
|
76
|
-
const
|
|
76
|
+
const s = e;
|
|
77
77
|
for (; e < o && t[e] !== 61 && t[e] !== 62 && !Z(t[e]); ) e++;
|
|
78
78
|
const a = e;
|
|
79
79
|
for (; Z(t[e]); ) e++;
|
|
@@ -81,9 +81,9 @@ function Y(t, e, r) {
|
|
|
81
81
|
for (e++; Z(t[e]); ) e++;
|
|
82
82
|
const l = t[e];
|
|
83
83
|
if (l !== 34 && l !== 39) continue;
|
|
84
|
-
const
|
|
84
|
+
const i = e + 1, f = t.indexOf(l, i);
|
|
85
85
|
if (f < 0) return o;
|
|
86
|
-
l === 34 && r(
|
|
86
|
+
l === 34 && r(s, a, i, f), e = f + 1;
|
|
87
87
|
}
|
|
88
88
|
return o;
|
|
89
89
|
}
|
|
@@ -99,7 +99,7 @@ const pt = [
|
|
|
99
99
|
["paint_supports", "supports"],
|
|
100
100
|
// support enforcer/blocker: states 1 and 2
|
|
101
101
|
["paint_seam", "seam"],
|
|
102
|
-
//
|
|
102
|
+
// seam enforcer/blocker: states 1 and 2
|
|
103
103
|
["paint_fuzzy_skin", "fuzzy"]
|
|
104
104
|
// ditto
|
|
105
105
|
], Wt = Object.fromEntries(pt);
|
|
@@ -126,7 +126,7 @@ class It {
|
|
|
126
126
|
}
|
|
127
127
|
function et(t, e = null) {
|
|
128
128
|
const r = /* @__PURE__ */ new Map(), o = [];
|
|
129
|
-
let n = e,
|
|
129
|
+
let n = e, s = 0, a = 0, l = 0, i = 0, f = 0, c = 0, u = 0, p = null, m = null, g = null, w = null, S = null;
|
|
130
130
|
const I = () => {
|
|
131
131
|
if (n.id)
|
|
132
132
|
if (n.components.length) r.set(n.id, { components: n.components });
|
|
@@ -140,7 +140,7 @@ function et(t, e = null) {
|
|
|
140
140
|
}, v = (d, O, E, j) => {
|
|
141
141
|
if (O - d !== 1) return;
|
|
142
142
|
const R = t[d];
|
|
143
|
-
R === 120 ? a = G(t, E, j) : R === 121 ? l = G(t, E, j) : R === 122 && (
|
|
143
|
+
R === 120 ? a = G(t, E, j) : R === 121 ? l = G(t, E, j) : R === 122 && (i = G(t, E, j));
|
|
144
144
|
}, x = (d, O, E, j) => {
|
|
145
145
|
if (O - d === 2 && t[d] === 118) {
|
|
146
146
|
const R = t[d + 1];
|
|
@@ -171,16 +171,16 @@ function et(t, e = null) {
|
|
|
171
171
|
let j = d;
|
|
172
172
|
for (; j < $ && !Z(t[j]) && t[j] !== 62 && t[j] !== 47; ) j++;
|
|
173
173
|
if (O) {
|
|
174
|
-
n && B(t, d, j, "object") ? I() :
|
|
174
|
+
n && B(t, d, j, "object") ? I() : s === 1 && B(t, d, j, "build") && (s = 2), N = t.indexOf(62, j) + 1 || $;
|
|
175
175
|
continue;
|
|
176
176
|
}
|
|
177
177
|
if (n) {
|
|
178
178
|
if (B(t, d, j, "vertex")) {
|
|
179
|
-
if (ct(t, j, 120) && (a = Q(t, j + 4), ct(t, F, 121) && (l = Q(t, F + 4), ct(t, F, 122) && (
|
|
180
|
-
N = F + 2, n.id && n.verts.push3(a, l,
|
|
179
|
+
if (ct(t, j, 120) && (a = Q(t, j + 4), ct(t, F, 121) && (l = Q(t, F + 4), ct(t, F, 122) && (i = Q(t, F + 4), t[F] === 47 && t[F + 1] === 62)))) {
|
|
180
|
+
N = F + 2, n.id && n.verts.push3(a, l, i);
|
|
181
181
|
continue;
|
|
182
182
|
}
|
|
183
|
-
a = 0, l = 0,
|
|
183
|
+
a = 0, l = 0, i = 0, N = Y(t, j, v), n.id && n.verts.push3(a, l, i);
|
|
184
184
|
continue;
|
|
185
185
|
}
|
|
186
186
|
if (B(t, d, j, "triangle")) {
|
|
@@ -189,10 +189,10 @@ function et(t, e = null) {
|
|
|
189
189
|
if (lt(t, j, 49)) {
|
|
190
190
|
const K = Q(t, j + 5);
|
|
191
191
|
if (lt(t, F, 50)) {
|
|
192
|
-
const
|
|
192
|
+
const it = Q(t, F + 5);
|
|
193
193
|
if (lt(t, F, 51)) {
|
|
194
194
|
const at = Q(t, F + 5);
|
|
195
|
-
f = K, c =
|
|
195
|
+
f = K, c = it, u = at, R = F;
|
|
196
196
|
}
|
|
197
197
|
}
|
|
198
198
|
}
|
|
@@ -208,11 +208,11 @@ function et(t, e = null) {
|
|
|
208
208
|
} else if (B(t, d, j, "object")) {
|
|
209
209
|
y = null, N = Y(t, j, k), n = { id: y, components: [], verts: new It(), tris: new It(), paint: kt() }, t[N - 2] === 47 && I();
|
|
210
210
|
continue;
|
|
211
|
-
} else if (
|
|
211
|
+
} else if (s === 0 && B(t, d, j, "build")) {
|
|
212
212
|
N = Y(t, j, () => {
|
|
213
|
-
}),
|
|
213
|
+
}), s = 1, t[N - 2] === 47 && (s = 2);
|
|
214
214
|
continue;
|
|
215
|
-
} else if (
|
|
215
|
+
} else if (s === 1 && B(t, d, j, "item")) {
|
|
216
216
|
p = null, m = null, g = null, w = null, N = Y(t, j, T), p && o.push(A());
|
|
217
217
|
continue;
|
|
218
218
|
}
|
|
@@ -226,9 +226,9 @@ function qt(t) {
|
|
|
226
226
|
}
|
|
227
227
|
function ft(t) {
|
|
228
228
|
const e = /* @__PURE__ */ new Map(), r = [];
|
|
229
|
-
let o = null, n = 0,
|
|
230
|
-
const p = () => ({ objectid:
|
|
231
|
-
B(t, I, A, "objectid") ?
|
|
229
|
+
let o = null, n = 0, s = null, a = null, l = null, i = null, f = null, c = 0, u = -1;
|
|
230
|
+
const p = () => ({ objectid: s, path: a || l, transform: Bt(i) }), m = (I, A, T, v) => {
|
|
231
|
+
B(t, I, A, "objectid") ? s = U(t, T, v) : B(t, I, A, "p:path") ? a = U(t, T, v) : B(t, I, A, "path") ? l = U(t, T, v) : B(t, I, A, "transform") && (i = U(t, T, v));
|
|
232
232
|
}, g = (I, A, T, v) => {
|
|
233
233
|
B(t, I, A, "id") && (f = U(t, T, v));
|
|
234
234
|
};
|
|
@@ -274,7 +274,7 @@ function ft(t) {
|
|
|
274
274
|
o && B(t, k, d, "object") ? v(c) : n === 1 && B(t, k, d, "build") && (n = 2);
|
|
275
275
|
continue;
|
|
276
276
|
}
|
|
277
|
-
o ? B(t, k, d, "mesh") ? (o.hasMesh = !0, u = c) : B(t, k, d, "component") && (
|
|
277
|
+
o ? B(t, k, d, "mesh") ? (o.hasMesh = !0, u = c) : B(t, k, d, "component") && (s = null, a = null, l = null, i = null, Y(t, d, m), s && o.components.push(p())) : B(t, k, d, "object") ? (f = null, Y(t, d, g), o = { id: f, start: x, components: [], hasMesh: !1 }, t[y - 1] === 47 && v(c)) : n === 0 && B(t, k, d, "build") ? (n = 1, t[y - 1] === 47 && (n = 2)) : n === 1 && B(t, k, d, "item") && (s = null, a = null, l = null, i = null, Y(t, d, m), s && r.push(p()));
|
|
278
278
|
}
|
|
279
279
|
}
|
|
280
280
|
return { advance: w, open: () => o, finish: () => ({ objects: e, items: r }) };
|
|
@@ -284,9 +284,9 @@ function yt(t, e, r) {
|
|
|
284
284
|
const o = [];
|
|
285
285
|
for (let n = 0; n < r; n++) {
|
|
286
286
|
if (X(t, e) !== 33639248) return null;
|
|
287
|
-
const
|
|
288
|
-
if (
|
|
289
|
-
o.push({ name: Xt.decode(t.subarray(e + 46, e + 46 + f)), method: a, compressedSize: l, size:
|
|
287
|
+
const s = q(t, e + 8), a = q(t, e + 10), l = X(t, e + 20), i = X(t, e + 24), f = q(t, e + 28), c = q(t, e + 30), u = q(t, e + 32), p = X(t, e + 42);
|
|
288
|
+
if (s & 1 || l === 4294967295 || i === 4294967295 || p === 4294967295 || a !== 0 && a !== 8) return null;
|
|
289
|
+
o.push({ name: Xt.decode(t.subarray(e + 46, e + 46 + f)), method: a, compressedSize: l, size: i, local: p }), e += 46 + f + c + u;
|
|
290
290
|
}
|
|
291
291
|
return o;
|
|
292
292
|
}
|
|
@@ -308,22 +308,22 @@ function Gt(t) {
|
|
|
308
308
|
if (!r) return null;
|
|
309
309
|
const o = /* @__PURE__ */ new Map();
|
|
310
310
|
for (const n of r) {
|
|
311
|
-
const
|
|
312
|
-
if (
|
|
313
|
-
o.set(n.name, { method: n.method, compressedSize: n.compressedSize, size: n.size, dataStart:
|
|
311
|
+
const s = vt(t.subarray(n.local, n.local + dt), n.local);
|
|
312
|
+
if (s === null) return null;
|
|
313
|
+
o.set(n.name, { method: n.method, compressedSize: n.compressedSize, size: n.size, dataStart: s });
|
|
314
314
|
}
|
|
315
315
|
return o;
|
|
316
316
|
}
|
|
317
317
|
async function Qt(t) {
|
|
318
318
|
const e = async (c, u) => new Uint8Array(await t.slice(c, u).arrayBuffer()), r = Math.max(0, t.size - Lt), o = await e(r, t.size), n = Et(o);
|
|
319
319
|
if (!n) return null;
|
|
320
|
-
let
|
|
321
|
-
a < 0 && (
|
|
322
|
-
const l = yt(
|
|
320
|
+
let s = o, a = n.directoryStart - r;
|
|
321
|
+
a < 0 && (s = await e(n.directoryStart, r + n.at), a = 0);
|
|
322
|
+
const l = yt(s, a, n.count);
|
|
323
323
|
if (!l) return null;
|
|
324
|
-
const
|
|
324
|
+
const i = await Promise.all(l.map((c) => e(c.local, c.local + dt))), f = /* @__PURE__ */ new Map();
|
|
325
325
|
return l.forEach((c, u) => {
|
|
326
|
-
const p = vt(
|
|
326
|
+
const p = vt(i[u], c.local);
|
|
327
327
|
p !== null && f.set(c.name, { method: c.method, compressedSize: c.compressedSize, size: c.size, dataStart: p });
|
|
328
328
|
}), f.size !== l.length ? null : f;
|
|
329
329
|
}
|
|
@@ -344,8 +344,8 @@ function te(t, e) {
|
|
|
344
344
|
return {
|
|
345
345
|
push(n) {
|
|
346
346
|
if (o + n.length > r.length) {
|
|
347
|
-
const
|
|
348
|
-
|
|
347
|
+
const s = new Uint8Array(Math.max(r.length * 2, o + n.length));
|
|
348
|
+
s.set(r.subarray(0, o)), r = s;
|
|
349
349
|
}
|
|
350
350
|
r.set(n, o), o += n.length, e(r, o);
|
|
351
351
|
},
|
|
@@ -360,17 +360,17 @@ async function ee(t, e, r, o = 1 << 20) {
|
|
|
360
360
|
return;
|
|
361
361
|
}
|
|
362
362
|
const n = bt(t).pipeThrough(new DecompressionStream("deflate-raw")).getReader();
|
|
363
|
-
let
|
|
363
|
+
let s = new Uint8Array(o), a = 0;
|
|
364
364
|
for (; ; ) {
|
|
365
|
-
const { done: l, value:
|
|
365
|
+
const { done: l, value: i } = await n.read();
|
|
366
366
|
if (l) break;
|
|
367
367
|
let f = 0;
|
|
368
|
-
for (; f <
|
|
369
|
-
const c = Math.min(
|
|
370
|
-
|
|
368
|
+
for (; f < i.length; ) {
|
|
369
|
+
const c = Math.min(i.length - f, s.length - a);
|
|
370
|
+
s.set(i.subarray(f, f + c), a), a += c, f += c, a === s.length && (r(s), s = new Uint8Array(o), a = 0);
|
|
371
371
|
}
|
|
372
372
|
}
|
|
373
|
-
a && r(
|
|
373
|
+
a && r(s.subarray(0, a));
|
|
374
374
|
}
|
|
375
375
|
async function ne(t, e, r) {
|
|
376
376
|
const o = te(e, r);
|
|
@@ -380,36 +380,36 @@ function oe(t) {
|
|
|
380
380
|
const e = t.length, r = new Float32Array(e);
|
|
381
381
|
for (let u = 0; u < e; u += 3)
|
|
382
382
|
r[u] = t[u], r[u + 1] = t[u + 2], r[u + 2] = -t[u + 1];
|
|
383
|
-
let o = 1 / 0, n = 1 / 0,
|
|
383
|
+
let o = 1 / 0, n = 1 / 0, s = 1 / 0, a = -1 / 0, l = -1 / 0, i = -1 / 0;
|
|
384
384
|
for (let u = 0; u < e; u += 3)
|
|
385
|
-
o = Math.min(o, r[u]), a = Math.max(a, r[u]), n = Math.min(n, r[u + 1]), l = Math.max(l, r[u + 1]),
|
|
386
|
-
const f = (o + a) / 2, c = (
|
|
385
|
+
o = Math.min(o, r[u]), a = Math.max(a, r[u]), n = Math.min(n, r[u + 1]), l = Math.max(l, r[u + 1]), s = Math.min(s, r[u + 2]), i = Math.max(i, r[u + 2]);
|
|
386
|
+
const f = (o + a) / 2, c = (s + i) / 2;
|
|
387
387
|
for (let u = 0; u < e; u += 3)
|
|
388
388
|
r[u] -= f, r[u + 1] -= n, r[u + 2] -= c;
|
|
389
|
-
return { localPos: r, size: { w: a - o, d:
|
|
389
|
+
return { localPos: r, size: { w: a - o, d: i - s, h: l - n } };
|
|
390
390
|
}
|
|
391
391
|
function re(t) {
|
|
392
392
|
const e = [1 / 0, 1 / 0, 1 / 0], r = [-1 / 0, -1 / 0, -1 / 0];
|
|
393
393
|
for (let o = 0; o < t.length; o += 3)
|
|
394
394
|
for (let n = 0; n < 3; n++) {
|
|
395
|
-
const
|
|
396
|
-
|
|
395
|
+
const s = t[o + n];
|
|
396
|
+
s < e[n] && (e[n] = s), s > r[n] && (r[n] = s);
|
|
397
397
|
}
|
|
398
398
|
return { min: e, max: r };
|
|
399
399
|
}
|
|
400
|
-
function
|
|
400
|
+
function se(t, e) {
|
|
401
401
|
const r = [0, 0, 0];
|
|
402
|
-
if (!(e.max[0] < e.min[0] || e.max[1] < e.min[1] || e.max[2] < e.min[2])) for (let
|
|
402
|
+
if (!(e.max[0] < e.min[0] || e.max[1] < e.min[1] || e.max[2] < e.min[2])) for (let s = 0; s < 3; s++) r[s] = (e.min[s] + e.max[s]) * 0.5;
|
|
403
403
|
let n = 0;
|
|
404
|
-
for (let
|
|
405
|
-
const a = r[0] - t[
|
|
406
|
-
n = Math.max(n, a * a + l * l +
|
|
404
|
+
for (let s = 0; s < t.length; s += 3) {
|
|
405
|
+
const a = r[0] - t[s], l = r[1] - t[s + 1], i = r[2] - t[s + 2];
|
|
406
|
+
n = Math.max(n, a * a + l * l + i * i);
|
|
407
407
|
}
|
|
408
408
|
return { center: r, radius: Math.sqrt(n) };
|
|
409
409
|
}
|
|
410
|
-
function
|
|
410
|
+
function ie(t) {
|
|
411
411
|
const { localPos: e, size: r } = oe(t), o = re(e);
|
|
412
|
-
return { localPos: e, size: r, bounds: o, sphere:
|
|
412
|
+
return { localPos: e, size: r, bounds: o, sphere: se(e, o) };
|
|
413
413
|
}
|
|
414
414
|
function ae(t) {
|
|
415
415
|
return new Promise((e) => {
|
|
@@ -418,8 +418,8 @@ function ae(t) {
|
|
|
418
418
|
r || (r = !0, e(n));
|
|
419
419
|
};
|
|
420
420
|
try {
|
|
421
|
-
Jt(t, (n,
|
|
422
|
-
o(n ? Ot(t) :
|
|
421
|
+
Jt(t, (n, s) => {
|
|
422
|
+
o(n ? Ot(t) : s);
|
|
423
423
|
});
|
|
424
424
|
} catch {
|
|
425
425
|
o(Ot(t));
|
|
@@ -431,8 +431,8 @@ function Dt(t, e) {
|
|
|
431
431
|
const r = new Array(12);
|
|
432
432
|
for (let o = 0; o < 4; o++)
|
|
433
433
|
for (let n = 0; n < 3; n++) {
|
|
434
|
-
let
|
|
435
|
-
o === 3 && (
|
|
434
|
+
let s = 0;
|
|
435
|
+
o === 3 && (s = e[9 + n]), r[o * 3 + n] = t[o * 3] * e[n] + t[o * 3 + 1] * e[3 + n] + t[o * 3 + 2] * e[6 + n] + s;
|
|
436
436
|
}
|
|
437
437
|
return r;
|
|
438
438
|
}
|
|
@@ -455,18 +455,18 @@ function ot(t) {
|
|
|
455
455
|
const zt = { support_enforcer: "enforcer", support_blocker: "blocker" };
|
|
456
456
|
function ce(t) {
|
|
457
457
|
const e = /* @__PURE__ */ new Map(), r = /* @__PURE__ */ new Map(), o = /* @__PURE__ */ new Map(), n = /<object\b([^>]*)>([\s\S]*?)<\/object>/g;
|
|
458
|
-
let
|
|
459
|
-
for (;
|
|
460
|
-
const
|
|
461
|
-
if (
|
|
462
|
-
const f =
|
|
463
|
-
e.set(
|
|
458
|
+
let s;
|
|
459
|
+
for (; s = n.exec(t); ) {
|
|
460
|
+
const i = H(s[1], "id");
|
|
461
|
+
if (i) {
|
|
462
|
+
const f = s[2];
|
|
463
|
+
e.set(i, ot(f.replace(/<(?:part|volume)\b[\s\S]*?<\/(?:part|volume)>/g, "")));
|
|
464
464
|
const c = [];
|
|
465
465
|
for (const p of f.match(/<volume\b[\s\S]*?<\/volume>/g) || []) {
|
|
466
466
|
const m = ot(p).volume_type, g = m === "SupportBlocker" ? "blocker" : m === "SupportEnforcer" ? "enforcer" : null, w = Number(H(p, "firstid")), S = Number(H(p, "lastid"));
|
|
467
467
|
g && Number.isInteger(w) && Number.isInteger(S) && w >= 0 && S >= w && c.push({ firstTriangle: w, lastTriangle: S, kind: g });
|
|
468
468
|
}
|
|
469
|
-
c.length && r.set(
|
|
469
|
+
c.length && r.set(i, c);
|
|
470
470
|
const u = (f.match(/<part\b[\s\S]*?<\/part>/g) || []).map((p) => ({
|
|
471
471
|
id: H(p, "id"),
|
|
472
472
|
subtype: H(p, "subtype"),
|
|
@@ -479,14 +479,14 @@ function ce(t) {
|
|
|
479
479
|
const w = zt[g.subtype];
|
|
480
480
|
w && g.faces && p.push({ firstTriangle: m, lastTriangle: m + g.faces - 1, kind: w }), m += g.faces;
|
|
481
481
|
}
|
|
482
|
-
o.set(
|
|
482
|
+
o.set(i, { partIds: u.map((g) => g.id), records: p });
|
|
483
483
|
}
|
|
484
484
|
}
|
|
485
485
|
}
|
|
486
486
|
const a = [], l = /<plate\b[^>]*>([\s\S]*?)<\/plate>/g;
|
|
487
|
-
for (;
|
|
488
|
-
const
|
|
489
|
-
for (const u of
|
|
487
|
+
for (; s = l.exec(t); ) {
|
|
488
|
+
const i = s[1], f = ot(i.replace(/<model_instance\b[\s\S]*?<\/model_instance>/g, "")), c = [];
|
|
489
|
+
for (const u of i.match(/<model_instance\b[\s\S]*?<\/model_instance>/g) || []) {
|
|
490
490
|
const p = ot(u).object_id;
|
|
491
491
|
p && c.push(p);
|
|
492
492
|
}
|
|
@@ -501,34 +501,34 @@ const le = Object.freeze({
|
|
|
501
501
|
uiEditing: "unavailable"
|
|
502
502
|
});
|
|
503
503
|
function At(t, e, r, o, n) {
|
|
504
|
-
const
|
|
505
|
-
if (!t?.trim()) return
|
|
506
|
-
const a = t.trim().split(/\r?\n/), l = new RegExp(`^${e}_format_version=(\\d+)$`).exec(a[0]),
|
|
504
|
+
const s = /* @__PURE__ */ new Map();
|
|
505
|
+
if (!t?.trim()) return s;
|
|
506
|
+
const a = t.trim().split(/\r?\n/), l = new RegExp(`^${e}_format_version=(\\d+)$`).exec(a[0]), i = l ? Number(l[1]) : 0;
|
|
507
507
|
for (const f of a.slice(l ? 1 : 0)) {
|
|
508
508
|
const c = /^object_id=(\d+)\|(.*)$/.exec(f);
|
|
509
|
-
if (!c ||
|
|
510
|
-
const u = Number(c[1]), p = c[2].trim() ? c[2].trim().split(/\s+/).map(Number) : [], m = r(
|
|
509
|
+
if (!c || s.has(Number(c?.[1]))) continue;
|
|
510
|
+
const u = Number(c[1]), p = c[2].trim() ? c[2].trim().split(/\s+/).map(Number) : [], m = r(i);
|
|
511
511
|
if (!m || p.length % m !== 0 || p.some((w) => !Number.isFinite(w))) {
|
|
512
|
-
o.push({ code: e === "support_points" ? "SLA_SUPPORT_POINT_COUNT" : "SLA_DRAIN_HOLE_COUNT", object: u }),
|
|
512
|
+
o.push({ code: e === "support_points" ? "SLA_SUPPORT_POINT_COUNT" : "SLA_DRAIN_HOLE_COUNT", object: u }), s.set(u, []);
|
|
513
513
|
continue;
|
|
514
514
|
}
|
|
515
515
|
const g = [];
|
|
516
|
-
for (let w = 0; w < p.length; w += m) g.push(n(p.slice(w, w + m),
|
|
517
|
-
|
|
516
|
+
for (let w = 0; w < p.length; w += m) g.push(n(p.slice(w, w + m), i));
|
|
517
|
+
s.set(u, g);
|
|
518
518
|
}
|
|
519
|
-
return
|
|
519
|
+
return s;
|
|
520
520
|
}
|
|
521
521
|
function Tt(t, e) {
|
|
522
522
|
const [r, o, n] = e;
|
|
523
523
|
return [r * t[0] + o * t[3] + n * t[6] + t[9], r * t[1] + o * t[4] + n * t[7] + t[10], r * t[2] + o * t[5] + n * t[8] + t[11]];
|
|
524
524
|
}
|
|
525
525
|
function fe(t, e) {
|
|
526
|
-
const [r, o, n] = e,
|
|
527
|
-
return a ?
|
|
526
|
+
const [r, o, n] = e, s = [r * t[0] + o * t[3] + n * t[6], r * t[1] + o * t[4] + n * t[7], r * t[2] + o * t[5] + n * t[8]], a = Math.hypot(...s);
|
|
527
|
+
return a ? s.map((l) => l / a) : s;
|
|
528
528
|
}
|
|
529
529
|
function ue(t, e) {
|
|
530
|
-
const r = (
|
|
531
|
-
const f = t.get(
|
|
530
|
+
const r = (i) => {
|
|
531
|
+
const f = t.get(i);
|
|
532
532
|
return f ? e.decode(f) : null;
|
|
533
533
|
}, o = {
|
|
534
534
|
settings: null,
|
|
@@ -557,69 +557,69 @@ function ue(t, e) {
|
|
|
557
557
|
} catch {
|
|
558
558
|
o.settings = null;
|
|
559
559
|
}
|
|
560
|
-
const
|
|
561
|
-
if (
|
|
562
|
-
let
|
|
560
|
+
const s = r("Metadata/three_slicer_settings.json");
|
|
561
|
+
if (s) {
|
|
562
|
+
let i = null;
|
|
563
563
|
try {
|
|
564
|
-
|
|
564
|
+
i = JSON.parse(s);
|
|
565
565
|
} catch {
|
|
566
|
-
|
|
566
|
+
i = null;
|
|
567
567
|
}
|
|
568
568
|
const f = (c) => c && typeof c == "object" && !Array.isArray(c);
|
|
569
|
-
if (f(
|
|
570
|
-
f(
|
|
569
|
+
if (f(i)) {
|
|
570
|
+
f(i.viewer) && Object.keys(i.viewer).length && (o.viewerSettings = i.viewer);
|
|
571
571
|
let c = [];
|
|
572
|
-
f(
|
|
572
|
+
f(i.plates) && (c = Object.entries(i.plates));
|
|
573
573
|
const u = c.filter(([p, m]) => /^\d+$/.test(p) && f(m) && Object.keys(m).length);
|
|
574
|
-
u.length && (o.plateSettings = Object.fromEntries(u.map(([p, m]) => [Number(p), m]))), Number.isInteger(
|
|
574
|
+
u.length && (o.plateSettings = Object.fromEntries(u.map(([p, m]) => [Number(p), m]))), Number.isInteger(i.plateCount) && i.plateCount >= 1 && (o.plateCount = i.plateCount);
|
|
575
575
|
}
|
|
576
576
|
}
|
|
577
577
|
const a = r("Metadata/model_settings.config");
|
|
578
578
|
if (a) {
|
|
579
|
-
const
|
|
580
|
-
o.objectMeta =
|
|
579
|
+
const i = ce(a);
|
|
580
|
+
o.objectMeta = i.objects, o.plates = i.plates, o.volumeMeta = i.volumes, o.partVolumeMeta = i.partVolumes;
|
|
581
581
|
}
|
|
582
|
-
const l = o.plates.map((
|
|
582
|
+
const l = o.plates.map((i) => ({ index: i.index, gcode: i.gcodeFile && r(V(i.gcodeFile)) })).filter((i) => i.gcode);
|
|
583
583
|
return l.length && (o.gcodePlates = l), o.sla.supportPoints = At(
|
|
584
584
|
r("Metadata/Slic3r_PE_sla_support_points.txt"),
|
|
585
585
|
"support_points",
|
|
586
|
-
(
|
|
586
|
+
(i) => i === 0 ? 3 : i === 1 ? 5 : 0,
|
|
587
587
|
o.sla.issues,
|
|
588
|
-
(
|
|
589
|
-
position:
|
|
590
|
-
radius: f === 0 ? Ht :
|
|
591
|
-
type: f === 0 ||
|
|
588
|
+
(i, f) => ({
|
|
589
|
+
position: i.slice(0, 3),
|
|
590
|
+
radius: f === 0 ? Ht : i[3],
|
|
591
|
+
type: f === 0 || i[4] === 2 ? "manual" : i[4] === 1 ? "island" : "slope"
|
|
592
592
|
})
|
|
593
593
|
), o.sla.drainHoles = At(
|
|
594
594
|
r("Metadata/Slic3r_PE_sla_drain_holes.txt"),
|
|
595
595
|
"drain_holes",
|
|
596
|
-
(
|
|
596
|
+
(i) => i === 1 ? 8 : 0,
|
|
597
597
|
o.sla.issues,
|
|
598
|
-
(
|
|
599
|
-
const f = Math.hypot(
|
|
600
|
-
return { position:
|
|
598
|
+
(i) => {
|
|
599
|
+
const f = Math.hypot(i[3], i[4], i[5]), c = f ? i.slice(3, 6).map((u) => u / f) : i.slice(3, 6);
|
|
600
|
+
return { position: i.slice(0, 3).map((u, p) => u + c[p]), normal: c, radius: i[6], height: i[7] - 1 };
|
|
601
601
|
}
|
|
602
602
|
), o.hasLayerHeightProfile = !!r("Metadata/layer_heights_profile.txt")?.trim(), o.hasCustomGcodePerLayer = !!r("Metadata/custom_gcode_per_layer.xml")?.trim(), o;
|
|
603
603
|
}
|
|
604
|
-
const
|
|
604
|
+
const st = Symbol("part not in job");
|
|
605
605
|
function pe(t) {
|
|
606
606
|
return {
|
|
607
607
|
get(e) {
|
|
608
608
|
const r = t.get(e);
|
|
609
|
-
if (!r) throw
|
|
609
|
+
if (!r) throw st;
|
|
610
610
|
return r;
|
|
611
611
|
}
|
|
612
612
|
};
|
|
613
613
|
}
|
|
614
|
-
function ut(t, e, r, o, n,
|
|
614
|
+
function ut(t, e, r, o, n, s) {
|
|
615
615
|
if (o > 16) return;
|
|
616
616
|
const a = n(e)?.objects.get(t);
|
|
617
617
|
if (a) {
|
|
618
618
|
if (a.components) {
|
|
619
|
-
for (const l of a.components) ut(l.objectid, l.path || e, Dt(l.transform, r), o + 1, n,
|
|
619
|
+
for (const l of a.components) ut(l.objectid, l.path || e, Dt(l.transform, r), o + 1, n, s);
|
|
620
620
|
return;
|
|
621
621
|
}
|
|
622
|
-
a.mesh &&
|
|
622
|
+
a.mesh && s(a.mesh, r);
|
|
623
623
|
}
|
|
624
624
|
}
|
|
625
625
|
function gt(t, e) {
|
|
@@ -628,12 +628,12 @@ function gt(t, e) {
|
|
|
628
628
|
r += l.tris.length * 3;
|
|
629
629
|
});
|
|
630
630
|
const o = new Float32Array(r), n = kt();
|
|
631
|
-
let
|
|
632
|
-
for (const a of t) ut(a.objectid, a.path, a.xf, a.depth, e, ({ verts: l, tris:
|
|
633
|
-
const u =
|
|
634
|
-
for (let p = 0; p <
|
|
635
|
-
const m =
|
|
636
|
-
o[
|
|
631
|
+
let s = 0;
|
|
632
|
+
for (const a of t) ut(a.objectid, a.path, a.xf, a.depth, e, ({ verts: l, tris: i, paint: f }, c) => {
|
|
633
|
+
const u = s / 9;
|
|
634
|
+
for (let p = 0; p < i.length; p++) {
|
|
635
|
+
const m = i[p] * 3, g = l[m], w = l[m + 1], S = l[m + 2];
|
|
636
|
+
o[s] = g * c[0] + w * c[3] + S * c[6] + c[9], o[s + 1] = g * c[1] + w * c[4] + S * c[7] + c[10], o[s + 2] = g * c[2] + w * c[5] + S * c[8] + c[11], s += 3;
|
|
637
637
|
}
|
|
638
638
|
for (const [, p] of pt)
|
|
639
639
|
for (const [m, g] of f[p]) n[p].set(u + m, g);
|
|
@@ -643,14 +643,14 @@ function gt(t, e) {
|
|
|
643
643
|
function wt({ sink: t, paintSink: e }, r, o) {
|
|
644
644
|
if (t.length < 9) return null;
|
|
645
645
|
let n = t;
|
|
646
|
-
const
|
|
646
|
+
const s = [];
|
|
647
647
|
if (r.length) {
|
|
648
648
|
const p = /* @__PURE__ */ new Set();
|
|
649
649
|
for (let m = 0; m < r.length; m++) {
|
|
650
650
|
const g = r[m], w = g.firstTriangle * 9, S = Math.min(t.length, (g.lastTriangle + 1) * 9);
|
|
651
651
|
if (!(w >= S)) {
|
|
652
652
|
for (let I = g.firstTriangle; I <= g.lastTriangle; I++) p.add(I);
|
|
653
|
-
|
|
653
|
+
s.push({ volume: m, kind: g.kind, tris: t.slice(w, S) });
|
|
654
654
|
}
|
|
655
655
|
}
|
|
656
656
|
if (p.size) {
|
|
@@ -661,15 +661,15 @@ function wt({ sink: t, paintSink: e }, r, o) {
|
|
|
661
661
|
n = m;
|
|
662
662
|
}
|
|
663
663
|
}
|
|
664
|
-
let a = 1 / 0, l = 1 / 0,
|
|
664
|
+
let a = 1 / 0, l = 1 / 0, i = -1 / 0, f = -1 / 0;
|
|
665
665
|
for (let p = 0; p < n.length; p += 3) {
|
|
666
666
|
const m = n[p], g = n[p + 1];
|
|
667
|
-
m < a && (a = m), m >
|
|
667
|
+
m < a && (a = m), m > i && (i = m), g < l && (l = g), g > f && (f = g);
|
|
668
668
|
}
|
|
669
669
|
let c = e;
|
|
670
670
|
Yt(e) && (c = null);
|
|
671
|
-
const u = { tris: n, paint: c, modifiers:
|
|
672
|
-
return o && (u.baked =
|
|
671
|
+
const u = { tris: n, paint: c, modifiers: s, bbox: { minX: a, minY: l, maxX: i, maxY: f } };
|
|
672
|
+
return o && (u.baked = ie(n)), u;
|
|
673
673
|
}
|
|
674
674
|
async function de(t) {
|
|
675
675
|
const e = await Ut(t.members);
|
|
@@ -684,17 +684,17 @@ async function Ut(t) {
|
|
|
684
684
|
}
|
|
685
685
|
function Ct(t, e) {
|
|
686
686
|
const r = new Set(t.names), o = (n) => {
|
|
687
|
-
const
|
|
688
|
-
if (e.has(
|
|
689
|
-
if (r.has(
|
|
687
|
+
const s = V(n);
|
|
688
|
+
if (e.has(s)) return e.get(s);
|
|
689
|
+
if (r.has(s)) throw st;
|
|
690
690
|
return null;
|
|
691
691
|
};
|
|
692
692
|
return t.items.map((n) => {
|
|
693
693
|
try {
|
|
694
694
|
return { index: n.index, built: wt(gt(n.refs, o), n.volumeRecords, t.bake) };
|
|
695
|
-
} catch (
|
|
696
|
-
if (
|
|
697
|
-
throw
|
|
695
|
+
} catch (s) {
|
|
696
|
+
if (s === st) return { index: n.index, local: !0 };
|
|
697
|
+
throw s;
|
|
698
698
|
}
|
|
699
699
|
});
|
|
700
700
|
}
|
|
@@ -703,13 +703,13 @@ function Oe() {
|
|
|
703
703
|
}
|
|
704
704
|
const me = (t) => t.length === 12 && t.every((e, r) => e === ht[r]);
|
|
705
705
|
function Se(t, e, { bake: r = !1, objectId: o = null, complete: n = !0 } = {}) {
|
|
706
|
-
const
|
|
706
|
+
const s = () => ({ objects: e.objects });
|
|
707
707
|
let a = null;
|
|
708
708
|
o !== null && (a = e.open.get(o) ?? null, e.open.delete(o));
|
|
709
709
|
const l = et(t, a);
|
|
710
710
|
o !== null && !n && l.openObject && e.open.set(o, l.openObject);
|
|
711
|
-
for (const [
|
|
712
|
-
e.objects.set(
|
|
711
|
+
for (const [i, f] of l.objects)
|
|
712
|
+
e.objects.set(i, f), f.mesh && e.ready.set(i, wt(gt([{ objectid: i, path: "", xf: ht, depth: 0 }], s), [], r));
|
|
713
713
|
}
|
|
714
714
|
const he = 1 << 20;
|
|
715
715
|
async function Ie(t, e) {
|
|
@@ -718,23 +718,23 @@ async function Ie(t, e) {
|
|
|
718
718
|
items: [],
|
|
719
719
|
objects: {
|
|
720
720
|
get(l) {
|
|
721
|
-
const
|
|
722
|
-
if (
|
|
721
|
+
const i = e?.objects.get(l);
|
|
722
|
+
if (i) return i;
|
|
723
723
|
if (o) return o.get(l);
|
|
724
|
-
throw
|
|
724
|
+
throw st;
|
|
725
725
|
}
|
|
726
726
|
}
|
|
727
727
|
});
|
|
728
|
-
const n = [],
|
|
728
|
+
const n = [], s = [];
|
|
729
729
|
for (const l of t.items) {
|
|
730
|
-
const [
|
|
731
|
-
l.refs.length === 1 && V(
|
|
730
|
+
const [i] = l.refs;
|
|
731
|
+
l.refs.length === 1 && V(i.path) === t.keptPath && me(i.xf) && !l.volumeRecords.length && e?.ready.has(i.objectid) ? (n.push({ index: l.index, built: e.ready.get(i.objectid), prebuilt: !0 }), e.ready.delete(i.objectid)) : s.push(l);
|
|
732
732
|
}
|
|
733
|
-
const a = [...n, ...Ct({ ...t, items:
|
|
733
|
+
const a = [...n, ...Ct({ ...t, items: s }, r)];
|
|
734
734
|
return e.ready.clear(), { items: a };
|
|
735
735
|
}
|
|
736
736
|
async function ge(t, e, r, o, n) {
|
|
737
|
-
const
|
|
737
|
+
const s = /* @__PURE__ */ new Map(), a = new Array(r.size).fill(0), l = [], i = /* @__PURE__ */ new Map(), f = /* @__PURE__ */ new Set();
|
|
738
738
|
let c = null, u = null;
|
|
739
739
|
const p = () => {
|
|
740
740
|
let S = 0;
|
|
@@ -742,86 +742,86 @@ async function ge(t, e, r, o, n) {
|
|
|
742
742
|
return S;
|
|
743
743
|
}, m = (S, I, A, T, v) => {
|
|
744
744
|
a[I] += T - A, l.push(r.scan(I, c.slice(A, T), { bake: o, objectId: S.id, complete: v }).catch(() => {
|
|
745
|
-
f.add(S.id),
|
|
745
|
+
f.add(S.id), s.delete(S.id);
|
|
746
746
|
}));
|
|
747
747
|
}, w = await (r.inflate ?? ne)(t, e, (S, I) => {
|
|
748
748
|
S !== c && (c = S, u = ft(S));
|
|
749
749
|
for (const x of u.advance(I)) {
|
|
750
|
-
if (
|
|
751
|
-
const y =
|
|
750
|
+
if (s.has(x.id) || f.has(x.id)) continue;
|
|
751
|
+
const y = i.get(x.id);
|
|
752
752
|
if (y) {
|
|
753
|
-
|
|
753
|
+
i.delete(x.id), s.set(x.id, y.slot), m(x, y.slot, y.sent, x.end, !0);
|
|
754
754
|
continue;
|
|
755
755
|
}
|
|
756
756
|
if (!x.hasMesh) continue;
|
|
757
757
|
const k = p();
|
|
758
|
-
|
|
758
|
+
s.set(x.id, k), m(x, k, x.start, x.end, !0);
|
|
759
759
|
}
|
|
760
760
|
const A = u.open();
|
|
761
761
|
if (!A?.id || !A.hasMesh || f.has(A.id)) return;
|
|
762
|
-
let T =
|
|
762
|
+
let T = i.get(A.id);
|
|
763
763
|
if (!T) {
|
|
764
764
|
if (I - A.start < n) return;
|
|
765
|
-
T = { slot: p(), sent: A.start },
|
|
765
|
+
T = { slot: p(), sent: A.start }, i.set(A.id, T);
|
|
766
766
|
}
|
|
767
767
|
const v = S.subarray(0, I).lastIndexOf(62) + 1;
|
|
768
768
|
v - T.sent < n || (m(A, T.slot, T.sent, v, !1), T.sent = v);
|
|
769
769
|
});
|
|
770
|
-
return c !== w && (u = ft(w), u.advance(w.length)), { rootBytes: w, root: u.finish(), keptOn:
|
|
770
|
+
return c !== w && (u = ft(w), u.advance(w.length)), { rootBytes: w, root: u.finish(), keptOn: s, scans: Promise.all(l) };
|
|
771
771
|
}
|
|
772
772
|
const Ft = (t) => Promise.all(t.map(de)), rt = (t) => typeof Blob < "u" && t instanceof Blob;
|
|
773
773
|
async function we(t) {
|
|
774
774
|
let e = null;
|
|
775
775
|
if (rt(t) ? e = await Qt(t) : e = Gt(t), !e) {
|
|
776
|
-
const
|
|
776
|
+
const s = /* @__PURE__ */ new Map();
|
|
777
777
|
let a = t;
|
|
778
778
|
rt(t) && (a = new Uint8Array(await t.arrayBuffer()));
|
|
779
779
|
const l = await ae(a);
|
|
780
|
-
for (const
|
|
781
|
-
return { names: [...
|
|
780
|
+
for (const i of Object.keys(l)) s.set(V(i), l[i]);
|
|
781
|
+
return { names: [...s.keys()], entry: () => null, read: async (i) => s.get(i) ?? null, compressed: async () => null };
|
|
782
782
|
}
|
|
783
783
|
const r = /* @__PURE__ */ new Map();
|
|
784
|
-
for (const [
|
|
785
|
-
const o = (
|
|
784
|
+
for (const [s, a] of e) r.set(V(s), a);
|
|
785
|
+
const o = (s) => rt(t) ? t.slice(s.dataStart, s.dataStart + s.compressedSize) : Zt(t, s), n = /* @__PURE__ */ new Map();
|
|
786
786
|
return {
|
|
787
787
|
names: [...r.keys()],
|
|
788
|
-
entry: (
|
|
789
|
-
compressed: (
|
|
790
|
-
const a = r.get(
|
|
788
|
+
entry: (s) => r.get(s) ?? null,
|
|
789
|
+
compressed: (s) => {
|
|
790
|
+
const a = r.get(s);
|
|
791
791
|
return a ? o(a) : null;
|
|
792
792
|
},
|
|
793
|
-
read: (
|
|
794
|
-
const a = r.get(
|
|
795
|
-
return a ? (n.has(
|
|
793
|
+
read: (s) => {
|
|
794
|
+
const a = r.get(s);
|
|
795
|
+
return a ? (n.has(s) || n.set(s, mt(o(a), a)), n.get(s)) : Promise.resolve(null);
|
|
796
796
|
}
|
|
797
797
|
};
|
|
798
798
|
}
|
|
799
799
|
const Rt = (t) => t.toLowerCase().endsWith(".model");
|
|
800
|
-
async function Pe(t, e = "model", { runJobs: r = Ft, bake: o = !1, pool: n = null, pieceBytes:
|
|
800
|
+
async function Pe(t, e = "model", { runJobs: r = Ft, bake: o = !1, pool: n = null, pieceBytes: s = he } = {}) {
|
|
801
801
|
try {
|
|
802
|
-
return await je(t, e, { runJobs: r, bake: o, pool: n, pieceBytes:
|
|
802
|
+
return await je(t, e, { runJobs: r, bake: o, pool: n, pieceBytes: s });
|
|
803
803
|
} finally {
|
|
804
804
|
n?.release();
|
|
805
805
|
}
|
|
806
806
|
}
|
|
807
|
-
async function je(t, e, { runJobs: r, bake: o, pool: n, pieceBytes:
|
|
807
|
+
async function je(t, e, { runJobs: r, bake: o, pool: n, pieceBytes: s }) {
|
|
808
808
|
let a = t;
|
|
809
809
|
ArrayBuffer.isView(t) ? a = new Uint8Array(t.buffer, t.byteOffset, t.byteLength) : rt(t) || (a = new Uint8Array(t));
|
|
810
|
-
const l = await we(a),
|
|
810
|
+
const l = await we(a), i = new TextDecoder(), f = /* @__PURE__ */ new Map();
|
|
811
811
|
await Promise.all(l.names.filter((h) => !Rt(h)).map(async (h) => f.set(h, await l.read(h))));
|
|
812
812
|
let c = "3D/3dmodel.model";
|
|
813
813
|
const u = f.get("_rels/.rels");
|
|
814
814
|
if (u) {
|
|
815
|
-
for (const h of
|
|
815
|
+
for (const h of i.decode(u).match(/<Relationship\b[^>]*>/g) || [])
|
|
816
816
|
if ((H(h, "Type") || "").endsWith("/3dmodel")) {
|
|
817
817
|
c = V(H(h, "Target"));
|
|
818
818
|
break;
|
|
819
819
|
}
|
|
820
820
|
}
|
|
821
|
-
const p = ue(f,
|
|
821
|
+
const p = ue(f, i);
|
|
822
822
|
let m = null, g = null, w = /* @__PURE__ */ new Map(), S = Promise.resolve(), I = null;
|
|
823
823
|
const A = l.entry(c), T = r === Ft && !n;
|
|
824
|
-
if (n?.size > 1 && A ? { rootBytes: m, root: g, keptOn: w, scans: S } = await ge(l.compressed(c), A, n, o,
|
|
824
|
+
if (n?.size > 1 && A ? { rootBytes: m, root: g, keptOn: w, scans: S } = await ge(l.compressed(c), A, n, o, s) : (m = await l.read(c), m && T ? g = I = et(m) : g = m && qt(m)), !g && p.gcodePlates) return { objects: [], project: p };
|
|
825
825
|
if (!g) throw new Error(`3MF root model not found: ${c}`);
|
|
826
826
|
const v = () => I ??= et(m);
|
|
827
827
|
let x = g.items;
|
|
@@ -908,12 +908,12 @@ async function je(t, e, { runJobs: r, bake: o, pool: n, pieceBytes: i }) {
|
|
|
908
908
|
return M.length && _.push(nt(M)), { members: _, names: l.names, items: h.items, bake: o };
|
|
909
909
|
}));
|
|
910
910
|
K.sort((h, _) => _.members.reduce((M, P) => M + P.data.length, 0) - h.members.reduce((M, P) => M + P.data.length, 0)), await S;
|
|
911
|
-
const
|
|
911
|
+
const it = O.map((h, _) => {
|
|
912
912
|
if (!h) return null;
|
|
913
913
|
for (const P of h.items) for (const z of y(P.refs)) w.get(z) !== _ && h.spans.add(z);
|
|
914
914
|
const M = [];
|
|
915
915
|
return h.spans.size && M.push(nt(h.spans)), n.build(_, { members: M, names: l.names, items: h.items, bake: o, keptPath: c }).catch(() => ({ items: h.items.map((P) => ({ index: P.index, local: !0 })) }));
|
|
916
|
-
}).filter(Boolean), [at, $t] = await Promise.all([r(K), Promise.all(
|
|
916
|
+
}).filter(Boolean), [at, $t] = await Promise.all([r(K), Promise.all(it)]);
|
|
917
917
|
for (const h of [...at, ...$t])
|
|
918
918
|
for (const _ of h.items)
|
|
919
919
|
_.local ? d.push(j(_.index)) : R[_.index] = _.built;
|
|
@@ -942,8 +942,9 @@ export {
|
|
|
942
942
|
de as a,
|
|
943
943
|
te as b,
|
|
944
944
|
Oe as c,
|
|
945
|
-
|
|
945
|
+
ie as d,
|
|
946
946
|
re as e,
|
|
947
|
+
oe as f,
|
|
947
948
|
ee as i,
|
|
948
949
|
Pe as p,
|
|
949
950
|
Ie as r,
|