@realsee/dnalogel 3.2.0-dev.4 → 3.2.0-dev.6

package/libs/GuideLinePlugin/GuideLineModeItem.js

@@ -13,7 +13,7 @@ import "../PanoTagPlugin/controller/index.js";
 import "./Components/Tag.js";
 import "./utils/index.js";
 import "../vendor/object-assign-deep/objectAssignDeep.js";
-import { GuideLineModeItem as Vi } from "./GuideLineModeItem/index.js";
+import { GuideLineModeItem as Wi } from "./GuideLineModeItem/index.js";
 import "../vendor/polyline-normals/index.js";
 import "../vendor/polyline-miter-util/index.js";
 import "../vendor/gl-vec2/add.js";
@@ -72,6 +72,7 @@ import "../shared-utils/five/calculateThreeMouse.js";
 import "../PanoTagPlugin/utils/tag/adaptConfig.js";
 import "../shared-utils/typescript/entries.js";
 import "../shared-utils/url/getUrl.js";
+import "../shared-utils/five/transformPosition.js";
 import "../shared-utils/five/getFloorIndex.js";
 import "../shared-utils/safeObj.js";
 import "../PanoTagPlugin/Components/TagContainer.js";
@@ -152,5 +153,5 @@ import "../shared-utils/three/GLTFLoader.js";
 import "@realsee/five/gltf-loader";
 import "../shared-utils/five/fiveModelLoad.js";
 export {
-  Vi as GuideLineModeItem
+  Wi as GuideLineModeItem
 };

package/libs/GuideLinePlugin/index.js

@@ -1,6 +1,6 @@
 import t from "./Controller.js";
-import { GuideLineItem$1 as ft } from "./GuideLineItem/index.js";
-import { GuideLineModeItem$1 as st } from "./GuideLineModeItem/index.js";
+import { GuideLineItem$1 as lt } from "./GuideLineItem/index.js";
+import { GuideLineModeItem$1 as It } from "./GuideLineModeItem/index.js";
 import "../base/BasePluginWithData.js";
 import "../base/BasePlugin.js";
 import "../shared-utils/Subscribe.js";
@@ -85,6 +85,7 @@ import "../shared-utils/five/calculateThreeMouse.js";
 import "../PanoTagPlugin/utils/tag/adaptConfig.js";
 import "../shared-utils/typescript/entries.js";
 import "../shared-utils/url/getUrl.js";
+import "../shared-utils/five/transformPosition.js";
 import "../shared-utils/five/getFloorIndex.js";
 import "../shared-utils/safeObj.js";
 import "../PanoTagPlugin/Components/TagContainer.js";
@@ -168,10 +169,10 @@ import "./utils/index.js";
 import "../shared-utils/to.js";
 import "../shared-utils/five/changeMode.js";
 import "../shared-utils/nearlyEqual.js";
-const Gt = (i, o) => new t(i, o);
+const Lt = (i, o) => new t(i, o);
 export {
-  ft as GuideLineItem,
-  st as GuideLineModeItem,
-  Gt as GuideLinePlugin,
-  Gt as default
+  lt as GuideLineItem,
+  It as GuideLineModeItem,
+  Lt as GuideLinePlugin,
+  Lt as default
 };

package/libs/PanoTagPlugin/controller/TagComputer.js

@@ -1,30 +1,30 @@
-var w = Object.defineProperty, E = Object.defineProperties;
+var B = Object.defineProperty, E = Object.defineProperties;
 var $ = Object.getOwnPropertyDescriptors;
-var k = Object.getOwnPropertySymbols;
-var L = Object.prototype.hasOwnProperty, O = Object.prototype.propertyIsEnumerable;
-var M = (m, e, i) => e in m ? w(m, e, { enumerable: !0, configurable: !0, writable: !0, value: i }) : m[e] = i, y = (m, e) => {
+var C = Object.getOwnPropertySymbols;
+var w = Object.prototype.hasOwnProperty, O = Object.prototype.propertyIsEnumerable;
+var k = (m, e, i) => e in m ? B(m, e, { enumerable: !0, configurable: !0, writable: !0, value: i }) : m[e] = i, g = (m, e) => {
   for (var i in e || (e = {}))
-    L.call(e, i) && M(m, i, e[i]);
-  if (k)
-    for (var i of k(e))
-      O.call(e, i) && M(m, i, e[i]);
+    w.call(e, i) && k(m, i, e[i]);
+  if (C)
+    for (var i of C(e))
+      O.call(e, i) && k(m, i, e[i]);
   return m;
-}, D = (m, e) => E(m, $(e));
-import * as U from "three";
-import { is3DTag as z, isMediaModelTag as R } from "../utils/tag/tagCheck.js";
-import { getTagCenterPosition as I, getTagPosition as Z } from "../utils/tagPosition.js";
-import { checkRange as b } from "../utils/checkRange.js";
-import { isPanoramaLike as h, isModelLike as H } from "../../shared-utils/five/mode.js";
+}, M = (m, e) => E(m, $(e));
+import * as j from "three";
+import { is3DTag as L, isMediaModelTag as D } from "../utils/tag/tagCheck.js";
+import { getTagCenterPosition as x, getTagPosition as z } from "../utils/tagPosition.js";
+import { checkRange as p } from "../utils/checkRange.js";
+import { isPanoramaLike as b, isModelLike as Z } from "../../shared-utils/five/mode.js";
 import "hammerjs";
 import "@realsee/five";
 import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
-import { notNil as N } from "../../shared-utils/isNil.js";
-import { TagUtil as q } from "./TagUtil.js";
-import { getFloorIndex as W } from "../../shared-utils/five/getFloorIndex.js";
-import { safeObj as j } from "../../shared-utils/safeObj.js";
-import { toArray as X } from "../../shared-utils/util.js";
+import { notNil as H } from "../../shared-utils/isNil.js";
+import { TagUtil as N } from "./TagUtil.js";
+import { getFloorIndex as q } from "../../shared-utils/five/getFloorIndex.js";
+import { safeObj as R } from "../../shared-utils/safeObj.js";
+import { toArray as W } from "../../shared-utils/util.js";
 import "../../shared-utils/three/centerPoint.js";
 import "../../shared-utils/positionToVector3.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DRenderer.js";
@@ -63,8 +63,9 @@ import "../../shared-utils/five/calculateThreeMouse.js";
 import "../utils/tag/adaptConfig.js";
 import "../../shared-utils/typescript/entries.js";
 import "../../shared-utils/url/getUrl.js";
-const T = new U.Raycaster();
-class Je extends q {
+import "../../shared-utils/five/transformPosition.js";
+const I = new j.Raycaster();
+class Je extends N {
   constructor(e) {
     super(e);
   }
@@ -72,12 +73,12 @@ class Je extends q {
    * @description: 获取是否可见
    */
   getVisible(e, i) {
-    const l = y(y({}, this.five.getCurrentState()), i), { panoIndex: t, mode: n } = l, f = h(n) ? this.getPanoIndexCache({ panoIndex: t, id: e.id }) : void 0;
+    const l = g(g({}, this.five.getCurrentState()), i), { panoIndex: t, mode: n } = l, f = b(n) ? this.getPanoIndexCache({ panoIndex: t, id: e.id }) : void 0;
     if ((f == null ? void 0 : f.visible) !== void 0)
       return f.visible;
     {
-      const s = [], d = (() => {
-        var r, c, u;
+      const s = [], u = (() => {
+        var r, c, v;
         const o = (r = e.config.visibleConfig) != null ? r : {};
         if (typeof o == "function")
           return { value: o(this.five, { tag: e, distance: this.getDistance(e) }), checkedList: s, reason: "config function result" };
@@ -87,8 +88,8 @@ class Je extends q {
           return { value: !0, checkedList: s, reason: "config.keep is visible" };
         if (o.visibleFiveMode !== void 0) {
           const a = typeof o.visibleFiveMode == "function" ? o.visibleFiveMode(e) : o.visibleFiveMode;
-          let v = !1;
-          if (Array.isArray(a) ? v = a.includes(n) : a === "ModelLike" ? v = H(n) : a === "PanoramaLike" ? v = !h(n) : a === "all" ? v = !0 : typeof a == "string" && (v = a === n), v === !1)
+          let d = !1;
+          if (Array.isArray(a) ? d = a.includes(n) : a === "ModelLike" ? d = Z(n) : a === "PanoramaLike" ? d = !b(n) : a === "all" ? d = !0 : typeof a == "string" && (d = a === n), d === !1)
             return {
               value: !1,
               checkedList: s,
@@ -99,7 +100,7 @@ class Je extends q {
         }
         if (o.followModelVisibility === !0 && (n === "Floorplan" || n === "Mapview") && this.getVisibleByFloorIndex(e) === !1)
           return { value: !1, checkedList: s, reason: "followModelVisibility check failed" };
-        if (h(n) && o.visiblePanoIndex !== void 0 && o.visiblePanoIndex !== "all" && t !== void 0) {
+        if (b(n) && o.visiblePanoIndex !== void 0 && o.visiblePanoIndex !== "all" && t !== void 0) {
           if (s.push("visiblePanoIndex"), Array.isArray(o.visiblePanoIndex) && !o.visiblePanoIndex.includes(t))
             return {
               value: !1,
@@ -110,22 +111,22 @@ class Je extends q {
             return {
               value: !1,
               checkedList: s,
-              reason: `current panoIndex is not equal to tag.panoIndex. currentPanoIndex: ${t}, tag.panoIndex: ${(u = e.fiveState) == null ? void 0 : u.panoIndex}`
+              reason: `current panoIndex is not equal to tag.panoIndex. currentPanoIndex: ${t}, tag.panoIndex: ${(v = e.fiveState) == null ? void 0 : v.panoIndex}`
             };
         }
         if (o.visibleDistance !== void 0 && (s.push("visibleDistance"), o.visibleDistance !== "unLimited")) {
           const a = this.getDistance(e);
-          if (b(a, o.visibleDistance) === !1)
+          if (p(a, o.visibleDistance) === !1)
             return {
               value: !1,
               checkedList: s,
               reason: `distance is not in visibleDistance. distance: ${a}, visibleDistance: ${o.visibleDistance}`
             };
         }
-        if (h(n) && o.angleRange && z(e)) {
+        if (b(n) && o.angleRange && L(e)) {
           s.push("angleRange");
           const a = this.getAngle(e);
-          if (b(a, o.angleRange) === !1)
+          if (p(a, o.angleRange) === !1)
             return { value: !1, checkedList: s, reason: `angle is not in angleRange. angle: ${a}, angleRange: ${o.angleRange}` };
         }
         if (o.intersectRaycaster !== !1 && (typeof o.intersectRaycaster != "object" || o.intersectRaycaster.enabled !== !1)) {
@@ -145,7 +146,7 @@ class Je extends q {
           reason: "all check passed"
         };
       })();
-      return f && (f.visible = d.value, f.__debug_visible_reason__ = d), d.value;
+      return f && (f.visible = u.value, f.__debug_visible_reason__ = u), u.value;
     }
   }
   /**
@@ -168,7 +169,7 @@ class Je extends q {
           return !1;
         if (n.keep === "unfolded")
           return !0;
-        if (n.unfoldDistance && b(this.getDistance(e), n.unfoldDistance) === !1)
+        if (n.unfoldDistance && p(this.getDistance(e), n.unfoldDistance) === !1)
           return !1;
       })();
       t.unfolded = f;
@@ -194,24 +195,24 @@ class Je extends q {
           return;
         if (t.autoUnfold.strategy === "ScreenPostion") {
           const f = this.getTagProject(e);
-          if (f && b(f.x, t.autoUnfold.autoUnfoldProjectX) === !1)
+          if (f && p(f.x, t.autoUnfold.autoUnfoldProjectX) === !1)
             return !1;
         }
         if (t.autoUnfold.strategy === "MinimumDistance") {
-          const d = this.filterPointTag.filter((r) => this.getCurrentVisibleState(r)).filter((r) => {
+          const u = this.filterPointTag.filter((r) => this.getCurrentVisibleState(r)).filter((r) => {
             const c = this.getTagProject(r);
             if (!c)
               return !1;
-            const { x: u, y: a, z: v } = c;
-            return !(Math.abs(v) > 1 || Math.abs(u) > 1 || Math.abs(a) > 1);
+            const { x: v, y: a, z: d } = c;
+            return !(Math.abs(d) > 1 || Math.abs(v) > 1 || Math.abs(a) > 1);
           }).map((r) => ({ tag: r, id: r.id, tagConfig: this.getTagConfig(r).unfoldedConfig })).filter(({ tag: r, tagConfig: c }) => {
-            var u, a;
-            return !(typeof c == "function" || c.keep || c.autoUnfold === !1 || ((u = c.autoUnfold) == null ? void 0 : u.enable) === !1 || ((a = c.autoUnfold) == null ? void 0 : a.strategy) !== "MinimumDistance");
-          }).map((r) => D(y({}, r), { distance: this.getDistance(r.tag) })).filter(({ distance: r, tagConfig: c }) => {
-            const u = c.autoUnfold.distance;
-            return !(u && b(r, u) === !1);
+            var v, a;
+            return !(typeof c == "function" || c.keep || c.autoUnfold === !1 || ((v = c.autoUnfold) == null ? void 0 : v.enable) === !1 || ((a = c.autoUnfold) == null ? void 0 : a.strategy) !== "MinimumDistance");
+          }).map((r) => M(g({}, r), { distance: this.getDistance(r.tag) })).filter(({ distance: r, tagConfig: c }) => {
+            const v = c.autoUnfold.distance;
+            return !(v && p(r, v) === !1);
           }).sort((r, c) => r.distance - c.distance).findIndex((r) => r.id === e.id);
-          if (d === -1 || d <= ((n = t.autoUnfold.maxNumber) != null ? n : 1) - 1 === !1)
+          if (u === -1 || u <= ((n = t.autoUnfold.maxNumber) != null ? n : 1) - 1 === !1)
             return !1;
         }
         return !0;
@@ -265,7 +266,7 @@ class Je extends q {
    * @description 一个点的标签
    */
   getTagProject(e) {
-    const i = I(e);
+    const i = x(e);
     if (!i)
       return;
     const { x: l, y: t, z: n } = i.project(this.five.camera);
@@ -274,36 +275,36 @@ class Je extends q {
   }
   /** 通过射线检测标签可用性 */
   getTagEnableByIntersect(e, i) {
-    var o, r, c, u, a, v;
-    const l = j(j((o = this.getTagConfig(e).visibleConfig) != null ? o : {}).intersectRaycaster), t = i != null ? i : this.five.getCurrentState().panoIndex, n = h(this.five.getCurrentState().mode) ? (r = this.work.observers[t]) == null ? void 0 : r.position : this.five.camera.position;
+    var o, r, c, v, a;
+    const l = R(R((o = this.getTagConfig(e).visibleConfig) != null ? o : {}).intersectRaycaster), t = i != null ? i : this.five.getCurrentState().panoIndex, n = b(this.five.getCurrentState().mode) ? this.getObserverPosition(t) : this.five.camera.position;
     if (n === void 0)
       return { value: !1, reason: { type: "startPosition is undefined", fivePanoIndex: t } };
-    const f = X(
+    const f = W(
       (() => {
-        var g;
-        const p = (g = l.checkPoints) != null ? g : "center";
-        return p === "center" ? I(e) : p === "corner" ? Z(e) : Array.isArray(p) ? p : [];
+        var h;
+        const d = (h = l.checkPoints) != null ? h : "center";
+        return d === "center" ? x(e) : d === "corner" ? z(e) : Array.isArray(d) ? d : [];
       })()
     );
-    let s = 0, d = 0;
-    for (const p of f) {
-      const g = new U.Vector3().subVectors(p, n).normalize();
-      T.set(n, g);
-      const _ = n.distanceTo(p), [P] = this.five.model.intersectRaycaster(T), x = (() => {
-        if (!R(e))
+    let s = 0, u = 0;
+    for (const d of f) {
+      const h = new j.Vector3().subVectors(d, n).normalize();
+      I.set(n, h);
+      const U = n.distanceTo(d), [y] = this.five.model.intersectRaycaster(I), P = (() => {
+        if (!D(e))
           return;
-        const S = this.tags.filter(R).map((B) => {
-          var C;
-          return (C = B.model) == null ? void 0 : C.object;
-        }).filter(N), [V] = T.intersectObjects(S, !0);
-        return V;
-      })(), F = (c = l.distanceAccuracy) != null ? c : 0.01;
-      Math.min((u = P == null ? void 0 : P.distance) != null ? u : 1 / 0, (a = x == null ? void 0 : x.distance) != null ? a : 1 / 0) + F >= _ ? s++ : d++;
-      const A = (v = l.needPassed) != null ? v : 1;
-      if (s >= A)
+        const A = this.tags.filter(D).map((V) => {
+          var T;
+          return (T = V.model) == null ? void 0 : T.object;
+        }).filter(H), [S] = I.intersectObjects(A, !0);
+        return S;
+      })(), _ = (r = l.distanceAccuracy) != null ? r : 0.01;
+      Math.min((c = y == null ? void 0 : y.distance) != null ? c : 1 / 0, (v = P == null ? void 0 : P.distance) != null ? v : 1 / 0) + _ >= U ? s++ : u++;
+      const F = (a = l.needPassed) != null ? a : 1;
+      if (s >= F)
         return { value: !0 };
     }
-    return d === 0 ? { value: !0 } : {
+    return u === 0 ? { value: !0 } : {
       value: !1,
       reason: {
         type: "intersectRaycaster check failed",
@@ -314,10 +315,10 @@ class Je extends q {
   }
   /** 检测是否匹配当前楼层 */
   getVisibleByFloorIndex(e) {
-    var n, f, s, d, o, r, c;
+    var n, f, s, u, o, r, c;
     let i = 0;
     const l = (n = e.fiveState) == null ? void 0 : n.panoIndex;
-    l !== void 0 ? i = (f = this.work.observers[l]) == null ? void 0 : f.floorIndex : i = W(this.work.observers, (c = (r = (d = (s = e.model) == null ? void 0 : s.object) == null ? void 0 : d.position) != null ? r : (o = e.mediaPlane) == null ? void 0 : o.position) != null ? c : I(e));
+    l !== void 0 ? i = (f = this.work.observers[l]) == null ? void 0 : f.floorIndex : i = q(this.work, (c = (r = (u = (s = e.model) == null ? void 0 : s.object) == null ? void 0 : u.position) != null ? r : (o = e.mediaPlane) == null ? void 0 : o.position) != null ? c : x(e));
     const t = this.five.model.shownFloor;
     return t === null || t === i;
   }

package/libs/PanoTagPlugin/controller/TagRender.js

@@ -74,6 +74,7 @@ import "../../shared-utils/five/calculateThreeMouse.js";
 import "../utils/tag/adaptConfig.js";
 import "../../shared-utils/typescript/entries.js";
 import "../../shared-utils/url/getUrl.js";
+import "../../shared-utils/five/transformPosition.js";
 import "../../shared-utils/five/getFloorIndex.js";
 import "../../shared-utils/safeObj.js";
 import "../../shared-utils/three/loadTexture.js";
@@ -158,7 +159,7 @@ import "../../CSS3DRenderPlugin/Controller.js";
 import "../../CSS3DRenderPlugin/utils/waitFiveModelLoaded.js";
 import "@realsee/five/gltf-loader";
 const q = /* @__PURE__ */ new Map(), B = /* @__PURE__ */ new Map();
-class hi extends x {
+class ui extends x {
   constructor(t) {
     super(t);
     P(this, "group", new y());
@@ -464,5 +465,5 @@ class hi extends x {
   }
 }
 export {
-  hi as TagRender
+  ui as TagRender
 };

package/libs/PanoTagPlugin/controller/TagUtil.d.ts

@@ -1,4 +1,4 @@
-import type { TagInstance, TagContentType, StickType, TagId, TagConfig, PlaneTag, MediaStore } from '../typings';
+import type { TagInstance, TagContentType, StickType, TagId, TagConfig, PlaneTag, MediaStore, Position } from '../typings';
 import * as THREE from 'three';
 import type { Tag, Tags, PointTagInstance, Point3DTag } from '../typings';
 import { TagCache } from './TagCache';
@@ -10,6 +10,8 @@ import { FiveDomEvents } from '../../shared-utils/five/FiveDomEvents';
 export declare abstract class TagUtil extends TagCache {
     tags: TagInstance[];
     config: Pick<Tags, 'globalConfig' | 'contentTypeConfig'>;
+    set workCode(workCode: string);
+    get workCode(): string;
     protected get work(): import("@realsee/five").Work;
     protected mediaStore: MediaStore;
     /** css3DRenderPlugin */
@@ -25,6 +27,7 @@ export declare abstract class TagUtil extends TagCache {
         disposed: boolean;
     };
     protected domEvents: FiveDomEvents;
+    private _workCode;
     protected constructor(five: Five);
     getTagById<C extends TagContentType = TagContentType, S extends StickType = StickType>(id: TagId): TagInstance<C, S> | undefined;
     /** 暂停当前标签内进行的所有多媒体 */
@@ -40,6 +43,7 @@ export declare abstract class TagUtil extends TagCache {
      * @description 获取标签当前状态
      */
     getCurrentVisibleState(tag: TagInstance): boolean;
+    protected getObserverPosition: (index: number) => THREE.Vector3;
     protected loadVideoFirstFrame: () => void;
     protected updateTagConfig(): void;
     protected can<T extends Tag>(action: 'show' | 'hide' | 'fold' | 'unfold', paramsTag: T): boolean;
@@ -52,7 +56,7 @@ export declare abstract class TagUtil extends TagCache {
      * @description: 获取距离
      */
     protected getDistance(tag: TagInstance, fiveState?: Partial<FiveState>): number;
-    protected getPositions(tag: TagInstance): [THREE.Vector3, THREE.Vector3, THREE.Vector3, THREE.Vector3] | [import("../typings").ArrayPosition, import("../typings").ArrayPosition, import("../typings").ArrayPosition, import("../typings").ArrayPosition];
+    protected getPositions(tag: TagInstance): [Position, Position, Position, Position];
     protected addObjectClickHandler(tag: TagInstance, object: THREE.Object3D | undefined, handler: (event: Event) => any): () => void;
     protected getTagNormal(tag: TagInstance): THREE.Vector3 | undefined;
     protected get filterPointTag(): PointTagInstance[];
@@ -60,6 +64,7 @@ export declare abstract class TagUtil extends TagCache {
     protected get filterImagePlane(): TagInstance<"MediaPlane", "Plane">[];
     protected get filterMediaModel(): TagInstance<"MediaModel", "Model">[];
     protected get filterCSS3DTag(): (TagInstance<"Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", "Plane"> | TagInstance<"Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", "Model"> | TagInstance<"Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", "3DPoint">)[];
+    protected getTransformedPostion(position: Tag['position']): THREE.Vector3 | [THREE.Vector3, THREE.Vector3, THREE.Vector3, THREE.Vector3];
     /**
      * @description 检查是否已经销毁
      * @returns isDisposed; 已经销毁返回 true，否则返回 false