mxcad 1.0.64 → 1.0.65

package/dist/mxcad.es.js

@@ -1,4 +1,4 @@
-import _D, { MxFun as d, MrxDbgUiPrPoint as T, MxCursorType as qD, MrxDbgUtils as $D, store as oD, loadCoreCode as JD, MxPaintBrush as v, MrxDbgUiPrBaseReturn as y, MxDbCircleShape as aD, MxDbLine as J, MxDbPolyline as ZD, MxDbCircleArc as q, Mx3PointArc as YD, MxDbEllipseShape as QD, McEdGetPointWorldDrawObject as XD, MxDbEllipse as DC } from "mxdraw";
+import _D, { MxFun as d, MrxDbgUiPrPoint as T, MxCursorType as qD, MrxDbgUtils as $D, store as oD, loadCoreCode as JD, MxPaintBrush as S, MrxDbgUiPrBaseReturn as y, MxDbCircleShape as aD, MxDbLine as J, MxDbPolyline as ZD, MxDbCircleArc as q, Mx3PointArc as YD, MxDbEllipseShape as QD, McEdGetPointWorldDrawObject as XD, MxDbEllipse as DC } from "mxdraw";
 function uD(E) {
   return btoa(unescape(encodeURIComponent(E)));
 }
@@ -349,7 +349,7 @@ class M {
     return this.type == 1 ? d.getCurrentDraw().getMxEntity(this.id) : null;
   }
 }
-class L extends O {
+class v extends O {
   constructor(D) {
     super(D);
   }
@@ -442,7 +442,7 @@ class j {
     this.imp.colorIndex = D;
   }
 }
-class FC extends L {
+class FC extends v {
   constructor(D) {
     super(D), D || this.initTempObject(new i.mxcadassemblyimp.MdDbLayerTableRecord());
   }
@@ -489,17 +489,17 @@ class FC extends L {
     this.imp.setLineWeight(D);
   }
 }
-class dD extends L {
+class dD extends v {
   constructor(D) {
     super(D);
   }
 }
-class hD extends L {
+class hD extends v {
   constructor(D) {
     super(D);
   }
 }
-class wD extends L {
+class wD extends v {
   constructor(D) {
     super(D);
   }
@@ -583,7 +583,7 @@ class gD extends O {
     return this.imp.step(D, C);
   }
 }
-class Q extends L {
+class Q extends v {
   constructor(D) {
     super(D), D || this.initTempObject(new i.mxcadassemblyimp.MdDbBlockTableRecord());
   }
@@ -622,7 +622,7 @@ class yD extends O {
     this.imp.start(D, C);
   }
 }
-class xD extends L {
+class xD extends v {
   constructor(D) {
     super(D), D || this.initTempObject(new i.mxcadassemblyimp.MdDbBlockTable());
   }
@@ -641,13 +641,13 @@ class xD extends L {
     return this.imp.add(D.getImp());
   }
 }
-class V extends L {
+class V extends v {
   constructor(D) {
     super(D);
   }
   explode() {
     let D = this.imp.explode();
-    return new N(D);
+    return new K(D);
   }
   get trueColor() {
     return new j(this.imp.TrueColor());
@@ -763,18 +763,18 @@ class _ extends V {
   }
   offsetCurves(D, C) {
     let B = this.imp.offsetCurves(D, C.imp);
-    return new N(B);
+    return new K(B);
   }
   splitCurves(D) {
     let C = this.imp.splitCurves(D);
-    return new N(C);
+    return new K(C);
   }
   getArea() {
     return { val: this.imp.getArea(), ret: i.getCallResult() };
   }
   getSamplePoints(D) {
     let C = this.imp.getSamplePoints(D);
-    return new N(C);
+    return new K(C);
   }
   getLength() {
     return { val: this.imp.getLength(), ret: i.getCallResult() };
@@ -1172,11 +1172,11 @@ class kD extends _ {
     this.imp.setEndAngle(D);
   }
 }
-function K(E = null) {
+function N(E = null) {
   let D;
   return E == null ? D = new i.mxcadassemblyimp.McDrawResbuf() : D = E.getImp(), D;
 }
-class N extends O {
+class K extends O {
   constructor(D) {
     super(D), D || this.initTempObject(new i.mxcadassemblyimp.McDrawResbuf());
   }
@@ -1249,7 +1249,7 @@ class PD {
   }
   findEntAtPoint(D, C, B, F = -1, A = null) {
     this.init();
-    let t = this.imp.findEntAtPoint(D, C, B, F, K(A));
+    let t = this.imp.findEntAtPoint(D, C, B, F, N(A));
     return new M(t, b.kMxCAD);
   }
   selectEnt(D, C = null) {
@@ -1266,8 +1266,8 @@ class PD {
         t.forEach((r) => {
           e.push(new M(r, b.kMxDraw));
         });
-        let s = this.findEntAtPoint(A.x, A.y, A.z, -1, C);
-        s.isValid() && e.push(s), B(e);
+        let n = this.findEntAtPoint(A.x, A.y, A.z, -1, C);
+        n.isValid() && e.push(n), B(e);
       });
     });
   }
@@ -1281,13 +1281,13 @@ class RD extends O {
     super(), this.initTempObject(new i.mxcadassemblyimp.McDrawSelSet());
   }
   allSelect(D = null) {
-    return this.imp.allSelect(K(D));
+    return this.imp.allSelect(N(D));
   }
   pointSelect(D, C, B = null, F = -1) {
-    return this.imp.pointSelect(D, C, K(B), F);
+    return this.imp.pointSelect(D, C, N(B), F);
   }
   crossingSelect(D, C, B, F, A = null) {
-    return this.imp.crossingSelect(D, C, B, F, K(A));
+    return this.imp.crossingSelect(D, C, B, F, N(A));
   }
   count() {
     return this.imp.count();
@@ -1324,8 +1324,8 @@ class U {
   openWebFile(D, C, B = !0) {
     let F = Math.round(Math.random() * 1e7);
     if (C) {
-      let A = this, t = (e, s) => {
-        A.mxObject.removeEventFuction("openFileComplete", t), F == s && C(e);
+      let A = this, t = (e, n) => {
+        A.mxObject.removeEventFuction("openFileComplete", t), F == n && C(e);
       };
       A.mxObject.addEvent("openFileComplete", t);
     }
@@ -1473,8 +1473,8 @@ class U {
   DrawPoint(D, C) {
     return this.imp.DrawPoint(D, C);
   }
-  DrawSolid(D, C, B, F, A, t, e, s) {
-    return this.imp.DrawSolid(D, C, B, F, A, t, e, s);
+  DrawSolid(D, C, B, F, A, t, e, n) {
+    return this.imp.DrawSolid(D, C, B, F, A, t, e, n);
   }
   DrawMText(D, C, B, F, A, t, e) {
     return this.imp.DrawMText(D, C, B, F, A, t, e);
@@ -1488,8 +1488,8 @@ class U {
   DrawDimAligned(D, C, B, F, A, t) {
     return this.imp.DrawDimAligned(D, C, B, F, A, t);
   }
-  DrawDimAngular(D, C, B, F, A, t, e, s) {
-    return this.imp.DrawDimAngular(D, C, B, F, A, t, e, s);
+  DrawDimAngular(D, C, B, F, A, t, e, n) {
+    return this.imp.DrawDimAngular(D, C, B, F, A, t, e, n);
   }
   DrawDimDiametric(D, C, B, F, A) {
     return this.imp.DrawDimDiametric(D, C, B, F, A);
@@ -1544,7 +1544,7 @@ class U {
     !D || i.App.getImp().DestroyObject(D);
   }
 }
-class SD {
+class LD {
   imp;
   init(D) {
     this.imp = D, w.kZAxis = new w(0, 0, 1), w.kXAxis = new w(1, 0, 0), w.kYAxis = new w(0, 1, 0), p.kOrigin = new p(0, 0, 0), W.kIdentity = new W();
@@ -1611,15 +1611,20 @@ class SD {
       let B = new Y();
       return B.getImp().ConnectionTempObject(D), i.App.DestroyObject(D), B;
     }
-    return console.log("Mx: Clone error type"), new L(D);
+    return console.log("Mx: Clone error type"), new v(D);
   }
   setFontFilePath(D) {
-    return this.imp.setFontFilePath(D);
+    this.imp.setFontFilePath(D);
+  }
+  addNetworkLoadingFont(D) {
+    typeof D == "string" ? this.imp.addNetworkLoadingFont(D) : D.forEach((C) => {
+      this.imp.addNetworkLoadingFont(C);
+    });
   }
 }
-class vD {
+class SD {
   mxcadassemblyimp;
-  App = new SD();
+  App = new LD();
   getCallResult() {
     return this.App.getLastCallResult();
   }
@@ -1632,7 +1637,7 @@ class vD {
     return D && D.x && D.y && (B.x = D.x, B.y = D.y, D.z && (B.y = D.z)), B;
   }
 }
-const iD = "1.0.64", AC = "SharedArrayBuffer" in window, X = document.currentScript && /unpkg\.com\/mxcad/.test(document.currentScript.src), tC = (E, D = self.location.href) => X ? `https://unpkg.com/mxcad@${iD}/dist/wasm/2d-st/${E}` : D + E, eC = (E, D = self.location.href) => X ? `https://unpkg.com/mxcad@${iD}/dist/wasm/2d/${E}` : D + E, iC = (E, D = self.location.href) => X ? `https://unpkg.com/mxcad@${iD}/dist/wasm/3d/${E}` : D + E, LD = (E) => new Promise((D, C) => {
+const iD = "1.0.65", AC = "SharedArrayBuffer" in window, X = document.currentScript && /unpkg\.com\/mxcad/.test(document.currentScript.src), tC = (E, D = self.location.href) => X ? `https://unpkg.com/mxcad@${iD}/dist/wasm/2d-st/${E}` : D + E, eC = (E, D = self.location.href) => X ? `https://unpkg.com/mxcad@${iD}/dist/wasm/2d/${E}` : D + E, iC = (E, D = self.location.href) => X ? `https://unpkg.com/mxcad@${iD}/dist/wasm/3d/${E}` : D + E, vD = (E) => new Promise((D, C) => {
   const B = document.createElement("script");
   B.src = E, B.type = "text/javascript", B.crossOrigin = "anonymous", document.body.appendChild(B), B.onload = () => {
     D();
@@ -1641,23 +1646,23 @@ const iD = "1.0.64", AC = "SharedArrayBuffer" in window, X = document.currentScr
   };
 }), rC = async (E, D, C) => {
   const { locateFile: B } = C, F = B(E + ".js");
-  return await LD(F), await globalThis[D](C);
+  return await vD(F), await globalThis[D](C);
 };
 let i;
-async function OD(E, D = AC || !X ? tC : eC, C, B) {
-  return new Promise(async (F, A) => {
+async function OD(E, D = AC || !X ? tC : eC, C, B, F) {
+  return new Promise(async (A, t) => {
     try {
-      if (i || (i = new vD()), i.mxcadassemblyimp)
-        return E && E(i), F(i);
-      const e = await rC("mxdrawassembly_min", "mxdrawassembly", {
+      if (i || (i = new SD()), i.mxcadassemblyimp)
+        return E && E(i), A(i);
+      const n = await rC("mxdrawassembly_min", "mxdrawassembly", {
         locateFile: D,
         wasmBinary: C
       });
-      i.mxcadassemblyimp = e;
-      let s = new e.McApp();
-      B && s.setFontFilePath(B), s.Init(), i.App.init(s), E && E(i), F(i);
-    } catch (t) {
-      A(t);
+      i.mxcadassemblyimp = n;
+      let r = new n.McApp();
+      B && r.setFontFilePath(B), r.Init(), i.App.init(r), F && i.App.addNetworkLoadingFont(F), E && E(i), A(i);
+    } catch (e) {
+      t(e);
     }
   });
 }
@@ -1682,7 +1687,7 @@ const sC = (E) => {
   }
 }), oC = async (E) => {
   oD.state.MxFun || await JD();
-  const { fontspath: D, locateFile: C, wasmBinary: B, canvas: F, userIdentitySign: A, onOpenFileComplete: t, fileUrl: e, onInit: s = () => {
+  const { networkFonts: D, fontspath: C, locateFile: B, wasmBinary: F, canvas: A, userIdentitySign: t, onOpenFileComplete: e, fileUrl: n, onInit: r = () => {
     d.setIniset({
       EnableIntelliSelect: !0,
       IntelliSelectType: 1,
@@ -1690,15 +1695,15 @@ const sC = (E) => {
     });
   } } = E || {};
   await OD(() => {
-  }, C, B, D), s();
-  let r = await nC(F, A);
-  const o = d.getMxFunTHREE();
-  let a = new o.Vector2();
-  r.getRenderer().getSize(a);
-  const l = i.App.CreateMxCAD(a.width, a.height, r.getCanvas().id, r.isWebgl2(), r.getId());
-  return r.initMxCpp(l), r.addEvent("openFileComplete", () => {
-    t && t();
-  }), e && l.openWebFile(e), l;
+  }, B, F, C, D), r();
+  let o = await nC(A, t);
+  const u = d.getMxFunTHREE();
+  let l = new u.Vector2();
+  o.getRenderer().getSize(l);
+  const s = i.App.CreateMxCAD(l.width, l.height, o.getCanvas().id, o.isWebgl2(), o.getId());
+  return o.initMxCpp(s), o.addEvent("openFileComplete", () => {
+    e && e();
+  }), n && s.openWebFile(n), s;
 };
 async function aC() {
   const E = new T();
@@ -1732,23 +1737,23 @@ class uC extends aD {
   }
 }
 const sD = (E) => {
-  const [D, C, B] = E, { x: F, y: A, z: t } = D, { x: e, y: s, z: r } = C, { x: o, y: a, z: l } = B, n = A * r - s * t - A * l + a * t + s * l - a * r, u = -(F * r - e * t - F * l + o * t + e * l - o * r), h = F * s - e * A - F * a + o * A + e * a - o * s, g = -(F * s * l - F * a * r - e * A * l + e * a * t + o * A * r - o * s * t), c = 2 * (e - F), m = 2 * (s - A), k = 2 * (r - t), I = F * F + A * A + t * t - e * e - s * s - r * r, P = 2 * (o - F), R = 2 * (a - A), S = 2 * (l - t), G = F * F + A * A + t * t - o * o - a * a - l * l, KD = -(u * k * G - u * S * I - m * h * G + m * S * g + R * h * I - R * k * g) / (n * m * S - n * R * k - c * u * S + c * R * h + P * u * k - P * m * h), ND = (n * k * G - n * S * I - c * h * G + c * S * g + P * h * I - P * k * g) / (n * m * S - n * R * k - c * u * S + c * R * h + P * u * k - P * m * h), HD = -(n * m * G - n * R * I - c * u * G + c * R * g + P * u * I - P * m * g) / (n * m * S - n * R * k - c * u * S + c * R * h + P * u * k - P * m * h);
-  return new THREE.Vector3(KD, ND, HD);
+  const [D, C, B] = E, { x: F, y: A, z: t } = D, { x: e, y: n, z: r } = C, { x: o, y: u, z: l } = B, s = A * r - n * t - A * l + u * t + n * l - u * r, a = -(F * r - e * t - F * l + o * t + e * l - o * r), h = F * n - e * A - F * u + o * A + e * u - o * n, g = -(F * n * l - F * u * r - e * A * l + e * u * t + o * A * r - o * n * t), c = 2 * (e - F), m = 2 * (n - A), k = 2 * (r - t), I = F * F + A * A + t * t - e * e - n * n - r * r, P = 2 * (o - F), R = 2 * (u - A), L = 2 * (l - t), G = F * F + A * A + t * t - o * o - u * u - l * l, ND = -(a * k * G - a * L * I - m * h * G + m * L * g + R * h * I - R * k * g) / (s * m * L - s * R * k - c * a * L + c * R * h + P * a * k - P * m * h), KD = (s * k * G - s * L * I - c * h * G + c * L * g + P * h * I - P * k * g) / (s * m * L - s * R * k - c * a * L + c * R * h + P * a * k - P * m * h), HD = -(s * m * G - s * R * I - c * a * G + c * R * g + P * a * I - P * m * g) / (s * m * L - s * R * k - c * a * L + c * R * h + P * a * k - P * m * h);
+  return new THREE.Vector3(ND, KD, HD);
 };
 function jD() {
   const E = new T();
   let D = new uC();
-  v.use(D), D.closed = !1;
+  S.use(D), D.closed = !1;
   let C = 0, B = "default", F = !0;
   const A = () => {
     E.setUserDraw(
-      (n, u) => {
-        D.radius = F ? D.center.distanceTo(n) : D.center.distanceTo(n) / 2, u.drawCustomEntity(D), u.drawLine(D.center, n);
+      (s, a) => {
+        D.radius = F ? D.center.distanceTo(s) : D.center.distanceTo(s) / 2, a.drawCustomEntity(D), a.drawLine(D.center, s);
       }
     );
-  }, t = (n) => {
+  }, t = (s) => {
     if (B === "default") {
-      if (n === y.kOk) {
+      if (s === y.kOk) {
         if (C === 0)
           E.setMessage(`
 \u6307\u5B9A\u5706\u7684\u534A\u5F84:`), E.setKeyWords("[\u76F4\u5F84(D)]"), D.center = E.value(), A();
@@ -1756,19 +1761,19 @@ function jD() {
           return i.App.GetCurrentMxCAD().DrawCircle(D.center.x, D.center.y, D.radius), !0;
         C++;
       }
-      n === y.kKeyWord && E.isKeyWordPicked("D") && (F = !1, A(), E.setMessage(`
+      s === y.kKeyWord && E.isKeyWordPicked("D") && (F = !1, A(), E.setMessage(`
 \u6307\u5B9A\u5706\u7684\u76F4\u5F84:`), E.setKeyWords(""));
     }
   };
   let e = [];
-  const s = (n) => {
+  const n = (s) => {
     if (B === "3P" && (E.setMessage(`
-\u6307\u5B9A\u5706\u4E0A\u7684\u7B2C\u4E00\u4E2A\u70B9:`), n === y.kOk)) {
-      if (C === 0 && (e.push(E.value()), E.setUserDraw((u, h) => {
-        h.drawLine(e[0], u);
+\u6307\u5B9A\u5706\u4E0A\u7684\u7B2C\u4E00\u4E2A\u70B9:`), s === y.kOk)) {
+      if (C === 0 && (e.push(E.value()), E.setUserDraw((a, h) => {
+        h.drawLine(e[0], a);
       }), E.setMessage(`
-\u6307\u5B9A\u5706\u4E0A\u7684\u7B2C\u4E8C\u4E2A\u70B9:`)), C === 1 && (e.push(E.value()), E.setUserDraw((u, h) => {
-        const [g, c] = e, m = u;
+\u6307\u5B9A\u5706\u4E0A\u7684\u7B2C\u4E8C\u4E2A\u70B9:`)), C === 1 && (e.push(E.value()), E.setUserDraw((a, h) => {
+        const [g, c] = e, m = a;
         D.center = sD([
           g,
           c,
@@ -1781,25 +1786,25 @@ function jD() {
     }
   };
   let r;
-  const o = (n, u) => {
-    new THREE.Line3(n, u).getCenter(D.center), D.radius = u.distanceTo(n) / 2;
-  }, a = (n) => {
+  const o = (s, a) => {
+    new THREE.Line3(s, a).getCenter(D.center), D.radius = a.distanceTo(s) / 2;
+  }, u = (s) => {
     if (B === "2P" && (E.setMessage(`
-\u6307\u5B9A\u5706\u76F4\u5F84\u7684\u7B2C\u4E00\u4E2A\u7AEF\u70B9:`), n === y.kOk)) {
-      if (C === 0 && (r = E.value(), E.setUserDraw((u, h) => {
-        o(r, u), h.drawCustomEntity(D), h.drawLine(r, u);
+\u6307\u5B9A\u5706\u76F4\u5F84\u7684\u7B2C\u4E00\u4E2A\u7AEF\u70B9:`), s === y.kOk)) {
+      if (C === 0 && (r = E.value(), E.setUserDraw((a, h) => {
+        o(r, a), h.drawCustomEntity(D), h.drawLine(r, a);
       }), E.setMessage(`
 \u6307\u5B9A\u5706\u76F4\u5F84\u7684\u7B2C\u4E8C\u4E2A\u7AEF\u70B9:`)), C === 1)
         return o(r, E.value()), i.App.GetCurrentMxCAD().DrawCircle(D.center.x, D.center.y, D.radius), !0;
       C++;
     }
-  }, l = (n) => {
+  }, l = (s) => {
     if (B === "T") {
       if (E.setMessage(`
-\u6307\u5B9A\u5BF9\u8C61\u4E0E\u5706\u7684\u7B2C\u4E00\u4E2A\u5207\u70B9:`), n === y.kOk) {
+\u6307\u5B9A\u5BF9\u8C61\u4E0E\u5706\u7684\u7B2C\u4E00\u4E2A\u5207\u70B9:`), s === y.kOk) {
         if (C === 0) {
-          const u = E.value();
-          console.log(u), d.getCurrentDraw();
+          const a = E.value();
+          console.log(a), d.getCurrentDraw();
         }
         C++;
       }
@@ -1810,18 +1815,18 @@ function jD() {
     `
 \u6307\u5B9A\u5706\u7684\u5706\u5FC3\u6216[\u4E09\u70B9(3P)/\u4E24\u70B9(2P)/\u5207\u70B9\u3001\u5207\u70B9\u3001\u534A\u5F84(T)]:`
   ), E.setKeyWords("3P 2P T"), E.goWhile(
-    (n) => {
-      if (n === y.kKeyWord && (E.isKeyWordPicked("3P") ? B = "3P" : E.isKeyWordPicked("2P") ? B = "2P" : E.isKeyWordPicked("T") && (B = "T")), t(n))
+    (s) => {
+      if (s === y.kKeyWord && (E.isKeyWordPicked("3P") ? B = "3P" : E.isKeyWordPicked("2P") ? B = "2P" : E.isKeyWordPicked("T") && (B = "T")), t(s))
         return { exit: !0 };
-      if (s(n))
+      if (n(s))
         return { exit: !0 };
-      if (a(n))
+      if (u(s))
         return { exit: !0 };
-      if (l(n))
+      if (l(s))
         return { exit: !0 };
     },
-    (n) => {
-      n === y.kCancel && i.App.GetCurrentMxCAD().DrawCircle(D.center.x, D.center.y, D.radius);
+    (s) => {
+      s === y.kCancel && i.App.GetCurrentMxCAD().DrawCircle(D.center.x, D.center.y, D.radius);
     }
   );
 }
@@ -1851,12 +1856,12 @@ async function ID() {
   };
   F(), E.goWhile(
     (A) => {
-      if (A === y.kOk && (D = new J(), v.use(D), D.pt1 = B, D.pt2 = E.value(), B = D.pt2.clone(), C.push(D), F()), A === y.kKeyWord) {
+      if (A === y.kOk && (D = new J(), S.use(D), D.pt1 = B, D.pt2 = E.value(), B = D.pt2.clone(), C.push(D), F()), A === y.kKeyWord) {
         if (E.isKeyWordPicked("E"))
           nD();
         else if (E.isKeyWordPicked("C")) {
           const t = new J();
-          return t.pt1 = B.clone(), t.pt2 = C[0].pt1.clone(), v.use(t), C.push(t), B = t.pt2.clone(), nD(), { exit: !0 };
+          return t.pt1 = B.clone(), t.pt2 = C[0].pt1.clone(), S.use(t), C.push(t), B = t.pt2.clone(), nD(), { exit: !0 };
         }
       }
     },
@@ -1893,8 +1898,8 @@ async function cC() {
       if (t.GetCount() == 0)
         return;
       let e = t.GetCount();
-      for (let s = 0; s < e; s++) {
-        let r = t.AtObject(s).val;
+      for (let n = 0; n < e; n++) {
+        let r = t.AtObject(n).val;
         r?.ObjectName == "McDbMText" && console.log(r.contents);
       }
     }
@@ -1939,7 +1944,7 @@ async function dC() {
 }
 async function GD() {
   const E = new T(), D = new ZD();
-  v.use(D), E.setMessage(`
+  S.use(D), E.setMessage(`
 \u6307\u5B9A\u8D77\u70B9:`);
   let C;
   E.setUserDraw((B, F) => {
@@ -1975,17 +1980,17 @@ async function WD() {
   let B = 5;
   E.setUserDraw((F, A) => {
     C.radius = D.distanceTo(F);
-    let t = C.getEndParam().val, s = C.getDistAtParam(t).val / B, r = 0, o = new THREE.Vector3(), a = new THREE.Vector3();
+    let t = C.getEndParam().val, n = C.getDistAtParam(t).val / B, r = 0, o = new THREE.Vector3(), u = new THREE.Vector3();
     for (let l = 0; l < B; l++) {
-      let n = C.getPointAtDist(r).val;
-      r += s, l > 0 ? A.drawMcDbLine(n.x, n.y, n.z, o.x, o.y, o.z) : a = new THREE.Vector3(n.x, n.y, n.z), l == B - 1 && A.drawMcDbLine(n.x, n.y, n.z, a.x, a.y, a.z), o = new THREE.Vector3(n.x, n.y, n.z);
+      let s = C.getPointAtDist(r).val;
+      r += n, l > 0 ? A.drawMcDbLine(s.x, s.y, s.z, o.x, o.y, o.z) : u = new THREE.Vector3(s.x, s.y, s.z), l == B - 1 && A.drawMcDbLine(s.x, s.y, s.z, u.x, u.y, u.z), o = new THREE.Vector3(s.x, s.y, s.z);
     }
   }), E.setMessage(`
 \u6307\u5B9A\u4E8C\u70B9:`), await E.go(), E.drawReserve();
 }
 d.addCommand("Mx_Polygon", WD);
 function hC(E, D, C) {
-  const B = E.x, F = D.x, A = C.x, t = E.y, e = D.y, s = C.y, r = B - F, o = t - e, a = B - A, l = t - s, n = (B * B - F * F + (t * t - e * e)) / 2, u = (B * B - A * A + (t * t - s * s)) / 2, h = o * a - r * l, g = -(l * n - o * u) / h, c = -(r * u - a * n) / h;
+  const B = E.x, F = D.x, A = C.x, t = E.y, e = D.y, n = C.y, r = B - F, o = t - e, u = B - A, l = t - n, s = (B * B - F * F + (t * t - e * e)) / 2, a = (B * B - A * A + (t * t - n * n)) / 2, h = o * u - r * l, g = -(l * s - o * a) / h, c = -(r * a - u * s) / h;
   return new THREE.Vector3(g, c, 0);
 }
 function wC(E, D) {
@@ -2000,10 +2005,10 @@ function gC(E, D, C) {
 }
 function CD(E, D, C) {
   const B = E.x, F = D.x, A = E.y, t = D.y;
-  let e, s, r;
-  return e = (A - t) / C, s = (B - F) / C, s >= 0.99999 && (s = 0.99999), s <= -0.99999 && (s = -0.99999), r = Math.acos(s), r = r / Math.PI * 180, e < -0.05 && (r = 360 - r), {
+  let e, n, r;
+  return e = (A - t) / C, n = (B - F) / C, n >= 0.99999 && (n = 0.99999), n <= -0.99999 && (n = -0.99999), r = Math.acos(n), r = r / Math.PI * 180, e < -0.05 && (r = 360 - r), {
     sin: e,
-    cos: s,
+    cos: n,
     angle: r
   };
 }
@@ -2035,13 +2040,13 @@ class rD extends aD {
   }
   getArcMidPoint(D, C, B, F, A) {
     const t = D, e = B * Math.PI / 180;
-    let s = F * Math.PI / 180;
+    let n = F * Math.PI / 180;
     const r = new THREE.Vector3(), o = new THREE.Vector3();
-    r.x = t.x + C * Math.cos(e), r.y = t.y + C * Math.sin(e), o.x = t.x + C * Math.cos(s), o.y = t.y + C * Math.sin(s);
-    const a = C;
-    (A ? B < F : B > F) && (s += Math.PI * 2);
+    r.x = t.x + C * Math.cos(e), r.y = t.y + C * Math.sin(e), o.x = t.x + C * Math.cos(n), o.y = t.y + C * Math.sin(n);
+    const u = C;
+    (A ? B < F : B > F) && (n += Math.PI * 2);
     const l = new THREE.Vector3();
-    return l.x = t.x + a * Math.cos((e + s) / 2), l.y = t.y + a * Math.sin((e + s) / 2), [r, l, o, this.center];
+    return l.x = t.x + u * Math.cos((e + n) / 2), l.y = t.y + u * Math.sin((e + n) / 2), [r, l, o, this.center];
   }
   getGripPoints() {
     return this.getArcMidPoint(
@@ -2062,12 +2067,12 @@ class rD extends aD {
     D[C].add(B);
     const [F, A, t] = D;
     this.center = hC(F, t, A), this.radius = wC(A, this.center);
-    const e = CD(F, this.center, this.radius), s = CD(t, this.center, this.radius), r = CD(A, this.center, this.radius);
+    const e = CD(F, this.center, this.radius), n = CD(t, this.center, this.radius), r = CD(A, this.center, this.radius);
     this.clockwise = gC(
-      s.angle,
+      n.angle,
       e.angle,
       r.angle
-    ), this.startAngle = THREE.MathUtils.degToRad(e.angle), this.endAngle = THREE.MathUtils.degToRad(s.angle);
+    ), this.startAngle = THREE.MathUtils.degToRad(e.angle), this.endAngle = THREE.MathUtils.degToRad(n.angle);
   }
 }
 async function UD() {
@@ -2075,7 +2080,7 @@ async function UD() {
   E.setMessage(`
 \u6307\u5B9A\u5706\u5F27\u7684\u8D77\u70B9:`), E.setKeyWords("[\u5706\u5FC3(C)]");
   let D = new rD();
-  D.closed = !1, v.use(D);
+  D.closed = !1, S.use(D);
   let C, B, F;
   const A = f(
     E,
@@ -2083,7 +2088,7 @@ async function UD() {
       C = E.value(), E.setMessage(`
 \u6307\u5B9A\u5706\u5F27\u7684\u7B2C\u4E8C\u4E2A\u70B9:`), E.setKeyWords("[\u5706\u5FC3(C)/\u7AEF\u70B9(E)]"), E.setUserDraw((c, m) => {
         m.drawLine(C, c);
-      }), u();
+      }), a();
     },
     () => {
       if (E.isKeyWordPicked("C")) {
@@ -2098,7 +2103,7 @@ async function UD() {
   const e = f(
     E,
     () => {
-      t = E.value(), F = new q(), F.closed = !1, v.use(F), F.center = t, D.center = t, E.setMessage(`
+      t = E.value(), F = new q(), F.closed = !1, S.use(F), F.center = t, D.center = t, E.setMessage(`
 \u6307\u5B9A\u5706\u5F27\u7684\u8D77\u70B9:`), E.setUserDraw((c, m) => {
         m.drawCustomEntity(F), m.drawLine(t, c);
       }), o();
@@ -2106,11 +2111,11 @@ async function UD() {
     () => {
     }
   );
-  let s, r;
+  let n, r;
   const o = f(
     E,
     () => {
-      s = E.value(), F.endPoint = s, E.setMessage(
+      n = E.value(), F.endPoint = n, E.setMessage(
         `
 \u6307\u5B9A\u5706\u5F27\u7684\u7AEF\u70B9(\u6309\u4F4F ctrl \u952E\u53D6\u76F8\u53CD\u65B9\u5411)\u6216 [\u89D2\u5EA6(A)/\u5F26\u957F(L)/\u4FEE\u6539\u534A\u5F84(R)]:`
       ), E.setKeyWords("A L R"), r = new J(), r.setDashLineDisplay(!0), r.setDashArray(0.05), r.setLineWidth(2), r.setColor("#ffd30d"), r.pt1 = F.center, E.setUserDraw((c, m) => {
@@ -2120,11 +2125,11 @@ async function UD() {
     () => {
     }
   );
-  let a;
+  let u;
   const l = f(
     E,
     () => {
-      a = E.value(), F.startPoint = a, F.endPoint = s, d.getCurrentDraw().addMxEntity(F);
+      u = E.value(), F.startPoint = u, F.endPoint = n, d.getCurrentDraw().addMxEntity(F);
     },
     () => {
       if (E.isKeyWordPicked("A"))
@@ -2152,23 +2157,23 @@ async function UD() {
         return !0;
     }
   );
-  let n;
-  const u = f(
+  let s;
+  const a = f(
     E,
     () => {
-      n = E.value(), E.setMessage(`
-\u6307\u5B9A\u5706\u5F27\u7684\u7AEF\u70B9:`), B = new YD(), B.autoClockwise = !0, B.closed = !1, v.use(B), B.point1 = C, B.point3 = n, E.setUserDraw((c, m) => {
+      s = E.value(), E.setMessage(`
+\u6307\u5B9A\u5706\u5F27\u7684\u7AEF\u70B9:`), B = new YD(), B.autoClockwise = !0, B.closed = !1, S.use(B), B.point1 = C, B.point3 = s, E.setUserDraw((c, m) => {
         B.point2 = c, m.drawCustomEntity(B);
       }), g();
     },
     () => {
       if (E.isKeyWordPicked("C"))
-        F = new q(), F.closed = !1, v.use(F), E.setMessage(`
+        F = new q(), F.closed = !1, S.use(F), E.setMessage(`
 \u6307\u5B9A\u5706\u5F27\u7684\u5706\u5FC3`), E.setKeyWords(""), E.setUserDraw((c, m) => {
           F.startPoint = C, m.drawLine(c, F.startPoint);
         }), e();
       else if (E.isKeyWordPicked("E"))
-        F = new q(), F.closed = !1, v.use(F), E.setMessage(`
+        F = new q(), F.closed = !1, S.use(F), E.setMessage(`
 \u6307\u5B9A\u5706\u5F27\u7684\u5706\u5FC3`), E.setKeyWords(""), E.setUserDraw((c, m) => {
           F.startPoint = C, m.drawLine(c, F.startPoint);
         }), e();
@@ -2180,7 +2185,7 @@ async function UD() {
   const g = f(
     E,
     () => {
-      B.point1 = C, B.point2 = E.value(), B.point3 = n, h.DrawArc2(B.point1.x, B.point1.y, B.point3.x, B.point3.y, B.point2.x, B.point2.y);
+      B.point1 = C, B.point2 = E.value(), B.point3 = s, h.DrawArc2(B.point1.x, B.point1.y, B.point3.x, B.point3.y, B.point2.x, B.point2.y);
     },
     () => {
       if (E.isKeyWordPicked("C"))
@@ -2198,15 +2203,15 @@ d.on("init", () => {
 });
 function zD() {
   const E = new T(), D = new QD();
-  D.closed = !1, v.use(D), E.setMessage(`
+  D.closed = !1, S.use(D), E.setMessage(`
 \u6307\u5B9A\u692D\u5706\u7684\u8F74\u7AEF\u70B9`), E.setKeyWords("[\u4E2D\u5FC3\u70B9(C)]");
   let C, B = new THREE.Vector3();
   f(
     E,
     () => {
       C = E.value(), E.setUserDraw((r, o) => {
-        const a = new THREE.Line3(C, r);
-        a.getCenter(B), D.center = B, D.xRadius = a.distance() / 2, D.yRadius = D.xRadius, D.rotation = DD(r.x, r.y, B.x, B.y), o.drawLine(r, C);
+        const u = new THREE.Line3(C, r);
+        u.getCenter(B), D.center = B, D.xRadius = u.distance() / 2, D.yRadius = D.xRadius, D.rotation = DD(r.x, r.y, B.x, B.y), o.drawLine(r, C);
       }), E.setMessage(`
 \u6307\u5B9A\u692D\u5706\u5F27\u8F74\u7684\u53E6\u4E00\u4E2A\u7AEF\u70B9:`), E.setKeyWords(""), A();
     },
@@ -2239,11 +2244,11 @@ function zD() {
       E.setUserDraw((r, o) => {
         D.endAngle = DD(r.x, r.y, B.x, B.y) - D.rotation, o.drawLine(B, r), o.drawCustomEntity(D);
       }), E.setMessage(`
-\u6307\u5B9A\u7EC8\u6B62\u89D2\u5EA6`), E.setKeyWords(""), s();
+\u6307\u5B9A\u7EC8\u6B62\u89D2\u5EA6`), E.setKeyWords(""), n();
     },
     () => {
     }
-  ), s = f(
+  ), n = f(
     E,
     () => {
       let r = new w(D.xRadius, 0, 0);
@@ -2277,7 +2282,7 @@ async function VD() {
 d.addCommand("Mx_Erase", VD);
 const xC = async (E, D, C) => {
   const { locateFile: B } = C, F = B(E + ".js");
-  return await LD(F), await globalThis[D](C);
+  return await vD(F), await globalThis[D](C);
 };
 function bC(E) {
   return typeof ResizeObserver == "function" ? new ResizeObserver(E) : null;
@@ -2307,37 +2312,37 @@ class z {
   canvas;
   constructor(D) {
     const C = () => {
-      const a = this.canvas.parentElement?.clientWidth || window.innerWidth, l = this.canvas.parentElement?.clientHeight || window.innerHeight;
-      let n = Math.min(a, window.screen.availWidth), u = Math.min(l, window.screen.availHeight);
-      n = Math.max(A, n), u = Math.max(t, u), this.canvas.style.width = n + 1 + "px", this.canvas.style.height = u + "px";
+      const u = this.canvas.parentElement?.clientWidth || window.innerWidth, l = this.canvas.parentElement?.clientHeight || window.innerHeight;
+      let s = Math.min(u, window.screen.availWidth), a = Math.min(l, window.screen.availHeight);
+      s = Math.max(A, s), a = Math.max(t, a), this.canvas.style.width = s + 1 + "px", this.canvas.style.height = a + "px";
       const h = window.devicePixelRatio || 1;
-      this.canvas.width = n * h, this.canvas.height = u * h;
+      this.canvas.width = s * h, this.canvas.height = a * h;
     }, B = MC(C, 50), {
       canvas: F,
       minWidth: A = 300,
       minHeight: t = 300,
       updateCanvasSize: e = B,
-      ...s
+      ...n
     } = D;
     let r = typeof F == "string" ? document.querySelectorAll(F)[0] : F, o = r.getContext("webgl2", { alpha: !1, depth: !0, antialias: !1, preserveDrawingBuffer: !0 });
-    o == null && (o = r.getContext("webgl", { alpha: !1, depth: !0, antialias: !1, preserveDrawingBuffer: !0 })), this.canvas = r, this.ctx = o, s.canvas = this.canvas;
-    for (let a in s)
-      this[a] = s[a];
+    o == null && (o = r.getContext("webgl", { alpha: !1, depth: !0, antialias: !1, preserveDrawingBuffer: !0 })), this.canvas = r, this.ctx = o, n.canvas = this.canvas;
+    for (let u in n)
+      this[u] = n[u];
     if (this.canvas instanceof HTMLCanvasElement) {
-      const a = this.canvas.parentElement || document.body;
-      fC(a, e);
+      const u = this.canvas.parentElement || document.body;
+      fC(u, e);
     } else
       console.error("createMxDraw3d canvas \u53C2\u6570\u4E0D\u6B63\u786E \u65E0\u6CD5\u83B7\u53D6\u5230canvas\u5143\u7D20");
     window.onresize = C, C(), xC("mxdraw3d_min", "mxdraw3d", this).then(() => {
-      z.onloadWasmMxDraw3dModel && z.onloadWasmMxDraw3dModel(this), this.updateCanvasSize = e, this.open3DFile = (a) => {
+      z.onloadWasmMxDraw3dModel && z.onloadWasmMxDraw3dModel(this), this.updateCanvasSize = e, this.open3DFile = (u) => {
         const l = new FileReader();
         l.onload = () => {
           if (!!l.result && l.result instanceof ArrayBuffer) {
-            var n = new Uint8Array(l.result);
-            const u = this._malloc(n.length);
-            this.HEAPU8.set(n, u), this.openFromMemory(a.name, u, n.length, !0), this.displayGround(!0), this.canvas.focus();
+            var s = new Uint8Array(l.result);
+            const a = this._malloc(s.length);
+            this.HEAPU8.set(s, a), this.openFromMemory(u.name, a, s.length, !0), this.displayGround(!0), this.canvas.focus();
           }
-        }, l.readAsArrayBuffer(a);
+        }, l.readAsArrayBuffer(u);
       };
     });
   }
@@ -2366,15 +2371,15 @@ const PC = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   McGePoint3d: p,
   McGeVector3d: w,
   McGeMatrix3d: W,
-  getFilterImp: K,
-  McDrawResbuf: N,
+  getFilterImp: N,
+  McDrawResbuf: K,
   McDrawUtilityClass: PD,
   McDrawUtility: eD,
   McDrawSelSet: RD,
   McRxObject: O,
   McObjectIdType: b,
   McObjectId: M,
-  McDbObject: L,
+  McDbObject: v,
   get McDb() {
     return BD;
   },
@@ -2401,8 +2406,8 @@ const PC = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   McDbRotatedDimension: TD,
   McDbArc: kD,
   McObject: U,
-  McAppType: SD,
-  MxCppType: vD,
+  McAppType: LD,
+  MxCppType: SD,
   get MxCpp() {
     return i;
   },
@@ -2421,7 +2426,7 @@ const PC = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   loadMxCADassembly3d: TC
 }, Symbol.toStringTag, { value: "Module" }));
 export {
-  SD as McAppType,
+  LD as McAppType,
   j as McCmColor,
   BD as McDb,
   MD as McDbAlignedDimension,
@@ -2441,12 +2446,12 @@ export {
   Z as McDbLine,
   hD as McDbLinetypeTable,
   FD as McDbMText,
-  L as McDbObject,
+  v as McDbObject,
   bD as McDbPolyline,
   TD as McDbRotatedDimension,
   Y as McDbText,
   wD as McDbTextStyleTable,
-  N as McDrawResbuf,
+  K as McDrawResbuf,
   RD as McDrawSelSet,
   eD as McDrawUtility,
   PD as McDrawUtilityClass,
@@ -2458,7 +2463,7 @@ export {
   b as McObjectIdType,
   O as McRxObject,
   i as MxCpp,
-  vD as MxCppType,
+  SD as MxCppType,
   z as MxDraw3d,
   H as MxTools,
   lD as b64Decode,
@@ -2475,7 +2480,7 @@ export {
   GD as drawPolyLine,
   WD as drawPolygon,
   aC as drawText,
-  K as getFilterImp,
+  N as getFilterImp,
   OD as loadMxCADassembly,
   TC as loadMxCADassembly3d,
   VD as mxErase,