@realsee/dnalogel 3.54.1 → 3.54.2

package/libs/PanoVideoPlugin/VideoMeshController.js

@@ -8,6 +8,7 @@ import "hammerjs";
 import "../shared-utils/three/PointSelector/index.js";
 import "three/examples/jsm/renderers/CSS3DRenderer";
 import "@realsee/five/line";
+import "../shared-utils/three/core/Five_LineMaterial2.js";
 import "../shared-utils/three/core/Sphere.js";
 import A from "animejs";
 import { requestAnimationFrameInterval as D } from "../shared-utils/animationFrame/index.js";
@@ -45,20 +46,22 @@ import "../CSS3DRenderPlugin/utils/createResizeObserver.js";
 import "../shared-utils/three/PointSelector/utils/PointHelper2.js";
 import "../Sculpt/Meshes/Line.js";
 import "../Sculpt/typings/style.js";
-import "../shared-utils/five/FiveLine.js";
 import "../shared-utils/three/IObject3D.js";
 import "../Sculpt/utils/removeAllTag.js";
 import "../Sculpt/utils/Meshes/getLengthHTML.js";
 import "../shared-utils/three/applyObjectMatrixWorld.js";
 import "../shared-utils/util.js";
 import "../shared-utils/three/core/LineGeometry.js";
+import "../shared-utils/three/core/LineMaterial.js";
+import "../shared-utils/three/core/Line2.js";
+import "../shared-utils/three/core/LineMaterial2.js";
 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 "@realsee/five";
-class Ci {
+class Gi {
   /** 初始化视频、模型以及相关事件监听。 */
   constructor(i, e) {
     t(this, "video");
@@ -107,8 +110,8 @@ class Ci {
       const h = (f = this.five.work) == null ? void 0 : f.observers[this.panoIndex];
       if (!h)
         return this.logWarning(`点位 ${this.panoIndex} 不存在，请检查 Five 数据是否正常。`);
-      const l = h.position.clone(), m = h.quaternion.clone(), u = r.clone();
-      return u.applyAxisAngle(new p(0, 1, 0), Math.PI / 2), u.applyQuaternion(m), u.add(l), u;
+      const m = h.position.clone(), l = h.quaternion.clone(), u = r.clone();
+      return u.applyAxisAngle(new p(0, 1, 0), Math.PI / 2), u.applyQuaternion(l), u.add(m), u;
     });
     /** Five 数据加载后需要根据点位位姿调整点位模型位置 */
     t(this, "onFiveDataLoaded", () => {
@@ -329,10 +332,10 @@ class Ci {
   checkIntersectionInBounding(i, e) {
     if (!e.uv)
       return !1;
-    const [n, o] = e.uv.toArray(), [a, d, s, r] = i, h = 1 - d - r, l = a + s, m = h + r;
-    return n >= a && n <= l && o >= h && o <= m;
+    const [n, o] = e.uv.toArray(), [a, d, s, r] = i, h = 1 - d - r, m = a + s, l = h + r;
+    return n >= a && n <= m && o >= h && o <= l;
   }
 }
 export {
-  Ci as VideoMeshController
+  Gi as VideoMeshController
 };

package/libs/PanoVideoPlugin/index.js

@@ -1,5 +1,5 @@
 import { PanoVideoPluginController as r } from "./Controller.js";
-import { typings as go } from "./typings/index.js";
+import { typings as Vo } from "./typings/index.js";
 import "./VideoMeshController.js";
 import "./utils/shader.js";
 import "../shared-utils/tag.js";
@@ -31,6 +31,7 @@ import "../shared-utils/three/centerPoint.js";
 import "../shared-utils/three/getObjectVisible.js";
 import "@realsee/five/line";
 import "../shared-utils/isNil.js";
+import "../shared-utils/three/core/Five_LineMaterial2.js";
 import "../shared-utils/three/core/Sphere.js";
 import "animejs";
 import "../vendor/@tweenjs/tween/dist/tween.esm.js.js";
@@ -44,13 +45,15 @@ import "../CSS3DRenderPlugin/utils/createResizeObserver.js";
 import "../shared-utils/three/PointSelector/utils/PointHelper2.js";
 import "../Sculpt/Meshes/Line.js";
 import "../Sculpt/typings/style.js";
-import "../shared-utils/five/FiveLine.js";
 import "../shared-utils/three/IObject3D.js";
 import "../Sculpt/utils/removeAllTag.js";
 import "../Sculpt/utils/Meshes/getLengthHTML.js";
 import "../shared-utils/three/applyObjectMatrixWorld.js";
 import "../shared-utils/util.js";
 import "../shared-utils/three/core/LineGeometry.js";
+import "../shared-utils/three/core/LineMaterial.js";
+import "../shared-utils/three/core/Line2.js";
+import "../shared-utils/three/core/LineMaterial2.js";
 import "../CSS3DRenderPlugin/utils/three/CSS3DSprite.js";
 import "../shared-utils/isTouchDevice.js";
 import "../shared-utils/five/getPosition.js";
@@ -60,9 +63,9 @@ import "../shared-utils/animationFrame/index.js";
 import "./utils/index.js";
 import "../base/BasePlugin.js";
 import "../shared-utils/url/absoluteUrl.js";
-const lo = (o) => new r(o);
+const go = (o) => new r(o);
 export {
-  lo as PanoVideoPlugin,
-  go as PanoVideoPluginType,
-  lo as default
+  go as PanoVideoPlugin,
+  Vo as PanoVideoPluginType,
+  go as default
 };

package/libs/PipelinePlugin/Controller.js

@@ -14,14 +14,14 @@ var m = (c, o, e) => new Promise((t, i) => {
   var s = (a) => {
     try {
       n(e.next(a));
-    } catch (p) {
-      i(p);
+    } catch (h) {
+      i(h);
     }
   }, r = (a) => {
     try {
       n(e.throw(a));
-    } catch (p) {
-      i(p);
+    } catch (h) {
+      i(h);
     }
   }, n = (a) => a.done ? t(a.value) : Promise.resolve(a.value).then(s, r);
   n((e = e.apply(c, o)).next());
@@ -34,6 +34,7 @@ import "../shared-utils/three/PointSelector/index.js";
 import "three/examples/jsm/renderers/CSS3DRenderer";
 import "@realsee/five/line";
 import { notNil as T } from "../shared-utils/isNil.js";
+import "../shared-utils/three/core/Five_LineMaterial2.js";
 import "../shared-utils/three/core/Sphere.js";
 import "animejs";
 import "../vendor/@tweenjs/tween/dist/tween.esm.js.js";
@@ -74,13 +75,15 @@ import "../CSS3DRenderPlugin/utils/createResizeObserver.js";
 import "../shared-utils/three/PointSelector/utils/PointHelper2.js";
 import "../Sculpt/Meshes/Line.js";
 import "../Sculpt/typings/style.js";
-import "../shared-utils/five/FiveLine.js";
 import "../shared-utils/three/IObject3D.js";
 import "../Sculpt/utils/removeAllTag.js";
 import "../Sculpt/utils/Meshes/getLengthHTML.js";
 import "../shared-utils/three/applyObjectMatrixWorld.js";
 import "../shared-utils/util.js";
 import "../shared-utils/three/core/LineGeometry.js";
+import "../shared-utils/three/core/LineMaterial.js";
+import "../shared-utils/three/core/Line2.js";
+import "../shared-utils/three/core/LineMaterial2.js";
 import "../CSS3DRenderPlugin/utils/three/CSS3DSprite.js";
 import "../shared-utils/isTouchDevice.js";
 import "../shared-utils/five/getPosition.js";
@@ -95,7 +98,7 @@ import "../shared-utils/three/Extras/Curves/BezierCurve3.js";
 import "../shared-utils/three/Extras/Core/Interpolations.js";
 import "../shared-utils/three/Extras/Core/Interpolations2.js";
 const g = { flowSpeed: 0.6, rotateSpeed: 0 };
-class Ke extends S {
+class Xe extends S {
   constructor(e) {
     super(e);
     // ==================== public properties ====================
@@ -124,12 +127,12 @@ class Ke extends S {
       const [t] = e, i = t.intersectObjects(this.pipeObjects, !1);
       if (i.length === 0 || !this.data)
         return;
-      const n = i[0].object.customID, a = this.data.pipes.find(({ id: h }) => h === n), p = this.data.pipelines.find((h) => a && h.pipes.includes(a));
-      if (!(!a || !p))
+      const n = i[0].object.customID, a = this.data.pipes.find(({ id: p }) => p === n), h = this.data.pipelines.find((p) => a && p.pipes.includes(a));
+      if (!(!a || !h))
         return this.hooks.emit("tap", {
           intersectObjects: i,
           pipe: a,
-          pipeline: p,
+          pipeline: h,
           wantsFiveTapGestureParams: e
         }), !1;
     });
@@ -155,14 +158,14 @@ class Ke extends S {
     return m(this, null, function* () {
       const r = this.data;
       this.data = yield this.formatData(e, s), this.removeAllPipes(), this.hooks.emit("dataChange", this.data, r), this.pipeObjects = yield Promise.all(
-        this.data.pipes.filter((n) => !!(n != null && n.texture)).map((b) => m(this, [b], function* ({ id: n, texture: a, path: p, radius: h }) {
-          const l = yield this.loadPipeTexture(a), f = { id: n, path: p, textureURL: a, texture: l, geometryConfig: { radius: h } };
+        this.data.pipes.filter((n) => !!(n != null && n.texture)).map((b) => m(this, [b], function* ({ id: n, texture: a, path: h, radius: p }) {
+          const l = yield this.loadPipeTexture(a), f = { id: n, path: h, textureURL: a, texture: l, geometryConfig: { radius: p } };
           return new D(f);
         }))
       ), this.data.pipelines.forEach((n) => {
-        n.pipes.reduce((a, p) => {
-          const h = this.findPipeObjectWithID(p.id);
-          return h == null || h.setInitialDisplacement(a), a + ((h == null ? void 0 : h.pathLength) || 0);
+        n.pipes.reduce((a, h) => {
+          const p = this.findPipeObjectWithID(h.id);
+          return p == null || p.setInitialDisplacement(a), a + ((p == null ? void 0 : p.pathLength) || 0);
         }, 0);
       }), this.hooks.emit("dataLoaded", this.data), this.state.visible === !1 && this.pipeObjects.forEach((n) => n.setOpacity(0)), this.state.enabled && (this.group.add(...this.pipeObjects), this.five.needsRender = !0), t && this.setState(t, { userAction: i });
     });
@@ -258,10 +261,10 @@ class Ke extends S {
    * */
   switchPipelines(e) {
     return m(this, null, function* () {
-      var p, h, b, l, f, w;
+      var h, p, b, l, f, w;
       if (!this.data)
         return;
-      const t = (p = e == null ? void 0 : e.target) != null ? p : null, i = (h = e == null ? void 0 : e.userAction) != null ? h : !0;
+      const t = (h = e == null ? void 0 : e.target) != null ? h : null, i = (p = e == null ? void 0 : e.userAction) != null ? p : !0;
       this.updateState({ target: t }, i);
       const s = { duration: 500 }, r = (l = (b = e == null ? void 0 : e.hideAnime) != null ? b : e == null ? void 0 : e.anime) != null ? l : s, n = (w = (f = e == null ? void 0 : e.showAnime) != null ? f : e == null ? void 0 : e.anime) != null ? w : s, a = {
         target: t,
@@ -375,5 +378,5 @@ class Ke extends S {
   }
 }
 export {
-  Ke as Controller
+  Xe as Controller
 };

package/libs/PipelinePlugin/index.js

@@ -30,6 +30,7 @@ import "../shared-utils/three/centerPoint.js";
 import "../shared-utils/three/getObjectVisible.js";
 import "@realsee/five/line";
 import "../shared-utils/isNil.js";
+import "../shared-utils/three/core/Five_LineMaterial2.js";
 import "../shared-utils/three/core/Sphere.js";
 import "animejs";
 import "../vendor/@tweenjs/tween/dist/tween.esm.js.js";
@@ -43,13 +44,15 @@ import "../CSS3DRenderPlugin/utils/createResizeObserver.js";
 import "../shared-utils/three/PointSelector/utils/PointHelper2.js";
 import "../Sculpt/Meshes/Line.js";
 import "../Sculpt/typings/style.js";
-import "../shared-utils/five/FiveLine.js";
 import "../shared-utils/three/IObject3D.js";
 import "../Sculpt/utils/removeAllTag.js";
 import "../Sculpt/utils/Meshes/getLengthHTML.js";
 import "../shared-utils/three/applyObjectMatrixWorld.js";
 import "../shared-utils/util.js";
 import "../shared-utils/three/core/LineGeometry.js";
+import "../shared-utils/three/core/LineMaterial.js";
+import "../shared-utils/three/core/Line2.js";
+import "../shared-utils/three/core/LineMaterial2.js";
 import "../CSS3DRenderPlugin/utils/three/CSS3DSprite.js";
 import "../shared-utils/isTouchDevice.js";
 import "../shared-utils/five/getPosition.js";
@@ -67,8 +70,8 @@ import "../shared-utils/animationFrame/BetterTween.js";
 import "../shared-utils/three/Extras/Curves/BezierCurve3.js";
 import "../shared-utils/three/Extras/Core/Interpolations.js";
 import "../shared-utils/three/Extras/Core/Interpolations2.js";
-const wr = (r) => new o(r);
+const br = (r) => new o(r);
 export {
-  wr as PipelinePlugin,
-  wr as default
+  br as PipelinePlugin,
+  br as default
 };

package/libs/PipelinePlugin/utils/Objects/FlowPipe.js

@@ -7,6 +7,7 @@ import "hammerjs";
 import "../../../shared-utils/three/PointSelector/index.js";
 import "three/examples/jsm/renderers/CSS3DRenderer";
 import "@realsee/five/line";
+import "../../../shared-utils/three/core/Five_LineMaterial2.js";
 import "../../../shared-utils/three/core/Sphere.js";
 import "animejs";
 import { requestAnimationFrameInterval as c } from "../../../shared-utils/animationFrame/index.js";
@@ -44,13 +45,15 @@ import "../../../CSS3DRenderPlugin/utils/createResizeObserver.js";
 import "../../../shared-utils/three/PointSelector/utils/PointHelper2.js";
 import "../../../Sculpt/Meshes/Line.js";
 import "../../../Sculpt/typings/style.js";
-import "../../../shared-utils/five/FiveLine.js";
 import "../../../shared-utils/three/IObject3D.js";
 import "../../../Sculpt/utils/removeAllTag.js";
 import "../../../Sculpt/utils/Meshes/getLengthHTML.js";
 import "../../../shared-utils/three/applyObjectMatrixWorld.js";
 import "../../../shared-utils/util.js";
 import "../../../shared-utils/three/core/LineGeometry.js";
+import "../../../shared-utils/three/core/LineMaterial.js";
+import "../../../shared-utils/three/core/Line2.js";
+import "../../../shared-utils/three/core/LineMaterial2.js";
 import "../../../CSS3DRenderPlugin/utils/three/CSS3DSprite.js";
 import "../../../shared-utils/isTouchDevice.js";
 import "../../../shared-utils/five/getPosition.js";
@@ -80,7 +83,7 @@ const d = (
   }
 `
 );
-class It extends h {
+class yt extends h {
   constructor(t) {
     super(t, d);
     /** 初始状态下，当前水管内的水流在整体管道上的位移
@@ -138,5 +141,5 @@ class It extends h {
   }
 }
 export {
-  It as ObjectFlowPipe
+  yt as ObjectFlowPipe
 };

package/libs/PipelinePlugin/utils/Objects/HighlightPipe.js

@@ -7,6 +7,7 @@ import "hammerjs";
 import "../../../shared-utils/three/PointSelector/index.js";
 import "three/examples/jsm/renderers/CSS3DRenderer";
 import "@realsee/five/line";
+import "../../../shared-utils/three/core/Five_LineMaterial2.js";
 import "../../../shared-utils/three/core/Sphere.js";
 import "animejs";
 import { tweenProgress as h } from "../../../shared-utils/animationFrame/BetterTween.js";
@@ -44,13 +45,15 @@ import "../../../CSS3DRenderPlugin/utils/createResizeObserver.js";
 import "../../../shared-utils/three/PointSelector/utils/PointHelper2.js";
 import "../../../Sculpt/Meshes/Line.js";
 import "../../../Sculpt/typings/style.js";
-import "../../../shared-utils/five/FiveLine.js";
 import "../../../shared-utils/three/IObject3D.js";
 import "../../../Sculpt/utils/removeAllTag.js";
 import "../../../Sculpt/utils/Meshes/getLengthHTML.js";
 import "../../../shared-utils/three/applyObjectMatrixWorld.js";
 import "../../../shared-utils/util.js";
 import "../../../shared-utils/three/core/LineGeometry.js";
+import "../../../shared-utils/three/core/LineMaterial.js";
+import "../../../shared-utils/three/core/Line2.js";
+import "../../../shared-utils/three/core/LineMaterial2.js";
 import "../../../CSS3DRenderPlugin/utils/three/CSS3DSprite.js";
 import "../../../shared-utils/isTouchDevice.js";
 import "../../../shared-utils/five/getPosition.js";
@@ -61,7 +64,7 @@ import "../../../shared-utils/animationFrame/index.js";
 import "../../../shared-utils/three/Extras/Curves/BezierCurve3.js";
 import "../../../shared-utils/three/Extras/Core/Interpolations.js";
 import "../../../shared-utils/three/Extras/Core/Interpolations2.js";
-class vi extends a {
+class Pi extends a {
   constructor(i) {
     super(i);
     p(this, "imageCount", 64);
@@ -84,5 +87,5 @@ class vi extends a {
   }
 }
 export {
-  vi as ObjectHighlightPipe
+  Pi as ObjectHighlightPipe
 };

package/libs/PipelinePlugin/utils/Objects/Pipe.js

@@ -32,6 +32,7 @@ import "hammerjs";
 import "../../../shared-utils/three/PointSelector/index.js";
 import "three/examples/jsm/renderers/CSS3DRenderer";
 import "@realsee/five/line";
+import "../../../shared-utils/three/core/Five_LineMaterial2.js";
 import "../../../shared-utils/three/core/Sphere.js";
 import "animejs";
 import { BetterTween as g } from "../../../shared-utils/animationFrame/BetterTween.js";
@@ -69,13 +70,15 @@ import "../../../CSS3DRenderPlugin/utils/createResizeObserver.js";
 import "../../../shared-utils/three/PointSelector/utils/PointHelper2.js";
 import "../../../Sculpt/Meshes/Line.js";
 import "../../../Sculpt/typings/style.js";
-import "../../../shared-utils/five/FiveLine.js";
 import "../../../shared-utils/three/IObject3D.js";
 import "../../../Sculpt/utils/removeAllTag.js";
 import "../../../Sculpt/utils/Meshes/getLengthHTML.js";
 import "../../../shared-utils/three/applyObjectMatrixWorld.js";
 import "../../../shared-utils/util.js";
 import "../../../shared-utils/three/core/LineGeometry.js";
+import "../../../shared-utils/three/core/LineMaterial.js";
+import "../../../shared-utils/three/core/Line2.js";
+import "../../../shared-utils/three/core/LineMaterial2.js";
 import "../../../CSS3DRenderPlugin/utils/three/CSS3DSprite.js";
 import "../../../shared-utils/isTouchDevice.js";
 import "../../../shared-utils/five/getPosition.js";

package/libs/Sculpt/Meshes/Cylinder.js

@@ -16,9 +16,10 @@ import "../../shared-utils/tag.js";
 import "hammerjs";
 import "../../shared-utils/three/PointSelector/index.js";
 import "three/examples/jsm/renderers/CSS3DRenderer";
+import { anyPositionToVector3 as C } from "../../shared-utils/positionToVector3.js";
 import "@realsee/five/line";
 import { notNil as f } from "../../shared-utils/isNil.js";
-import { anyPositionToVector3 as C } from "../../shared-utils/positionToVector3.js";
+import "../../shared-utils/three/core/Five_LineMaterial2.js";
 import "../../shared-utils/three/core/Sphere.js";
 import "animejs";
 import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
@@ -26,7 +27,7 @@ import "../../shared-utils/five/FivePuppet.js";
 import { CircleWithEdgeMesh as c } from "./CircleWithEdge.js";
 import { radiusToSegments as M } from "../utils/radiusToSegments.js";
 import { ColoredMesh as _ } from "../utils/three/ColoredMesh.js";
-class D extends b {
+class F extends b {
   constructor(t) {
     super();
     o(this, "bottomCircle");
@@ -93,5 +94,5 @@ class D extends b {
   }
 }
 export {
-  D as CylinderMesh
+  F as CylinderMesh
 };

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

@@ -1,11 +1,11 @@
 import * as THREE from 'three';
 import { type OcclusionStyle, type LineStyle, type lengthConfig, type DisplayInfoConfig } from '../typings/style';
-import { THREE_Line2 } from '../../shared-utils/five/FiveLine';
 import { type AnyPositions } from '../../shared-utils/positionToVector3';
 import { IObject3D } from '../../shared-utils/three/IObject3D';
 import type { PointsData } from '../utils/data';
 import { LightTag } from '../../shared-utils/tag';
 import { LineGeometry } from '../../shared-utils/three/core/LineGeometry';
+import { THREE_Line2 } from '../../shared-utils/three/core/Line2';
 export type LineMeshStyle = LineStyle & {
     dashed?: boolean;
 } & OcclusionStyle & Partial<lengthConfig> & Partial<DisplayInfoConfig>;
@@ -27,8 +27,8 @@ export declare class LineMesh extends IObject3D {
     set geometry(geometry: LineGeometry);
     get geometry(): LineGeometry;
     private _geometry;
-    protected line: THREE_Line2;
-    protected backLine: THREE_Line2;
+    protected line1: THREE_Line2;
+    protected line2: THREE_Line2;
     private opacityBeforeHighlight;
     private paramsStyle;
     private lastRenderDomItem;