@realsee/dnalogel 3.48.5 → 3.48.6

package/dist/shared-utils/three/PointSelector/index.d.ts

@@ -56,14 +56,21 @@ export declare class PointSelector extends Subscribe<EventMap> {
     /**
      * @description: 不在 five canvas 上时为 true
      */
-    outOfFive: boolean;
-    enabled: boolean;
+    get outOfFive(): boolean;
+    get enabled(): boolean;
+    get cursorError(): boolean;
+    set cursorError(cursorError: boolean);
+    _cursorError: boolean;
     actionIfNoModelUnderMouse: ActionIfNoModelUnderMouse;
     plane?: THREE.Plane | null;
-    pointSelectorHelper: PointSelectorHelper;
+    readonly pointSelectorHelper: PointSelectorHelper;
     /** @deprecated directly use `pointSelector.on/off` instead */
-    hook: this;
+    readonly hook: this;
     private five;
+    private set outOfFive(value);
+    private _outOfFive;
+    private set enabled(value);
+    private _enabled;
     private hammer?;
     private mode;
     /** 长按屏幕的动作触发后为true，手指抬起后为false */
@@ -90,6 +97,7 @@ export declare class PointSelector extends Subscribe<EventMap> {
      * @return: select 是否成功
      */
     select: (intersection?: PointIntersection) => boolean;
+    private onMouseWheel;
     /**
      * @description: 鼠标进入five canvas时
      */

package/dist/shared-utils/three/PointSelector/utils/contents.d.ts

@@ -0,0 +1 @@
+export declare const CURSOR_NOT_ALLOW_URL = "url(\"data:image/svg+xml,%3Csvg width='12px' height='12px' viewBox='0 0 12 12' xmlns='http://www.w3.org/2000/svg'%3E%3Cg stroke='none' stroke-width='1' fill='none' fill-rule='evenodd'%3E%3Cpath d='M6,12 C9.3137085,12 12,9.3137085 12,6 C12,2.6862915 9.3137085,0 6,0 C2.6862915,0 0,2.6862915 0,6 C0,9.3137085 2.6862915,12 6,12 Z' fill='%23FF5959'%3E%3C/path%3E%3Cg transform='translate(2, 2)' stroke='%23FFFFFF'%3E%3Ccircle cx='4' cy='4' r='4'%3E%3C/circle%3E%3Cline x1='1.07141075' y1='1.23997894' x2='6.64700843' y2='6.81557662'%3E%3C/line%3E%3C/g%3E%3C/g%3E%3C/svg%3E\") 6 6, auto";

package/dist/shared-utils/three/generatePolygonGeometry.d.ts

@@ -2,5 +2,8 @@ import type { Vector3 } from 'three';
 import * as THREE from 'three';
 /**
  * @description: 根据多边形的顶点数组生成多边形的 BufferGeometry
+ * @param checkLinesIntersect 检查多边形边线是否相交,需要保证传入的顶点是有序的
  */
-export default function generatePolygonGeometry(_points: Vector3[]): THREE.BufferGeometry;
+export default function generatePolygonGeometry(_points: Vector3[], config?: {
+    checkLinesIntersect?: boolean;
+}): THREE.BufferGeometry;

package/libs/ModelMakerPlugin/Controller.js

@@ -68,6 +68,7 @@ import "../shared-utils/three/generatePolygonGeometry.js";
 import "../shared-utils/three/earcut3D.js";
 import "earcut";
 import "../shared-utils/three/getNormal.js";
+import "../PanoMeasurePlugin/utils/isIntersecting.js";
 import "../Sculpt/utils/three/ColoredMesh.js";
 import "../shared-utils/three/geometryUtil.js";
 import "../shared-utils/three/THREERaycaster.js";
@@ -86,7 +87,7 @@ import "../shared-utils/three/addIfNotExists.js";
 import "../shared-utils/five/FiveDomEvents.js";
 import "../shared-utils/three/getObjectVisible.js";
 import "../shared-utils/five/calculateThreeMouse.js";
-class tt extends z {
+class it extends z {
   constructor(e, t) {
     var r, p;
     super(e);
@@ -247,5 +248,5 @@ class tt extends z {
   }
 }
 export {
-  tt as Controller
+  it as Controller
 };

package/libs/ModelMakerPlugin/index.js

@@ -45,6 +45,7 @@ import "../shared-utils/three/generatePolygonGeometry.js";
 import "../shared-utils/three/earcut3D.js";
 import "earcut";
 import "../shared-utils/three/getNormal.js";
+import "../PanoMeasurePlugin/utils/isIntersecting.js";
 import "../Sculpt/utils/three/ColoredMesh.js";
 import "../shared-utils/three/geometryUtil.js";
 import "../Sculpt/Meshes/PolygonWithEdge.js";
@@ -59,7 +60,7 @@ import "../components/AreaLabel/LabelItem.js";
 import "../components/AreaLabel/Assets/roomLabelBg.js";
 import "./item/prismItem.js";
 import "../shared-utils/five/fiveModelLoad.js";
-const Mo = (...o) => new r(...o);
+const ao = (...o) => new r(...o);
 export {
-  Mo as ModelMakerPlugin
+  ao as ModelMakerPlugin
 };

package/libs/PanoMeasurePlugin/Components/Controller0.js

@@ -27,6 +27,7 @@ import "../../shared-utils/three/generatePolygonGeometry.js";
 import "../../shared-utils/three/earcut3D.js";
 import "earcut";
 import "../../shared-utils/three/getNormal.js";
+import "../utils/isIntersecting.js";
 import "../utils/dom/areaDom.js";
 import "../../shared-utils/three/geometryUtil.js";
 import "hammerjs";
@@ -45,7 +46,6 @@ import "../../shared-utils/three/THREESphere.js";
 import "animejs";
 import "../../shared-utils/isNil.js";
 import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
-import "../utils/isIntersecting.js";
 import "../../shared-utils/three/PointSelector/index.js";
 import "../../shared-utils/three/PointSelector/utils/PointSelectorHelper.js";
 import "../../shared-utils/three/Magnifier.js";
@@ -71,6 +71,7 @@ import "../../CSS3DRenderPlugin/utils/three/CSS3DSprite.js";
 import "../../shared-utils/isTouchDevice.js";
 import "../../shared-utils/five/getPosition.js";
 import "../../shared-utils/five/getRaycasterByNdcPosition.js";
+import "../../shared-utils/three/PointSelector/utils/contents.js";
 import "../Modules/DeleteDom/index.js";
 import "../Modules/DeleteDom/_Assets/delete.svg.js";
 import "../Modules/DeleteDom/_Assets/delete_bg.png.js";
@@ -116,17 +117,17 @@ function O(n) {
   let o, i, t, p, f = (
     /*i18n*/
     n[2]("撤销") + ""
-  ), d, v, m, a, b, c = (
+  ), m, v, d, a, b, c = (
     /*i18n*/
     n[2]("结束") + ""
   ), r, l, _;
   return {
     c() {
-      o = h("div"), i = h("div"), t = h("div"), p = C(), d = y(f), v = C(), m = h("div"), a = h("div"), b = C(), r = y(c), g(t, "class", "icon svelte-468fdd"), E(t, "background-image", `url(${ee})`), g(i, "class", "button svelte-468fdd"), z(i, "forbid", !/*canRevoke*/
-      n[3]), g(a, "class", "icon svelte-468fdd"), E(a, "background-image", `url(${te})`), g(m, "class", "button svelte-468fdd"), g(o, "class", "buttons svelte-468fdd");
+      o = h("div"), i = h("div"), t = h("div"), p = C(), m = y(f), v = C(), d = h("div"), a = h("div"), b = C(), r = y(c), g(t, "class", "icon svelte-468fdd"), E(t, "background-image", `url(${ee})`), g(i, "class", "button svelte-468fdd"), z(i, "forbid", !/*canRevoke*/
+      n[3]), g(a, "class", "icon svelte-468fdd"), E(a, "background-image", `url(${te})`), g(d, "class", "button svelte-468fdd"), g(o, "class", "buttons svelte-468fdd");
     },
     m(u, e) {
-      R(u, o, e), s(o, i), s(i, t), s(i, p), s(i, d), s(o, v), s(o, m), s(m, a), s(m, b), s(m, r), l || (_ = [
+      R(u, o, e), s(o, i), s(i, t), s(i, p), s(i, m), s(o, v), s(o, d), s(d, a), s(d, b), s(d, r), l || (_ = [
         S(
           i,
           "click",
@@ -134,7 +135,7 @@ function O(n) {
           n[7]
         ),
         S(
-          m,
+          d,
           "click",
           /*complete*/
           n[6]
@@ -144,7 +145,7 @@ function O(n) {
     p(u, e) {
       e & /*i18n*/
       4 && f !== (f = /*i18n*/
-      u[2]("撤销") + "") && A(d, f), e & /*canRevoke*/
+      u[2]("撤销") + "") && A(m, f), e & /*canRevoke*/
       8 && z(i, "forbid", !/*canRevoke*/
       u[3]), e & /*i18n*/
       4 && c !== (c = /*i18n*/
@@ -156,7 +157,7 @@ function O(n) {
   };
 }
 function ie(n) {
-  let o, i, t, p, f, d, v, m, a, b, c, r = (
+  let o, i, t, p, f, m, v, d, a, b, c, r = (
     /*showExit*/
     n[1] && L(n)
   ), l = (
@@ -195,10 +196,10 @@ function ie(n) {
     n[4] !== void 0 && (u.setIndex = /*setSwitcherActiveIndex*/
     n[4]), a = new Y({ props: u }), G.push(() => H(a, "setIndex", _)), {
       c() {
-        o = h("div"), r && r.c(), i = C(), t = h("div"), p = h("div"), f = C(), d = h("div"), l && l.c(), v = C(), m = h("div"), P(a.$$.fragment), g(p, "class", "mask svelte-468fdd"), g(m, "class", "mode-switcher svelte-468fdd"), g(d, "class", "center svelte-468fdd"), g(t, "class", "bottom svelte-468fdd"), g(o, "class", "Measure-Controller svelte-468fdd");
+        o = h("div"), r && r.c(), i = C(), t = h("div"), p = h("div"), f = C(), m = h("div"), l && l.c(), v = C(), d = h("div"), P(a.$$.fragment), g(p, "class", "mask svelte-468fdd"), g(d, "class", "mode-switcher svelte-468fdd"), g(m, "class", "center svelte-468fdd"), g(t, "class", "bottom svelte-468fdd"), g(o, "class", "Measure-Controller svelte-468fdd");
       },
       m(e, k) {
-        R(e, o, k), r && r.m(o, null), s(o, i), s(o, t), s(t, p), s(t, f), s(t, d), l && l.m(d, null), s(d, v), s(d, m), T(a, m, null), c = !0;
+        R(e, o, k), r && r.m(o, null), s(o, i), s(o, t), s(t, p), s(t, f), s(t, m), l && l.m(m, null), s(m, v), s(m, d), T(a, d, null), c = !0;
       },
       p(e, [k]) {
         /*showExit*/
@@ -206,7 +207,7 @@ function ie(n) {
         2 && w(r, 1)) : (r = L(e), r.c(), w(r, 1), r.m(o, i)) : r && (X(), I(r, 1, 1, () => {
           r = null;
         }), J()), /*showController*/
-        e[5] ? l ? l.p(e, k) : (l = O(e), l.c(), l.m(d, v)) : l && (l.d(1), l = null);
+        e[5] ? l ? l.p(e, k) : (l = O(e), l.c(), l.m(m, v)) : l && (l.d(1), l = null);
         const M = {};
         k & /*i18n*/
         4 && (M.options = [
@@ -245,23 +246,23 @@ function ie(n) {
   );
 }
 function re(n, o, i) {
-  let { measureController: t } = o, { showExit: p = !1 } = o, { i18n: f = (e) => e } = o, d = !1, v;
-  function m(e) {
+  let { measureController: t } = o, { showExit: p = !1 } = o, { i18n: f = (e) => e } = o, m = !1, v;
+  function d(e) {
     e === "Edit" ? i(5, r = !0) : (v(null), i(5, r = !1));
   }
   function a() {
     t.controller instanceof $ && t.controller.complete(), t.save({ mode: "Watch" });
   }
   function b(e) {
-    i(3, d = e.length > 0);
+    i(3, m = e.length > 0);
   }
   function c() {
-    i(3, d = !1);
+    i(3, m = !1);
   }
   N(() => {
-    t.hook.on("modeChange", m), t.hook.on("complete", c), t.hook.on("pointsChange", b);
+    t.hook.on("modeChange", d), t.hook.on("complete", c), t.hook.on("pointsChange", b);
   }), Q(() => {
-    t.hook.off("modeChange", m), t.hook.off("complete", c), t.hook.off("pointsChange", b);
+    t.hook.off("modeChange", d), t.hook.off("complete", c), t.hook.off("pointsChange", b);
   });
   let r = !1;
   const l = () => t.revoke(), _ = (e) => {
@@ -276,7 +277,7 @@ function re(n, o, i) {
     t,
     p,
     f,
-    d,
+    m,
     v,
     r,
     a,
@@ -285,7 +286,7 @@ function re(n, o, i) {
     u
   ];
 }
-class At extends j {
+class qt extends j {
   constructor(o) {
     super(), x(
       this,
@@ -303,5 +304,5 @@ class At extends j {
   }
 }
 export {
-  At as default
+  qt as default
 };

package/libs/PanoMeasurePlugin/Components/Controller1.js

@@ -31,6 +31,7 @@ import "../../shared-utils/three/generatePolygonGeometry.js";
 import "../../shared-utils/three/earcut3D.js";
 import "earcut";
 import "../../shared-utils/three/getNormal.js";
+import "../utils/isIntersecting.js";
 import "../utils/dom/areaDom.js";
 import "../../shared-utils/three/geometryUtil.js";
 import "hammerjs";
@@ -49,7 +50,6 @@ import "../../shared-utils/three/THREESphere.js";
 import "animejs";
 import "../../shared-utils/isNil.js";
 import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
-import "../utils/isIntersecting.js";
 import "../../shared-utils/three/PointSelector/index.js";
 import "../../shared-utils/three/PointSelector/utils/PointSelectorHelper.js";
 import "../../shared-utils/three/Magnifier.js";
@@ -75,6 +75,7 @@ import "../../CSS3DRenderPlugin/utils/three/CSS3DSprite.js";
 import "../../shared-utils/isTouchDevice.js";
 import "../../shared-utils/five/getPosition.js";
 import "../../shared-utils/five/getRaycasterByNdcPosition.js";
+import "../../shared-utils/three/PointSelector/utils/contents.js";
 import "../Modules/DeleteDom/index.js";
 import "../Modules/DeleteDom/_Assets/delete.svg.js";
 import "../Modules/DeleteDom/_Assets/delete_bg.png.js";
@@ -435,7 +436,7 @@ function de(o, t, i) {
     x
   ];
 }
-class Ht extends ee {
+class Jt extends ee {
   constructor(t) {
     super(), te(
       this,
@@ -453,5 +454,5 @@ class Ht extends ee {
   }
 }
 export {
-  Ht as default
+  Jt as default
 };

package/libs/PanoMeasurePlugin/Controller/EditController.js

@@ -17,7 +17,7 @@ import { throttle as q } from "../../shared-utils/throttle.js";
 import z from "./BaseController.js";
 import { Polyline as E } from "../Model/polyline.js";
 import R from "../Model/area.js";
-import H from "../utils/isIntersecting.js";
+import { isIntersecting as H } from "../utils/isIntersecting.js";
 import { PointSelector as F } from "../../shared-utils/three/PointSelector/index.js";
 import N from "../Modules/DeleteDom/index.js";
 import * as f from "three";
@@ -82,11 +82,12 @@ import "../../CSS3DRenderPlugin/utils/three/CSS3DSprite.js";
 import "../../shared-utils/isTouchDevice.js";
 import "../../shared-utils/five/getPosition.js";
 import "../../shared-utils/five/getRaycasterByNdcPosition.js";
+import "../../shared-utils/three/PointSelector/utils/contents.js";
 import "../Modules/DeleteDom/_Assets/delete.svg.js";
 import "../Modules/DeleteDom/_Assets/delete_bg.png.js";
 import "../Modules/DeleteDom/_Assets/delete_hover_bg.png.js";
 const b = () => !1;
-class ut extends z {
+class gt extends z {
   constructor(e) {
     super(e);
     s(this, "type", "edit");
@@ -366,5 +367,5 @@ class ut extends z {
   }
 }
 export {
-  ut as default
+  gt as default
 };

package/libs/PanoMeasurePlugin/Controller/WatchController.js

@@ -50,8 +50,9 @@ import "../../shared-utils/three/generatePolygonGeometry.js";
 import "../../shared-utils/three/earcut3D.js";
 import "earcut";
 import "../../shared-utils/three/getNormal.js";
+import "../utils/isIntersecting.js";
 const E = () => !1;
-class jt extends U {
+class xt extends U {
   constructor(t) {
     super(t);
     s(this, "type", "watch");
@@ -224,5 +225,5 @@ class jt extends U {
   }
 }
 export {
-  jt as default
+  xt as default
 };

package/libs/PanoMeasurePlugin/Controller/index.js

@@ -53,11 +53,11 @@ import "../../shared-utils/three/generatePolygonGeometry.js";
 import "../../shared-utils/three/earcut3D.js";
 import "earcut";
 import "../../shared-utils/three/getNormal.js";
+import "../utils/isIntersecting.js";
 import "../utils/dom/areaDom.js";
 import "../../shared-utils/three/geometryUtil.js";
 import "hammerjs";
 import "../../shared-utils/isNil.js";
-import "../utils/isIntersecting.js";
 import "../../shared-utils/three/PointSelector/index.js";
 import "../../shared-utils/three/PointSelector/utils/PointSelectorHelper.js";
 import "../../shared-utils/three/PointSelector/utils/PointHelper.js";
@@ -90,6 +90,7 @@ import "../../shared-utils/util.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DSprite.js";
 import "../../shared-utils/five/getPosition.js";
 import "../../shared-utils/five/getRaycasterByNdcPosition.js";
+import "../../shared-utils/three/PointSelector/utils/contents.js";
 import "../Modules/DeleteDom/index.js";
 import "../Modules/DeleteDom/_Assets/delete.svg.js";
 import "../Modules/DeleteDom/_Assets/delete_bg.png.js";
@@ -122,7 +123,7 @@ import "../../vendor/svelte/easing/index.js";
 import "../../vendor/object-assign-deep/objectAssignDeep.js";
 import "../Components/Tip.js";
 import "../../shared-utils/url/absoluteUrl.js";
-class $e extends H {
+class ze extends H {
   constructor(t, e) {
     var l, u, d, f, g, y, C, M, w, P, b, v;
     super(t);
@@ -331,5 +332,5 @@ class $e extends H {
   }
 }
 export {
-  $e as default
+  ze as default
 };

package/libs/PanoMeasurePlugin/Model/area.js

@@ -22,6 +22,7 @@ import "../../shared-utils/three/generatePolygonGeometry.js";
 import "../../shared-utils/three/earcut3D.js";
 import "earcut";
 import "../../shared-utils/three/getNormal.js";
+import "../utils/isIntersecting.js";
 import "../../shared-utils/three/geometryUtil.js";
 import "hammerjs";
 import "three/examples/jsm/renderers/CSS3DRenderer";
@@ -39,7 +40,7 @@ import "../../shared-utils/three/THREESphere.js";
 import "animejs";
 import "../../shared-utils/isNil.js";
 import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
-class ot {
+class st {
   constructor(t, e) {
     i(this, "id", f());
     i(this, "selected", !1);
@@ -138,5 +139,5 @@ class ot {
   }
 }
 export {
-  ot as default
+  st as default
 };

package/libs/PanoMeasurePlugin/Model/polygon.js

@@ -3,12 +3,13 @@ var c = (o, t, e) => t in o ? l(o, t, { enumerable: !0, configurable: !0, writab
 var s = (o, t, e) => (c(o, typeof t != "symbol" ? t + "" : t, e), e);
 import * as r from "three";
 import { IObject3D as h } from "../../shared-utils/three/IObject3D.js";
-import { generatePolygonGeometry as d } from "../../shared-utils/three/generatePolygonGeometry.js";
+import { generatePolygonGeometry as p } from "../../shared-utils/three/generatePolygonGeometry.js";
 import "../../shared-utils/three/earcut3D.js";
 import "earcut";
 import "../../shared-utils/three/getNormal.js";
-const p = new r.BufferGeometry();
-class w extends h {
+import "../utils/isIntersecting.js";
+const d = new r.BufferGeometry();
+class k extends h {
   constructor(e) {
     super();
     s(this, "isPolygonMesh", !0);
@@ -36,11 +37,11 @@ class w extends h {
    */
   updatePoints(e) {
     this.points = e;
-    const i = d(e);
-    i ? (this.geometry.copy(i), this.isBlank = !1) : (this.geometry.copy(p), this.isBlank = !0);
+    const i = p(e);
+    i ? (this.geometry.copy(i), this.isBlank = !1) : (this.geometry.copy(d), this.isBlank = !0);
   }
 }
 export {
-  p as blankGeometry,
-  w as default
+  d as blankGeometry,
+  k as default
 };

package/libs/PanoMeasurePlugin/Modules/UIController/index.js

@@ -37,6 +37,7 @@ import "../../../shared-utils/three/generatePolygonGeometry.js";
 import "../../../shared-utils/three/earcut3D.js";
 import "earcut";
 import "../../../shared-utils/three/getNormal.js";
+import "../../utils/isIntersecting.js";
 import "../../utils/dom/areaDom.js";
 import "../../../shared-utils/three/geometryUtil.js";
 import "hammerjs";
@@ -55,7 +56,6 @@ import "../../../shared-utils/three/THREESphere.js";
 import "animejs";
 import "../../../shared-utils/isNil.js";
 import "../../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
-import "../../utils/isIntersecting.js";
 import "../../../shared-utils/three/PointSelector/index.js";
 import "../../../shared-utils/three/PointSelector/utils/PointSelectorHelper.js";
 import "../../../shared-utils/three/Magnifier.js";
@@ -81,6 +81,7 @@ import "../../../CSS3DRenderPlugin/utils/three/CSS3DSprite.js";
 import "../../../shared-utils/isTouchDevice.js";
 import "../../../shared-utils/five/getPosition.js";
 import "../../../shared-utils/five/getRaycasterByNdcPosition.js";
+import "../../../shared-utils/three/PointSelector/utils/contents.js";
 import "../DeleteDom/index.js";
 import "../DeleteDom/_Assets/delete.svg.js";
 import "../DeleteDom/_Assets/delete_bg.png.js";
@@ -91,7 +92,7 @@ import "../../Components/Common/Switcher1.js";
 import "../../Components/Common/CircleButton.js";
 import "../../../vendor/svelte/transition/index.js";
 import "../../../vendor/svelte/easing/index.js";
-class lo {
+class co {
   constructor(o, t) {
     i(this, "revoke");
     i(this, "container");
@@ -145,5 +146,5 @@ class lo {
   }
 }
 export {
-  lo as UIController
+  co as UIController
 };

package/libs/PanoMeasurePlugin/index.js

@@ -1,16 +1,16 @@
 import t from "./Controller/index.js";
 import "three";
-import { Magnifier as ar } from "../shared-utils/three/Magnifier.js";
+import { Magnifier as ur } from "../shared-utils/three/Magnifier.js";
 import "three/examples/jsm/renderers/CSS3DRenderer";
 import "@realsee/five/line";
 import "../shared-utils/tag.js";
 import "../shared-utils/three/THREESphere.js";
 import "animejs";
 import "../vendor/@tweenjs/tween/dist/tween.esm.js.js";
-import { Model as lr } from "./Model/index.js";
-import { default as sr } from "./Model/point.js";
-import { default as Mr } from "./Model/line.js";
-import { Polyline as xr } from "./Model/polyline.js";
+import { Model as Pr } from "./Model/index.js";
+import { default as fr } from "./Model/point.js";
+import { default as gr } from "./Model/line.js";
+import { Polyline as dr } from "./Model/polyline.js";
 import "./Controller/EditController.js";
 import "../shared-utils/throttle.js";
 import "./Controller/BaseController.js";
@@ -31,6 +31,7 @@ import "../shared-utils/three/generatePolygonGeometry.js";
 import "../shared-utils/three/earcut3D.js";
 import "earcut";
 import "../shared-utils/three/getNormal.js";
+import "./utils/isIntersecting.js";
 import "./utils/dom/areaDom.js";
 import "../shared-utils/three/geometryUtil.js";
 import "hammerjs";
@@ -44,7 +45,6 @@ import "../shared-utils/Subscribe.js";
 import "../shared-utils/Utils/WorkUtil.js";
 import "../shared-utils/five/transformPosition.js";
 import "../shared-utils/three/temp.js";
-import "./utils/isIntersecting.js";
 import "../shared-utils/three/PointSelector/index.js";
 import "../shared-utils/three/PointSelector/utils/PointSelectorHelper.js";
 import "../shared-utils/three/PointSelector/utils/PointHelper.js";
@@ -69,6 +69,7 @@ import "../CSS3DRenderPlugin/utils/three/CSS3DSprite.js";
 import "../shared-utils/isTouchDevice.js";
 import "../shared-utils/five/getPosition.js";
 import "../shared-utils/five/getRaycasterByNdcPosition.js";
+import "../shared-utils/three/PointSelector/utils/contents.js";
 import "./Modules/DeleteDom/index.js";
 import "./Modules/DeleteDom/_Assets/delete.svg.js";
 import "./Modules/DeleteDom/_Assets/delete_bg.png.js";
@@ -111,15 +112,15 @@ import "./Controller/ShortcutKeyController.js";
 import "../shared-utils/safeObj.js";
 import "../base/BasePlugin.js";
 import "../shared-utils/url/absoluteUrl.js";
-const pr = function(o, r) {
+const er = function(o, r) {
   return new t(o, r);
 };
 export {
-  ar as Magnifier,
-  pr as PanoMeasurePlugin,
-  Mr as PanoMeasurePluginLine,
-  lr as PanoMeasurePluginModel,
-  sr as PanoMeasurePluginPoint,
-  xr as PanoMeasurePluginPolyline,
-  pr as default
+  ur as Magnifier,
+  er as PanoMeasurePlugin,
+  gr as PanoMeasurePluginLine,
+  Pr as PanoMeasurePluginModel,
+  fr as PanoMeasurePluginPoint,
+  dr as PanoMeasurePluginPolyline,
+  er as default
 };

package/libs/PanoMeasurePlugin/utils/isIntersecting.d.ts

@@ -11,5 +11,5 @@ interface Line3D {
  * @description 判断线段是否相交
  * @todo ai写的一些变量名起的比较怪，懒得改了
  */
-export default function isIntersecting(line1: Line3D, line2: Line3D | Line3D[]): boolean;
+export declare function isIntersecting(line1: Line3D, line2: Line3D | Line3D[]): boolean;
 export {};

package/libs/PanoMeasurePlugin/utils/isIntersecting.js

@@ -1,25 +1,48 @@
-function m(t, n) {
-  const e = Array.isArray(n) ? n : [n];
-  for (let o = 0; o < e.length; o++) {
-    const x = e[o], r = t.start, u = t.end, s = x.start, i = x.end;
-    if (c(r, s) || c(r, i) || c(u, s) || c(u, i) || c(r, u))
-      continue;
-    const z = f(r, u, s), d = f(r, u, i), l = f(s, i, r), h = f(s, i, u);
-    if (z !== d && l !== h || z === 0 && a(r, u, s) || d === 0 && a(r, u, i) || l === 0 && a(s, i, r) || h === 0 && a(s, i, u))
+function a(n, t) {
+  const s = Array.isArray(t) ? t : [t];
+  for (let u = 0; u < s.length; u++) {
+    const r = n.start, e = n.end, c = s[u].start, o = s[u].end;
+    if (!(f(r, c) || f(r, o) || f(e, c) || f(e, o) || f(r, e)) && d([r.x, r.y, r.z], [e.x, e.y, e.z], [c.x, c.y, c.z], [o.x, o.y, o.z]))
       return !0;
   }
   return !1;
 }
-function c(t, n) {
-  return t.x === n.x && t.z === n.z && t.y === n.y;
+function d(n, t, s, u) {
+  const r = [t[0] - n[0], t[1] - n[1], t[2] - n[2]], e = [u[0] - s[0], u[1] - s[1], u[2] - s[2]], c = [
+    [r[0], -e[0]],
+    [r[1], -e[1]],
+    [r[2], -e[2]]
+  ], o = [s[0] - n[0], s[1] - n[1], s[2] - n[2]], i = g(c, o);
+  if (i === null)
+    return !1;
+  const [x, z] = i;
+  return !!(y(x) && y(z));
 }
-function f(t, n, e) {
-  const o = (e.z - t.z) * (n.x - t.x) - (n.z - t.z) * (e.x - t.x);
-  return o === 0 ? 0 : o < 0 ? 2 : 1;
+function g(n, t) {
+  if (q(n) === 0)
+    return null;
+  const u = I(n);
+  return V(u, t);
 }
-function a(t, n, e) {
-  return n.x <= Math.max(t.x, e.x) && n.x >= Math.min(t.x, e.x) && n.z <= Math.max(t.z, e.z) && n.z >= Math.min(t.z, e.z);
+function q(n) {
+  return n[0][0] * n[1][1] - n[0][1] * n[1][0];
+}
+function I(n) {
+  const t = n[0][0] * n[1][1] - n[0][1] * n[1][0];
+  return [
+    [n[1][1] / t, -n[0][1] / t],
+    [-n[1][0] / t, n[0][0] / t]
+  ];
+}
+function V(n, t) {
+  return [n[0][0] * t[0] + n[0][1] * t[1], n[1][0] * t[0] + n[1][1] * t[1]];
+}
+function y(n) {
+  return n >= 0 && n <= 1;
+}
+function f(n, t) {
+  return n.x === t.x && n.y === t.y && n.z === t.z;
 }
 export {
-  m as default
+  a as isIntersecting
 };

package/libs/Sculpt/Meshes/Line.d.ts

@@ -33,6 +33,7 @@ export declare class LineMesh extends IObject3D {
     points: THREE.Vector3[];
     lengthDoms: LightTag[];
     get style(): LineMeshStyle;
+    get opacity(): number;
     get lineWidth(): number;
     get color(): THREE.Color;
     get dashed(): boolean;