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

package/libs/PanoTagPlugin/utils/model/mediaPlane.d.ts

@@ -46,7 +46,10 @@ declare class VideoPlane extends MediaPlane {
         videoCoverSrc?: string;
         objectFit?: ObjectFit;
         videoTextureMap?: Map<Src, VideoTexture>;
-        ImageTextureMap?: Map<Src, ImageTexture>;
+        ImageTextureMap?: Map<Src, {
+            texture: ImageTexture;
+            transparent: boolean;
+        }>;
         domEvents?: FiveDomEvents;
     });
     play(muted?: boolean): Promise<void>;

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

@@ -1,35 +1,35 @@
-var C = Object.defineProperty;
-var B = (c, d, e) => d in c ? C(c, d, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[d] = e;
-var r = (c, d, e) => (B(c, typeof d != "symbol" ? d + "" : d, e), e);
-var v = (c, d, e) => new Promise((i, t) => {
+var F = Object.defineProperty;
+var B = (c, h, e) => h in c ? F(c, h, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[h] = e;
+var r = (c, h, e) => (B(c, typeof h != "symbol" ? h + "" : h, e), e);
+var v = (c, h, e) => new Promise((i, t) => {
   var n = (s) => {
     try {
       o(e.next(s));
-    } catch (a) {
-      t(a);
+    } catch (u) {
+      t(u);
     }
-  }, h = (s) => {
+  }, a = (s) => {
     try {
       o(e.throw(s));
-    } catch (a) {
-      t(a);
+    } catch (u) {
+      t(u);
     }
-  }, o = (s) => s.done ? i(s.value) : Promise.resolve(s.value).then(n, h);
-  o((e = e.apply(c, d)).next());
+  }, o = (s) => s.done ? i(s.value) : Promise.resolve(s.value).then(n, a);
+  o((e = e.apply(c, h)).next());
 });
-import * as p from "three";
-import { Vector3 as I } from "three";
-import { centerPoint as T } from "../../../shared-utils/three/centerPoint.js";
-import { loadTexture as b } from "../../../shared-utils/three/loadTexture.js";
-import { QuadrangleGeometry as L, QuadrangleMesh as w } from "../../../shared-utils/three/Quadrangle.js";
-import { getVideoTexture as V } from "../../../shared-utils/three/loadVideoTexture.js";
-import { Image_Play_Icon_With_Text as H, Image_Play_Icon as P } from "../../Assets/Icon.js";
-import { getPositionsByObjectFit as f } from "../../../shared-utils/three/getPositionsByObjectFit.js";
+import * as I from "three";
+import { Vector3 as w } from "three";
+import { centerPoint as b } from "../../../shared-utils/three/centerPoint.js";
+import { loadPicture as x } from "../../../shared-utils/three/loadTexture.js";
+import { QuadrangleGeometry as V, QuadrangleMesh as P } from "../../../shared-utils/three/Quadrangle.js";
+import { getVideoTexture as H } from "../../../shared-utils/three/loadVideoTexture.js";
+import { Image_Play_Icon_With_Text as L, Image_Play_Icon as T } from "../../Assets/Icon.js";
+import { getPositionsByObjectFit as g } from "../../../shared-utils/three/getPositionsByObjectFit.js";
 import { FragmentTransparencyMaterial as R } from "../../../shared-utils/three/FragmentTransparencyMaterial.js";
-import { getNormal as x } from "../../../shared-utils/three/getNormal.js";
+import { getNormal as E } from "../../../shared-utils/three/getNormal.js";
 import "../../../shared-utils/math/pointIsRectangle.js";
 import "../../../shared-utils/device.js";
-class E extends p.Mesh {
+class C extends I.Mesh {
   constructor() {
     super(...arguments);
     r(this, "name", "MediaPlane");
@@ -50,44 +50,42 @@ class E extends p.Mesh {
     });
   }
 }
-class $ extends E {
+class $ extends C {
   constructor(e, i, t) {
     var o;
     super();
     r(this, "name", "PanoTagPluginImagePlane");
     this.src = e;
     const n = (o = t == null ? void 0 : t.resolveZFighting) != null ? o : !0;
-    let h = i;
+    let a = i;
     if (n) {
-      const s = x(i, 5e-4);
-      h = i.map((a) => a.clone().add(s));
+      const s = E(i, 5e-4);
+      a = i.map((u) => u.clone().add(s));
     }
-    b(e).then((s) => {
-      var g;
-      const a = new URL(e, location.href).pathname.toLowerCase().endsWith(".png");
-      a && (s.minFilter = p.NearestFilter, s.magFilter = p.NearestFilter);
-      const u = new p.MeshBasicMaterial({ map: s, transparent: a }), M = f(
-        (g = t == null ? void 0 : t.objectFit) != null ? g : "contain",
-        h,
+    x(e).then(({ texture: s, transparent: u }) => {
+      var p;
+      const M = new I.MeshBasicMaterial({ map: s, transparent: u }), d = g(
+        (p = t == null ? void 0 : t.objectFit) != null ? p : "contain",
+        a,
         s.image.width / s.image.height
-      ), l = T(...M), m = M.map((F) => F.clone().sub(l)), y = new L(m);
-      this.position.copy(l), this.geometry = y, this.material = u;
+      ), l = b(...d), m = d.map((y) => y.clone().sub(l)), f = new V(m);
+      this.position.copy(l), this.geometry = f, this.material = M;
     }).catch((s) => {
       console.error(`Imageplane error ${s == null ? void 0 : s.message}`);
     });
   }
 }
-class q extends E {
+class q extends C {
   // eslint-disable-next-line max-params
   constructor(e, i, t) {
     const {
       videoCoverSrc: n,
-      objectFit: h = "contain",
+      objectFit: a = "contain",
       playButton: o = "withText",
       paused: s = !0,
-      videoTextureMap: a,
-      ImageTextureMap: u,
-      domEvents: M
+      videoTextureMap: u,
+      ImageTextureMap: M,
+      domEvents: d
     } = t != null ? t : {};
     super();
     r(this, "isVideoPlane", !0);
@@ -105,7 +103,7 @@ class q extends E {
     r(this, "buttonMesh");
     r(this, "videoTextureMap");
     r(this, "ImageTextureMap");
-    this.cornerPoints = i, this.src = e, this.buttonSrc = (() => o === "withText" ? H : o === "withoutText" ? P : typeof o == "string" ? o : P)(), this.videoCoverSrc = n, this.objectFit = h, this.videoTextureMap = a, this.ImageTextureMap = u, this.domEvents = M, this.position.copy(T(...i)), this.videoCoverSrc && s ? this.addCoverMesh().then(() => this.addButtonMesh()) : this.addVideoMesh().then(() => {
+    this.cornerPoints = i, this.src = e, this.buttonSrc = (() => o === "withText" ? L : o === "withoutText" ? T : typeof o == "string" ? o : T)(), this.videoCoverSrc = n, this.objectFit = a, this.videoTextureMap = u, this.ImageTextureMap = M, this.domEvents = d, this.position.copy(b(...i)), this.videoCoverSrc && s ? this.addCoverMesh().then(() => this.addButtonMesh()) : this.addVideoMesh().then(() => {
       s ? this.addButtonMesh() : this.play(!0);
     }), this.addEventListener("removed", () => {
       this.remove(...this.children);
@@ -152,11 +150,8 @@ class q extends E {
           return this.coverMesh;
         if (!this.videoCoverSrc)
           return;
-        const i = yield this.getImageTexture(this.videoCoverSrc);
-        if (!i)
-          return;
-        const t = new p.MeshBasicMaterial({ transparent: !1, map: i }), n = f(this.objectFit, this.cornerPoints, i.image.width / i.image.height), h = new w(n, t);
-        return h.position.copy(new I(0, 0, 0)), h.name = "videoCoverMesh", h;
+        const { texture: i, transparent: t } = yield this.getImageTexture(this.videoCoverSrc), n = new I.MeshBasicMaterial({ transparent: !1, map: i }), a = g(this.objectFit, this.cornerPoints, i.image.width / i.image.height), o = new P(a, n);
+        return o.position.copy(new w(0, 0, 0)), o.name = "videoCoverMesh", o;
       }))();
       return e && (this.children.includes(this.coverMesh) || (this.add(e), this.coverMesh = e)), e;
     });
@@ -170,13 +165,13 @@ class q extends E {
           return this.videoMesh;
         if (!this.src)
           return;
-        const t = this.getVideoTexture(this.src), n = new p.MeshBasicMaterial({ transparent: !1, map: t }), h = yield new Promise((s) => {
-          t.metadataLoaded ? s(f(this.objectFit, this.cornerPoints, t.image.videoWidth / t.image.videoHeight)) : t.addEventListener(
+        const t = this.getVideoTexture(this.src), n = new I.MeshBasicMaterial({ transparent: !1, map: t }), a = yield new Promise((s) => {
+          t.metadataLoaded ? s(g(this.objectFit, this.cornerPoints, t.image.videoWidth / t.image.videoHeight)) : t.addEventListener(
             "videoLoaded",
-            () => s(f(this.objectFit, this.cornerPoints, t.image.videoWidth / t.image.videoHeight))
+            () => s(g(this.objectFit, this.cornerPoints, t.image.videoWidth / t.image.videoHeight))
           );
-        }), o = new w(h, n);
-        return o.name = "videoMesh", o.position.copy(new I(0, 0, 0)), o;
+        }), o = new P(a, n);
+        return o.name = "videoMesh", o.position.copy(new w(0, 0, 0)), o;
       }))();
       if (!e)
         return;
@@ -196,15 +191,15 @@ class q extends E {
       if (this.children.includes(this.buttonMesh))
         return;
       const e = yield (() => v(this, null, function* () {
-        var l, m, y, g;
+        var m, f, p, y;
         if (this.buttonMesh)
           return this.buttonMesh;
-        const i = (m = (l = this.videoMesh) == null ? void 0 : l.geometry.points[0].distanceTo(this.videoMesh.geometry.points[3])) != null ? m : 1 / 0, t = (g = (y = this.coverMesh) == null ? void 0 : y.geometry.points[0].distanceTo(this.coverMesh.geometry.points[3])) != null ? g : 1 / 0, n = this.cornerPoints[0].distanceTo(this.cornerPoints[3]), o = Math.min(i, t, n) / n * 0.3, s = yield this.getImageTexture(this.buttonSrc), a = f("contain", this.cornerPoints, s.image.width / s.image.height), u = new w(a, new R(s));
-        u.position.copy(new I(0, 0, 0)), u.name = "buttonMesh", u.scale.set(o, o, o), this.domEvents.addAutoBindEventListener(u, "click", () => {
+        const i = (f = (m = this.videoMesh) == null ? void 0 : m.geometry.points[0].distanceTo(this.videoMesh.geometry.points[3])) != null ? f : 1 / 0, t = (y = (p = this.coverMesh) == null ? void 0 : p.geometry.points[0].distanceTo(this.coverMesh.geometry.points[3])) != null ? y : 1 / 0, n = this.cornerPoints[0].distanceTo(this.cornerPoints[3]), o = Math.min(i, t, n) / n * 0.3, { texture: s, transparent: u } = yield this.getImageTexture(this.buttonSrc), M = g("contain", this.cornerPoints, s.image.width / s.image.height), d = new P(M, new R(s));
+        d.position.copy(new w(0, 0, 0)), d.name = "buttonMesh", d.scale.set(o, o, o), this.domEvents.addAutoBindEventListener(d, "click", () => {
           this.play();
         });
-        const M = x(a, 5e-4);
-        return u.position.add(M), u;
+        const l = E(M, 5e-4);
+        return d.position.add(l), d;
       }))();
       return this.children.includes(this.buttonMesh) || (this.add(e), this.buttonMesh = e), e;
     });
@@ -214,7 +209,7 @@ class q extends E {
       var t, n;
       if ((t = this.ImageTextureMap) != null && t.has(e))
         return this.ImageTextureMap.get(e);
-      const i = yield b(e);
+      const i = yield x(e);
       return (n = this.ImageTextureMap) == null || n.set(e, i), i;
     });
   }
@@ -222,7 +217,7 @@ class q extends E {
     var t, n;
     if ((t = this.videoTextureMap) != null && t.has(e))
       return this.videoTextureMap.get(e);
-    const i = V(e);
+    const i = H(e);
     return (n = this.videoTextureMap) == null || n.set(e, i), i;
   }
 }

package/libs/PanoVideoPlugin/utils/shader.js

@@ -1,11 +1,16 @@
-const v = `
+const v = (
+  /* glsl */
+  `
 varying vec2 vUv;
 void main() {
   vUv = uv;
   vec4 mvPosition = modelViewMatrix * vec4(position, 1);
   gl_Position = projectionMatrix * mvPosition;
 }
-`, a = `
+`
+), a = (
+  /* glsl */
+  `
 uniform sampler2D map;
 uniform vec4 size;
 varying vec2 vUv;
@@ -18,7 +23,8 @@ void main() {
 	float match = (1.0 - step(0.5, abs(uv.x - 0.5))) * (1.0 - step(0.5, abs(uv.y - 0.5))) * (transX < transY ? transX : transY);
   gl_FragColor = vec4(texture2D(map, uv).xyz, match);
 }
-`;
+`
+);
 export {
   a as fragmentShader,
   v as vertexShader

package/libs/base/BasePlugin.js

@@ -14,7 +14,7 @@ let b = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.3.0-dev.2");
+    i(this, "VERSION", "3.3.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.3.0-dev.2",
+    "%c %c@realsee/dnalogel %cv3.3.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/libs/shared-utils/three/getIntersect.d.ts

@@ -1,6 +1,5 @@
-import * as THREE from 'three';
-import type { Five } from '@realsee/five';
+import type { Five, Intersection } from '@realsee/five';
 export declare function getIntersectFromRelativePosition(five: Five, position: {
     x: number;
     y: number;
-}): THREE.Intersection;
+}): Intersection;

package/libs/shared-utils/three/loadTexture.d.ts

@@ -1,2 +1,6 @@
 import * as THREE from 'three';
-export declare function loadTexture(url: string): Promise<THREE.Texture>;
+export declare function loadTexture(uri: string): Promise<THREE.Texture>;
+export declare function loadPicture(uri: string): Promise<{
+    texture: THREE.Texture;
+    transparent: boolean;
+}>;

package/libs/shared-utils/three/loadTexture.js

@@ -1,28 +1,37 @@
-var i = (r, n, o) => new Promise((s, a) => {
-  var u = (e) => {
+var s = (t, e, n) => new Promise((d, c) => {
+  var l = (r) => {
     try {
-      t(o.next(e));
-    } catch (d) {
-      a(d);
+      o(n.next(r));
+    } catch (i) {
+      c(i);
     }
-  }, m = (e) => {
+  }, h = (r) => {
     try {
-      t(o.throw(e));
-    } catch (d) {
-      a(d);
+      o(n.throw(r));
+    } catch (i) {
+      c(i);
     }
-  }, t = (e) => e.done ? s(e.value) : Promise.resolve(e.value).then(u, m);
-  t((o = o.apply(r, n)).next());
+  }, o = (r) => r.done ? d(r.value) : Promise.resolve(r.value).then(l, h);
+  o((n = n.apply(t, e)).next());
 });
-import * as c from "three";
-const x = new c.TextureLoader();
-function T(r) {
-  return i(this, null, function* () {
-    return new Promise((n, o) => {
-      x.load(r, n, void 0, o);
-    }).then((n) => (n.encoding = c.sRGBEncoding, n));
+import * as a from "three";
+const m = new a.TextureLoader();
+function p(t) {
+  return s(this, null, function* () {
+    return new Promise((e, n) => {
+      m.load(t, e, void 0, n);
+    }).then((e) => (e.encoding = a.sRGBEncoding, e));
+  });
+}
+function g(t) {
+  return s(this, null, function* () {
+    return p(t).then((e) => {
+      const n = t.startsWith("data:") ? t.includes("png") : new URL(t, location.href).pathname.toLowerCase().endsWith(".png");
+      return n && (e.minFilter = a.NearestFilter, e.magFilter = a.NearestFilter), { texture: e, transparent: n };
+    });
   });
 }
 export {
-  T as loadTexture
+  g as loadPicture,
+  p as loadTexture
 };

package/package.json

@@ -7,7 +7,7 @@
   "repository": "https://github.com/realsee-developer/dnalogel.git",
   "description": "如视 VR 看房插件合集",
   "private": false,
-  "version": "3.3.0-dev.2",
+  "version": "3.3.0-dev.4",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "clean": "rm -rf components dist docs libs types ./vite.config.js.timestamp*",
@@ -36,7 +36,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.22.9",
-    "@realsee/five": "6.0.0-alpha.24",
+    "@realsee/five": "6.0.0-alpha.34",
     "@sveltejs/vite-plugin-svelte": "^2.4.2",
     "@tsconfig/svelte": "^4.0.1",
     "@tweenjs/tween.js": "^20.0.3",