@realsee/dnalogel 2.10.6 → 2.11.0-alpha.1

package/libs/PanoVideoPlugin/VideoMeshController.js

@@ -1,15 +1,15 @@
-var g = Object.defineProperty;
-var F = (h, e, i) => e in h ? g(h, e, { enumerable: !0, configurable: !0, writable: !0, value: i }) : h[e] = i;
-var t = (h, e, i) => (F(h, typeof e != "symbol" ? e + "" : e, i), i);
-import { vertexShader as E, fragmentShader as I } from "./utils/shader.js";
+var F = Object.defineProperty;
+var I = (d, e, i) => e in d ? F(d, e, { enumerable: !0, configurable: !0, writable: !0, value: i }) : d[e] = i;
+var t = (d, e, i) => (I(d, typeof e != "symbol" ? e + "" : e, i), i);
+import { vertexShader as E, fragmentShader as M } from "./utils/shader.js";
 import "hammerjs";
-import { VideoTexture as D, LinearFilter as m, ShaderMaterial as P, Vector4 as A, SphereBufferGeometry as M, Mesh as x, Vector3 as f, Quaternion as C } from "three";
+import { VideoTexture as P, LinearFilter as m, ShaderMaterial as A, Vector4 as x, SphereBufferGeometry as D, Mesh as b, Vector3 as f, Quaternion as C } from "three";
 import "@realsee/five";
 import "@tweenjs/tween.js";
 import "../CSS3DRenderPlugin/CSS3DRender.js";
 import "../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
-import { requestAnimationFrameInterval as L } from "../shared-utils/animationFrame/index.js";
-import V from "./utils/index.js";
+import { requestAnimationFrameInterval as y } from "../shared-utils/animationFrame/index.js";
+import B from "./utils/index.js";
 import "../CSS3DRenderPlugin/utils/three/CSS3DRenderer.js";
 import "three/examples/jsm/renderers/CSS3DRenderer";
 import "../CSS3DRenderPlugin/utils/getAllCSS3DObject.js";
@@ -23,7 +23,7 @@ import "../CSS3DRenderPlugin/utils/three/OpacityMesh.js";
 import "../CSS3DRenderPlugin/utils/three/CSS3DScene.js";
 import "../CSS3DRenderPlugin/utils/three/CSS3DGroup.js";
 import "../shared-utils/animationFrame/BetterTween.js";
-class Y {
+class Z {
   constructor(e, i) {
     t(this, "_id");
     t(this, "url");
@@ -35,31 +35,24 @@ class Y {
     t(this, "videoMesh");
     t(this, "_enabled", !0);
     t(this, "_disposed", !1);
-    t(this, "videoDataLoaded", !1);
     t(this, "hasVideoEverPlayed", !1);
     t(this, "renderFiveDisposer");
     t(this, "uv2Position", (e, i) => {
-      var c;
-      const o = Math.PI, a = Math.PI * 2, d = e, s = 1 - i, r = new f(
-        -1 * Math.cos(a * d) * Math.sin(o * s),
-        1 * Math.cos(o * s),
-        1 * Math.sin(a * d) * Math.sin(o * s)
-      );
-      r.setX(-r.x);
-      const u = (c = this.five.work) == null ? void 0 : c.observers[this.panoIndex];
-      if (!u)
+      var p;
+      const o = Math.PI, s = Math.PI * 2, u = -1 * Math.cos(s * e) * Math.sin(o * i), r = 1 * Math.cos(o * i), a = 1 * Math.sin(s * e) * Math.sin(o * i), h = new f(u, r, a), v = (p = this.five.work) == null ? void 0 : p.observers[this.panoIndex];
+      if (!v)
         return this.logWarning(`\u70B9\u4F4D ${this.panoIndex} \u4E0D\u5B58\u5728\uFF0C\u8BF7\u68C0\u67E5 Five \u6570\u636E\u662F\u5426\u6B63\u5E38\u3002`);
-      const l = u.position.clone(), p = u.quaternion.clone(), v = r.clone();
-      return v.applyAxisAngle(new f(0, 1, 0), Math.PI / 2), v.applyQuaternion(p), v.add(l), v;
+      const c = v.position.clone(), g = v.quaternion.clone(), l = h.clone();
+      return l.add(c), l.applyAxisAngle(new f(0, 1, 0), -Math.PI / 2), l.applyQuaternion(g), l;
     });
     t(this, "onFiveDataLoaded", () => {
-      var r;
-      const e = (r = this.five.work) == null ? void 0 : r.observers[this.panoIndex];
+      var a;
+      const e = (a = this.five.work) == null ? void 0 : a.observers[this.panoIndex];
       if (!e)
         return this.logWarning(`\u70B9\u4F4D ${this.panoIndex} \u4E0D\u5B58\u5728\uFF0C\u8BF7\u68C0\u67E5 Five \u6570\u636E\u662F\u5426\u6B63\u5E38\u3002`);
       this.observer = e;
-      const { x: i, y: n, z: o, w: a } = e.quaternion, d = new C(i, n, o, 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 f(0, 1, 0), Math.PI / 2), this.videoMesh.applyQuaternion(d);
+      const { x: i, y: n, z: o, w: s } = e.quaternion, u = new C(i, n, o, s), r = e.position;
+      this.videoMesh.position.fromArray([r.x, r.y, r.z]), this.videoMesh.quaternion.set(0, 0, 0, 1), this.videoMesh.rotateOnAxis(new f(0, 1, 0), Math.PI / 2), this.videoMesh.applyQuaternion(u);
     });
     t(this, "onFiveWantsMoveToPano", (e) => {
       e === this.panoIndex && (this.hasVideoEverPlayed || this.video.play().catch((i) => {
@@ -96,52 +89,36 @@ class Y {
       if (this.checkIntersectionInBounding(this.origin, i))
         return this.video.muted = !this.video.muted, !1;
     });
-    t(this, "onVideoDataLoaded", () => {
-      this.videoDataLoaded = !0, this.video.paused === !1 && this.video.src !== "" && this.onVideoPlayingAndLoaded();
-    });
     t(this, "onVideoPlaying", () => {
-      this.hasVideoEverPlayed = !0, this.video.src !== "" && this.videoDataLoaded && this.onVideoPlayingAndLoaded();
-    });
-    t(this, "onVideoPlayingAndLoaded", () => {
-      if (!this.videoDataLoaded)
-        return this.logWarning("\u89C6\u9891\u6570\u636E\u672A\u52A0\u8F7D");
-      if (this.video.paused === !0)
-        return this.logWarning("\u89C6\u9891\u5DF2\u6682\u505C");
-      this.video.addEventListener(
-        "timeupdate",
-        () => {
-          this.video.src !== "" && this.panoIndex === this.five.getCurrentState().panoIndex && this.five.getCurrentState().mode === "Panorama" && (this.renderFiveDisposer || (this.renderFiveDisposer = L(() => {
-            this.five.needsRender = !0;
-          }, 30)), this.five.scene.add(this.videoMesh));
-        },
-        { once: !0 }
-      );
+      this.hasVideoEverPlayed = !0, this.video.src !== "" && (this.renderFiveDisposer = y(() => {
+        this.five.needsRender = !0;
+      }), this.five.scene.add(this.videoMesh));
     });
     t(this, "onVideoPaused", () => {
       var e;
-      (e = this.renderFiveDisposer) == null || e.call(this), this.renderFiveDisposer = void 0;
+      (e = this.renderFiveDisposer) == null || e.call(this);
     });
-    var r, u;
-    this.five = e, this.panoIndex = i.panoIndex, this._id = i.renderID, this.url = i.url, this.origin = i.origin.slice(), this._enabled = (u = (r = i.initialState) == null ? void 0 : r.enabled) != null ? u : !0;
+    var a, h;
+    this.five = e, this.panoIndex = i.panoIndex, this._id = i.renderID, this.url = i.url, this.origin = i.origin.slice(), this._enabled = (h = (a = i.initialState) == null ? void 0 : a.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 D(this.video);
+    const o = new P(this.video);
     o.minFilter = m, o.magFilter = m;
-    const a = new P({
+    const s = new A({
       vertexShader: E,
-      fragmentShader: I,
+      fragmentShader: M,
       uniforms: {
         map: { value: o },
         size: {
-          value: new A(this.origin[0], 1 - this.origin[1] - this.origin[3], this.origin[2], this.origin[3])
+          value: new x(this.origin[0], 1 - this.origin[1] - this.origin[3], this.origin[2], this.origin[3])
         }
       },
       depthTest: !0,
       transparent: !0
-    }), d = new M(1, 64, 64);
-    d.scale(-1, 1, 1);
-    const s = new x(d, a);
-    s.name = "pano-video", this.videoMesh = s, this.five.work && this.onFiveDataLoaded(), this.enabled && this.addEventListeners(), this.mountIfNeeded();
+    }), u = new D(1, 64, 64);
+    u.scale(-1, 1, 1);
+    const r = new b(u, s);
+    r.name = "pano-video", this.videoMesh = r, this.five.work && this.onFiveDataLoaded(), this.enabled && this.addEventListeners(), this.mountIfNeeded();
   }
   get renderID() {
     return this._id;
@@ -170,8 +147,8 @@ class Y {
     const i = this.uv2Position(e[0], e[1]);
     if (!i)
       return;
-    const n = new f().subVectors(i, this.observer.position).normalize(), { longitude: o, latitude: a } = V(n);
-    this.five.setState({ panoIndex: this.panoIndex, longitude: o, latitude: a }), this.onFiveWantsMoveToPano(this.panoIndex);
+    const n = new f().subVectors(i, this.observer.position).normalize(), { longitude: o, latitude: s } = B(n);
+    this.five.setState({ panoIndex: this.panoIndex, longitude: o, latitude: s }), this.onFiveWantsMoveToPano(this.panoIndex);
   }
   getUVCenter() {
     if (!this.origin)
@@ -180,10 +157,10 @@ class Y {
     return [e, i];
   }
   addEventListeners() {
-    this.five.on("loaded", this.onFiveDataLoaded), this.five.on("modeChange", this.onFiveModeChange), this.five.on("panoArrived", this.onFivePanoArrived), this.five.on("panoWillArrive", this.onFivePanoWillArrive), this.five.on("wantsMoveToPano", this.onFiveWantsMoveToPano), this.five.on("wantsTapGesture", this.onFiveWantsTapGesture), this.five.on("initAnimationEnded", this.onFiveInitAnimationEnded), this.video.addEventListener("canplaythrough", this.onVideoDataLoaded), this.video.addEventListener("playing", this.onVideoPlaying), this.video.addEventListener("pause", this.onVideoPaused);
+    this.five.on("loaded", this.onFiveDataLoaded), this.five.on("modeChange", this.onFiveModeChange), this.five.on("panoArrived", this.onFivePanoArrived), this.five.on("panoWillArrive", this.onFivePanoWillArrive), this.five.on("wantsMoveToPano", this.onFiveWantsMoveToPano), this.five.on("wantsTapGesture", this.onFiveWantsTapGesture), this.five.on("initAnimationEnded", this.onFiveInitAnimationEnded), this.video.addEventListener("playing", this.onVideoPlaying), this.video.addEventListener("pause", this.onVideoPaused);
   }
   removeEventListeners() {
-    this.five.off("loaded", this.onFiveDataLoaded), this.five.off("modeChange", this.onFiveModeChange), this.five.off("panoArrived", this.onFivePanoArrived), this.five.off("panoWillArrive", this.onFivePanoWillArrive), this.five.off("wantsMoveToPano", this.onFiveWantsMoveToPano), this.five.off("wantsTapGesture", this.onFiveWantsTapGesture), this.five.off("initAnimationEnded", this.onFiveInitAnimationEnded), this.video.removeEventListener("canplaythrough", this.onVideoDataLoaded), this.video.removeEventListener("playing", this.onVideoPlaying), this.video.removeEventListener("pause", this.onVideoPaused);
+    this.five.off("loaded", this.onFiveDataLoaded), this.five.off("modeChange", this.onFiveModeChange), this.five.off("panoArrived", this.onFivePanoArrived), this.five.off("panoWillArrive", this.onFivePanoWillArrive), this.five.off("wantsMoveToPano", this.onFiveWantsMoveToPano), this.five.off("wantsTapGesture", this.onFiveWantsTapGesture), this.five.off("initAnimationEnded", this.onFiveInitAnimationEnded), this.video.removeEventListener("playing", this.onVideoPlaying), this.video.removeEventListener("pause", this.onVideoPaused);
   }
   mountIfNeeded() {
     const e = this.five.getCurrentState();
@@ -214,10 +191,10 @@ class Y {
   checkIntersectionInBounding(e, i) {
     if (!i.uv)
       return !1;
-    const [n, o] = i.uv.toArray(), [a, d, s, r] = e, u = 1 - d - r, l = a + s, p = u + r;
-    return n >= a && n <= l && o >= u && o <= p;
+    const [n, o] = i.uv.toArray(), [s, u, r, a] = e, h = 1 - u - a, v = s + r, c = h + a;
+    return n >= s && n <= v && o >= h && o <= c;
   }
 }
 export {
-  Y as VideoMeshController
+  Z as VideoMeshController
 };

package/libs/base/BasePlugin.d.ts

@@ -49,6 +49,10 @@ declare type EventMap<PluginState> = {
  * plugin 的基本控制器
  */
 declare abstract class Controller<PluginState extends State, PluginEventMap extends EventMap<PluginState>> {
+    /**
+     * @realsee/dnalogel 版本号
+     */
+    readonly VERSION: string;
     five: Five;
     /**
      * 插件事件钩子

package/libs/base/BasePlugin.js

@@ -2,8 +2,9 @@ var i = Object.defineProperty;
 var a = (e, r, t) => r in e ? i(e, r, { enumerable: !0, configurable: !0, writable: !0, value: t }) : e[r] = t;
 var s = (e, r, t) => (a(e, typeof r != "symbol" ? r + "" : r, t), t);
 import { Subscribe as c } from "../shared-utils/Subscribe.js";
-class x {
+class o {
   constructor(r, t) {
+    s(this, "VERSION", "2.11.0-alpha.1");
     s(this, "five");
     s(this, "hooks", new c());
     s(this, "staticPrefix", "//vrlab-static.ljcdn.com");
@@ -14,5 +15,5 @@ class x {
   }
 }
 export {
-  x as Controller
+  o as Controller
 };

package/libs/index.js

@@ -218,7 +218,6 @@ import "./CruisePlugin/utils/vectorToCoordinates.js";
 import "./CruisePlugin/utils/formatRad.js";
 import "./CruisePlugin/utils/linerValue.js";
 import "./CruisePlugin/utils/sleep.js";
-import "@realsee/five/gltf-loader";
 import "object-assign-deep";
 import "./PanoTagPlugin/Components/TagContainer.js";
 import "./PanoTagPlugin/Components/TagItem.js";
@@ -301,6 +300,7 @@ import "./PanoTagPlugin/utils/checkRange.js";
 import "./PanoTagPlugin/controller/TagCacheController.js";
 import "./PanoTagPlugin/utils/tag/format.js";
 import "./shared-utils/three/GLTFLoader.js";
+import "@realsee/five/gltf-loader";
 import "./shared-utils/Object3DHelper/utils/threex/domevents/index.js";
 import "./shared-utils/Object3DHelper/Helper/MoveHelper.js";
 import "./shared-utils/Object3DHelper/Base/BaseHelper.js";

package/package.json

@@ -7,7 +7,7 @@
   "repository": "https://github.com/realsee-developer/dnalogel.git",
   "description": "如视 VR 看房插件合集",
   "private": false,
-  "version": "2.10.6",
+  "version": "2.11.0-alpha.1",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "clean": "rm -rf components dist docs libs types ./vite.config.js.timestamp*",
@@ -52,7 +52,7 @@
     "eslint-config-alloy": "^4.7.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-svelte": "^2.14.1",
+    "eslint-plugin-svelte": "^2.22.0",
     "glob": "^8.0.3",
     "npm-run-all": "^4.1.5",
     "postcss": "^8.4.19",