@realsee/dnalogel 3.64.12 → 3.64.14

package/libs/MeasurePlugin/Controller.js

@@ -1,39 +1,38 @@
-var D = Object.defineProperty, _ = Object.defineProperties;
-var L = Object.getOwnPropertyDescriptors;
+var C = Object.defineProperty, L = Object.defineProperties;
+var F = Object.getOwnPropertyDescriptors;
 var w = Object.getOwnPropertySymbols;
-var C = Object.prototype.hasOwnProperty, k = Object.prototype.propertyIsEnumerable;
-var E = (a, s, e) => s in a ? D(a, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : a[s] = e, y = (a, s) => {
-  for (var e in s || (s = {}))
-    C.call(s, e) && E(a, e, s[e]);
+var k = Object.prototype.hasOwnProperty, H = Object.prototype.propertyIsEnumerable;
+var b = (h, l, e) => l in h ? C(h, l, { enumerable: !0, configurable: !0, writable: !0, value: e }) : h[l] = e, y = (h, l) => {
+  for (var e in l || (l = {}))
+    k.call(l, e) && b(h, e, l[e]);
   if (w)
-    for (var e of w(s))
-      k.call(s, e) && E(a, e, s[e]);
-  return a;
-}, P = (a, s) => _(a, L(s));
-var i = (a, s, e) => (E(a, typeof s != "symbol" ? s + "" : s, e), e);
-import * as h from "three";
+    for (var e of w(l))
+      H.call(l, e) && b(h, e, l[e]);
+  return h;
+}, P = (h, l) => L(h, F(l));
+var i = (h, l, e) => (b(h, typeof l != "symbol" ? l + "" : l, e), e);
+import * as c from "three";
 import "../shared-utils/tag.js";
 import "../vendor/hammerjs/hammer.js";
-import { Subscribe as F } from "../shared-utils/Subscribe.js";
-import { PointSelector as H } from "../shared-utils/three/PointSelector/index.js";
+import { Subscribe as T } from "../shared-utils/Subscribe.js";
+import { PointSelector as I } from "../shared-utils/three/PointSelector/index.js";
 import "../shared-utils/three/CSS3DRenderer/index.js";
 import "../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
-import { IObject3D as I } from "../shared-utils/three/IObject3D.js";
-import "@realsee/five/line";
-import "../shared-utils/three/core/Five_LineMaterial2.js";
+import { LineMesh as D } from "../Sculpt/Meshes/Line.js";
 import "../shared-utils/three/core/Sphere.js";
 import "../vendor/animejs/lib/anime.es.js";
 import { FiveDomEvents as x } from "../shared-utils/five/FiveDomEvents.js";
 import "../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../shared-utils/five/FivePuppet.js";
-import { MeasureMesh as T } from "./utils/MeasureMesh.js";
-import { PointMesh as U } from "../Sculpt/Meshes/Point.js";
-import { LineWithDotsMesh as b } from "../Sculpt/Meshes/LineWithDots.js";
+import { MeasureMesh as U } from "./utils/MeasureMesh.js";
+import { PointMesh as _ } from "../Sculpt/Meshes/Point.js";
+import { LineWithDotsMesh as V } from "../Sculpt/Meshes/LineWithDots.js";
 import { hotkeys as d } from "../vendor/hotkeys-js/dist/hotkeys.esm.js";
-import { PolygonMesh as V } from "../Sculpt/Meshes/Polygon.js";
-import { validatePolygon as z } from "./utils/validatePolygon.js";
-import { Cursor as A } from "../Sculpt/utils/Modules/Cursor.js";
-import { THREERaycaster as R } from "../shared-utils/three/core/Raycaster.js";
+import { PolygonMesh as z } from "../Sculpt/Meshes/Polygon.js";
+import { validatePolygon as A } from "./utils/validatePolygon.js";
+import { IObject3D as R } from "../shared-utils/three/IObject3D.js";
+import { Cursor as B } from "../Sculpt/utils/Modules/Cursor.js";
+import { THREERaycaster as N } from "../shared-utils/three/core/Raycaster.js";
 import "../shared-utils/positionToVector3.js";
 import "../shared-utils/five/vector3ToScreen.js";
 import "../shared-utils/five/getFiveModel.js";
@@ -46,6 +45,8 @@ import "../shared-utils/dom/resizeObserver.js";
 import "../shared-utils/five/fiveEveryReadyListener.js";
 import "../shared-utils/throttle.js";
 import "../shared-utils/five/fiveModelLoad.js";
+import "@realsee/five/line";
+import "../shared-utils/three/core/Five_LineMaterial2.js";
 import "../shared-utils/three/PointSelector/utils/PointSelectorHelper.js";
 import "../shared-utils/three/Magnifier.js";
 import "../shared-utils/three/PointSelector/utils/PointHelper.js";
@@ -61,7 +62,7 @@ import "../shared-utils/CSS3DRender/index.js";
 import "../shared-utils/CSS3DRender/CSS3DRenderer.js";
 import "../shared-utils/createResizeObserver.js";
 import "../shared-utils/three/PointSelector/utils/PointHelper2.js";
-import "../Sculpt/Meshes/Line.js";
+import "../CSS3DRenderPlugin/utils/three/CSS3DSprite.js";
 import "../Sculpt/typings/style.js";
 import "../Sculpt/utils/Meshes/getLengthHTML.js";
 import "../shared-utils/three/applyObjectMatrixWorld.js";
@@ -72,7 +73,6 @@ import "../shared-utils/three/core/Line2.js";
 import "../shared-utils/three/core/LineMaterial2.js";
 import "../Sculpt/utils/unit.js";
 import "../Sculpt/utils/renderDom.js";
-import "../CSS3DRenderPlugin/utils/three/CSS3DSprite.js";
 import "../shared-utils/isTouchDevice.js";
 import "../shared-utils/five/getPosition.js";
 import "../shared-utils/five/getRaycasterByNdcPosition.js";
@@ -88,7 +88,7 @@ import "../PanoMeasurePlugin/utils/isIntersecting.js";
 import "../Sculpt/utils/three/ColoredMesh.js";
 import "../shared-utils/three/geometryUtil.js";
 import "../shared-utils/three/vectorIsEqual.js";
-class at extends F {
+class pt extends T {
   constructor(e, t) {
     super();
     i(this, "name", "MeasurePlugin");
@@ -114,48 +114,58 @@ class at extends F {
      * @description 开始测量
      */
     i(this, "measure", () => {
-      this.listener.addMeasureListener(), this.listener.removeClickListener(), this.group.children.forEach((n) => n.unselect()), this.cursor.removeDeleteButton();
-      const e = new T({
+      this.listener.addMeasureListener(), this.listener.removeClickListener(), this.group.children.forEach((r) => r.unselect()), this.cursor.removeDeleteButton();
+      const e = new U({
         lineStyle: this.lineStyle,
         polygonStyle: this.polygonStyle
       });
-      this.currentMeasureMesh = e, this.pointSelector.actionIfNoIntersection = "disable", this.updateSelectAdsorbedHelper();
-      const t = new U(), r = new b(P(y({}, this.lineStyle), { dashed: !0 })), o = new V(this.polygonStyle), c = new b(P(y({}, this.lineStyle), { lineOpacity: 0.5, dashed: !0 })), p = new b(P(y({}, this.lineStyle), { lineOpacity: 0.5, dashed: !0 })), m = () => {
-        t.removeFromParent(), r.removeFromParent(), o.removeFromParent(), c.removeFromParent(), p.removeFromParent();
+      this.currentMeasureMesh = e, e.line.setStyle({ cssStyle: "pointer-events: none;" }), this.pointSelector.actionIfNoIntersection = "disable", this.updateSelectAdsorbedHelper();
+      const t = new _({ occlusionMode: "depthTest", occlusionVisibility: !0 }), n = new V(P(y({}, this.lineStyle), { dashed: !0, cssStyle: "pointer-events: none;" })), o = new z(this.polygonStyle), a = new D(P(y({}, this.lineStyle), {
+        lineOpacity: 0.5,
+        lineColor: 3407837,
+        dashed: !0,
+        cssStyle: "pointer-events: none; color: #fff; opacity: 0.5;"
+      })), p = new D(P(y({}, this.lineStyle), {
+        lineOpacity: 0.5,
+        lineColor: 3407837,
+        dashed: !0,
+        cssStyle: "pointer-events: none; color: #fff; opacity: 0.5;"
+      })), u = new _({ occlusionMode: "depthTest", occlusionVisibility: !0, color: 3407837, opacity: 0.5 }), f = () => {
+        t.removeFromParent(), n.removeFromParent(), o.removeFromParent(), a.removeFromParent(), p.removeFromParent(), u.removeFromParent();
       };
       this.group.add(e);
-      const v = (n) => {
-        if (!n) {
-          m();
+      const v = (r) => {
+        if (!r) {
+          f();
           return;
         }
-        if (e.points.length === 0 && (this.pointSelector.actionIfNoIntersection = "disable", this.group.addIfNotExists(t), t.position.copy(n.point)), e.points.length >= 1)
-          if (this.pointSelector.actionIfNoIntersection = "virtualPoint", t.removeFromParent(), this.group.addIfNotExists(r), r.setPoints([e.points.at(-1), n.point]), n.isAdsorbed)
-            c.removeFromParent(), p.removeFromParent();
+        if (e.points.length === 0 && (this.pointSelector.actionIfNoIntersection = "disable", this.group.addIfNotExists(t), t.position.copy(r.point)), e.points.length >= 1)
+          if (this.pointSelector.actionIfNoIntersection = "virtualPoint", t.removeFromParent(), this.group.addIfNotExists(n), n.setPoints([e.points.at(-1), r.point]), r.isAdsorbed)
+            a.removeFromParent(), p.removeFromParent(), u.removeFromParent();
           else {
-            const l = e.points.at(-1);
-            if (Math.abs(n.point.y - l.y) > 0.2) {
-              const u = new h.Vector3(n.point.x, l.y, n.point.z);
-              c.setPoints([l, u]), p.setPoints([u, n.point]);
+            const s = e.points.at(-1);
+            if (Math.abs(r.point.y - s.y) > 0.2) {
+              const m = new c.Vector3(r.point.x, s.y, r.point.z);
+              a.setPoints([s, m]), p.setPoints([m, r.point]), u.position.copy(m);
             } else {
-              let u = new h.Vector3();
-              Math.abs(n.point.x - l.x) < Math.abs(n.point.z - l.z) ? u = new h.Vector3(n.point.x, l.y, l.z) : u = new h.Vector3(l.x, l.y, n.point.z), c.setPoints([l, u]), p.setPoints([u, n.point]);
+              let m = new c.Vector3();
+              Math.abs(r.point.x - s.x) < Math.abs(r.point.z - s.z) ? m = new c.Vector3(r.point.x, s.y, s.z) : m = new c.Vector3(s.x, s.y, r.point.z), a.setPoints([s, m]), p.setPoints([m, r.point]), u.position.copy(m);
             }
-            this.group.addIfNotExists(c, p);
+            this.group.addIfNotExists(a, p, u);
           }
         if (e.points.length >= 2) {
-          const l = [...e.points, n.point];
-          z(l) ? (o.setPoints(l), this.group.addIfNotExists(o)) : o.removeFromParent();
+          const s = [...e.points, r.point];
+          A(s) ? (o.setPoints(s), this.group.addIfNotExists(o)) : o.removeFromParent();
         }
-      }, f = (n) => {
-        n && (m(), e.setPoints([...e.points, n.point]), this.updateSelectAdsorbedHelper(), e.isPolygon && this.pointSelector.disable());
-      }, M = () => {
-        var n, l;
-        e == null || e.setPoints(e.points.slice(0, -1)), m(), (l = (n = this.pointSelector.pointSelectorHelper) == null ? void 0 : n.magnifier) == null || l.render(), this.updateSelectAdsorbedHelper(), this.five.needsRender = !0;
+      }, M = (r) => {
+        r && (f(), e.setPoints([...e.points, r.point]), this.updateSelectAdsorbedHelper(), e.isPolygon && this.pointSelector.disable());
       }, g = () => {
-        this.pointSelector.off("intersectionUpdate", v), this.pointSelector.off("select", f), this.pointSelector.off("disable", g), this.off("undo", M), m(), e.points.length < 2 && e.removeFromParent(), e.__five_pano_index = this.five.panoIndex, this.currentMeasureMesh = null, this.listener.addClickListener(), this.listener.removeMeasureListener(), this.emit("measureEnd");
+        var r, s;
+        e == null || e.setPoints(e.points.slice(0, -1)), f(), (s = (r = this.pointSelector.pointSelectorHelper) == null ? void 0 : r.magnifier) == null || s.render(), this.updateSelectAdsorbedHelper(), this.five.needsRender = !0;
+      }, E = () => {
+        this.pointSelector.off("intersectionUpdate", v), this.pointSelector.off("select", M), this.pointSelector.off("disable", E), this.off("undo", g), e.line.setStyle({ cssStyle: "pointer-events: auto;" }), f(), e.points.length < 2 && e.removeFromParent(), e.__five_pano_index = this.five.panoIndex, this.currentMeasureMesh = null, this.listener.addClickListener(), this.listener.removeMeasureListener(), this.emit("measureEnd");
       };
-      this.on("undo", M), this.pointSelector.on("intersectionUpdate", v), this.pointSelector.on("select", f), this.pointSelector.on("disable", g), this.pointSelector.enable();
+      this.on("undo", g), this.pointSelector.on("intersectionUpdate", v), this.pointSelector.on("select", M), this.pointSelector.on("disable", E), this.pointSelector.enable();
     });
     /**
      * @description 结束测量
@@ -198,17 +208,17 @@ class at extends F {
       addClickListener: () => {
         this.group.children.forEach((e) => {
           var t;
-          (t = e.line.doms) == null || t.forEach((r) => {
-            r.container.onclick = (o) => this.onClick({ origDomEvent: o, target: e }), r.container.onmouseenter = () => this.onHover({ target: e }), r.container.onmouseleave = () => this.onUnHover({ target: e });
-          }), e.polygon.areaDom && (e.polygon.areaDom.container.onclick = (r) => this.onClick({ origDomEvent: r, target: e }), e.polygon.areaDom.container.onmouseenter = () => this.onHover({ target: e }), e.polygon.areaDom.container.onmouseleave = () => this.onUnHover({ target: e })), this.fiveDomEvents.addEventListener(e, "click", this.onClick), this.fiveDomEvents.addEventListener(e, "hover", this.onHover), this.fiveDomEvents.addEventListener(e, "unHover", this.onUnHover), this.five.on("panoArrived", this.onMoveToPano), this.five.on("modeChange", this.onModeChange), d("delete, backspace", this.deleteSelectedMesh);
+          (t = e.line.doms) == null || t.forEach((n) => {
+            n.container.onclick = (o) => this.onClick({ origDomEvent: o, target: e }), n.container.onmouseenter = () => this.onHover({ target: e }), n.container.onmouseleave = () => this.onUnHover({ target: e });
+          }), e.polygon.areaDom && (e.polygon.areaDom.container.onclick = (n) => this.onClick({ origDomEvent: n, target: e }), e.polygon.areaDom.container.onmouseenter = () => this.onHover({ target: e }), e.polygon.areaDom.container.onmouseleave = () => this.onUnHover({ target: e })), this.fiveDomEvents.addEventListener(e, "click", this.onClick), this.fiveDomEvents.addEventListener(e, "hover", this.onHover), this.fiveDomEvents.addEventListener(e, "unHover", this.onUnHover), this.five.on("panoArrived", this.onMoveToPano), this.five.on("modeChange", this.onModeChange), d("delete, backspace", this.deleteSelectedMesh);
         });
       },
       removeClickListener: () => {
         this.group.children.forEach((e) => {
-          var t, r;
+          var t, n;
           (t = e.line.doms) == null || t.forEach((o) => {
             o != null && o.container && (o.container.onclick = null, o.container.onmouseenter = null, o.container.onmouseleave = null);
-          }), (r = e.polygon.areaDom) != null && r.container && (e.polygon.areaDom.container.onclick = null, e.polygon.areaDom.container.onmouseenter = null, e.polygon.areaDom.container.onmouseleave = null);
+          }), (n = e.polygon.areaDom) != null && n.container && (e.polygon.areaDom.container.onclick = null, e.polygon.areaDom.container.onmouseenter = null, e.polygon.areaDom.container.onmouseleave = null);
         }), this.fiveDomEvents.clear(), this.five.off("panoArrived", this.onMoveToPano), this.five.off("modeChange", this.onModeChange), d.unbind("delete, backspace");
       },
       // 绘制快捷键
@@ -220,22 +230,22 @@ class at extends F {
       }
     });
     i(this, "onMoveToPano", (e) => {
-      const t = this.group.children.filter((o) => o !== this.currentMeasureMesh), r = new R();
+      const t = this.group.children.filter((o) => o !== this.currentMeasureMesh), n = new N();
       t.forEach((o) => {
         var p;
         if (o.unselect(), o.__five_pano_index === e) {
           o.visible = !0;
           return;
         }
-        ((p = o.line.points) == null ? void 0 : p.some((m) => {
-          var S, u;
-          const v = m.clone().sub(this.five.camera.position).normalize();
-          r.set(this.five.camera.position, v);
-          const f = (u = (S = this.five.model.intersectRaycaster(r, void 0, !0)) == null ? void 0 : S[0]) == null ? void 0 : u.point;
-          if (!f)
+        ((p = o.line.points) == null ? void 0 : p.some((u) => {
+          var s, S;
+          const f = u.clone().sub(this.five.camera.position).normalize();
+          n.set(this.five.camera.position, f);
+          const v = (S = (s = this.five.model.intersectRaycaster(n, void 0, !0)) == null ? void 0 : s[0]) == null ? void 0 : S.point;
+          if (!v)
             return !0;
-          const M = 0.01, g = m.distanceTo(this.five.camera.position);
-          return f.distanceTo(this.five.camera.position) + M > g;
+          const M = 0.01, g = u.distanceTo(this.five.camera.position);
+          return v.distanceTo(this.five.camera.position) + M > g;
         })) ? o.visible = !0 : o.visible = !1, this.five.needsRender = !0;
       });
     });
@@ -245,27 +255,27 @@ class at extends F {
       });
     });
     i(this, "onClick", ({ origDomEvent: e, target: t }) => {
-      const r = t;
-      if (!r)
+      const n = t;
+      if (!n)
         return;
-      if (r.selected) {
-        r.unselect(), this.cursor.removeDeleteButton();
+      if (n.selected) {
+        n.unselect(), this.cursor.removeDeleteButton();
         return;
       }
-      let o, c;
-      if (e instanceof TouchEvent ? (o = e.touches[0].clientX, c = e.touches[0].clientY) : e instanceof MouseEvent && (o = e.clientX, c = e.clientY), o === void 0 || c === void 0)
+      let o, a;
+      if (e instanceof TouchEvent ? (o = e.touches[0].clientX, a = e.touches[0].clientY) : e instanceof MouseEvent && (o = e.clientX, a = e.clientY), o === void 0 || a === void 0)
         return;
-      this.group.children.forEach((m) => m.unselect()), r.select();
+      this.group.children.forEach((u) => u.unselect()), n.select();
       const p = () => {
-        r.removeFromParent(), this.cursor.removeDeleteButton(), this.five.needsRender = !0;
+        n.removeFromParent(), this.cursor.removeDeleteButton(), this.five.needsRender = !0;
       };
       this.cursor.showDeleteButton({
         clientX: o,
-        clientY: c,
+        clientY: a,
         container: this.five.getElement().parentElement,
         onClick: p
       }), this.five.once("cameraUpdate", () => {
-        r.unselect(), this.cursor.removeDeleteButton();
+        n.unselect(), this.cursor.removeDeleteButton();
       });
     });
     i(this, "onHover", ({ target: e }) => {
@@ -292,13 +302,13 @@ class at extends F {
         this.pointSelector.setAdherePoints([this.currentMeasureMesh.points[0]]);
         const e = this.currentMeasureMesh.points.at(-1);
         this.pointSelector.adhereLine = [
-          new h.Line3(new h.Vector3(1, 0, 0).add(e), new h.Vector3(-1, 0, 0).add(e)),
-          new h.Line3(new h.Vector3(0, 1, 0).add(e), new h.Vector3(0, -1, 0).add(e)),
-          new h.Line3(new h.Vector3(0, 0, 1).add(e), new h.Vector3(0, 0, -1).add(e))
+          new c.Line3(new c.Vector3(1, 0, 0).add(e), new c.Vector3(-1, 0, 0).add(e)),
+          new c.Line3(new c.Vector3(0, 1, 0).add(e), new c.Vector3(0, -1, 0).add(e)),
+          new c.Line3(new c.Vector3(0, 0, 1).add(e), new c.Vector3(0, 0, -1).add(e))
         ], this.pointSelector.adherePlane = [];
       }
       if (this.currentMeasureMesh.points.length >= 3) {
-        const e = new h.Plane().setFromCoplanarPoints(
+        const e = new c.Plane().setFromCoplanarPoints(
           this.currentMeasureMesh.points[0],
           this.currentMeasureMesh.points[1],
           this.currentMeasureMesh.points[2]
@@ -307,25 +317,25 @@ class at extends F {
       } else
         this.pointSelector.adherePlane = [];
     });
-    this.five = e, this.config = t != null ? t : { unit: "m" }, this.group = new I(), this.group.name = "MeasureGroup", this.five.scene.add(this.group);
+    this.five = e, this.config = t != null ? t : { unit: "m" }, this.group = new R(), this.group.name = "MeasureGroup", this.five.scene.add(this.group);
   }
   get pointSelector() {
-    return this._pointSelector ? this._pointSelector : (this._pointSelector = new H(this.five, { mode: "cursor", helper: { pointHelper: "highlight" } }), this._pointSelector);
+    return this._pointSelector ? this._pointSelector : (this._pointSelector = new I(this.five, { mode: "cursor", helper: { pointHelper: "highlight" } }), this._pointSelector);
   }
   get fiveDomEvents() {
     return this._fiveDomEvents ? this._fiveDomEvents : (this._fiveDomEvents = new x(this.five, { fiveModels: null }), this._fiveDomEvents);
   }
   get cursor() {
-    return this._cursor ? this._cursor : (this._cursor = new A(), this._cursor);
+    return this._cursor ? this._cursor : (this._cursor = new B(), this._cursor);
   }
   get config() {
     return this._config;
   }
   set config(e) {
-    var t, r;
-    this._config = e, this.lineStyle.lengthUnit = e.unit, this.polygonStyle.lengthUnit = e.unit, (r = (t = this.group) == null ? void 0 : t.children) == null || r.forEach((o) => o.changeConfig({ lineStyle: this.lineStyle, polygonStyle: this.polygonStyle }));
+    var t, n;
+    this._config = e, this.lineStyle.lengthUnit = e.unit, this.polygonStyle.lengthUnit = e.unit, (n = (t = this.group) == null ? void 0 : t.children) == null || n.forEach((o) => o.changeConfig({ lineStyle: this.lineStyle, polygonStyle: this.polygonStyle }));
   }
 }
 export {
-  at as MeasureController
+  pt as MeasureController
 };

package/libs/ModelMakerPlugin/index.d.ts

@@ -3,7 +3,7 @@ import { Controller } from './Controller';
 export declare const ModelMakerPlugin: (five: import("@realsee/five").Five, config?: {
     tagContainerZIndex?: number;
     occlusionVisibility?: boolean | import("@realsee/five").Mode[];
-    occlusionMode?: "translucence" | "depthTest";
+    occlusionMode?: "depthTest" | "translucence";
 }) => ModelMakerPluginType.ModelMakerController;
 export type { Controller as ModelMakerPluginInstance };
 export type { ModelMakerPluginType };

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

@@ -23,7 +23,7 @@ export declare class LineMesh extends IObject3D implements RenderDomObjectType {
     get color(): THREE.Color;
     get dashed(): boolean;
     get occlusionVisibility(): boolean;
-    get occlusionMode(): "translucence" | "depthTest";
+    get occlusionMode(): "depthTest" | "translucence";
     protected highlighted: boolean;
     private get five();
     set geometry(geometry: LineGeometry);