@realsee/dnalogel 3.36.1 → 3.36.3

package/libs/PanoVideoPlugin/VideoMeshController.js

@@ -9,8 +9,8 @@ import "../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
 import A from "animejs";
-import { requestAnimationFrameInterval as E } from "../shared-utils/animationFrame/index.js";
-import W from "./utils/index.js";
+import { requestAnimationFrameInterval as D } from "../shared-utils/animationFrame/index.js";
+import E from "./utils/index.js";
 import "../shared-utils/positionToVector3.js";
 import "../CSS3DRenderPlugin/utils/three/CSS3DRenderer.js";
 import "three/examples/jsm/renderers/CSS3DRenderer";
@@ -53,6 +53,7 @@ class ie {
      * @remark 由于 render video 依赖 Five render，因此需要自动 render five。
      */
     t(this, "renderFiveDisposer");
+    t(this, "hooks");
     /**
      * 取消静音
      *
@@ -64,10 +65,10 @@ class ie {
     /** 把 uv 值转换成位置 */
     t(this, "uv2Position", (e, i) => {
       var c;
-      const o = Math.PI, a = Math.PI * 2, d = e, s = 1 - i, r = new l(
-        -1 * Math.cos(a * d) * Math.sin(o * s),
-        1 * Math.cos(o * s),
-        1 * Math.sin(a * d) * Math.sin(o * s)
+      const n = Math.PI, a = Math.PI * 2, d = e, s = 1 - i, r = new l(
+        -1 * Math.cos(a * d) * Math.sin(n * s),
+        1 * Math.cos(n * s),
+        1 * Math.sin(a * d) * Math.sin(n * s)
       );
       r.setX(-r.x);
       const h = (c = this.five.work) == null ? void 0 : c.observers[this.panoIndex];
@@ -83,7 +84,7 @@ class ie {
       if (!e)
         return this.logWarning(`点位 ${this.panoIndex} 不存在，请检查 Five 数据是否正常。`);
       this.observer = e;
-      const { x: i, y: n, z: o, w: a } = e.quaternion, d = new b(i, n, o, a), s = e.position;
+      const { x: i, y: o, z: n, w: a } = e.quaternion, d = new b(i, o, n, a), s = e.position;
       this.videoMesh.position.fromArray([s.x, s.y, s.z]), this.videoMesh.quaternion.set(0, 0, 0, 1), this.videoMesh.rotateOnAxis(new l(0, 1, 0), Math.PI / 2), this.videoMesh.applyQuaternion(d);
     });
     /** 兼容视频播放 */
@@ -122,8 +123,16 @@ class ie {
       const [i] = e.intersectObject(this.videoMesh);
       if (!i)
         return;
-      if (this.checkIntersectionInBounding(this.origin, i))
-        return this.video.muted = !this.video.muted, !1;
+      if (this.checkIntersectionInBounding(this.origin, i)) {
+        const n = {
+          target: this,
+          _preventDefaultReturn: !1,
+          preventDefault: () => {
+            n._preventDefaultReturn = !0;
+          }
+        };
+        return this.hooks.emit("click", n), n._preventDefaultReturn === !1 && (this.video.muted = !this.video.muted), !1;
+      }
     });
     /** video canplaythrough 事件触发 */
     t(this, "onVideoDataLoaded", () => {
@@ -148,7 +157,7 @@ class ie {
       this.video.addEventListener(
         "timeupdate",
         () => {
-          if (this.enabled && this.panoIndex === this.five.getCurrentState().panoIndex && this.five.getCurrentState().mode === "Panorama" && (this.renderFiveDisposer || (this.renderFiveDisposer = E(() => {
+          if (this.enabled && this.panoIndex === this.five.getCurrentState().panoIndex && this.five.getCurrentState().mode === "Panorama" && (this.renderFiveDisposer || (this.renderFiveDisposer = D(() => {
             this.five.needsRender = !0;
           }, 30)), this.five.scene.add(this.videoMesh), this.videoMesh.material.uniforms.opacity.value === 0)) {
             const e = {
@@ -177,16 +186,16 @@ class ie {
       (e = this.renderFiveDisposer) == null || e.call(this), this.renderFiveDisposer = void 0;
     });
     var r, h;
-    this.five = e, this.panoIndex = i.panoIndex, this._id = i.renderID, this.url = i.url, this.origin = i.origin.slice(), this._enabled = (h = (r = i.initialState) == null ? void 0 : r.enabled) != null ? h : !0;
-    const n = document.createElement("video");
-    n.crossOrigin = "anonymous", n.autoplay = !1, n.muted = !0, n.loop = !0, n.playsInline = !0, this.video = n;
-    const o = new F(this.video);
-    o.minFilter = m, o.magFilter = m;
+    this.five = e, this.panoIndex = i.panoIndex, this._id = i.renderID, this.url = i.url, this.origin = i.origin.slice(), this.hooks = i.hooks, this._enabled = (h = (r = i.initialState) == null ? void 0 : r.enabled) != null ? h : !0;
+    const o = document.createElement("video");
+    o.crossOrigin = "anonymous", o.autoplay = !1, o.muted = !0, o.loop = !0, o.playsInline = !0, this.video = o;
+    const n = new F(this.video);
+    n.minFilter = m, n.magFilter = m;
     const a = new y({
       vertexShader: M,
       fragmentShader: P,
       uniforms: {
-        map: { value: o },
+        map: { value: n },
         size: {
           value: new x(this.origin[0], 1 - this.origin[1] - this.origin[3], this.origin[2], this.origin[3])
         },
@@ -234,8 +243,8 @@ class ie {
     const i = this.uv2Position(e[0], e[1]);
     if (!i)
       return;
-    const n = new l().subVectors(i, this.observer.position).normalize(), { longitude: o, latitude: a } = W(n);
-    this.five.setState({ panoIndex: this.panoIndex, longitude: o, latitude: a }), this.onFiveWantsMoveToPano(this.panoIndex);
+    const o = new l().subVectors(i, this.observer.position).normalize(), { longitude: n, latitude: a } = E(o);
+    this.five.setState({ panoIndex: this.panoIndex, longitude: n, latitude: a }), this.onFiveWantsMoveToPano(this.panoIndex);
   }
   /** 获取视频中心点的 uv */
   getUVCenter() {
@@ -287,8 +296,8 @@ class ie {
   checkIntersectionInBounding(e, i) {
     if (!i.uv)
       return !1;
-    const [n, o] = i.uv.toArray(), [a, d, s, r] = e, h = 1 - d - r, f = a + s, p = h + r;
-    return n >= a && n <= f && o >= h && o <= p;
+    const [o, n] = i.uv.toArray(), [a, d, s, r] = e, h = 1 - d - r, f = a + s, p = h + r;
+    return o >= a && o <= f && n >= h && n <= p;
   }
 }
 export {

package/libs/PanoVideoPlugin/typings.d.ts

@@ -1,4 +1,5 @@
 import type * as BasePlugin from '../base/BasePluginWithData';
+import type { VideoMeshController } from './VideoMeshController';
 /** 单个视频元素 */
 export interface VideoItem {
     /** client render ID
@@ -61,4 +62,9 @@ export interface PluginEventMap extends BasePlugin.EventMap<PluginState, PluginD
     disable: (params: {
         userAction: boolean;
     }) => void;
+    /** 点位视频被点击 */
+    click: (event: {
+        target: VideoMeshController;
+        preventDefault: () => void;
+    }) => void;
 }

package/libs/base/BasePlugin.js

@@ -15,7 +15,7 @@ let C = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.36.1");
+    i(this, "VERSION", "3.36.3");
     i(this, "five");
     /**
      * @description: 插件事件钩子

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.36.1",
+    "%c %c@realsee/dnalogel %cv3.36.3",
     [
       "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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realsee/dnalogel",
-  "version": "3.36.1",
+  "version": "3.36.3",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",