@realsee/dnalogel 2.18.1-2 → 2.18.2

package/libs/PanoTagPlugin/typings/tag/TagConfig.d.ts

@@ -7,31 +7,59 @@ import type { PartialDeep } from 'type-fest';
 export interface TagConfig<C extends TagContentType = TagContentType, S extends StickType = StickType> {
     /** 显示/隐藏配置 */
     visibleConfig?: {
-        /** 保持可见/不可见, 设置后visibleConfig下所有其他配置都不生效 */
+        /**
+         * @description 保持可见/不可见, 设置后visibleConfig下所有其他配置都不生效
+         * @default undefined
+         */
         keep?: 'visible' | 'hidden';
-        /** 在哪些 five mode 下可见，默认为 ['Panorama'] */
+        /**
+         * @description 在哪些 five mode 下可见
+         * @default ['Panorama']
+         */
         visibleFiveMode?: Mode[];
-        /** 当 visibleFiveMode 包含 'Floorplan' 或者 'MapView' 时，是否仅在当前楼层模型下可见，默认为true */
+        /**
+         * @description 当 visibleFiveMode 包含 'Floorplan' 或者 'MapView' 时，是否仅在当前楼层模型下可见
+         * @default false
+         */
         followModelVisibility?: boolean;
-        /** 走点时不隐藏 */
+        /**
+         * @description 走点时不隐藏
+         * @default false
+         */
         alwaysShowWhenMovePano?: true;
-        /** min-max米内显示 | 无距离限制 */
+        /**
+         * @description min-max米内显示 | 无距离限制
+         * @default 'unLimited'
+         */
         visibleDistance?: MinMax | 'unLimited';
         /**
          * @description: 限制xx点位上可见，默认为all
          * @param all: 不限制
          * @param current: 仅当前点位可见
          * @param: number[] 仅指定点位可见
+         * @default 'all'
          */
         visiblePanoIndex?: 'all' | 'current' | number[];
-        /** 碰撞检测配置，默认开启 */
-        intersectRaycaster?: boolean /** 是否开启碰撞检测，默认true */ | {
-            /** 是否开启碰撞检测，默认true */
+        /**
+         * @description 碰撞检测配置，默认开启
+         * @default true
+         */
+        intersectRaycaster?: boolean | {
+            /**
+             * @description 是否开启碰撞检测
+             * @default true
+             */
             enabled?: boolean;
-            /** 碰撞检测的允许误差, 默认值为0.01 */
+            /**
+             * @description 碰撞检测的允许误差
+             * @default 0.01
+             */
             distanceAccuracy?: number;
         };
-        /** 3D标签中 「标签所在平面或垂直于标签法线的平面」 与 「摄像机到标签点或中心点的向量」 的夹角，范围内自动展开，范围外自动收起 */
+        /**
+         * @description 3D标签中 「标签所在平面或垂直于标签法线的平面」 与 「摄像机到标签点或中心点的向量」 的夹角，范围内自动展开，范围外自动收起
+         * @default undefined
+         */
         angleRange?: MinMax;
     } | ((five: Five, tagState: {
         tag: Tag<C, S>;
@@ -44,16 +72,22 @@ export interface TagConfig<C extends TagContentType = TagContentType, S extends
     unfoldedConfig?: {
         /** 保持展开/收起，设置后unfoldedConfig下所有其他配置都不生效 */
         keep?: 'unfolded' | 'folded';
-        /** 划动到不可见状态时，自动收起，disableFold: true 的标签不受此参数影响 */
-        autoUnfoldWhenHide?: false;
+        /**
+         * @description 划动到不可见状态时，自动收起，disableFold: true 的标签不受此参数影响
+         * @note 部分标签是无法收起的
+         * @default true
+         */
+        autoFoldWhenHide?: false;
         /**
          * @deprecated replace by { keep: 'folded' }
          * @deprecated 部分标签是无法打开的
+         * @default undefined
          */
         disableUnfold?: true;
         /**
          * @deprecated replace by { keep: 'unfolded' }
          * @deprecated 部分标签是无法收起的
+         * @default undefined
          */
         disableFold?: true;
         /** min-max米内自动展开,否则收起 */

package/libs/PanoTagPlugin/utils/model/mediaPlane.d.ts

@@ -51,6 +51,7 @@ declare class VideoPlane extends MediaPlane {
     pause(): void;
     initialDomEvents(domEvents: DomEvents): void;
     initialRenderHooks(func: (render: () => void) => () => any): void;
+    private showPlayUI;
     private showPauseUI;
     private render;
     private addAutoBindEventListener;

package/libs/PanoTagPlugin/utils/model/mediaPlane.js

@@ -1,6 +1,6 @@
-var x = Object.defineProperty;
-var P = (c, a, e) => a in c ? x(c, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[a] = e;
-var o = (c, a, e) => (P(c, typeof a != "symbol" ? a + "" : a, e), e);
+var b = Object.defineProperty;
+var x = (c, a, e) => a in c ? b(c, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[a] = e;
+var o = (c, a, e) => (x(c, typeof a != "symbol" ? a + "" : a, e), e);
 var u = (c, a, e) => new Promise((t, s) => {
   var i = (n) => {
     try {
@@ -17,17 +17,18 @@ var u = (c, a, e) => new Promise((t, s) => {
   }, r = (n) => n.done ? t(n.value) : Promise.resolve(n.value).then(i, d);
   r((e = e.apply(c, a)).next());
 });
-import * as M from "three";
+import * as l from "three";
 import { Vector3 as g } from "three";
-import { centerPoint as w } from "../../../shared-utils/three/centerPoint.js";
-import { loadTexture as I } from "../../../shared-utils/three/loadTexture.js";
+import { centerPoint as L } from "../../../shared-utils/three/centerPoint.js";
+import { loadTexture as T } from "../../../shared-utils/three/loadTexture.js";
 import { QuadrangleGeometry as V, QuadrangleMesh as y } from "../../../shared-utils/three/Quadrangle.js";
 import { getVideoTexture as B } from "../../../shared-utils/three/loadVideoTexture.js";
-import { Image_Play_Icon_With_Text as C, Image_Play_Icon as T } from "../../Assets/Icon.js";
+import { Image_Play_Icon_With_Text as C, Image_Play_Icon as I } from "../../Assets/Icon.js";
 import { getPositionsByObjectFit as p } from "../../../shared-utils/three/getPositionsByObjectFit.js";
 import { FragmentTransparencyMaterial as F } from "../../../shared-utils/three/FragmentTransparencyMaterial.js";
 import "../../../shared-utils/math/pointIsRectangle.js";
-class b extends M.Mesh {
+import "../../../shared-utils/device.js";
+class P extends l.Mesh {
   constructor() {
     super(...arguments);
     o(this, "name", "MediaPlane");
@@ -38,20 +39,20 @@ class b extends M.Mesh {
     return e !== null && e.remove(this), this;
   }
 }
-class Q extends b {
+class z extends P {
   constructor(e, t, s) {
     super();
     o(this, "name", "PanoTagPluginImagePlane");
-    this.src = e, I(e).then((i) => {
+    this.src = e, T(e).then((i) => {
       var m;
-      const d = new URL(e, location.href).pathname.endsWith(".png"), r = new M.MeshBasicMaterial({ map: i, transparent: d }), n = p((m = s == null ? void 0 : s.objectFit) != null ? m : "contain", t, i.image.width / i.image.height), h = w(...n), v = n.map((f) => f.clone().sub(h)), l = new V(v);
-      this.position.copy(h), this.geometry = l, this.material = r;
+      const d = new URL(e, location.href).pathname.endsWith(".png"), r = new l.MeshBasicMaterial({ map: i, transparent: d }), n = p((m = s == null ? void 0 : s.objectFit) != null ? m : "contain", t, i.image.width / i.image.height), h = L(...n), v = n.map((f) => f.clone().sub(h)), M = new V(v);
+      this.position.copy(h), this.geometry = M, this.material = r;
     }).catch((i) => {
-      console.error({ e: i });
+      console.error(`Imageplane error ${i}`);
     });
   }
 }
-class z extends b {
+class G extends P {
   // eslint-disable-next-line max-params
   constructor(e, t, s) {
     const { videoCoverSrc: i, objectFit: d = "contain", playButton: r = "withText", paused: n = !0, videoTextureMap: h, ImageTextureMap: v } = s != null ? s : {};
@@ -72,24 +73,24 @@ class z extends b {
     o(this, "buttonMesh");
     o(this, "videoTextureMap");
     o(this, "ImageTextureMap");
-    this.cornerPoints = t, this.src = e, this.buttonSrc = (() => r === "withText" ? C : r === "withoutText" ? T : typeof r == "string" ? r : T)(), this.videoCoverSrc = i, this.objectFit = d, this.videoTextureMap = h, this.ImageTextureMap = v, this.position.copy(w(...t)), this.videoCoverSrc && n ? this.addCoverMesh().then(() => this.addButtonMesh()) : this.addVideoMesh().then(() => {
+    this.cornerPoints = t, this.src = e, this.buttonSrc = (() => r === "withText" ? C : r === "withoutText" ? I : typeof r == "string" ? r : I)(), this.videoCoverSrc = i, this.objectFit = d, this.videoTextureMap = h, this.ImageTextureMap = v, this.position.copy(L(...t)), this.videoCoverSrc && n ? this.addCoverMesh().then(() => this.addButtonMesh()) : this.addVideoMesh().then(() => {
       n ? this.addButtonMesh() : this.play(!0);
     }), this.addEventListener("removed", () => {
       this.remove(...this.children);
     }), this.addEventListener("dispose", () => {
-      var l;
-      this.domEventsListenerTemporaryList = [], (l = this.disposers) == null || l.forEach((m) => m == null ? void 0 : m());
+      var M;
+      this.domEventsListenerTemporaryList = [], (M = this.disposers) == null || M.forEach((m) => m == null ? void 0 : m());
     });
   }
   play(e = !1) {
     return u(this, null, function* () {
-      this.videoMesh || (yield this.addVideoMesh()), this.coverMesh && (this.coverMesh.visible = !1), this.remove(this.buttonMesh), this.videoMesh.visible = !0, this.videoInstance.paused && this.videoInstance.play().catch((t) => {
-        console.error(t);
+      this.videoMesh || (yield this.addVideoMesh()), this.showPlayUI(), this.videoInstance.paused && this.videoInstance.play().then(() => this.showPlayUI()).catch((t) => {
+        this.pause(), console.error("play error", t);
       }), this.videoInstance.muted = e, this.render();
     });
   }
   pause() {
-    this.videoInstance && (this.showPauseUI(), this.videoInstance.pause(), this.render());
+    this.videoInstance && (this.videoInstance.pause(), this.showPauseUI().then(() => this.render()));
   }
   initialDomEvents(e) {
     this.domEvents || (this.domEvents = e, this.domEventsListenerTemporaryList.forEach((t) => this.addDomEventListener(...t)), this.domEventsListenerTemporaryList = []);
@@ -101,9 +102,12 @@ class z extends b {
     });
     this.disposers.push(() => s);
   }
+  showPlayUI() {
+    this.coverMesh && (this.coverMesh.visible = !1), this.remove(this.buttonMesh), this.videoMesh.visible = !0;
+  }
   showPauseUI() {
     return u(this, null, function* () {
-      this.coverMesh ? (this.coverMesh.visible = !0, this.videoMesh && (this.videoMesh.visible = !1)) : (yield this.addCoverMesh(), this.coverMesh && (this.videoMesh.visible = !1)), this.addButtonMesh(), this.render();
+      this.coverMesh ? (this.coverMesh.visible = !0, this.videoMesh && (this.videoMesh.visible = !1)) : (yield this.addCoverMesh(), this.coverMesh && (this.videoMesh.visible = !1)), this.addButtonMesh().then(() => this.render());
     });
   }
   render() {
@@ -141,7 +145,7 @@ class z extends b {
         const t = yield this.getImageTexture(this.videoCoverSrc);
         if (!t)
           return;
-        const s = new M.MeshBasicMaterial({ transparent: !1, map: t }), i = p(this.objectFit, this.cornerPoints, t.image.width / t.image.height), d = new y(i, s);
+        const s = new l.MeshBasicMaterial({ transparent: !1, map: t }), i = p(this.objectFit, this.cornerPoints, t.image.width / t.image.height), d = new y(i, s);
         return d.position.copy(new g(0, 0, 0)), d.name = "videoCoverMesh", d;
       }))();
       return e && (this.children.includes(this.coverMesh) || (this.add(e), this.coverMesh = e)), e;
@@ -156,7 +160,7 @@ class z extends b {
           return this.videoMesh;
         if (!this.src)
           return;
-        const s = this.getVideoTexture(this.src), i = new M.MeshBasicMaterial({ transparent: !1, map: s }), d = yield new Promise((n) => {
+        const s = this.getVideoTexture(this.src), i = new l.MeshBasicMaterial({ transparent: !1, map: s }), d = yield new Promise((n) => {
           s.metadataLoaded ? n(p(this.objectFit, this.cornerPoints, s.image.videoWidth / s.image.videoHeight)) : s.addEventListener(
             "videoLoaded",
             () => n(p(this.objectFit, this.cornerPoints, s.image.videoWidth / s.image.videoHeight))
@@ -182,13 +186,13 @@ class z extends b {
       if (this.children.includes(this.buttonMesh))
         return;
       const e = yield (() => u(this, null, function* () {
-        var m, f, E, L;
+        var m, f, E, w;
         if (this.buttonMesh)
           return this.buttonMesh;
-        const t = (f = (m = this.videoMesh) == null ? void 0 : m.geometry.points[0].distanceTo(this.videoMesh.geometry.points[3])) != null ? f : 1 / 0, s = (L = (E = this.coverMesh) == null ? void 0 : E.geometry.points[0].distanceTo(this.coverMesh.geometry.points[3])) != null ? L : 1 / 0, i = this.cornerPoints[0].distanceTo(this.cornerPoints[3]), r = Math.min(t, s, i) / i * 0.3, n = yield this.getImageTexture(this.buttonSrc), h = p("contain", this.cornerPoints, n.image.width / n.image.height), v = new y(h, new F(n));
+        const t = (f = (m = this.videoMesh) == null ? void 0 : m.geometry.points[0].distanceTo(this.videoMesh.geometry.points[3])) != null ? f : 1 / 0, s = (w = (E = this.coverMesh) == null ? void 0 : E.geometry.points[0].distanceTo(this.coverMesh.geometry.points[3])) != null ? w : 1 / 0, i = this.cornerPoints[0].distanceTo(this.cornerPoints[3]), r = Math.min(t, s, i) / i * 0.3, n = yield this.getImageTexture(this.buttonSrc), h = p("contain", this.cornerPoints, n.image.width / n.image.height), v = new y(h, new F(n));
         v.position.copy(new g(0, 0, 0)), v.name = "buttonMesh", v.scale.set(r, r, r), this.addAutoBindEventListener(v, "click", () => this.play());
-        const l = new M.Vector3().crossVectors(new M.Vector3().subVectors(h[0], h[1]), new M.Vector3().subVectors(h[0], h[3])).normalize().multiplyScalar(1e-4);
-        return v.position.add(l), v;
+        const M = new l.Vector3().crossVectors(new l.Vector3().subVectors(h[0], h[1]), new l.Vector3().subVectors(h[0], h[3])).normalize().multiplyScalar(1e-4);
+        return v.position.add(M), v;
       }))();
       return this.children.includes(this.buttonMesh) || (this.add(e), this.buttonMesh = e), e;
     });
@@ -198,7 +202,7 @@ class z extends b {
       var s, i;
       if ((s = this.ImageTextureMap) != null && s.has(e))
         return this.ImageTextureMap.get(e);
-      const t = yield I(e);
+      const t = yield T(e);
       return (i = this.ImageTextureMap) == null || i.set(e, t), t;
     });
   }
@@ -211,6 +215,6 @@ class z extends b {
   }
 }
 export {
-  Q as ImagePlane,
-  z as VideoPlane
+  z as ImagePlane,
+  G as VideoPlane
 };

package/libs/base/BasePlugin.js

@@ -14,7 +14,7 @@ let n = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    e(this, "VERSION", "2.18.1-2");
+    e(this, "VERSION", "2.18.2");
     e(this, "five");
     /**
      * 插件事件钩子

package/libs/index.js

@@ -244,7 +244,7 @@ import "./PanoTagPlugin/tag.config.js";
 import "./PanoTagPlugin/utils/planeNormal.js";
 import "./PanoTagPlugin/utils/normalPositionToPositions.js";
 import "./PanoTagPlugin/controller/TagCache.js";
-import "./PanoTagPlugin/utils/device.js";
+import "./shared-utils/device.js";
 import "./PanoTagPlugin/utils/model/mediaPlane.js";
 import "./shared-utils/three/Quadrangle.js";
 import "./shared-utils/math/pointIsRectangle.js";

package/libs/shared-utils/device.d.ts

@@ -0,0 +1,6 @@
+export declare const isIOS: boolean;
+export declare const isAndroid: boolean;
+export declare const isWX: boolean;
+export declare const isIOSWX: boolean;
+export declare const isAndroidWX: boolean;
+export declare const isBrowser: boolean;

package/libs/shared-utils/device.js

@@ -0,0 +1,8 @@
+const e = navigator.userAgent.toLowerCase().indexOf("iphone") !== -1;
+navigator.userAgent.toLowerCase().indexOf("android");
+const o = navigator.userAgent.toLowerCase().indexOf("micromessenger") !== -1, n = e && o;
+export {
+  e as isIOS,
+  n as isIOSWX,
+  o as isWX
+};

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.info(
-    "%c %c@realsee/dnalogel %cv2.18.1-2",
+    "%c %c@realsee/dnalogel %cv2.18.2",
     [
       "background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAMCAMAAACHgmeRAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABLFBMVEUAAAAapPoap/oaqvkbrfkbr/gZnfwZoPsaqfnD4v/E4/8Ylv0clPm93/+/4P/B4f8Yj/683/8Wif+33P8Uhv+x2f8ShP+s1v8Pgf+n0/8Nf/+h0f8Lff8Lff8Nf/9dl/+czv8KfP8KfP+Lxf+Uyv+Xy/+Hwv+Jw/+Mxf+Oxv+RyP8aovsapfoap/oZmfwZm/wZnvsYnPsYkf4YlP0NePsDYfgYcfi43f+63v8Xiv8Xjf4EWfwCV/sWZ/qz2v+02/8Vh/8WiP8EUf8CTf4WXv2u1/+v2P8Thf8Thv8ETf8CR/8VV/+o1f+q1f8Qgv8Rg/8DSv8BRf8UVP+j0v+k0v8OgP8Pgf8DR/8DQv9Nhf+dzv+fz/+Kv/+Vyv+Xy/+azf+Oxv+Qx/+SyP////8MUhLdAAAAK3RSTlMACEWQ2bd98uQECPXxqO7c+Pb49vj2+Pb49vj23Oul8fMHA+TwerXXjEIG2P+bHgAAAAFiS0dEY1y+LaoAAAB+SURBVAjXY2BgZGJmYWVgYGBgY9fW0eVg4ORi4NbTNzDk4eXjZxAwMjYxNTO3EGQQsrSytrG1sxdmEHFwdHJ2cXUTZRBz9/D08vbxFWeQ8PMPCAwKDpFkkAoNC4+IjIqWZpCRlZOPiY2LV2BQVGJQTkhMUlEFWaOmrqGpxQAAyg0S9Dq+VPYAAAAASUVORK5CYII=')",
       "background-repeat: no-repeat",

package/libs/shared-utils/three/loadVideoTexture.d.ts

@@ -3,7 +3,7 @@ import { type Overwrite } from '../../typings/utils.type';
 export default function loadVideoTexture(src: string, videoElement?: HTMLVideoElement): Promise<Overwrite<THREE.VideoTexture, {
     image: HTMLVideoElement;
 }>>;
-export declare function getVideoTexture(src: string, videoElement?: HTMLVideoElement, metadataLoadedCallback?: (texture: THREE.VideoTexture) => void): Overwrite<THREE.VideoTexture, {
+export declare function getVideoTexture(src: string, videoElement?: HTMLVideoElement): Overwrite<THREE.VideoTexture, {
     image: HTMLVideoElement;
     metadataLoaded: boolean;
 }>;

package/libs/shared-utils/three/loadVideoTexture.js

@@ -1,12 +1,32 @@
-import * as t from "three";
-function u(i, n, o) {
-  const e = n != null ? n : document.createElement("video");
+import * as a from "three";
+import { isWX as d, isIOS as s } from "../device.js";
+function m(u, r) {
+  let n = !d;
+  const e = r != null ? r : document.createElement("video");
   e.preload = "metadata", e.crossOrigin = "anonymous", e.muted = !0, e.loop = !0, e.playsInline = !0, e.autoplay = !0;
-  const r = new t.VideoTexture(e);
-  return r.minFilter = t.LinearFilter, r.magFilter = t.LinearFilter, r.encoding = t.sRGBEncoding, r.metadataLoaded = !1, e.onloadedmetadata = () => {
-    o == null || o(r), r.dispatchEvent({ type: "videoLoaded" }), r.metadataLoaded = !0;
-  }, e.src = i, r;
+  const t = new a.VideoTexture(e);
+  t.minFilter = a.LinearFilter, t.magFilter = a.LinearFilter, t.encoding = a.sRGBEncoding, t.metadataLoaded = !1, e.src = u;
+  const o = () => {
+    t.metadataLoaded || (t.dispatchEvent({ type: "videoLoaded" }), t.metadataLoaded = !0);
+  };
+  if (d || (e.onloadedmetadata = () => {
+    o();
+  }), d) {
+    const i = () => {
+      if (!n) {
+        if (!e.paused) {
+          o();
+          return;
+        }
+        n = !0, e.muted = !0, e.play().then(() => {
+          e.pause(), e.currentTime = 0, o();
+        });
+      }
+    };
+    document.addEventListener("click", i, { once: !0 }), s && document.addEventListener("touchstart", i, { once: !0 });
+  }
+  return t;
 }
 export {
-  u as getVideoTexture
+  m as getVideoTexture
 };

package/package.json

@@ -4,11 +4,10 @@
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",
   "author": "REALSEE-DEVELOPER",
-  "type": "module",
   "repository": "https://github.com/realsee-developer/dnalogel.git",
   "description": "如视 VR 看房插件合集",
   "private": false,
-  "version": "2.18.1-2",
+  "version": "2.18.2",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "clean": "rm -rf components dist docs libs types ./vite.config.js.timestamp*",

package/dist/PanoTagPlugin/utils/device.d.ts

@@ -1 +0,0 @@
-export declare const isIOSWX: boolean;

package/libs/PanoTagPlugin/utils/device.d.ts

@@ -1 +0,0 @@
-export declare const isIOSWX: boolean;

package/libs/PanoTagPlugin/utils/device.js

@@ -1,4 +0,0 @@
-const e = navigator.userAgent.toLowerCase().indexOf("micromessenger") !== -1 && navigator.userAgent.toLowerCase().indexOf("iphone") !== -1;
-export {
-  e as isIOSWX
-};