@realsee/dnalogel 3.11.0-dev.0 → 3.11.0

package/libs/AreaMakerPlugin/typing.d.ts

@@ -80,6 +80,14 @@ export type AreaMakerItemEventMap = {
         target: AreaMakerItem;
         nativeEvent: MouseEvent;
     }) => void;
+    /**
+     * @description: 标注标签没有被遮挡，自动展示
+     */
+    tagShow: () => void;
+    /**
+     * @description: 标注标签被模型遮挡，自动隐藏
+     */
+    tagHide: () => void;
 };
 /** 动画相关的配置 */
 export interface AnimeOptions {

package/libs/AreaMakerPlugin/utils/Item.d.ts

@@ -44,7 +44,7 @@ export declare class AreaMakerItem {
     /** 标注标签实例 */
     tagApp: LabelItem | null;
     /** 标注标签是否可见 */
-    tagVisible: boolean;
+    tagVisible: boolean | null;
     /** 标注标签的世界坐标 */
     tagPosition: THREE.Vector3;
     /** 标注标签的 NDC 坐标 */

package/libs/AreaMakerPlugin/utils/Item.js

@@ -76,7 +76,7 @@ class it {
     /** 标注标签实例 */
     i(this, "tagApp");
     /** 标注标签是否可见 */
-    i(this, "tagVisible", !0);
+    i(this, "tagVisible", null);
     /** 标注标签的世界坐标 */
     i(this, "tagPosition", new a.Vector3());
     /** 标注标签的 NDC 坐标 */
@@ -127,14 +127,14 @@ class it {
         this.makerObject.material.opacity = o, this.outline.material.opacity = l;
         return;
       }
-      return new Promise((p) => {
+      return new Promise((m) => {
         this.opacityAnime = new T({ makerObjectOpacity: s, outlineOpacity: r }).to({
           makerObjectOpacity: o,
           outlineOpacity: l
-        }).onUpdate(({ makerObjectOpacity: m, outlineOpacity: c }) => {
-          this.makerObject.material.opacity = m, this.outline.material.opacity = c, this.plugin.five.needsRender = !0;
-        }).onComplete(() => p(!0)).onDispose(() => {
-          this.makerObject.material.opacity = o, this.outline.material.opacity = l, this.plugin.five.needsRender = !0, p(!1);
+        }).onUpdate(({ makerObjectOpacity: p, outlineOpacity: c }) => {
+          this.makerObject.material.opacity = p, this.outline.material.opacity = c, this.plugin.five.needsRender = !0;
+        }).onComplete(() => m(!0)).onDispose(() => {
+          this.makerObject.material.opacity = o, this.outline.material.opacity = l, this.plugin.five.needsRender = !0, m(!1);
         }).play();
       });
     });
@@ -182,7 +182,7 @@ class it {
     i(this, "updateTagVisible", () => {
       var s;
       const { result: e, msg: t } = this.checkTagVisible();
-      this.checkMsg.checkTagVisibleMsg = t, this.tagVisible !== e && (this.tagVisible = e, (s = this.tagApp) == null || s.$set({ visible: e }));
+      this.checkMsg.checkTagVisibleMsg = t, this.tagVisible !== e && (this.tagVisible = e, this.tagVisible ? this.hooks.emit("tagShow") : this.hooks.emit("tagHide"), (s = this.tagApp) == null || s.$set({ visible: e }));
     });
     /** 检测标注标签是否可见 */
     i(this, "checkTagVisible", () => {
@@ -210,8 +210,8 @@ class it {
       };
       this.containerResizeTimeoutID && clearTimeout(this.containerResizeTimeoutID), this.containerResizeTimeoutID = setTimeout(t, 100);
     });
-    var p, m, c, g;
-    const s = t.object_data, o = s.bottom_y, r = s.height, l = new a.Color((p = s.color) != null ? p : "#FFFFFF"), h = (m = s.opacity) != null ? m : 0.4;
+    var m, p, c, g;
+    const s = t.object_data, o = s.bottom_y, r = s.height, l = new a.Color((m = s.color) != null ? m : "#FFFFFF"), h = (p = s.opacity) != null ? p : 0.4;
     this.data = t, this.id = t.id, this.name = (c = t.name) != null ? c : "", this.plugin = e, this.height = r, this.bottomY = o, this.opacity = h, this.shape = new a.Shape().fromJSON(s.shape), this.floorIndex = t.floor_index, this.makerObject = new a.Mesh(d(this.shape, r), V(l, h)), u(this.makerObject, o), this.makerObject.material.depthTest = this.plugin.config.modelDepthTest, this.outline = new y(
       new a.EdgesGeometry(this.makerObject.geometry),
       new a.LineBasicMaterial({ color: l, transparent: !0 })
@@ -219,6 +219,8 @@ class it {
   }
   /** 挂载标注 */
   mount() {
+    if (this.mounted)
+      return;
     this.mounted = !0, this.updateVisible(), this.makerObject.material.depthTest = this.plugin.config.modelDepthTest, this.outline.material.depthTest = this.plugin.config.modelDepthTest, this.modelGroup.add(this.makerObject, this.outline);
     const e = !!this.name, t = this.plugin.tagDomContainer;
     if (e) {
@@ -237,7 +239,7 @@ class it {
   /** 卸载标注 */
   unmount() {
     var e, t;
-    this.mounted = !1, this.modelGroup.remove(...this.modelGroup.children), (e = this.tagApp) == null || e.$destroy(), this.tagApp = null, this.plugin.hooks.off("stateChange", this.onPluginStateChange), this.plugin.hooks.off("configChange", this.onPluginConfigChange), this.plugin.five.off("modeChange", this.updateVisible), this.plugin.five.off("modelShownFloorChange", this.updateVisible), this.plugin.five.off("cameraUpdate", this.onFiveCameraUpdate), (t = this.resizeObserver) == null || t.unobserve();
+    this.mounted && (this.mounted = !1, this.modelGroup.remove(...this.modelGroup.children), (e = this.tagApp) == null || e.$destroy(), this.tagApp = null, this.plugin.hooks.off("stateChange", this.onPluginStateChange), this.plugin.hooks.off("configChange", this.onPluginConfigChange), this.plugin.five.off("modeChange", this.updateVisible), this.plugin.five.off("modelShownFloorChange", this.updateVisible), this.plugin.five.off("cameraUpdate", this.onFiveCameraUpdate), (t = this.resizeObserver) == null || t.unobserve());
   }
   /** 更改标注透明度
    * @param opacity 标注透明度，范围：0-1

package/libs/CruisePlugin/BaseController.d.ts

@@ -4,11 +4,9 @@ import type { GuideLinePluginExportType } from '../GuideLinePlugin';
 import * as BasePlugin from '../base/BasePlugin';
 import type { PluginState, EventMap, MoveEffect } from './typing';
 import type { PartialDeep } from 'type-fest';
-import { WorkUtil } from '../shared-utils/Utils/WorkUtil';
 export declare const pluginFlag: (name: string) => string;
 export default abstract class CruiseController<PluginData, Config = unknown> extends BasePlugin.Controller<PluginState, EventMap> {
     state: PluginState;
-    protected workUtil: WorkUtil;
     protected data?: PluginData & {
         id: string | number;
     };

package/libs/CruisePlugin/BaseController.js

@@ -1,35 +1,34 @@
 var c = Object.defineProperty;
 var f = Object.getOwnPropertySymbols;
 var v = Object.prototype.hasOwnProperty, S = Object.prototype.propertyIsEnumerable;
-var p = (a, s, e) => s in a ? c(a, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : a[s] = e, g = (a, s) => {
+var u = (a, s, e) => s in a ? c(a, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : a[s] = e, g = (a, s) => {
   for (var e in s || (s = {}))
-    v.call(s, e) && p(a, e, s[e]);
+    v.call(s, e) && u(a, e, s[e]);
   if (f)
     for (var e of f(s))
-      S.call(s, e) && p(a, e, s[e]);
+      S.call(s, e) && u(a, e, s[e]);
   return a;
 };
-var d = (a, s, e) => (p(a, typeof s != "symbol" ? s + "" : s, e), e);
-var u = (a, s, e) => new Promise((t, i) => {
+var d = (a, s, e) => (u(a, typeof s != "symbol" ? s + "" : s, e), e);
+var p = (a, s, e) => new Promise((t, i) => {
   var r = (h) => {
     try {
       n(e.next(h));
     } catch (o) {
       i(o);
     }
-  }, b = (h) => {
+  }, m = (h) => {
     try {
       n(e.throw(h));
     } catch (o) {
       i(o);
     }
-  }, n = (h) => h.done ? t(h.value) : Promise.resolve(h.value).then(r, b);
+  }, n = (h) => h.done ? t(h.value) : Promise.resolve(h.value).then(r, m);
   n((e = e.apply(a, s)).next());
 });
 import { Controller as y } from "../base/BasePlugin.js";
 import { equal as L } from "../shared-utils/equal.js";
 import { objectAssignDeepExports as C } from "../vendor/object-assign-deep/objectAssignDeep.js";
-import { WorkUtil as P } from "../shared-utils/Utils/WorkUtil.js";
 import "../shared-utils/Subscribe.js";
 import "hammerjs";
 import "three";
@@ -52,10 +51,8 @@ import "../CSS3DRenderPlugin/utils/three/CSS3DGroup.js";
 import "../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
 import "../shared-utils/url/absoluteUrl.js";
 import "../shared-utils/isTruelyObject.js";
-import "../shared-utils/Utils/BaseUtil.js";
-import "../shared-utils/five/transformPosition.js";
-const m = "CruisePlugin", l = `${m}`, Z = (a) => `${l}--${a}`;
-class ee extends y {
+const b = "CruisePlugin", l = `${b}`, R = (a) => `${l}--${a}`;
+class T extends y {
   constructor(e, t) {
     super(e, t);
     d(this, "state", {
@@ -65,7 +62,6 @@ class ee extends y {
       playing: !1,
       speed: 1
     });
-    d(this, "workUtil", new P(this.five));
     d(this, "data");
     d(this, "config");
     d(this, "pauseDataMap", /* @__PURE__ */ new Map());
@@ -84,7 +80,7 @@ class ee extends y {
     d(this, "disableErrorLog", () => {
       console.error(`${l} is disabled`);
     });
-    this.config = t, Object.assign(window, { [`__${m}_DEBUG__`]: this });
+    this.config = t, Object.assign(window, { [`__${b}_DEBUG__`]: this });
   }
   /**
    * @description Play | Continue play. if have been paused, continue play from the pause position; if playing, do nothing
@@ -102,7 +98,7 @@ class ee extends y {
    * @description Show guide line
    */
   show(e) {
-    return u(this, null, function* () {
+    return p(this, null, function* () {
       this.setState({ visible: !0 }, e);
     });
   }
@@ -110,7 +106,7 @@ class ee extends y {
    * @description Hide guide line
    */
   hide(e) {
-    return u(this, null, function* () {
+    return p(this, null, function* () {
       this.setState({ visible: !1 }, e);
     });
   }
@@ -231,6 +227,6 @@ class ee extends y {
   }
 }
 export {
-  ee as default,
-  Z as pluginFlag
+  T as default,
+  R as pluginFlag
 };

package/libs/CruisePlugin/Move.js

@@ -42,9 +42,6 @@ import "../shared-utils/Subscribe.js";
 import "../shared-utils/url/absoluteUrl.js";
 import "../shared-utils/equal.js";
 import "../shared-utils/isTruelyObject.js";
-import "../shared-utils/Utils/WorkUtil.js";
-import "../shared-utils/Utils/BaseUtil.js";
-import "../shared-utils/five/transformPosition.js";
 import "../shared-utils/positionToVector3.js";
 import "../CSS3DRenderPlugin/utils/three/CSS3DRenderer.js";
 import "three/examples/jsm/renderers/CSS3DRenderer";
@@ -60,7 +57,7 @@ import "../CSS3DRenderPlugin/utils/three/CSS3DScene.js";
 import "../CSS3DRenderPlugin/utils/three/CSS3DGroup.js";
 import "../shared-utils/vectorToCoordinate.js";
 import "../shared-utils/formatRad.js";
-class he extends w {
+class re extends w {
   constructor(e, s) {
     var p;
     super(e, s);
@@ -143,5 +140,5 @@ class he extends w {
   }
 }
 export {
-  he as default
+  re as default
 };

package/libs/CruisePlugin/Work.d.ts

@@ -78,7 +78,11 @@ export default class WalkController extends CruiseController<PluginData, Config>
     protected setPauseData(): Map<string | number, {
         fiveState: Partial<State>;
         id?: string | number;
-        playedProgress: number;
+        playedProgress: number; /**
+         * privateState.playing 和 state.playing 的区别：
+         * state.playing 先为true，然后才 handleplay，handleplay方法内会检查privateState.playing，如果已经开始（privateState.playing === true），就不执行操作，如果为false，就执行操作
+         * 其实就是加了一个不允许重复执行handleplay的逻辑
+         */
         duration?: number;
     }>;
     /**