@realsee/dnalogel 2.16.0-10 → 2.16.0-11

package/libs/PanoTagPlugin/controller/TagComputer.js

@@ -12,16 +12,15 @@ var y = (d, f, e) => f in d ? B(d, f, { enumerable: !0, configurable: !0, writab
 }, P = (d, f) => U(d, M(f));
 var T = (d, f, e) => (y(d, typeof f != "symbol" ? f + "" : f, e), e);
 import * as C from "three";
-import { isMediaModelTag as h, is3DTag as j } from "../utils/tag/tagCheck.js";
+import { isMediaModelTag as m, is3DTag as j } from "../utils/tag/tagCheck.js";
 import { tagPosition as V } from "../utils/tagPosition.js";
 import { checkRange as g } from "../utils/checkRange.js";
 import "@realsee/five";
 import "hammerjs";
-import "@tweenjs/tween.js";
+import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
 import { notNil as k } from "../../shared-utils/isNil.js";
-import "../../shared-utils/animationFrame/BetterTween.js";
 import { TagUtil as S } from "./TagUtil.js";
 import "../../CSS3DRenderPlugin/utils/positionToVector3.js";
 import "../../shared-utils/three/centerPoint.js";
@@ -37,8 +36,7 @@ import "../../CSS3DRenderPlugin/utils/three/CSS3DObject.js";
 import "../../CSS3DRenderPlugin/utils/three/OpacityMesh.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DScene.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DGroup.js";
-import "../../shared-utils/animationFrame/index.js";
-import "object-assign-deep";
+import "../../vendor/object-assign-deep/objectAssignDeep.js";
 import "../tag.config.js";
 import "../utils/planeNormal.js";
 import "../utils/normalPositionToPositions.js";
@@ -49,15 +47,18 @@ import "../../vendor/svelte/store/index.js";
 import "../../vendor/svelte/internal/index.js";
 import "../utils/device.js";
 import "../../shared-utils/threex/domevents/index.js";
-class ge extends S {
+class he extends S {
   constructor(e) {
     super(e);
     T(this, "raycaster", new C.Raycaster());
   }
+  /**
+   * @description: 获取是否可见
+   */
   getVisibleByPanoIndex(e, i) {
     var t;
     const n = this.getCache({ panoIndex: i, id: e.id }), s = (t = this.five.panoIndex) != null ? t : i;
-    if (h(e))
+    if (m(e))
       return !0;
     if (n.visible !== void 0)
       return n.visible;
@@ -122,6 +123,7 @@ class ge extends S {
     const s = n == null ? void 0 : n.visibleFiveMode;
     return s ? s.includes(i) : i === "Panorama";
   }
+  /** 检测是否匹配当前楼层 */
   getVisibleByFloorIndex(e) {
     var l;
     const i = e.fiveState;
@@ -130,14 +132,19 @@ class ge extends S {
     const n = i.panoIndex, s = (l = this.five.work.observers[n]) == null ? void 0 : l.floorIndex, t = this.five.model.shownFloor;
     return t === null || t === s;
   }
+  /**
+   * @description 获取标签当前状态
+   * @return (this.state.visible && tag.state.visible) ?? true
+   */
   getCurrentVisibleState(e) {
     var i;
     return (i = this.state.visible && e.state.visible) != null ? i : !0;
   }
   getVisible(e) {
-    const i = this.five.getCurrentState(), n = this.getVisibleByFiveMode(e, i.mode), s = h(e) ? this.getVisibleByFloorIndex(e) : !0, t = i.mode === "Panorama" ? this.getVisibleByPanoIndex(e, i.panoIndex) : !0;
+    const i = this.five.getCurrentState(), n = this.getVisibleByFiveMode(e, i.mode), s = m(e) ? this.getVisibleByFloorIndex(e) : !0, t = i.mode === "Panorama" ? this.getVisibleByPanoIndex(e, i.panoIndex) : !0;
     return n && t && s;
   }
+  /** 获取当前点位上模型中的多媒体是否应该展示 */
   getModelMedialVisibleByPanoIndex(e) {
     if (!this.getCurrentVisibleState(e))
       return !1;
@@ -150,6 +157,9 @@ class ge extends S {
     const t = this.getTagEnableByIntersect(e, s);
     return n.modelMedialVisible = t.value, n.__debug_visible_reason__ = t, t.value !== !1;
   }
+  /**
+   * @description: 获取是否展开
+   */
   getUnfoldedByPanoIndex(e, i) {
     if (!this.getVisibleByPanoIndex(e))
       return;
@@ -176,11 +186,14 @@ class ge extends S {
       return r !== void 0 ? r : s.unfolded;
     }
   }
+  /**
+   * @description: 获取是否展开
+   */
   getUnfoldedByCamera(e) {
     return this.getVisibleByPanoIndex(e) ? (() => {
       var l;
       const s = this.getDistance(e), t = this.getTagConfig(e).unfoldedConfig;
-      if (!!t) {
+      if (t) {
         if (typeof t == "function")
           return t(this.five, { tag: e, distance: s });
         if (t.keep === "folded")
@@ -199,8 +212,8 @@ class ge extends S {
             const o = this.getTagProject(a);
             if (!o)
               return !1;
-            const { x: c, y: b, z: m } = o;
-            return !(Math.abs(m) > 1 || Math.abs(c) > 1 || Math.abs(b) > 1);
+            const { x: c, y: b, z: h } = o;
+            return !(Math.abs(h) > 1 || Math.abs(c) > 1 || Math.abs(b) > 1);
           }).map((a) => ({ tag: a, id: a.id, tagConfig: this.getTagConfig(a).unfoldedConfig })).filter(({ tag: a, tagConfig: o }) => {
             var c, b;
             return !(typeof o != "object" || o.keep || o.autoUnfold === !1 || ((c = o.autoUnfold) == null ? void 0 : c.enable) === !1 || ((b = o.autoUnfold) == null ? void 0 : b.strategy) !== "MinimumDistance");
@@ -221,6 +234,9 @@ class ge extends S {
       return s === void 0 || t === void 0 ? 0 : t - s;
     });
   }
+  /**
+   * @description: 一个点的标签
+   */
   setPointTagPosition() {
     const e = this.filterPointTag;
     e.length !== 0 && e.forEach((i) => {
@@ -253,7 +269,7 @@ class ge extends S {
     const e = this.five.getCurrentState().mode;
     this.tags.forEach((i) => {
       var s;
-      if (!h(i))
+      if (!m(i))
         return;
       if (!((s = i.model) != null && s.object)) {
         i.mediaVisible = !1;
@@ -266,12 +282,15 @@ class ge extends S {
   setUnfoldedByPanoIndex() {
     this.tags.forEach((e) => {
       const i = this.getUnfoldedByPanoIndex(e);
-      if (!!e.state && (i !== void 0 && (e.state.unfolded = i), i && !e.state.visible)) {
+      if (e.state && (i !== void 0 && (e.state.unfolded = i), i && !e.state.visible)) {
         const n = this.getTagConfig(e);
         typeof n.unfoldedConfig == "object" && n.unfoldedConfig.autoUnfoldWhenHide !== !1 && (e.state.unfolded = !1);
       }
     });
   }
+  /**
+   * @description: 一个点的标签
+   */
   getTagProject(e) {
     if (!this.getVisibleByPanoIndex(e))
       return;
@@ -282,14 +301,15 @@ class ge extends S {
     if (!(l > 1))
       return { x: s, y: t, z: l };
   }
+  /** 通过射线检测标签可用性 */
   getTagEnableByIntersect(e, i) {
     var v, p, a;
     const n = (v = this.getTagConfig(e).visibleConfig) != null ? v : {}, s = this.getDistance(e), [t] = this.five.model.intersectRaycaster(i), l = (() => {
-      if (!h(e))
+      if (!m(e))
         return;
-      const o = this.tags.filter(h).map((b) => {
-        var m;
-        return (m = b.model) == null ? void 0 : m.object;
+      const o = this.tags.filter(m).map((b) => {
+        var h;
+        return (h = b.model) == null ? void 0 : h.object;
       }).filter(k);
       return i.intersectObjects(o, !0)[0];
     })(), r = (() => {
@@ -302,6 +322,7 @@ class ge extends S {
         customModelIntersection.point is ${l == null ? void 0 : l.point.toArray()}, minIntersectionDistance is ${u}`
     } : { value: !0, reason: "" };
   }
+  /** 获取点位看向标签的射线 */
   getRaycasterFromPanoIndex(e, i) {
     var l;
     const n = (l = this.five.work.observers[i]) == null ? void 0 : l.position;
@@ -315,5 +336,5 @@ class ge extends S {
   }
 }
 export {
-  ge as TagComputer
+  he as TagComputer
 };

package/libs/PanoTagPlugin/controller/TagRender.js

@@ -33,7 +33,7 @@ import "../utils/tagPosition.js";
 import "../../shared-utils/three/loadTexture.js";
 import "../utils/checkRange.js";
 import "hammerjs";
-import "@tweenjs/tween.js";
+import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DRenderer.js";
 import "three/examples/jsm/renderers/CSS3DRenderer";
@@ -47,10 +47,8 @@ import "../../CSS3DRenderPlugin/utils/three/CSS3DScene.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DGroup.js";
 import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
 import "../../shared-utils/isNil.js";
-import "../../shared-utils/animationFrame/BetterTween.js";
-import "../../shared-utils/animationFrame/index.js";
 import "./TagUtil.js";
-import "object-assign-deep";
+import "../../vendor/object-assign-deep/objectAssignDeep.js";
 import "../tag.config.js";
 import "../utils/planeNormal.js";
 import "../utils/normalPositionToPositions.js";
@@ -71,7 +69,7 @@ import "../Components/Common/Icon/Icon.js";
 import "../utils/getImageInfo.js";
 import "../utils/px2rem.js";
 import "../Assets/Icon.js";
-import "classnames";
+import "../../vendor/classnames/index.js";
 import "../Components/Tag/TextTag/index.js";
 import "../Components/Tag/TextTag/TextTag.js";
 import "../Components/Common/Line/Straight.js";
@@ -109,13 +107,14 @@ import "../../vendor/svelte-carousel/src/utils/page.js";
 import "../../vendor/svelte-carousel/src/utils/clones.js";
 import "../../vendor/svelte-carousel/src/utils/object.js";
 import "../../vendor/svelte-carousel/src/components/Carousel/createCarousel.js";
-import "../../vendor/simply-reactive/src/simply-reactive.js";
-import "lodash.get";
-import "lodash.clonedeep";
-import "../../vendor/simply-reactive/src/utils/subscription.js";
-import "../../vendor/simply-reactive/src/utils/object.js";
-import "lodash.isequal";
-import "../../vendor/simply-reactive/src/utils/watcher.js";
+import "../../vendor/easy-reactive/src/simply-reactive.js";
+import "../../vendor/lodash.get/index.js";
+import "../../_commonjsHelpers.js";
+import "../../vendor/lodash.clonedeep/index.js";
+import "../../vendor/easy-reactive/src/utils/subscription.js";
+import "../../vendor/easy-reactive/src/utils/object.js";
+import "../../vendor/lodash.isequal/index.js";
+import "../../vendor/easy-reactive/src/utils/watcher.js";
 import "../../vendor/svelte-carousel/src/utils/lazy.js";
 import "../../vendor/svelte-carousel/src/utils/ProgressManager.js";
 import "../../vendor/svelte-carousel/src/utils/interval.js";
@@ -133,15 +132,19 @@ import "../Components/Tag/LinkTag.js";
 import "../Components/Tag/CustomTag.js";
 import "../../CSS3DRenderPlugin/Controller.js";
 import "../../CSS3DRenderPlugin/utils/waitFiveModelLoaded.js";
-class Qe extends O {
+class Le extends O {
   constructor(t) {
     super(t);
     d(this, "group", new P());
     d(this, "imagePlaneGroup", new P());
     d(this, "gltfObjectGroup", new P());
+    /** 维护一个可用模型表，用于快速删除不应该在场景中的模型 */
     d(this, "enabledModelTagSet", /* @__PURE__ */ new Set());
+    /** 临时状态 */
     d(this, "temporaryState", { visible: !0 });
+    /** 点标签 */
     d(this, "TagContainerSvelte");
+    /** 加载外部模型 */
     d(this, "loadModel", (t) => D(this, null, function* () {
       var s;
       const e = t.data.modelUrl;
@@ -173,9 +176,15 @@ class Qe extends O {
       (i = (e = t.imagePlane) == null ? void 0 : e.parent) == null || i.remove(t.imagePlane);
     }), this.tags = [], this.enabledModelTagSet.clear(), this.clearCache(), this.disposeAllCSS3DContainer(), this.updateRenderAllTags();
   }
+  /**
+   * @description: 更新所有标签
+   */
   updateRenderAllTags() {
     this.enabledModelTagSet.clear(), this.tags.forEach((t) => t.stickType === "Model" && this.enabledModelTagSet.add(t.id)), this.updateRenderPointTag(), this.updateRender3DDomTag(), this.updateRenderModelTag(), this.updateRenderImagePlane();
   }
+  /**
+   * @description: 渲染图片贴片
+   */
   updateRenderImagePlane() {
     this.sort(this.filterImagePlane).forEach((e) => {
       var n, a, s, r;
@@ -186,6 +195,9 @@ class Qe extends O {
       e.imagePlane = new R(i, o), e.imagePlane.setMatrixByCornerPoints(o), this.imagePlaneGroup.add(e.imagePlane);
     });
   }
+  /**
+   * @description: 渲染3D贴片
+   */
   updateRender3DDomTag() {
     this.sort([...this.filterCSS3DTag]).forEach((e) => {
       var i, o;
@@ -200,7 +212,7 @@ class Qe extends O {
         if (((i = e.state) == null ? void 0 : i.visible) === !1)
           return;
         if (this.css3DRenderPlugin || (this.css3DRenderPlugin = E(this.five)), e.stickType === "3DPoint" && !e.normal)
-          return console.error("updateRenderPlaneTag: \u4E09\u7EF4\u70B9\u6807\u7B7E\u7F3A\u5C11\u6CD5\u5411\u91CF\uFF01");
+          return console.error("updateRenderPlaneTag: 三维点标签缺少法向量！");
         const n = this.getPositions(e);
         if (!n)
           return;
@@ -230,6 +242,7 @@ class Qe extends O {
             props: {
               tag: e,
               hooks: this.hooks,
+              /** 模型标签要等模型加载好之后再展示 */
               state: this.state,
               mediaStore: this.mediaStore,
               temporaryState: this.temporaryState
@@ -242,6 +255,13 @@ class Qe extends O {
       }
     }), this.clearUnusedPanelTag();
   }
+  /** 更新所有模型标签
+   *
+   * 1. 移除不应该在场景中的模型
+   * 2. 更新模型的可见性
+   *
+   * FIXME: 有性能问题，但是之前的逻辑都是这么写，暂时先这样吧
+   */
   updateRenderModelTag() {
     const t = (i) => !this.enabledModelTagSet.has(i.customID);
     this.gltfObjectGroup.remove(...this.gltfObjectGroup.children.filter(t)), this.tags.filter(S).forEach((i) => {
@@ -257,6 +277,10 @@ class Qe extends O {
       t.imagePlane && (t.imagePlane.visible = this.getCurrentVisibleState(t)), (e = t.model) != null && e.object && (t.model.object.visible = this.getCurrentVisibleState(t));
     });
   }
+  /** 更新标签中多媒体面片的位置
+   * @param tag 标签
+   * @param model 模型
+   */
   updateTagCss3DObjectMatrix(t, e) {
     var C, v, M, y;
     const i = (M = (v = (C = t.mergedConfig) == null ? void 0 : C.tag3DConfig) == null ? void 0 : v.ratio) != null ? M : 216e-5, o = (y = t.tag3DContentSvelte) == null ? void 0 : y.domContainer.css3DObject;
@@ -269,12 +293,16 @@ class Qe extends O {
     const c = o.opacityMesh;
     c && g.decompose(c.position, c.quaternion, c.scale);
   }
+  /** 添加模型标签 */
   addMediaModelTag(t) {
     return D(this, null, function* () {
       const e = t.filter(S).map((i) => this.loadModel(i));
       yield Promise.all(e), this.setModelMedialVisible(), this.updateRenderAllTags();
     });
   }
+  /**
+   * @description: 渲染单个点的标签
+   */
   updateRenderPointTag() {
     var e;
     const t = this.sort(this.filterPointTag);
@@ -310,6 +338,9 @@ class Qe extends O {
       e == null || e.forEach((i) => i == null ? void 0 : i());
     this.store.css3DRenderDisposer = /* @__PURE__ */ new Map();
   }
+  /**
+   * @description: 检查并销毁不用的3D贴片
+   */
   clearUnusedPanelTag() {
     this.filter2DPointTag.forEach((t) => {
       var e;
@@ -322,5 +353,5 @@ class Qe extends O {
   }
 }
 export {
-  Qe as TagRender
+  Le as TagRender
 };

package/libs/PanoTagPlugin/controller/TagUtil.js

@@ -1,7 +1,7 @@
 var T = Object.defineProperty;
 var y = (c, u, e) => u in c ? T(c, u, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[u] = e;
 var a = (c, u, e) => (y(c, typeof u != "symbol" ? u + "" : u, e), e);
-import D from "object-assign-deep";
+import { objectAssignDeepExports as D } from "../../vendor/object-assign-deep/objectAssignDeep.js";
 import * as C from "three";
 import { DefaultConfig as w } from "../tag.config.js";
 import { anyPositionToVector3 as E, arrayPositionToVector3 as p } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
@@ -15,8 +15,7 @@ import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
 import "@realsee/five";
 import "hammerjs";
-import "@tweenjs/tween.js";
-import "../../shared-utils/animationFrame/BetterTween.js";
+import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import { isMediaPlaneTag as x, isMediaModelTag as v, isPlaneTag as V } from "../utils/tag/tagCheck.js";
 import { DomEvents as L } from "../../shared-utils/threex/domevents/index.js";
 import "@realsee/five/gltf-loader";
@@ -34,9 +33,8 @@ import "../../CSS3DRenderPlugin/utils/three/CSS3DObject.js";
 import "../../CSS3DRenderPlugin/utils/three/OpacityMesh.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DScene.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DGroup.js";
-import "../../shared-utils/animationFrame/index.js";
 import "../../vendor/svelte/internal/index.js";
-class he extends b {
+class ce extends b {
   constructor(e) {
     super(e);
     a(this, "tags", []);
@@ -44,6 +42,7 @@ class he extends b {
     a(this, "mediaStore", I({
       currentMediaElement: null
     }));
+    /** css3DRenderPlugin */
     a(this, "css3DRenderPlugin");
     a(this, "store", {
       disposers: [],
@@ -74,9 +73,14 @@ class he extends b {
     }
     return i;
   }
+  /** 暂停当前标签内进行的所有多媒体 */
   pauseCurrentMedia() {
     this.mediaStore.set({ currentMediaElement: null });
   }
+  /**
+   * @description: 获取merge后的配置
+   * TODO: 缓存
+   */
   getTagConfig(e) {
     var t, d;
     if (!e)
@@ -115,6 +119,7 @@ class he extends b {
       i.mergedConfig = o;
     });
   }
+  // eslint-disable-next-line complexity
   can(e, i) {
     const o = i, t = this.getTagConfig(o);
     if (!t || typeof t != "object")
@@ -154,6 +159,9 @@ class he extends b {
     } else
       return "Dom";
   }
+  /**
+   * @description: 获取角度
+   */
   getAngle(e, i) {
     var d, l, r;
     const o = (d = this.five.panoIndex) != null ? d : i;
@@ -176,6 +184,9 @@ class he extends b {
       return t.angle = m, t.angle;
     }
   }
+  /**
+   * @description: 获取距离
+   */
   getDistance(e, i) {
     var d, l, r;
     const o = (d = this.five.panoIndex) != null ? d : i;
@@ -229,7 +240,7 @@ class he extends b {
         return;
       }
       const n = s.origDomEvent;
-      !this.mouseInfo || (this.mouseInfo.isDown && this.mouseInfo.x === n.clientX && this.mouseInfo.y === n.clientY && Date.now() - this.mouseInfo.mouseDownTimestamp < 400 && o(n), this.mouseInfo = void 0);
+      this.mouseInfo && (this.mouseInfo.isDown && this.mouseInfo.x === n.clientX && this.mouseInfo.y === n.clientY && Date.now() - this.mouseInfo.mouseDownTimestamp < 400 && o(n), this.mouseInfo = void 0);
     }, r = (s) => {
       if (!t()) {
         this.mouseInfo = void 0;
@@ -248,10 +259,10 @@ class he extends b {
         return;
       }
       const n = s.origDomEvent;
-      !this.mouseInfo || (this.mouseInfo.isDown && this.mouseInfo.x === Math.floor(n.changedTouches[n.changedTouches.length - 1].clientX) && this.mouseInfo.y === Math.floor(n.changedTouches[n.changedTouches.length - 1].clientY) && Date.now() - this.mouseInfo.mouseDownTimestamp < 400 && o(n), this.mouseInfo = void 0);
+      this.mouseInfo && (this.mouseInfo.isDown && this.mouseInfo.x === Math.floor(n.changedTouches[n.changedTouches.length - 1].clientX) && this.mouseInfo.y === Math.floor(n.changedTouches[n.changedTouches.length - 1].clientY) && Date.now() - this.mouseInfo.mouseDownTimestamp < 400 && o(n), this.mouseInfo = void 0);
     };
     return this.domEvents.addEventListener(i, "mousedown", d, !1), this.domEvents.addEventListener(i, "mouseup", l, !1), this.domEvents.addEventListener(i, "touchstart", r, !1), this.domEvents.addEventListener(i, "touchend", f, !1), () => {
-      !this.domEvents || (this.mouseInfo = void 0, this.domEvents.removeEventListener(i, "mousedown", d), this.domEvents.removeEventListener(i, "mouseup", l), this.domEvents.removeEventListener(i, "touchstart", r), this.domEvents.removeEventListener(i, "touchend", f));
+      this.domEvents && (this.mouseInfo = void 0, this.domEvents.removeEventListener(i, "mousedown", d), this.domEvents.removeEventListener(i, "mouseup", l), this.domEvents.removeEventListener(i, "touchstart", r), this.domEvents.removeEventListener(i, "touchend", f));
     };
   }
   getTagNormal(e) {
@@ -262,6 +273,7 @@ class he extends b {
     if (e.stickType === "Model")
       return g(this.getPositions(e));
   }
+  // TODO: 优化点：下面这些函数，调用比较频繁，可以按点位加缓存
   get filterPointTag() {
     return this.tags.filter((e) => e.stickType === "2DPoint" || e.stickType === "3DPoint").filter((e) => e.position);
   }
@@ -288,10 +300,14 @@ class he extends b {
       return o === "BehindDom" || o === "Dom";
     });
   }
+  /**
+   * @description 检查是否已经销毁
+   * @returns isDisposed; 已经销毁返回 true，否则返回 false
+   */
   checkDisposed() {
     return this.store.disposed ? (console.error("PanoTagPluginController has been disposed"), !0) : !1;
   }
 }
 export {
-  he as TagUtil
+  ce as TagUtil
 };