@realsee/dnalogel 2.24.1 → 2.24.2

package/libs/PanoTagPlugin/utils/model/mediaPlane.js

@@ -1,38 +1,38 @@
 var E = Object.defineProperty;
-var V = (c, a, e) => a in c ? E(c, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[a] = e;
-var n = (c, a, e) => (V(c, typeof a != "symbol" ? a + "" : a, e), e);
-var v = (c, a, e) => new Promise((t, s) => {
-  var i = (o) => {
+var C = (c, d, e) => d in c ? E(c, d, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[d] = e;
+var r = (c, d, e) => (C(c, typeof d != "symbol" ? d + "" : d, e), e);
+var v = (c, d, e) => new Promise((t, s) => {
+  var o = (i) => {
     try {
-      r(e.next(o));
+      n(e.next(i));
     } catch (h) {
       s(h);
     }
-  }, d = (o) => {
+  }, a = (i) => {
     try {
-      r(e.throw(o));
+      n(e.throw(i));
     } catch (h) {
       s(h);
     }
-  }, r = (o) => o.done ? t(o.value) : Promise.resolve(o.value).then(i, d);
-  r((e = e.apply(c, a)).next());
+  }, n = (i) => i.done ? t(i.value) : Promise.resolve(i.value).then(o, a);
+  n((e = e.apply(c, d)).next());
 });
-import * as M from "three";
-import { Vector3 as g } from "three";
-import { centerPoint as b } from "../../../shared-utils/three/centerPoint.js";
-import { loadTexture as x } from "../../../shared-utils/three/loadTexture.js";
-import { QuadrangleGeometry as C, QuadrangleMesh as y } from "../../../shared-utils/three/Quadrangle.js";
+import * as l from "three";
+import { Vector3 as w } from "three";
+import { centerPoint as x } from "../../../shared-utils/three/centerPoint.js";
+import { loadTexture as T } from "../../../shared-utils/three/loadTexture.js";
+import { QuadrangleGeometry as F, QuadrangleMesh as I } from "../../../shared-utils/three/Quadrangle.js";
 import { getVideoTexture as B } from "../../../shared-utils/three/loadVideoTexture.js";
-import { Image_Play_Icon_With_Text as F, Image_Play_Icon as P } from "../../Assets/Icon.js";
+import { Image_Play_Icon_With_Text as L, Image_Play_Icon as b } from "../../Assets/Icon.js";
 import { getPositionsByObjectFit as f } from "../../../shared-utils/three/getPositionsByObjectFit.js";
-import { FragmentTransparencyMaterial as L } from "../../../shared-utils/three/FragmentTransparencyMaterial.js";
+import { FragmentTransparencyMaterial as H } from "../../../shared-utils/three/FragmentTransparencyMaterial.js";
 import "../../../shared-utils/math/pointIsRectangle.js";
 import "../../../shared-utils/device.js";
-class T extends M.Mesh {
+class P extends l.Mesh {
   constructor() {
     super(...arguments);
-    n(this, "name", "MediaPlane");
-    n(this, "src");
+    r(this, "name", "MediaPlane");
+    r(this, "src");
   }
   removeFromParent() {
     const e = this.parent;
@@ -42,61 +42,76 @@ class T extends M.Mesh {
     this.traverse((e) => {
       if (e.isMesh) {
         const t = e;
-        t.geometry.dispose(), (t.material instanceof Array ? t.material : [t.material]).forEach((i) => {
-          i.dispose();
+        t.geometry.dispose(), (t.material instanceof Array ? t.material : [t.material]).forEach((o) => {
+          o.dispose();
         });
       }
     });
   }
 }
-class G extends T {
+class G extends P {
   constructor(e, t, s) {
+    var n;
     super();
-    n(this, "name", "PanoTagPluginImagePlane");
-    this.src = e, x(e).then((i) => {
-      var m;
-      const d = new URL(e, location.href).pathname.endsWith(".png"), r = new M.MeshBasicMaterial({ map: i, transparent: d }), o = f((m = s == null ? void 0 : s.objectFit) != null ? m : "contain", t, i.image.width / i.image.height), h = b(...o), u = o.map((l) => l.clone().sub(h)), p = new C(u);
-      this.position.copy(h), this.geometry = p, this.material = r;
+    r(this, "name", "PanoTagPluginImagePlane");
+    this.src = e;
+    const o = (n = s == null ? void 0 : s.resolveZFighting) != null ? n : !0;
+    let a = t;
+    if (o) {
+      const i = new l.Vector3().crossVectors(
+        new l.Vector3().subVectors(t[0], t[1]),
+        new l.Vector3().subVectors(t[0], t[3])
+      ).normalize().multiplyScalar(5e-4);
+      a = t.map((h) => h.clone().add(i));
+    }
+    T(e).then((i) => {
+      var g;
+      const h = new URL(e, location.href).pathname.endsWith(".png"), u = new l.MeshBasicMaterial({ map: i, transparent: h }), p = f(
+        (g = s == null ? void 0 : s.objectFit) != null ? g : "contain",
+        a,
+        i.image.width / i.image.height
+      ), m = x(...p), M = p.map((V) => V.clone().sub(m)), y = new F(M);
+      this.position.copy(m), this.geometry = y, this.material = u;
     }).catch((i) => {
       console.error(`Imageplane error ${i}`);
     });
   }
 }
-class O extends T {
+class O extends P {
   // eslint-disable-next-line max-params
   constructor(e, t, s) {
     const {
-      videoCoverSrc: i,
-      objectFit: d = "contain",
-      playButton: r = "withText",
-      paused: o = !0,
+      videoCoverSrc: o,
+      objectFit: a = "contain",
+      playButton: n = "withText",
+      paused: i = !0,
       videoTextureMap: h,
       ImageTextureMap: u,
       domEvents: p
     } = s != null ? s : {};
     super();
-    n(this, "isVideoPlane", !0);
-    n(this, "name", "PanoTagPluginImagePlane");
-    n(this, "videoInstance");
-    n(this, "onVideoReady");
-    n(this, "objectFit");
-    n(this, "buttonSrc");
-    n(this, "videoCoverSrc");
-    n(this, "domEvents");
-    n(this, "disposers", []);
-    n(this, "cornerPoints");
-    n(this, "videoMesh");
-    n(this, "coverMesh");
-    n(this, "buttonMesh");
-    n(this, "videoTextureMap");
-    n(this, "ImageTextureMap");
-    this.cornerPoints = t, this.src = e, this.buttonSrc = (() => r === "withText" ? F : r === "withoutText" ? P : typeof r == "string" ? r : P)(), this.videoCoverSrc = i, this.objectFit = d, this.videoTextureMap = h, this.ImageTextureMap = u, this.domEvents = p, this.position.copy(b(...t)), this.videoCoverSrc && o ? this.addCoverMesh().then(() => this.addButtonMesh()) : this.addVideoMesh().then(() => {
-      o ? this.addButtonMesh() : this.play(!0);
+    r(this, "isVideoPlane", !0);
+    r(this, "name", "PanoTagPluginImagePlane");
+    r(this, "videoInstance");
+    r(this, "onVideoReady");
+    r(this, "objectFit");
+    r(this, "buttonSrc");
+    r(this, "videoCoverSrc");
+    r(this, "domEvents");
+    r(this, "disposers", []);
+    r(this, "cornerPoints");
+    r(this, "videoMesh");
+    r(this, "coverMesh");
+    r(this, "buttonMesh");
+    r(this, "videoTextureMap");
+    r(this, "ImageTextureMap");
+    this.cornerPoints = t, this.src = e, this.buttonSrc = (() => n === "withText" ? L : n === "withoutText" ? b : typeof n == "string" ? n : b)(), this.videoCoverSrc = o, this.objectFit = a, this.videoTextureMap = h, this.ImageTextureMap = u, this.domEvents = p, this.position.copy(x(...t)), this.videoCoverSrc && i ? this.addCoverMesh().then(() => this.addButtonMesh()) : this.addVideoMesh().then(() => {
+      i ? this.addButtonMesh() : this.play(!0);
     }), this.addEventListener("removed", () => {
       this.remove(...this.children);
     }), this.addEventListener("dispose", () => {
       var m;
-      (m = this.disposers) == null || m.forEach((l) => l == null ? void 0 : l());
+      (m = this.disposers) == null || m.forEach((M) => M == null ? void 0 : M());
     });
   }
   play(e = !1) {
@@ -111,8 +126,8 @@ class O extends T {
   }
   initialRenderHooks(e) {
     const s = e(() => {
-      var i;
-      this.videoMesh && ((i = this.videoInstance) == null ? void 0 : i.paused) === !1 && (this.videoMesh.needsRender = !0);
+      var o;
+      this.videoMesh && ((o = this.videoInstance) == null ? void 0 : o.paused) === !1 && (this.videoMesh.needsRender = !0);
     });
     this.disposers.push(() => s);
   }
@@ -140,8 +155,8 @@ class O extends T {
         const t = yield this.getImageTexture(this.videoCoverSrc);
         if (!t)
           return;
-        const s = new M.MeshBasicMaterial({ transparent: !1, map: t }), i = f(this.objectFit, this.cornerPoints, t.image.width / t.image.height), d = new y(i, s);
-        return d.position.copy(new g(0, 0, 0)), d.name = "videoCoverMesh", d;
+        const s = new l.MeshBasicMaterial({ transparent: !1, map: t }), o = f(this.objectFit, this.cornerPoints, t.image.width / t.image.height), a = new I(o, s);
+        return a.position.copy(new w(0, 0, 0)), a.name = "videoCoverMesh", a;
       }))();
       return e && (this.children.includes(this.coverMesh) || (this.add(e), this.coverMesh = e)), e;
     });
@@ -155,13 +170,13 @@ class O extends T {
           return this.videoMesh;
         if (!this.src)
           return;
-        const s = this.getVideoTexture(this.src), i = new M.MeshBasicMaterial({ transparent: !1, map: s }), d = yield new Promise((o) => {
-          s.metadataLoaded ? o(f(this.objectFit, this.cornerPoints, s.image.videoWidth / s.image.videoHeight)) : s.addEventListener(
+        const s = this.getVideoTexture(this.src), o = new l.MeshBasicMaterial({ transparent: !1, map: s }), a = yield new Promise((i) => {
+          s.metadataLoaded ? i(f(this.objectFit, this.cornerPoints, s.image.videoWidth / s.image.videoHeight)) : s.addEventListener(
             "videoLoaded",
-            () => o(f(this.objectFit, this.cornerPoints, s.image.videoWidth / s.image.videoHeight))
+            () => i(f(this.objectFit, this.cornerPoints, s.image.videoWidth / s.image.videoHeight))
           );
-        }), r = new y(d, i);
-        return r.name = "videoMesh", r.position.copy(new g(0, 0, 0)), r;
+        }), n = new I(a, o);
+        return n.name = "videoMesh", n.position.copy(new w(0, 0, 0)), n;
       }))();
       if (!e)
         return;
@@ -181,12 +196,12 @@ class O extends T {
       if (this.children.includes(this.buttonMesh))
         return;
       const e = yield (() => v(this, null, function* () {
-        var m, l, w, I;
+        var m, M, y, g;
         if (this.buttonMesh)
           return this.buttonMesh;
-        const t = (l = (m = this.videoMesh) == null ? void 0 : m.geometry.points[0].distanceTo(this.videoMesh.geometry.points[3])) != null ? l : 1 / 0, s = (I = (w = this.coverMesh) == null ? void 0 : w.geometry.points[0].distanceTo(this.coverMesh.geometry.points[3])) != null ? I : 1 / 0, i = this.cornerPoints[0].distanceTo(this.cornerPoints[3]), r = Math.min(t, s, i) / i * 0.3, o = yield this.getImageTexture(this.buttonSrc), h = f("contain", this.cornerPoints, o.image.width / o.image.height), u = new y(h, new L(o));
-        u.position.copy(new g(0, 0, 0)), u.name = "buttonMesh", u.scale.set(r, r, r), this.domEvents.addAutoBindEventListener(u, "click", () => this.play());
-        const p = new M.Vector3().crossVectors(new M.Vector3().subVectors(h[0], h[1]), new M.Vector3().subVectors(h[0], h[3])).normalize().multiplyScalar(1e-4);
+        const t = (M = (m = this.videoMesh) == null ? void 0 : m.geometry.points[0].distanceTo(this.videoMesh.geometry.points[3])) != null ? M : 1 / 0, s = (g = (y = this.coverMesh) == null ? void 0 : y.geometry.points[0].distanceTo(this.coverMesh.geometry.points[3])) != null ? g : 1 / 0, o = this.cornerPoints[0].distanceTo(this.cornerPoints[3]), n = Math.min(t, s, o) / o * 0.3, i = yield this.getImageTexture(this.buttonSrc), h = f("contain", this.cornerPoints, i.image.width / i.image.height), u = new I(h, new H(i));
+        u.position.copy(new w(0, 0, 0)), u.name = "buttonMesh", u.scale.set(n, n, n), this.domEvents.addAutoBindEventListener(u, "click", () => this.play());
+        const p = new l.Vector3().crossVectors(new l.Vector3().subVectors(h[0], h[1]), new l.Vector3().subVectors(h[0], h[3])).normalize().multiplyScalar(1e-4);
         return u.position.add(p), u;
       }))();
       return this.children.includes(this.buttonMesh) || (this.add(e), this.buttonMesh = e), e;
@@ -194,19 +209,19 @@ class O extends T {
   }
   getImageTexture(e) {
     return v(this, null, function* () {
-      var s, i;
+      var s, o;
       if ((s = this.ImageTextureMap) != null && s.has(e))
         return this.ImageTextureMap.get(e);
-      const t = yield x(e);
-      return (i = this.ImageTextureMap) == null || i.set(e, t), t;
+      const t = yield T(e);
+      return (o = this.ImageTextureMap) == null || o.set(e, t), t;
     });
   }
   getVideoTexture(e) {
-    var s, i;
+    var s, o;
     if ((s = this.videoTextureMap) != null && s.has(e))
       return this.videoTextureMap.get(e);
     const t = B(e);
-    return (i = this.videoTextureMap) == null || i.set(e, t), t;
+    return (o = this.videoTextureMap) == null || o.set(e, t), t;
   }
 }
 export {

package/libs/base/BasePlugin.js

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

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv2.24.1",
+    "%c %c@realsee/dnalogel %cv2.24.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

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