three-slicer-viewer 0.3.3 → 0.3.4

package/dist/gcode_parse.js

@@ -1,32 +1,60 @@
-import { D as Nt, a as Rt } from "./viewer_defaults-B7UUZ582.js";
-import { R as t, e as Z } from "./toolpath_encoding-BuYs95qZ.js";
-import { T as ft } from "./toolpath_palette-B8xEl-qa.js";
-const K = 1e-6, It = 254, At = /^(filament|extruder)_colour\s*=\s*(.*)$/i, ut = (n) => n.split(/[;,]/).map((r) => {
-  const o = /^"?#?([0-9a-f]{6})(?:[0-9a-f]{2})?"?$/i.exec(r.trim());
-  return o ? "#" + o[1].toUpperCase() : null;
-}), dt = (n) => "#" + ft[n % ft.length].map((r) => Math.round(r * 255).toString(16).padStart(2, "0")).join("");
-function gt(n, r) {
-  let o = [];
-  Array.isArray(n?.colors) && (o = n.colors);
-  const d = r ?? [], u = Math.max(o.length, d.length, n?.filament_mm_by_tool?.length ?? 0);
-  return Array.from({ length: u }, (h, c) => o[c] || d[c] || dt(c));
+import { D as At, a as St } from "./viewer_defaults-B7UUZ582.js";
+import { R as t, S as ut, e as $ } from "./toolpath_encoding-BuYs95qZ.js";
+import { T as mt } from "./toolpath_palette-B8xEl-qa.js";
+const ht = ";_GP_FIRST_LINE_M73_PLACEHOLDER", gt = ";_GP_LAST_LINE_M73_PLACEHOLDER", Lt = "@PRINT_TIME_SEC@", pt = "@USED_FILAMENT_LENGTH@", Nt = (s) => Math.floor((Math.max(0, s) + 0.5) / 60), Z = (s, i) => `M73 P${s} R${i}`;
+function Ct(s, i) {
+  let n = String(s ?? "");
+  const m = Number(i?.time_estimate) || 0;
+  if (n.includes(Lt) && (n = n.split(Lt).join(m.toFixed(2))), n.includes(pt) && (n = n.split(pt).join(((Number(i?.filament_mm) || 0) / 1e3).toFixed(2))), !n.includes(ht)) return n;
+  let a = [];
+  Array.isArray(i?.layer_times) && (a = i.layer_times);
+  const l = n.split(`
+`), o = [];
+  let L = 0, E = 0, d = "";
+  for (const N of l) {
+    if (N === ht) {
+      d = Z(0, Nt(m)), o.push(d);
+      continue;
+    }
+    if (N === gt) {
+      o.push(Z(100, 0));
+      continue;
+    }
+    if (o.push(N), !N.startsWith("; LAYER ")) continue;
+    let A = 0;
+    m > 0 && (A = Math.min(100, Math.floor(100 * E / m)));
+    const S = Z(A, Nt(m - E));
+    S !== d && (o.push(S), d = S), E += Number(a[L]) || 0, L += 1;
+  }
+  return o.join(`
+`);
 }
-function wt(n, r) {
-  return St(n.gcode, gt(n.stats, r));
+const B = 1e-6, Mt = 254, Tt = /^(filament|extruder)_colour\s*=\s*(.*)$/i, It = (s) => s.split(/[;,]/).map((i) => {
+  const n = /^"?#?([0-9a-f]{6})(?:[0-9a-f]{2})?"?$/i.exec(i.trim());
+  return n ? "#" + n[1].toUpperCase() : null;
+}), Pt = (s) => "#" + mt[s % mt.length].map((i) => Math.round(i * 255).toString(16).padStart(2, "0")).join("");
+function Ot(s, i) {
+  let n = [];
+  Array.isArray(s?.colors) && (n = s.colors);
+  const m = i ?? [], a = Math.max(n.length, m.length, s?.filament_mm_by_tool?.length ?? 0);
+  return Array.from({ length: a }, (l, o) => n[o] || m[o] || Pt(o));
 }
-function St(n, r) {
-  const o = String(n ?? ""), d = [r].flat().filter(Boolean);
-  if (!d.length || /^;\s*filament_colour\s*=/mi.test(o)) return o;
-  const u = "; filament_colour = " + d.join(";") + `
-`, h = o.lastIndexOf(`
+function Ut(s, i) {
+  return yt(s.gcode, Ot(s.stats, i));
+}
+function yt(s, i) {
+  const n = String(s ?? ""), m = [i].flat().filter(Boolean);
+  if (!m.length || /^;\s*filament_colour\s*=/mi.test(n)) return n;
+  const a = "; filament_colour = " + m.join(";") + `
+`, l = n.lastIndexOf(`
 ; CONFIG_BLOCK_END`);
-  if (h >= 0) return o.slice(0, h + 1) + u + o.slice(h + 1);
-  let c = `
+  if (l >= 0) return n.slice(0, l + 1) + a + n.slice(l + 1);
+  let o = `
 `;
-  return (!o || o.endsWith(`
-`)) && (c = ""), o + c + u;
+  return (!n || n.endsWith(`
+`)) && (o = ""), n + o + a;
 }
-const ht = {
+const _t = {
   // OrcaSlicer / PrusaSlicer ;TYPE: names
   "outer wall": t.WALL,
   "external perimeter": t.WALL,
@@ -69,7 +97,7 @@ const ht = {
   skin: t.SOLID,
   "support-interface": t.SUPPORT,
   "prime-tower": t.PRIME
-}, Pt = [
+}, Gt = [
   ["skirt/brim", t.SKIRT],
   ["skirt", t.SKIRT],
   ["walls", t.WALL],
@@ -80,7 +108,7 @@ const ht = {
   ["support", t.SUPPORT],
   ["prime tower", t.PRIME],
   ["wipe_tower_real", t.PRIME]
-], Ot = (n, r) => n === r || r.length < n.length && " (:/".includes(n[r.length]) && n.startsWith(r), Et = {
+], wt = (s, i) => s === i || i.length < s.length && " (:/".includes(s[i.length]) && s.startsWith(i), Wt = {
   1: t.WALL,
   2: t.WALL,
   3: t.WALL,
@@ -99,140 +127,151 @@ const ht = {
   16: t.SUPPORT,
   17: t.PRIME
 };
-function Wt(n, r = {}) {
-  const o = Math.PI / 4 * (r.filamentDiameter > 0 ? r.filamentDiameter : Nt) ** 2, d = r.defaultLayerHeight > 0 ? r.defaultLayerHeight : Rt;
-  let u = 0, h = 0, c = 0, b = 0, w = !0, y = !0, g = 0, O = t.WALL, W = 0, R = null;
-  const E = [];
-  let D = !1, x = !0, v = NaN, q = 0, X = 0, $ = 0;
-  const z = /* @__PURE__ */ new Set([0]), H = [];
-  let k = [], j = [], U = !1;
-  const V = () => {
-    O = t.WALL, W = 0;
-  }, C = (s, a = !1) => {
-    R = { z: s, p: [], w: [] }, E.push(R), x = !1, v = NaN, (a || !U) && V();
-  }, mt = () => E.length > 1 ? E[E.length - 2].z : 0, J = (s, a, S, P, A, i, e) => {
-    const m = Math.hypot(P - s, A - a, i - S);
-    if (!(m < K))
-      if (e > K) {
-        $ += e, H[g] = (H[g] ?? 0) + e, x ? C(Number.isNaN(v) ? i : v) : !D && i > R.z + 1e-3 && C(i);
-        const p = Z(O, g);
-        R.p.push(s, a, S, p, P, A, i, p);
-        const f = Math.max(0.02, R.z - mt() || d), L = W > 0 ? W : e * o / (m * f) + f * (1 - Math.PI / 4);
-        R.w.push(Math.min(3, Math.max(0.05, L))), q++;
-      } else R && (R.p.push(s, a, S, Z(t.TRAVEL, g), P, A, i, Z(t.TRAVEL, g)), R.w.push(0), X++);
+function Ht(s, { center: i = { x: 0, y: 0 }, filamentDiameter: n, layerHeight: m } = {}) {
+  const a = bt(s, { filamentDiameter: n, defaultLayerHeight: m });
+  for (const l of a.layers) {
+    const o = l.paths;
+    for (let L = 0; L + ut <= o.length; L += ut)
+      o[L] -= i.x, o[L + 1] -= i.y, o[L + 4] -= i.x, o[L + 5] -= i.y;
+  }
+  return a;
+}
+function bt(s, i = {}) {
+  const n = Math.PI / 4 * (i.filamentDiameter > 0 ? i.filamentDiameter : At) ** 2, m = i.defaultLayerHeight > 0 ? i.defaultLayerHeight : St;
+  let a = 0, l = 0, o = 0, L = 0, E = !0, d = !0, N = 0, A = t.WALL, S = 0, g = null;
+  const y = [];
+  let x = !1, D = !0, v = NaN, q = 0, X = 0, V = 0;
+  const K = /* @__PURE__ */ new Set([0]), z = [];
+  let j = [], k = [], F = !1;
+  const J = () => {
+    A = t.WALL, S = 0;
+  }, C = (c, f = !1) => {
+    g = { z: c, p: [], w: [] }, y.push(g), D = !1, v = NaN, (f || !F) && J();
+  }, Rt = () => y.length > 1 ? y[y.length - 2].z : 0, Q = (c, f, P, O, T, r, e) => {
+    const p = Math.hypot(O - c, T - f, r - P);
+    if (!(p < B))
+      if (e > B) {
+        V += e, z[N] = (z[N] ?? 0) + e, D ? C(Number.isNaN(v) ? r : v) : !x && r > g.z + 1e-3 && C(r);
+        const I = $(A, N);
+        g.p.push(c, f, P, I, O, T, r, I);
+        const h = Math.max(0.02, g.z - Rt() || m), _ = S > 0 ? S : e * n / (p * h) + h * (1 - Math.PI / 4);
+        g.w.push(Math.min(3, Math.max(0.05, _))), q++;
+      } else g && (g.p.push(c, f, P, $(t.TRAVEL, N), O, T, r, $(t.TRAVEL, N)), g.w.push(0), X++);
   };
-  for (const s of n.split(`
+  for (const c of s.split(`
 `)) {
-    const a = s.indexOf(";"), S = (a < 0 ? s : s.slice(0, a)).trim(), P = a < 0 ? "" : s.slice(a + 1).trim();
-    if (P && !S) {
-      const e = P.toLowerCase(), m = At.exec(P);
-      if (m) {
-        m[1].toLowerCase() === "filament" ? k = ut(m[2]) : j = ut(m[2]);
+    const f = c.indexOf(";"), P = (f < 0 ? c : c.slice(0, f)).trim(), O = f < 0 ? "" : c.slice(f + 1).trim();
+    if (O && !P) {
+      const e = O.toLowerCase(), p = Tt.exec(O);
+      if (p) {
+        p[1].toLowerCase() === "filament" ? j = It(p[2]) : k = It(p[2]);
         continue;
       }
       if (e.startsWith("type:")) {
-        O = ht[e.slice(5).trim()] ?? t.WALL, U = !0;
+        A = _t[e.slice(5).trim()] ?? t.WALL, F = !0;
         continue;
       }
       if (e.startsWith("feature:")) {
-        O = ht[e.slice(8).trim()] ?? t.WALL, U = !0;
+        A = _t[e.slice(8).trim()] ?? t.WALL, F = !0;
         continue;
       }
       if (e.startsWith("_extrusion_role:")) {
-        O = Et[parseInt(e.slice(16), 10)] ?? t.WALL, U = !0;
+        A = Wt[parseInt(e.slice(16), 10)] ?? t.WALL, F = !0;
         continue;
       }
       if (e.startsWith("width:") || e.startsWith("line_width:")) {
-        const L = parseFloat(e.slice(e.indexOf(":") + 1));
-        W = 0, L > 0 && (W = L);
+        const _ = parseFloat(e.slice(e.indexOf(":") + 1));
+        S = 0, _ > 0 && (S = _);
         continue;
       }
       if (e.startsWith("layer_change") || e.startsWith("change_layer") || e.startsWith("layer:")) {
-        D = !0, x = !0, V();
+        x = !0, D = !0, J();
         continue;
       }
       if (e.startsWith("z:") || e.startsWith("z_height:")) {
-        const L = parseFloat(e.slice(e.indexOf(":") + 1));
-        x && L > 0 && (D = !0, C(L));
+        const _ = parseFloat(e.slice(e.indexOf(":") + 1));
+        D && _ > 0 && (x = !0, C(_));
         continue;
       }
-      const p = /^layer \d+ z([-\d.]+)/.exec(e);
-      if (p) {
-        D = !0, C(parseFloat(p[1]), !0);
+      const I = /^layer \d+ z([-\d.]+)/.exec(e);
+      if (I) {
+        x = !0, C(parseFloat(I[1]), !0);
         continue;
       }
-      const f = Pt.find(([L]) => Ot(e, L));
-      f && (O = f[1]);
+      const h = Gt.find(([_]) => wt(e, _));
+      h && (A = h[1]);
       continue;
     }
-    if (!S) continue;
-    const A = S.split(/\s+/), i = A[0].toUpperCase();
-    if (i === "G90") {
-      w = !0;
+    if (!P) continue;
+    const T = P.split(/\s+/), r = T[0].toUpperCase();
+    if (r === "G90") {
+      E = !0;
       continue;
     }
-    if (i === "G91") {
-      w = !1;
+    if (r === "G91") {
+      E = !1;
       continue;
     }
-    if (i === "M82") {
-      y = !0;
+    if (r === "M82") {
+      d = !0;
       continue;
     }
-    if (i === "M83") {
-      y = !1;
+    if (r === "M83") {
+      d = !1;
       continue;
     }
-    if (/^T\d+$/.test(i)) {
-      const e = parseInt(i.slice(1), 10);
-      e <= It && (g = e, z.add(g));
+    if (/^T\d+$/.test(r)) {
+      const e = parseInt(r.slice(1), 10);
+      e <= Mt && (N = e, K.add(N));
       continue;
     }
-    if (i === "G92" || i === "G0" || i === "G1" || i === "G2" || i === "G3") {
-      let e = NaN, m = NaN, p = NaN, f = NaN, L = 0, tt = 0;
-      for (let I = 1; I < A.length; I++) {
-        const l = A[I][0], N = parseFloat(A[I].slice(1));
-        Number.isNaN(N) || (l === "X" || l === "x" ? e = N : l === "Y" || l === "y" ? m = N : l === "Z" || l === "z" ? p = N : l === "E" || l === "e" ? f = N : l === "I" || l === "i" ? L = N : (l === "J" || l === "j") && (tt = N));
+    if (r === "G92" || r === "G0" || r === "G1" || r === "G2" || r === "G3") {
+      let e = NaN, p = NaN, I = NaN, h = NaN, _ = 0, et = 0;
+      for (let M = 1; M < T.length; M++) {
+        const u = T[M][0], R = parseFloat(T[M].slice(1));
+        Number.isNaN(R) || (u === "X" || u === "x" ? e = R : u === "Y" || u === "y" ? p = R : u === "Z" || u === "z" ? I = R : u === "E" || u === "e" ? h = R : u === "I" || u === "i" ? _ = R : (u === "J" || u === "j") && (et = R));
       }
-      if (i === "G92") {
-        Number.isNaN(e) || (u = e), Number.isNaN(m) || (h = m), Number.isNaN(p) || (c = p), Number.isNaN(f) || (b = f);
+      if (r === "G92") {
+        Number.isNaN(e) || (a = e), Number.isNaN(p) || (l = p), Number.isNaN(I) || (o = I), Number.isNaN(h) || (L = h);
         continue;
       }
-      const B = Number.isNaN(e) ? u : w ? e : u + e, F = Number.isNaN(m) ? h : w ? m : h + m, Y = Number.isNaN(p) ? c : w ? p : c + p, et = Number.isNaN(f) ? 0 : y ? f - b : f;
-      if (i === "G2" || i === "G3") {
-        const I = u + L, l = h + tt, N = Math.hypot(u - I, h - l), G = Math.atan2(h - l, u - I);
-        let M = Math.atan2(F - l, B - I);
-        const it = i === "G3";
-        it && M <= G + K && (M += 2 * Math.PI), !it && M >= G - K && (M -= 2 * Math.PI);
-        const _ = Math.max(1, Math.min(360, Math.ceil(Math.abs(M - G) * N / 0.3)));
-        let nt = u, rt = h, st = c;
-        for (let T = 1; T <= _; T++) {
-          const ot = G + (M - G) * T / _, at = T === _ ? B : I + N * Math.cos(ot), lt = T === _ ? F : l + N * Math.sin(ot), ct = c + (Y - c) * T / _;
-          J(nt, rt, st, at, lt, ct, et / _), nt = at, rt = lt, st = ct;
+      const U = Number.isNaN(e) ? a : E ? e : a + e, H = Number.isNaN(p) ? l : E ? p : l + p, Y = Number.isNaN(I) ? o : E ? I : o + I, it = Number.isNaN(h) ? 0 : d ? h - L : h;
+      if (r === "G2" || r === "G3") {
+        const M = a + _, u = l + et, R = Math.hypot(a - M, l - u), b = Math.atan2(l - u, a - M);
+        let G = Math.atan2(H - u, U - M);
+        const nt = r === "G3";
+        nt && G <= b + B && (G += 2 * Math.PI), !nt && G >= b - B && (G -= 2 * Math.PI);
+        const w = Math.max(1, Math.min(360, Math.ceil(Math.abs(G - b) * R / 0.3)));
+        let st = a, ot = l, rt = o;
+        for (let W = 1; W <= w; W++) {
+          const at = b + (G - b) * W / w, lt = W === w ? U : M + R * Math.cos(at), ct = W === w ? H : u + R * Math.sin(at), ft = o + (Y - o) * W / w;
+          Q(st, ot, rt, lt, ct, ft, it / w), st = lt, ot = ct, rt = ft;
         }
       } else
-        J(u, h, c, B, F, Y, et);
-      u = B, h = F, c = Y, Number.isNaN(f) || (b = y ? f : b + f);
+        Q(a, l, o, U, H, Y, it);
+      a = U, l = H, o = Y, Number.isNaN(h) || (L = d ? h : L + h);
     }
   }
-  const pt = Math.max(k.length, j.length), Q = Array.from({ length: pt }, (s, a) => j[a] || k[a] || null), Lt = Array.from({ length: Math.max(...z) + 1 }, (s, a) => H[a] || 0);
+  const Et = Math.max(j.length, k.length), tt = Array.from({ length: Et }, (c, f) => k[f] || j[f] || null), dt = Array.from({ length: Math.max(...K) + 1 }, (c, f) => z[f] || 0);
   return {
-    layers: E.map((s) => ({ z: s.z, paths: Float32Array.from(s.p), widths: Float32Array.from(s.w) })),
+    layers: y.map((c) => ({ z: c.z, paths: Float32Array.from(c.p), widths: Float32Array.from(c.w) })),
     stats: {
-      layers: E.length,
+      layers: y.length,
       path_segments: q,
       travel_segments: X,
-      filament_mm: $,
-      tools: [...z].sort((s, a) => s - a),
+      filament_mm: V,
+      tools: [...K].sort((c, f) => c - f),
       // The kernel's own stat name, so the Filament-view switch and the stats card's per-tool split work unchanged.
-      filament_mm_by_tool: Lt,
-      ...Q.some(Boolean) && { colors: Q }
+      filament_mm_by_tool: dt,
+      ...tt.some(Boolean) && { colors: tt }
     }
   };
 }
 export {
-  wt as exportedGcode,
-  Wt as parseGcode,
-  gt as resultToolColors,
-  St as withFilamentColours
+  Ut as exportedGcode,
+  Ct as finalizeGcode,
+  bt as parseGcode,
+  Ht as previewFromGcode,
+  Ot as resultToolColors,
+  yt as withFilamentColours
 };