@realsee/dnalogel 3.64.11-alpha.1 → 3.64.12

package/libs/PanoVideoPlugin/Controller.js

@@ -1,15 +1,15 @@
-var g = Object.defineProperty, f = Object.defineProperties;
+var u = Object.defineProperty, g = Object.defineProperties;
 var b = Object.getOwnPropertyDescriptors;
 var h = Object.getOwnPropertySymbols;
 var M = Object.prototype.hasOwnProperty, W = Object.prototype.propertyIsEnumerable;
-var l = (e, i, r) => i in e ? g(e, i, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[i] = r, p = (e, i) => {
+var l = (e, i, r) => i in e ? u(e, i, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[i] = r, p = (e, i) => {
   for (var r in i || (i = {}))
     M.call(i, r) && l(e, r, i[r]);
   if (h)
     for (var r of h(i))
       W.call(i, r) && l(e, r, i[r]);
   return e;
-}, a = (e, i) => f(e, b(i));
+}, a = (e, i) => g(e, b(i));
 var s = (e, i, r) => (l(e, typeof i != "symbol" ? i + "" : i, r), r);
 import { VideoMeshController as m } from "./VideoMeshController.js";
 import { Controller as _ } from "../base/BasePlugin.js";
@@ -77,7 +77,7 @@ import "../Sculpt/utils/three/rayOnLine.js";
 import "../shared-utils/animationFrame/index.js";
 import "./utils/index.js";
 import "../shared-utils/url/absoluteUrl.js";
-class Br extends _ {
+class Ur extends _ {
   constructor(r) {
     super(r);
     s(this, "controllerMap", /* @__PURE__ */ new Map());
@@ -101,13 +101,14 @@ class Br extends _ {
     if (this.disposed)
       return this.logWarning("插件已被销毁");
     typeof ((o = t == null ? void 0 : t.initialState) == null ? void 0 : o.enabled) != "undefined" && t.initialState.enabled !== this.enabled && (t.initialState.enabled ? this.enable() : this.disable()), r.list.forEach((n) => {
-      const c = n.pano_index, u = n.render_id;
+      const c = n.pano_index, f = n.render_id;
       n.video_list.forEach((d) => {
         this.controllerMap.set(
           d.render_id,
           new m(this.five, a(p({}, d), {
+            fiveUtil: this.fiveUtil,
             panoIndex: c,
-            renderID: u,
+            renderID: f,
             hooks: this.hooks,
             initialState: { enabled: this.enabled }
           }))
@@ -184,6 +185,7 @@ class Br extends _ {
       this.controllerMap.set(
         o.render_id,
         new m(this.five, a(p({}, o), {
+          fiveUtil: this.fiveUtil,
           panoIndex: r,
           renderID: n,
           hooks: this.hooks,
@@ -220,5 +222,5 @@ class Br extends _ {
   }
 }
 export {
-  Br as PanoVideoPluginController
+  Ur as PanoVideoPluginController
 };

package/libs/PanoVideoPlugin/VideoMeshController.d.ts

@@ -3,6 +3,7 @@ import type { VideoMeshParams } from './typings';
 import type { Subscribe } from '../shared-utils/Subscribe';
 import type { PluginEventMap } from './typings';
 import type { Simplify } from 'type-fest';
+import type { FiveUtil } from '../shared-utils/Utils/FiveUtil';
 /** 点位视频控制器
  * @description 控制器存在副作用，包括：
  * - 对 Five 事件的监听。
@@ -23,6 +24,7 @@ export declare class VideoMeshController {
     /** 是否已经启用 */
     get enabled(): boolean;
     video: HTMLVideoElement;
+    private fiveUtil?;
     private _id;
     /** 视频资源地址 */
     private readonly url;
@@ -50,6 +52,8 @@ export declare class VideoMeshController {
     private hooks;
     /** 初始化视频、模型以及相关事件监听。 */
     constructor(five: Five, params: VideoMeshParams & {
+        fiveUtil?: FiveUtil;
+    } & {
         hooks: Subscribe<Simplify<PluginEventMap>>;
     });
     /**

package/libs/PanoVideoPlugin/VideoMeshController.js

@@ -1,9 +1,9 @@
-var g = Object.defineProperty;
-var I = (v, i, e) => i in v ? g(v, i, { enumerable: !0, configurable: !0, writable: !0, value: e }) : v[i] = e;
-var t = (v, i, e) => (I(v, typeof i != "symbol" ? i + "" : i, e), e);
-import { vertexShader as M, fragmentShader as P } from "./utils/shader.js";
+var c = Object.defineProperty;
+var g = (v, i, e) => i in v ? c(v, i, { enumerable: !0, configurable: !0, writable: !0, value: e }) : v[i] = e;
+var t = (v, i, e) => (g(v, typeof i != "symbol" ? i + "" : i, e), e);
+import { vertexShader as I, fragmentShader as M } from "./utils/shader.js";
 import "../shared-utils/tag.js";
-import { VideoTexture as F, LinearFilter as c, ShaderMaterial as y, Vector4 as x, SphereBufferGeometry as L, Mesh as V, Vector3 as p, Quaternion as b } from "three";
+import { VideoTexture as P, LinearFilter as f, ShaderMaterial as F, Vector4 as y, SphereBufferGeometry as x, Mesh as L, Vector3 as p, Quaternion as V } from "three";
 import "../vendor/hammerjs/hammer.js";
 import "../shared-utils/three/PointSelector/index.js";
 import "../shared-utils/three/CSS3DRenderer/index.js";
@@ -11,10 +11,10 @@ import "../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
 import "@realsee/five/line";
 import "../shared-utils/three/core/Five_LineMaterial2.js";
 import "../shared-utils/three/core/Sphere.js";
-import { anime as A } from "../vendor/animejs/lib/anime.es.js";
-import { requestAnimationFrameInterval as D } from "../shared-utils/animationFrame/index.js";
+import { anime as b } from "../vendor/animejs/lib/anime.es.js";
+import { requestAnimationFrameInterval as A } from "../shared-utils/animationFrame/index.js";
 import "../shared-utils/five/FivePuppet.js";
-import E from "./utils/index.js";
+import D from "./utils/index.js";
 import "../shared-utils/positionToVector3.js";
 import "../shared-utils/five/vector3ToScreen.js";
 import "../shared-utils/five/getFiveModel.js";
@@ -64,10 +64,11 @@ import "../shared-utils/five/getRaycasterByNdcPosition.js";
 import "../shared-utils/three/PointSelector/utils/contents.js";
 import "../Sculpt/utils/three/rayOnLine.js";
 import "@realsee/five";
-class Ui {
+class Oi {
   /** 初始化视频、模型以及相关事件监听。 */
   constructor(i, e) {
     t(this, "video");
+    t(this, "fiveUtil");
     t(this, "_id");
     /** 视频资源地址 */
     t(this, "url");
@@ -103,28 +104,26 @@ class Ui {
     });
     /** 把 uv 值转换成位置 */
     t(this, "uv2Position", (i, e) => {
-      var f;
-      const o = Math.PI, a = Math.PI * 2, d = i, s = 1 - e, r = new p(
-        -1 * Math.cos(a * d) * Math.sin(o * s),
+      const o = Math.PI, r = Math.PI * 2, a = i, s = 1 - e, d = new p(
+        -1 * Math.cos(r * a) * Math.sin(o * s),
         1 * Math.cos(o * s),
-        1 * Math.sin(a * d) * Math.sin(o * s)
+        1 * Math.sin(r * a) * Math.sin(o * s)
       );
-      r.setX(-r.x);
-      const h = (f = this.five.work) == null ? void 0 : f.observers[this.panoIndex];
+      d.setX(-d.x);
+      const h = this.fiveUtil.workUtil.getResolvedObserver(this.panoIndex);
       if (!h)
         return this.logWarning(`点位 ${this.panoIndex} 不存在，请检查 Five 数据是否正常。`);
-      const m = h.position.clone(), l = h.quaternion.clone(), u = r.clone();
-      return u.applyAxisAngle(new p(0, 1, 0), Math.PI / 2), u.applyQuaternion(l), u.add(m), u;
+      const l = h.position.clone(), m = h.quaternion.clone(), u = d.clone();
+      return u.applyAxisAngle(new p(0, 1, 0), Math.PI / 2), u.applyQuaternion(m), u.add(l), u;
     });
     /** Five 数据加载后需要根据点位位姿调整点位模型位置 */
     t(this, "onFiveDataLoaded", () => {
-      var r;
-      const i = (r = this.five.work) == null ? void 0 : r.observers[this.panoIndex];
+      const i = this.fiveUtil.workUtil.getResolvedObserver(this.panoIndex);
       if (!i)
         return this.logWarning(`点位 ${this.panoIndex} 不存在，请检查 Five 数据是否正常。`);
       this.observer = i;
-      const { x: e, y: n, z: o, w: a } = i.quaternion, d = new b(e, n, o, a), s = i.position;
-      this.videoMesh.position.fromArray([s.x, s.y, s.z]), this.videoMesh.quaternion.set(0, 0, 0, 1), this.videoMesh.rotateOnAxis(new p(0, 1, 0), Math.PI / 2), this.videoMesh.applyQuaternion(d);
+      const { x: e, y: n, z: o, w: r } = i.quaternion, a = new V(e, n, o, r), s = i.position;
+      this.videoMesh.position.fromArray([s.x, s.y, s.z]), this.videoMesh.quaternion.set(0, 0, 0, 1), this.videoMesh.rotateOnAxis(new p(0, 1, 0), Math.PI / 2), this.videoMesh.applyQuaternion(a);
     });
     /** 兼容视频播放 */
     t(this, "onFiveWantsMoveToPano", (i) => {
@@ -196,13 +195,13 @@ class Ui {
       this.video.addEventListener(
         "timeupdate",
         () => {
-          if (this.enabled && this.panoIndex === this.five.getCurrentState().panoIndex && this.five.getCurrentState().mode === "Panorama" && (this.renderFiveDisposer || (this.renderFiveDisposer = D(() => {
+          if (this.enabled && 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.videoMesh.material.uniforms.opacity.value === 0)) {
             const i = {
               value: 0
             };
-            A({
+            b({
               targets: i,
               value: 1,
               duration: 300,
@@ -224,28 +223,28 @@ class Ui {
       var i;
       (i = this.renderFiveDisposer) == null || i.call(this), this.renderFiveDisposer = void 0;
     });
-    var r, h;
-    this.five = i, this.panoIndex = e.panoIndex, this._id = e.renderID, this.url = e.url, this.origin = e.origin.slice(), this.hooks = e.hooks, this._enabled = (h = (r = e.initialState) == null ? void 0 : r.enabled) != null ? h : !0;
+    var d, h;
+    this.five = i, this.panoIndex = e.panoIndex, this.fiveUtil = e.fiveUtil, this._id = e.renderID, this.url = e.url, this.origin = e.origin.slice(), this.hooks = e.hooks, this._enabled = (h = (d = e.initialState) == null ? void 0 : d.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 = c, o.magFilter = c;
-    const a = new y({
-      vertexShader: M,
-      fragmentShader: P,
+    const o = new P(this.video);
+    o.minFilter = f, o.magFilter = f;
+    const r = new F({
+      vertexShader: I,
+      fragmentShader: M,
       uniforms: {
         map: { value: o },
         size: {
-          value: new x(this.origin[0], 1 - this.origin[1] - this.origin[3], this.origin[2], this.origin[3])
+          value: new y(this.origin[0], 1 - this.origin[1] - this.origin[3], this.origin[2], this.origin[3])
         },
         opacity: { value: 0 }
       },
       depthTest: !0,
       transparent: !0
-    }), d = new L(1, 64, 64);
-    d.scale(-1, 1, 1);
-    const s = new V(d, a);
-    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;
+    }), a = new x(1, 64, 64);
+    a.scale(-1, 1, 1);
+    const s = new L(a, r);
+    s.name = "pano-video-plugin", this.videoMesh = s, this.fiveUtil.workUtil.work && this.onFiveDataLoaded(), this.enabled && this.addEventListeners(), this.mountIfNeeded(), window[`__PANOVIDEO_${this.renderID}_DEBUG__`] = this;
   }
   /** 传入的 ID，不可更改 */
   get renderID() {
@@ -282,8 +281,8 @@ class Ui {
     const e = this.uv2Position(i[0], i[1]);
     if (!e)
       return;
-    const n = new p().subVectors(e, this.observer.position).normalize(), { longitude: o, latitude: a } = E(n);
-    this.five.setState({ panoIndex: this.panoIndex, longitude: o, latitude: a }), this.onFiveWantsMoveToPano(this.panoIndex);
+    const n = new p().subVectors(e, this.observer.position).normalize(), { longitude: o, latitude: r } = D(n);
+    this.five.setState({ panoIndex: this.panoIndex, longitude: o, latitude: r }), this.onFiveWantsMoveToPano(this.panoIndex);
   }
   /** 获取视频中心点的 uv */
   getUVCenter() {
@@ -335,10 +334,10 @@ class Ui {
   checkIntersectionInBounding(i, e) {
     if (!e.uv)
       return !1;
-    const [n, o] = e.uv.toArray(), [a, d, s, r] = i, h = 1 - d - r, m = a + s, l = h + r;
-    return n >= a && n <= m && o >= h && o <= l;
+    const [n, o] = e.uv.toArray(), [r, a, s, d] = i, h = 1 - a - d, l = r + s, m = h + d;
+    return n >= r && n <= l && o >= h && o <= m;
   }
 }
 export {
-  Ui as VideoMeshController
+  Oi as VideoMeshController
 };

package/libs/base/BasePlugin.js

@@ -13,7 +13,7 @@ import "../shared-utils/three/core/Five_LineMaterial2.js";
 import "../shared-utils/three/core/Sphere.js";
 import "../vendor/animejs/lib/anime.es.js";
 import { FiveUtil as m } from "../shared-utils/Utils/FiveUtil.js";
-import { absoluteUrl as a } from "../shared-utils/url/absoluteUrl.js";
+import { absoluteUrl as p } from "../shared-utils/url/absoluteUrl.js";
 import "../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../shared-utils/five/FivePuppet.js";
 let E = class {
@@ -21,7 +21,7 @@ let E = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.64.11-alpha.1");
+    i(this, "VERSION", "3.64.12");
     i(this, "NAME");
     i(this, "five");
     i(this, "workUtil");
@@ -52,7 +52,7 @@ let E = class {
    * @description: 获取静态资源的url
    */
   absoluteUrl(t) {
-    return a(this.staticPrefix, t);
+    return p(this.staticPrefix, t);
   }
   onWorkCodeChange() {
   }

package/libs/shared-utils/Utils/WorkUtil.d.ts

@@ -20,6 +20,7 @@ export declare class WorkUtil extends BaseUtil {
     get observers(): import("@realsee/five").WorkObserver[];
     get transform(): THREE.Matrix4;
     constructor(five: Five);
+    getResolvedObserver(observerIndex: number): import("@realsee/five").WorkResolvedObserver;
     /**
      * @description 获取全景点坐标
      */

package/libs/shared-utils/Utils/WorkUtil.js

@@ -1,21 +1,21 @@
-var k = Object.defineProperty;
-var h = (s, e, r) => e in s ? k(s, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : s[e] = r;
-var f = (s, e, r) => (h(s, typeof e != "symbol" ? e + "" : e, r), r);
-import { BaseUtil as m } from "./BaseUtil.js";
-import * as d from "three";
-import { transformPosition as a } from "../five/transformPosition.js";
+var a = Object.defineProperty;
+var h = (s, t, r) => t in s ? a(s, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : s[t] = r;
+var k = (s, t, r) => (h(s, typeof t != "symbol" ? t + "" : t, r), r);
+import { BaseUtil as d } from "./BaseUtil.js";
+import * as v from "three";
+import { transformPosition as f } from "../five/transformPosition.js";
 const n = /* @__PURE__ */ new Map();
-class v extends m {
+class c extends d {
   constructor(r) {
     super(r);
-    f(this, "_workCode");
+    k(this, "_workCode");
   }
   get fromType() {
-    var t, i;
+    var e, i;
     const r = this.workCode;
     if (n.has(r))
       return n.get(r);
-    const o = (i = (t = JSON.parse(this.work.raw.works[0])) == null ? void 0 : t.from_type) != null ? i : "vr";
+    const o = (i = (e = JSON.parse(this.work.raw.works[0])) == null ? void 0 : e.from_type) != null ? i : "vr";
     return n.set(r, o), o;
   }
   /**
@@ -36,34 +36,37 @@ class v extends m {
    */
   get work() {
     var r, o;
-    return (o = (r = this.five.works) == null ? void 0 : r.find((t) => t.workCode === this.workCode)) != null ? o : this.five.work;
+    return (o = (r = this.five.works) == null ? void 0 : r.find((e) => e.workCode === this.workCode)) != null ? o : this.five.work;
   }
   get observers() {
     var r;
     return (r = this.work) == null ? void 0 : r.observers;
   }
   get transform() {
-    var o, t, i, w;
-    const r = (w = (o = this.work) == null ? void 0 : o.transform) != null ? w : (i = (t = this.work) == null ? void 0 : t.options) == null ? void 0 : i.transform;
-    return r ? r.clone() : new d.Matrix4();
+    var o, e, i, w;
+    const r = (w = (o = this.work) == null ? void 0 : o.transform) != null ? w : (i = (e = this.work) == null ? void 0 : e.options) == null ? void 0 : i.transform;
+    return r ? r.clone() : new v.Matrix4();
+  }
+  getResolvedObserver(r) {
+    return this.five.works.getResolvedObserver({ workCode: this.workCode, panoIndex: r });
   }
   /**
    * @description 获取全景点坐标
    */
   getObserverPosition(r) {
-    var t;
-    const o = (t = this.getObserver(r)) == null ? void 0 : t.position;
+    var e;
+    const o = (e = this.getObserver(r)) == null ? void 0 : e.position;
     if (o)
-      return a(o, this.transform);
+      return f(o, this.transform);
   }
   /**
    * @description 获取全景点位和模型的地面坐标
    */
   getObserverStandingPosition(r) {
-    var t;
-    const o = (t = this.getObserver(r)) == null ? void 0 : t.standingPosition;
+    var e;
+    const o = (e = this.getObserver(r)) == null ? void 0 : e.standingPosition;
     if (o)
-      return a(o, this.transform);
+      return f(o, this.transform);
   }
   /**
    * @description 获取observer
@@ -74,5 +77,5 @@ class v extends m {
   }
 }
 export {
-  v as WorkUtil
+  c as WorkUtil
 };

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.64.11-alpha.1",
+    "%c %c@realsee/dnalogel %cv3.64.12",
     [
       "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.64.11-alpha.1",
+  "version": "3.64.12",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",