@realsee/dnalogel 3.35.0 → 3.35.2

package/libs/CSS3DRenderPlugin/utils/three/CSS3DObject.js

@@ -1,18 +1,18 @@
-var W = Object.defineProperty;
-var H = (c, r, t) => r in c ? W(c, r, { enumerable: !0, configurable: !0, writable: !0, value: t }) : c[r] = t;
-var i = (c, r, t) => (H(c, typeof r != "symbol" ? r + "" : r, t), t);
-import { CSS3DObject as C } from "three/examples/jsm/renderers/CSS3DRenderer";
+var H = Object.defineProperty;
+var C = (c, r, t) => r in c ? H(c, r, { enumerable: !0, configurable: !0, writable: !0, value: t }) : c[r] = t;
+var i = (c, r, t) => (C(c, typeof r != "symbol" ? r + "" : r, t), t);
+import { CSS3DObject as j } from "three/examples/jsm/renderers/CSS3DRenderer";
 import { Vector3 as l } from "three";
 import { even as w } from "../even.js";
-import { Subscribe as j } from "../../../shared-utils/Subscribe.js";
-import A from "./OpacityMesh.js";
-import { centerPoint as Q } from "../../../shared-utils/three/centerPoint.js";
-import { getObjectVisible as R } from "../../../shared-utils/three/getObjectVisible.js";
-const S = 1, D = `CSS3DObjectPlus@${S}`, L = 216e-5, N = 3e-3;
-class G extends C {
+import { Subscribe as A } from "../../../shared-utils/Subscribe.js";
+import Q from "./OpacityMesh.js";
+import { centerPoint as R } from "../../../shared-utils/three/centerPoint.js";
+import { getObjectVisible as D } from "../../../shared-utils/three/getObjectVisible.js";
+const O = 1, S = `CSS3DObjectPlus@${O}`, L = 216e-5, N = 3e-3;
+class G extends j {
   constructor(t) {
     var f, b, g;
-    const e = t.container, o = t.cornerPoints, n = (f = t.ratio) != null ? f : N, M = (b = t.dpr) != null ? b : 1, O = (g = t.pointerEvents) != null ? g : "auto", h = Math.max(L, n), d = o[0].distanceTo(o[1]), y = o[1].distanceTo(o[2]), a = w(d / n * M), p = w(y / n * M), m = Q(...o);
+    const e = t.container, o = t.cornerPoints, n = (f = t.ratio) != null ? f : N, M = (b = t.dpr) != null ? b : 1, E = (g = t.pointerEvents) != null ? g : "auto", h = Math.max(L, n), d = o[0].distanceTo(o[1]), m = o[1].distanceTo(o[2]), a = w(d / n * M), p = w(m / n * M), y = R(...o);
     let u;
     if (h === n)
       e.style.width = `${a}px`, e.style.height = `${p}px`, u = e;
@@ -23,8 +23,9 @@ class G extends C {
       e.style.position = "absolute", e.style.left = "0", e.style.top = "0", e.style.width = `${V * a}px`, e.style.height = `${V * p}px`, s.appendChild(e), u = s;
     }
     super(u);
-    i(this, "version", S);
+    i(this, "version", O);
     i(this, "isCSS3DObjectPlus", !0);
+    i(this, "name", S);
     i(this, "container");
     i(this, "width");
     i(this, "height");
@@ -34,11 +35,11 @@ class G extends C {
     i(this, "centerPosition");
     i(this, "ratio");
     i(this, "mode", "front");
-    i(this, "hooks", new j());
+    i(this, "hooks", new A());
     i(this, "opacityMesh");
     i(this, "selfVisible", !0);
     i(this, "setVisible", (t) => {
-      this.selfVisible = t, this.visible = R(this.parent) && this.selfVisible, this.opacityMesh && (this.opacityMesh.visible = this.visible);
+      this.selfVisible = t, this.visible = D(this.parent) && this.selfVisible, this.opacityMesh && (this.opacityMesh.visible = this.visible);
     });
     i(this, "updateVisible", () => {
       this.setVisible(this.selfVisible);
@@ -47,20 +48,20 @@ class G extends C {
      * @description: 生成透明Mesh
      */
     i(this, "createOpacityMesh", (t) => {
-      const { domWidthPx: e, domHeightPx: o } = t, n = new A(e, o);
+      const { domWidthPx: e, domHeightPx: o } = t, n = new Q(e, o);
       return n.position.copy(t.position), n.rotation.copy(t.rotation), n.scale.copy(t.scale), n;
     });
-    if (e.style.pointerEvents = O, Object.assign(e.style, t.style), this.scale.set(h, h, h), this.cornerPoints = o, this.ratio = n, this.container = e, t.mode && (this.mode = t.mode), h === n)
-      this.width = d, this.height = y, this.domWidthPx = a, this.domHeightPx = p, this.centerPosition = m;
+    if (e.style.pointerEvents = E, Object.assign(e.style, t.style), this.scale.set(h, h, h), this.cornerPoints = o, this.ratio = n, this.container = e, t.mode && (this.mode = t.mode), h === n)
+      this.width = d, this.height = m, this.domWidthPx = a, this.domHeightPx = p, this.centerPosition = y;
     else {
       const s = n / h;
-      this.width = s * d, this.height = s * y, this.domWidthPx = s * a, this.domHeightPx = s * p, this.centerPosition = new l().subVectors(m, o[0]).multiplyScalar(s).add(o[0]);
+      this.width = s * d, this.height = s * m, this.domWidthPx = s * a, this.domHeightPx = s * p, this.centerPosition = new l().subVectors(y, o[0]).multiplyScalar(s).add(o[0]);
     }
-    e.classList.add(`${D}__container`);
-    const E = new l().subVectors(o[1], o[0]), P = new l().subVectors(o[3], o[0]), $ = new l().crossVectors(E, P).normalize();
-    this.lookAt($);
-    const x = this.up.clone().applyQuaternion(this.quaternion), v = P.clone(), F = new l().crossVectors(x, v).normalize();
-    this.rotateOnWorldAxis(F, x.angleTo(v)), this.position.copy(m), this.addEventListener("added", () => {
+    e.classList.add(`${S}__container`);
+    const $ = new l().subVectors(o[1], o[0]), P = new l().subVectors(o[3], o[0]), F = new l().crossVectors($, P).normalize();
+    this.lookAt(F);
+    const x = this.up.clone().applyQuaternion(this.quaternion), v = P.clone(), W = new l().crossVectors(x, v).normalize();
+    this.rotateOnWorldAxis(W, x.angleTo(v)), this.position.copy(y), this.addEventListener("added", () => {
       var s;
       this.mode === "front" && ((s = this.opacityMesh) == null || s.removeFromParent());
     }), this.addEventListener("removed", () => {

package/libs/PanoTagPlugin/controller/index.js

@@ -1,12 +1,12 @@
 var V = Object.defineProperty, E = Object.defineProperties;
 var R = Object.getOwnPropertyDescriptors;
-var D = Object.getOwnPropertySymbols;
+var P = Object.getOwnPropertySymbols;
 var F = Object.prototype.hasOwnProperty, O = Object.prototype.propertyIsEnumerable;
 var A = (d, a, e) => a in d ? V(d, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : d[a] = e, c = (d, a) => {
   for (var e in a || (a = {}))
     F.call(a, e) && A(d, e, a[e]);
-  if (D)
-    for (var e of D(a))
+  if (P)
+    for (var e of P(a))
       O.call(a, e) && A(d, e, a[e]);
   return d;
 }, C = (d, a) => E(d, R(a));
@@ -27,7 +27,7 @@ var g = (d, a, e) => new Promise((t, i) => {
   }, r = (n) => n.done ? t(n.value) : Promise.resolve(n.value).then(s, o);
   r((e = e.apply(d, a)).next());
 });
-import * as P from "three";
+import * as D from "three";
 import { Subscribe as _ } from "@realsee/five";
 import { objectAssignDeepExports as u } from "../../vendor/object-assign-deep/objectAssignDeep.js";
 import { addDebugPoints as M } from "../utils/addDebugPoints.js";
@@ -250,7 +250,7 @@ class Ni extends j {
         return (t = this.getTagConfig(e).modelConfig) == null ? void 0 : t.autoLookAtEnabled;
       }).forEach((e) => {
         var l;
-        const t = new P.Mesh(new P.BoxGeometry(), new P.MeshBasicMaterial()), i = (l = e.model) == null ? void 0 : l.object;
+        const t = new D.Mesh(new D.BoxGeometry(), new D.MeshBasicMaterial()), i = (l = e.model) == null ? void 0 : l.object;
         if (!i)
           return;
         t.position.copy(i.position), t.quaternion.copy(i.quaternion);
@@ -425,7 +425,7 @@ class Ni extends j {
       if (!i)
         return;
       const s = (h = i.enabled) != null ? h : !0, o = (p = i.state) == null ? void 0 : p.visible, r = s && o;
-      r === !1 && (i.state.visible = !0, i.enabled = !0, this.setPointTagPosition(), this.updateDomView(), yield X(0), i.dom && (i.dom.style.visibility = "hidden"));
+      r === !1 && (i.state.visible = !0, i.enabled = !0, this.setPointTagPosition(), this.updateDomView(), this.updateRender3DDomTag(), yield X(0), i.dom && (i.dom.style.visibility = "hidden"), i.contentDom && (i.contentDom.style.visibility = "hidden"));
       const n = (() => {
         var v, T, y;
         const b = [];
@@ -435,7 +435,7 @@ class Ni extends j {
         return;
       yield (r ? Q : Y)(n, c({
         begin: () => {
-          r === !1 && i.dom && (i.dom.style.visibility = "");
+          r === !1 && (i.dom && (i.dom.style.visibility = ""), i.contentDom && (i.contentDom.style.visibility = ""));
         },
         updateRender: () => {
           this.five.needsRender = !0;

package/libs/PanoVideoPlugin/VideoMeshController.d.ts

@@ -19,9 +19,10 @@ export declare class VideoMeshController {
     get disposed(): boolean;
     /** 是否已经启用 */
     get enabled(): boolean;
+    video: HTMLVideoElement;
     private _id;
     /** 视频资源地址 */
-    private url;
+    private readonly url;
     /** Five Instance */
     private five;
     /** 视频对应的点位 */
@@ -31,7 +32,6 @@ export declare class VideoMeshController {
     /** 视频在球面的 uv：[left, top, width, height] */
     private origin;
     /** Video DOM */
-    private video;
     /** Video Mesh */
     private videoMesh;
     private _enabled;

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 W } from "../shared-utils/animationFrame/index.js";
-import E from "./utils/index.js";
+import { requestAnimationFrameInterval as E } from "../shared-utils/animationFrame/index.js";
+import W from "./utils/index.js";
 import "../shared-utils/positionToVector3.js";
 import "../CSS3DRenderPlugin/utils/three/CSS3DRenderer.js";
 import "three/examples/jsm/renderers/CSS3DRenderer";
@@ -28,6 +28,7 @@ import "../CSS3DRenderPlugin/utils/three/CSS3DGroup.js";
 class ie {
   /** 初始化视频、模型以及相关事件监听。 */
   constructor(e, i) {
+    t(this, "video");
     t(this, "_id");
     /** 视频资源地址 */
     t(this, "url");
@@ -40,7 +41,6 @@ class ie {
     /** 视频在球面的 uv：[left, top, width, height] */
     t(this, "origin");
     /** Video DOM */
-    t(this, "video");
     /** Video Mesh */
     t(this, "videoMesh");
     t(this, "_enabled", !0);
@@ -137,7 +137,7 @@ class ie {
      * @link https://developer.mozilla.org/en-US/docs/Web/HTML/Element/video
      */
     t(this, "onVideoPlaying", () => {
-      this.hasVideoEverPlayed = !0, this.video.src !== "" && this.videoDataLoaded && this.onVideoPlayingAndLoaded();
+      this.hasVideoEverPlayed = !0, this.enabled && this.videoDataLoaded && this.onVideoPlayingAndLoaded();
     });
     /** 触发 playing 和 canplaythrough */
     t(this, "onVideoPlayingAndLoaded", () => {
@@ -148,7 +148,7 @@ class ie {
       this.video.addEventListener(
         "timeupdate",
         () => {
-          if (this.video.src !== "" && this.panoIndex === this.five.getCurrentState().panoIndex && this.five.getCurrentState().mode === "Panorama" && (this.renderFiveDisposer || (this.renderFiveDisposer = W(() => {
+          if (this.enabled && this.panoIndex === this.five.getCurrentState().panoIndex && this.five.getCurrentState().mode === "Panorama" && (this.renderFiveDisposer || (this.renderFiveDisposer = E(() => {
             this.five.needsRender = !0;
           }, 30)), this.five.scene.add(this.videoMesh), this.videoMesh.material.uniforms.opacity.value === 0)) {
             const e = {
@@ -197,7 +197,7 @@ class ie {
     }), d = new L(1, 64, 64);
     d.scale(-1, 1, 1);
     const s = new V(d, a);
-    s.name = "pano-video", this.videoMesh = s, this.five.work && this.onFiveDataLoaded(), this.enabled && this.addEventListeners(), this.mountIfNeeded();
+    s.name = "pano-video-plugin", this.videoMesh = s, this.five.work && this.onFiveDataLoaded(), this.enabled && this.addEventListeners(), this.mountIfNeeded(), window[`__PANOVIDEO_${this.renderID}_DEBUG__`] = this;
   }
   /** 传入的 ID，不可更改 */
   get renderID() {
@@ -216,7 +216,7 @@ class ie {
     this.disposed || (this.disable(), this._disposed = !0);
   }
   enable() {
-    this.disposed || this.enabled || (this._enabled = !0, this.addEventListeners(), this.mountIfNeeded());
+    this.disposed || this.enabled || (this._enabled = !0, !this.observer && this.five.work && this.onFiveDataLoaded(), this.addEventListeners(), this.mountIfNeeded());
   }
   /** 禁用插件 */
   disable() {
@@ -234,7 +234,7 @@ 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 } = E(n);
+    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);
   }
   /** 获取视频中心点的 uv */

package/libs/base/BasePlugin.js

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

package/libs/shared-utils/logger.js

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

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