@realsee/dnalogel 3.9.0-dev.2 → 3.9.0-dev.4

package/libs/PanoTagPlugin/controller/index.js

@@ -1,15 +1,15 @@
-var E = Object.defineProperty, U = Object.defineProperties;
-var I = Object.getOwnPropertyDescriptors;
+var U = Object.defineProperty, I = Object.defineProperties;
+var R = Object.getOwnPropertyDescriptors;
 var A = Object.getOwnPropertySymbols;
-var R = Object.prototype.hasOwnProperty, B = Object.prototype.propertyIsEnumerable;
-var u = (d, a, e) => a in d ? E(d, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : d[a] = e, g = (d, a) => {
+var B = Object.prototype.hasOwnProperty, F = Object.prototype.propertyIsEnumerable;
+var u = (d, a, e) => a in d ? U(d, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : d[a] = e, g = (d, a) => {
   for (var e in a || (a = {}))
-    R.call(a, e) && u(d, e, a[e]);
+    B.call(a, e) && u(d, e, a[e]);
   if (A)
     for (var e of A(a))
-      B.call(a, e) && u(d, e, a[e]);
+      F.call(a, e) && u(d, e, a[e]);
   return d;
-}, v = (d, a) => U(d, I(a));
+}, v = (d, a) => I(d, R(a));
 var l = (d, a, e) => (u(d, typeof a != "symbol" ? a + "" : a, e), e);
 var c = (d, a, e) => new Promise((t, i) => {
   var s = (r) => {
@@ -28,14 +28,14 @@ var c = (d, a, e) => new Promise((t, i) => {
   n((e = e.apply(d, a)).next());
 });
 import * as b from "three";
-import { Subscribe as F } from "@realsee/five";
+import { Subscribe as M } from "@realsee/five";
 import { objectAssignDeepExports as f } from "../../vendor/object-assign-deep/objectAssignDeep.js";
-import { addDebugPoints as M } from "../utils/addDebugPoints.js";
+import { addDebugPoints as O } from "../utils/addDebugPoints.js";
 import { arrayPositionToVector3 as P } from "../../shared-utils/positionToVector3.js";
-import { isMediaModelTag as O, isModelTag as _ } from "../utils/tag/tagCheck.js";
-import { debounce as k } from "../utils/debounce.js";
-import { throttle as V } from "../utils/throttle.js";
-import { resizeObserver as D } from "../utils/resizeObserver.js";
+import { isMediaModelTag as _, isModelTag as k } from "../utils/tag/tagCheck.js";
+import { debounce as V } from "../utils/debounce.js";
+import { throttle as D } from "../utils/throttle.js";
+import { resizeObserver as S } from "../utils/resizeObserver.js";
 import L from "../utils/tag/format.js";
 import { generateBlankAudio as N, AudioNamespace as G } from "../../shared-utils/audio.js";
 import { TagRender as z } from "./TagRender.js";
@@ -169,7 +169,7 @@ import "../../CSS3DRenderPlugin/utils/waitFiveModelLoaded.js";
 import "../../shared-utils/three/GLTFLoader.js";
 import "@realsee/five/gltf-loader";
 import "../../shared-utils/animationFrame/index.js";
-const S = "Dnalogel-PanoTagPlugin", Ui = (d) => `${S}--${d}`;
+const w = "Dnalogel-PanoTagPlugin", Ui = (d) => `${w}--${d}`;
 class Ii extends z {
   constructor(e, t) {
     super(e);
@@ -205,7 +205,7 @@ class Ii extends z {
     l(this, "updateVisible", () => {
       const e = this.five.getCurrentState().mode;
       this.tags.forEach((t) => {
-        O(t) && e !== "Panorama" && this.changeTagMode(t, "behind");
+        _(t) && e !== "Panorama" && this.changeTagMode(t, "behind");
       }), this.setVisible(), this.updateRenderAllTags();
     });
     l(this, "handleFiveWantsMoveToPano", (e) => {
@@ -247,7 +247,7 @@ class Ii extends z {
     l(this, "handleFivePanoArrived", () => c(this, null, function* () {
       this.setVisible(), this.updatePointTagPosition(), yield this.setVisibleAndUnfolded(), this.tags.forEach((e) => {
         e.temporaryState = v(g({}, e.temporaryState), { visible: !0 });
-      }), this.tags.filter(_).filter((e) => {
+      }), this.tags.filter(k).filter((e) => {
         var t;
         return (t = this.getTagConfig(e).modelConfig) == null ? void 0 : t.autoLookAtEnabled;
       }).forEach((e) => {
@@ -284,14 +284,14 @@ class Ii extends z {
   load(e, t) {
     return c(this, null, function* () {
       var s, o;
-      this.clearTags(), console.debug(S, " load:", { data: JSON.parse(JSON.stringify(e)) }), this.config = f({}, this.config, {
+      this.clearTags(), console.debug(w, " load:", { data: JSON.parse(JSON.stringify(e)) }), this.config = f({}, this.config, {
         globalConfig: (s = e.globalConfig) != null ? s : {},
         contentTypeConfig: (o = e.contentTypeConfig) != null ? o : {}
       });
       const i = yield this.addTag(e.tagList, t);
       if (this.debug)
         try {
-          M(this.five, this.tags);
+          O(this.five, this.tags);
         } catch (n) {
           console.error(n);
         }
@@ -314,11 +314,11 @@ class Ii extends z {
             visible: void 0,
             unfolded: !this.can("fold", o)
           }, p.initialState),
-          hooks: new F(),
+          hooks: new M(),
           originPosition: o.position,
           position: (() => {
             const m = this.getTransformedPostion(o.position);
-            return Array.isArray(m) ? m.map((w) => w.toArray()) : m.toArray();
+            return Array.isArray(m) ? m.map((E) => E.toArray()) : m.toArray();
           })(),
           initialConfig: r,
           computedConfig: h,
@@ -491,11 +491,11 @@ class Ii extends z {
   addEventListener() {
     const { five: e, hooks: t } = this;
     let i = !1;
-    const s = () => {
+    const s = D(() => {
       i || (i = !0, e.ready().then(() => {
         this.onFiveEveryReady(), i = !1;
       }));
-    };
+    }, 150);
     return e.on("cameraUpdate", s), this.updateVisible(), this.handleFivePanoArrived(), e.on("wantsMoveToPano", this.handleFiveWantsMoveToPano), e.on("modeChange", this.updateVisible), e.on("initAnimationEnded", this.updateVisible), e.on("modelShownFloorChange", this.handleFiveModelShownFloorChange), e.on("cameraUpdate", this.handleFiveCameraUpdate), e.on("panoArrived", this.handleFivePanoArrived), e.on("panoArrived", this.loadVideoFirstFrame), t.on("click", this.clickhandler), () => {
       e.off("wantsMoveToPano", this.handleFiveWantsMoveToPano), e.off("modeChange", this.updateVisible), e.off("initAnimationEnded", this.updateVisible), e.off("modelShownFloorChange", this.handleFiveModelShownFloorChange), e.off("cameraUpdate", this.handleFiveCameraUpdate), e.off("cameraUpdate", s), e.off("panoArrived", this.handleFivePanoArrived), e.off("panoArrived", this.loadVideoFirstFrame), t.off("click", this.clickhandler), this.store.eventListenerDisposer = void 0;
     };
@@ -515,13 +515,13 @@ class Ii extends z {
       this.state.enabled && (this.show(), this.updateRenderAllTags());
     }, i = () => {
       this.state.enabled && this.hide();
-    }, { observe: s, unobserve: o } = D(
-      V(() => {
+    }, { observe: s, unobserve: o } = S(
+      D(() => {
         this.store.resizeObserverDisposer && i();
       }, 500),
       e
-    ), { observe: n, unobserve: r } = D(
-      k(() => t(), 400),
+    ), { observe: n, unobserve: r } = S(
+      V(() => t(), 400),
       e
     );
     return s(), n(), () => {

package/libs/PanoVideoPlugin/VideoMeshController.d.ts

@@ -75,10 +75,6 @@ export declare class VideoMeshController {
     private onFiveDataLoaded;
     /** 兼容视频播放 */
     private onFiveWantsMoveToPano;
-    /**
-     * 视频是否已经渐现完成，仅在视频首次加载时才会渐现
-     */
-    private fadeInComplete;
     /** 走到某个点位上时，挂载/卸载视频 */
     private onFivePanoArrived;
     private onFivePanoWillArrive;

package/libs/PanoVideoPlugin/VideoMeshController.js

@@ -1,9 +1,9 @@
 var g = Object.defineProperty;
 var I = (v, e, i) => e in v ? g(v, e, { enumerable: !0, configurable: !0, writable: !0, value: i }) : v[e] = i;
 var t = (v, e, i) => (I(v, typeof e != "symbol" ? e + "" : e, i), i);
-import { vertexShader as P, fragmentShader as F } from "./utils/shader.js";
+import { vertexShader as M, fragmentShader as P } from "./utils/shader.js";
 import "hammerjs";
-import { VideoTexture as M, LinearFilter as m, ShaderMaterial as y, Vector4 as x, SphereBufferGeometry as L, Mesh as V, Vector3 as l, Quaternion as b } from "three";
+import { VideoTexture as F, LinearFilter as m, ShaderMaterial as y, Vector4 as x, SphereBufferGeometry as L, Mesh as V, Vector3 as l, Quaternion as b } from "three";
 import "@realsee/five";
 import "../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
@@ -83,10 +83,6 @@ class ie {
       e === this.panoIndex && (this.hasVideoEverPlayed || this.video.play().catch(() => {
       }));
     });
-    /**
-     * 视频是否已经渐现完成，仅在视频首次加载时才会渐现
-     */
-    t(this, "fadeInComplete", !1);
     /** 走到某个点位上时，挂载/卸载视频 */
     t(this, "onFivePanoArrived", (e) => {
       if (this.disposed)
@@ -146,7 +142,7 @@ class ie {
         () => {
           if (this.video.src !== "" && this.panoIndex === this.five.getCurrentState().panoIndex && this.five.getCurrentState().mode === "Panorama" && (this.renderFiveDisposer || (this.renderFiveDisposer = A(() => {
             this.five.needsRender = !0;
-          }, 30)), this.five.scene.add(this.videoMesh), !this.fadeInComplete)) {
+          }, 30)), this.five.scene.add(this.videoMesh), this.videoMesh.material.uniforms.opacity.value === 0)) {
             const e = {
               value: 0
             };
@@ -159,7 +155,7 @@ class ie {
                 this.videoMesh.material.uniforms.opacity.value = e.value;
               },
               complete: () => {
-                this.video.play(), this.fadeInComplete = !0;
+                this.videoMesh.material.uniforms.opacity.value = 1;
               }
             });
           }
@@ -176,11 +172,11 @@ class ie {
     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 M(this.video);
+    const o = new F(this.video);
     o.minFilter = m, o.magFilter = m;
     const a = new y({
-      vertexShader: P,
-      fragmentShader: F,
+      vertexShader: M,
+      fragmentShader: P,
       uniforms: {
         map: { value: o },
         size: {
@@ -269,11 +265,11 @@ class ie {
   }
   /** 卸载：销毁视频资源；移除模型。 */
   unmount() {
-    this.video.pause(), this.fadeInComplete = !1, this.video.src !== "" && (this.video.src = ""), this.five.scene.remove(this.videoMesh);
+    this.video.pause(), this.videoMesh.material.uniforms.opacity.value = 0, this.video.src !== "" && (this.video.src = ""), this.five.scene.remove(this.videoMesh);
   }
   /** 暂停视频，去除模型。 */
   hide() {
-    this.video.pause(), this.fadeInComplete = !1, this.five.scene.remove(this.videoMesh);
+    this.video.pause(), this.videoMesh.material.uniforms.opacity.value = 0, this.five.scene.remove(this.videoMesh);
   }
   /** 控制台打印警告 */
   logWarning(e) {

package/libs/base/BasePlugin.js

@@ -14,7 +14,7 @@ let b = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.9.0-dev.2");
+    i(this, "VERSION", "3.9.0-dev.4");
     i(this, "five");
     /**
      * 插件事件钩子

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.9.0-dev.2",
+    "%c %c@realsee/dnalogel %cv3.9.0-dev.4",
     [
       "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

@@ -7,7 +7,7 @@
   "repository": "https://github.com/realsee-developer/dnalogel.git",
   "description": "如视 VR 看房插件合集",
   "private": false,
-  "version": "3.9.0-dev.2",
+  "version": "3.9.0-dev.4",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "clean": "rm -rf components dist docs libs types ./vite.config.js.timestamp*",