@realsee/dnalogel 3.66.0-alpha.13 → 3.66.0-alpha.14

package/libs/PanoTagPlugin/controller/Tag/BaseTag.d.ts

@@ -91,6 +91,7 @@ export declare abstract class BaseTag<C extends TagContentType = TagContentType,
     entryFromModel?: boolean;
     get sharedCache(): Cache;
     _updating: boolean;
+    hoverEnabled: boolean;
     constructor(plugin: PanoTagPluginController, tagData: TagData);
     /**
      * @description 使 state.visible 生效，但是只是加入渲染队列。等下次渲染时再真正生效
@@ -238,4 +239,12 @@ export declare abstract class BaseTag<C extends TagContentType = TagContentType,
     destroy(): void;
     showPopover(): void;
     hidePopover(): void;
+    /**
+     * 设置 hover 启用状态
+     */
+    setHoverEnabled(enabled: boolean): void;
+    /**
+     * 获取 hover 启用状态
+     */
+    getHoverEnabled(): boolean;
 }

package/libs/PanoTagPlugin/controller/Tag/BaseTag.js

@@ -19,7 +19,7 @@ var A = (c, e) => {
       e.indexOf(t) < 0 && j.call(c, t) && (i[t] = c[t]);
   return i;
 };
-var f = (c, e, i) => (M(c, typeof e != "symbol" ? e + "" : e, i), i);
+var a = (c, e, i) => (M(c, typeof e != "symbol" ? e + "" : e, i), i);
 var P = (c, e, i) => new Promise((t, r) => {
   var s = (n) => {
     try {
@@ -47,17 +47,17 @@ import "../../../shared-utils/three/PointSelector/index.js";
 import { centerPoint as ie } from "../../../shared-utils/three/centerPoint.js";
 import "../../../shared-utils/three/CSS3DRenderer/index.js";
 import "../../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
-import { anyPositionToVector3 as O } from "../../../shared-utils/positionToVector3.js";
+import { anyPositionToVector3 as E } from "../../../shared-utils/positionToVector3.js";
 import { toArray as te } from "../../../shared-utils/util.js";
 import "@realsee/five/line";
-import { isNil as R, notNil as L } from "../../../shared-utils/isNil.js";
+import { isNil as O, notNil as R } from "../../../shared-utils/isNil.js";
 import "../../../shared-utils/three/core/Five_LineMaterial2.js";
 import "../../../shared-utils/three/core/Sphere.js";
 import { blink as se, reblink as ne } from "../../../shared-utils/three/blink.js";
 import "../../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import { vectorToCoordinates as oe } from "../../../shared-utils/vectorToCoordinate.js";
-import { transformPosition as E } from "../../../shared-utils/five/transformPosition.js";
+import { transformPosition as L } from "../../../shared-utils/five/transformPosition.js";
 import { lookPoint as re } from "../../../shared-utils/five/lookPoint.js";
 import { uuid as le } from "../../../shared-utils/uuid.js";
 import "../../../shared-utils/five/FivePuppet.js";
@@ -122,36 +122,37 @@ import "../../../CSS3DRenderPlugin/utils/three/CSS3DGroup.js";
 import "../../../shared-utils/formatRad.js";
 class Ji {
   constructor(e, i) {
-    f(this, "plugin");
-    f(this, "id");
-    f(this, "contentType");
-    f(this, "stickType");
-    f(this, "enabled");
-    f(this, "config");
-    f(this, "data");
-    f(this, "state");
-    f(this, "temporaryState", { visible: !0 });
-    f(this, "originPosition");
-    f(this, "position");
-    f(this, "fiveState");
-    f(this, "model");
-    f(this, "matrix");
-    f(this, "screenPosition");
-    f(this, "normal");
-    f(this, "mediaPlane");
-    f(this, "hooks");
-    f(this, "zIndex");
-    f(this, "play");
-    f(this, "pause");
-    f(this, "tag3DContentSvelte");
-    f(this, "dom");
-    f(this, "contentDom");
-    f(this, "initialConfig");
-    f(this, "computedConfig");
-    f(this, "cache");
-    f(this, "entryFromModel");
-    f(this, "_updating", !1);
-    f(this, "ready", () => {
+    a(this, "plugin");
+    a(this, "id");
+    a(this, "contentType");
+    a(this, "stickType");
+    a(this, "enabled");
+    a(this, "config");
+    a(this, "data");
+    a(this, "state");
+    a(this, "temporaryState", { visible: !0 });
+    a(this, "originPosition");
+    a(this, "position");
+    a(this, "fiveState");
+    a(this, "model");
+    a(this, "matrix");
+    a(this, "screenPosition");
+    a(this, "normal");
+    a(this, "mediaPlane");
+    a(this, "hooks");
+    a(this, "zIndex");
+    a(this, "play");
+    a(this, "pause");
+    a(this, "tag3DContentSvelte");
+    a(this, "dom");
+    a(this, "contentDom");
+    a(this, "initialConfig");
+    a(this, "computedConfig");
+    a(this, "cache");
+    a(this, "entryFromModel");
+    a(this, "_updating", !1);
+    a(this, "hoverEnabled", !0);
+    a(this, "ready", () => {
       const { promise: e, resolve: i } = ce();
       if (!this._updating)
         i();
@@ -176,16 +177,16 @@ class Ji {
       visible: void 0,
       unfolded: !this.can("fold")
     }, o.initialState), this.originPosition = i.position, i.originPosition = this.originPosition, this.position = (() => {
-      const a = i.originPosition;
-      if (!a)
+      const f = i.originPosition;
+      if (!f)
         return;
       const g = e.workUtil.transform;
-      return Array.isArray(a) && a.length === 4 ? a.map(O).map((p) => E(p, g).toArray()) : E(O(a), g).toArray();
+      return Array.isArray(f) && f.length === 4 ? f.map(E).map((p) => L(p, g).toArray()) : L(E(f), g).toArray();
     })(), this.matrix = i.matrix ? (() => {
-      const a = new B.Matrix4().fromArray(i.matrix);
-      return a.premultiply(e.workUtil.transform), a.elements;
-    })() : i.matrix, this.initialConfig = s, this.computedConfig = l, this.stickType = t, this.config = i.config, this.fiveState = i.fiveState, this.normal = i.normal, this.cache = new de(), this.hooks = new Y(), Object.keys(i).forEach((a) => {
-      this[a] === void 0 && i[a] !== void 0 && (this[a] = i[a]);
+      const f = new B.Matrix4().fromArray(i.matrix);
+      return f.premultiply(e.workUtil.transform), f.elements;
+    })() : i.matrix, this.initialConfig = s, this.computedConfig = l, this.stickType = t, this.config = i.config, this.fiveState = i.fiveState, this.normal = i.normal, this.cache = new de(), this.hooks = new Y(), Object.keys(i).forEach((f) => {
+      this[f] === void 0 && i[f] !== void 0 && (this[f] = i[f]);
     });
   }
   get visible() {
@@ -234,7 +235,7 @@ class Ji {
       const t = (r = e == null ? void 0 : e.targetMode) != null ? r : this.five.state.mode;
       if (t === "Panorama") {
         const s = i == null ? void 0 : i.panoIndex;
-        if (R(s))
+        if (O(s))
           return this;
         const l = this.workUtil.getObserverPosition(s), o = this.centerPosition.clone().sub(l).normalize();
         this.five.setState(m({
@@ -260,22 +261,22 @@ class Ji {
           u();
           return;
         }
-        const a = setInterval(() => {
-          (this.dom || this.contentDom) && (u(), clearInterval(a));
+        const f = setInterval(() => {
+          (this.dom || this.contentDom) && (u(), clearInterval(f));
         }, 16.7);
       })) : this.stickType === "Model" && !((d = this.model) != null && d.object) ? yield (h = this.model) == null ? void 0 : h.promise : this.stickType === "Plane" && (yield new Promise((u) => P(this, null, function* () {
         if (this.mediaPlane) {
           u();
           return;
         }
-        const a = setInterval(() => {
-          this.mediaPlane && (u(), clearInterval(a));
+        const f = setInterval(() => {
+          this.mediaPlane && (u(), clearInterval(f));
         }, 16.7);
       }))), this.dom && (this.dom.style.visibility = "hidden"), this.contentDom && (this.contentDom.style.visibility = "hidden"));
       const s = (() => {
-        var a, g, p;
+        var f, g, p;
         const u = [];
-        return u.push(this.dom), u.push((g = (a = this.tag3DContentSvelte) == null ? void 0 : a.css3DInstance) == null ? void 0 : g.container), u.push((p = this.model) == null ? void 0 : p.object), u.push(this.mediaPlane), u.filter(Boolean);
+        return u.push(this.dom), u.push((g = (f = this.tag3DContentSvelte) == null ? void 0 : f.css3DInstance) == null ? void 0 : g.container), u.push((p = this.model) == null ? void 0 : p.object), u.push(this.mediaPlane), u.filter(Boolean);
       })();
       if (!s.length) {
         console.warn("tagDom is empty");
@@ -394,7 +395,7 @@ class Ji {
       return !1;
     const i = m(m({}, this.five.getCurrentState()), e);
     let t = this.cache.getVisible(this, i);
-    return R(t) && (t = this.computeVisible(i).value, this.cache.setVisible(this, i, t)), t;
+    return O(t) && (t = this.computeVisible(i).value, this.cache.setVisible(this, i, t)), t;
   }
   getUnfoldedByPanoIndex(e) {
     if (!this.currentVisible)
@@ -457,7 +458,7 @@ class Ji {
   computeVisible(e) {
     const i = m(m({}, this.five.getCurrentState()), e), { panoIndex: t, mode: r } = i, s = [];
     return (() => {
-      var d, u, a, g;
+      var d, u, f, g;
       const n = (d = this.getConfig().visibleConfig) != null ? d : {};
       if (typeof n == "function")
         return {
@@ -489,7 +490,7 @@ class Ji {
             return {
               value: !1,
               checkedList: s,
-              reason: `current panoIndex is not equal to tag.panoIndex. currentPanoIndex: ${t}, tag.panoIndex: ${(a = this.fiveState) == null ? void 0 : a.panoIndex}`
+              reason: `current panoIndex is not equal to tag.panoIndex. currentPanoIndex: ${t}, tag.panoIndex: ${(f = this.fiveState) == null ? void 0 : f.panoIndex}`
             };
         }
         if (n.visibleDistance !== void 0 && (s.push("visibleDistance"), n.visibleDistance !== "unLimited")) {
@@ -547,7 +548,7 @@ class Ji {
     if ((() => {
       var l;
       const s = t();
-      if (L((l = this.fiveState) == null ? void 0 : l.panoIndex) && e.entryFromModel) {
+      if (R((l = this.fiveState) == null ? void 0 : l.panoIndex) && e.entryFromModel) {
         if (x(i) && s ? this.entryFromModel = !1 : this.entryFromModel = !0, x(i))
           return !0;
       } else
@@ -570,13 +571,13 @@ class Ji {
     const s = te(
       (() => {
         var g;
-        const a = (g = i.checkPoints) != null ? g : "center";
-        return a === "center" ? z(this) : a === "corner" ? $(this) : Array.isArray(a) ? a : [];
+        const f = (g = i.checkPoints) != null ? g : "center";
+        return f === "center" ? z(this) : f === "corner" ? $(this) : Array.isArray(f) ? f : [];
       })()
     );
     let l = 0, o = 0;
-    for (const a of s) {
-      const g = new B.Vector3().subVectors(a, r).normalize();
+    for (const f of s) {
+      const g = new B.Vector3().subVectors(f, r).normalize();
       let p;
       S.set(r, g);
       const [v] = this.fiveUtil.model.intersectRaycaster(S);
@@ -584,15 +585,15 @@ class Ji {
       const b = (() => {
         if (!V(this))
           return;
-        const H = this.plugin.tags.filter(V).map((Z) => {
+        const q = this.plugin.tags.filter(V).map((Z) => {
           var F;
           return (F = Z.model) == null ? void 0 : F.object;
-        }).filter(L), [X] = S.intersectObjects(H, !0);
+        }).filter(R), [X] = S.intersectObjects(q, !0);
         return X;
-      })(), _ = r.distanceTo(a), W = (d = i.distanceAccuracy) != null ? d : 0.01;
-      p = Math.min(p != null ? p : 1 / 0, (h = b == null ? void 0 : b.distance) != null ? h : 1 / 0), p + W >= _ ? l++ : o++;
-      const q = (u = i.needPassed) != null ? u : 1;
-      if (l >= q)
+      })(), _ = r.distanceTo(f), H = (d = i.distanceAccuracy) != null ? d : 0.01;
+      p = Math.min(p != null ? p : 1 / 0, (h = b == null ? void 0 : b.distance) != null ? h : 1 / 0), p + H >= _ ? l++ : o++;
+      const W = (u = i.needPassed) != null ? u : 1;
+      if (l >= W)
         return { value: !0 };
     }
     return o === 0 ? { value: !0 } : {
@@ -730,6 +731,18 @@ class Ji {
     var e;
     (e = this.config.popoverConfig) != null && e.enabled && (this.state.popoverVisible = !1, this.hooks.emit("hidePopover"));
   }
+  /**
+   * 设置 hover 启用状态
+   */
+  setHoverEnabled(e) {
+    this.hoverEnabled = e;
+  }
+  /**
+   * 获取 hover 启用状态
+   */
+  getHoverEnabled() {
+    return this.hoverEnabled;
+  }
 }
 export {
   Ji as BaseTag

package/libs/PanoTagPlugin/controller/Tag/PointTag.js

@@ -149,7 +149,7 @@ class Gt extends g {
         if (!this.currentConfig.simulate3D)
           return 1;
         const u = 2 * Math.tan(0.5 * this.five.camera.fov / 180 * Math.PI), f = this.getDistance(void 0, 1);
-        return Math.max(Math.min(1 - u * f / 40, 1), 0.5);
+        return Math.max(Math.min(1 - u * f / 40, 1), 0.7);
       })(), d = this.five.renderer.getSize(y);
       this.screenPosition = {
         leftPx: (r.x + 1) / 2 * d.x,

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

@@ -14,6 +14,8 @@ declare class PanoTagPluginController extends TagRender {
     /** debug */
     private debug;
     private debugUtil;
+    /** 全局 hover 启用状态，默认 true */
+    globalHoverEnabled: boolean;
     constructor(five: Five, params?: {
         config?: Pick<Tags, 'contentTypeConfig' | 'globalConfig'>;
         debug?: boolean;
@@ -142,6 +144,22 @@ declare class PanoTagPluginController extends TagRender {
      */
     private addEventListener;
     render: () => void;
+    /**
+     * @description 设置标签 hover 启用状态
+     */
+    setTagHoverEnabled(id: TagId, enabled: boolean): void;
+    /**
+     * @description 获取标签 hover 启用状态
+     */
+    getTagHoverEnabled(id: TagId): boolean | undefined;
+    /**
+     * 设置全局 hover 启用状态
+     */
+    setGlobalHoverEnabled(enabled: boolean): void;
+    /**
+     * 获取全局 hover 启用状态
+     */
+    getGlobalHoverEnabled(): boolean;
 }
 export default PanoTagPluginController;
 export { PanoTagPluginController };