@realsee/dnalogel 2.17.1-alpha.2 → 2.17.1-alpha.5

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

@@ -1,6 +1,6 @@
-var x = Object.defineProperty;
-var P = (c, a, e) => a in c ? x(c, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[a] = e;
-var n = (c, a, e) => (P(c, typeof a != "symbol" ? a + "" : a, e), e);
+var b = Object.defineProperty;
+var x = (c, a, e) => a in c ? b(c, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[a] = e;
+var n = (c, a, e) => (x(c, typeof a != "symbol" ? a + "" : a, e), e);
 var v = (c, a, e) => new Promise((t, i) => {
   var s = (o) => {
     try {
@@ -18,13 +18,13 @@ var v = (c, a, e) => new Promise((t, i) => {
   r((e = e.apply(c, a)).next());
 });
 import * as p from "three";
-import { Vector3 as g } from "three";
-import { centerPoint as w } from "../../../shared-utils/three/centerPoint.js";
-import { loadTexture as I } from "../../../shared-utils/three/loadTexture.js";
+import { Vector3 as f } from "three";
+import { centerPoint as L } from "../../../shared-utils/three/centerPoint.js";
+import { loadTexture as T } from "../../../shared-utils/three/loadTexture.js";
 import { QuadrangleGeometry as V, QuadrangleMesh as y } from "../../../shared-utils/three/Quadrangle.js";
 import { getVideoTexture as B } from "../../../shared-utils/three/loadVideoTexture.js";
-import { Image_Play_Icon_With_Text as C, Image_Play_Icon as T } from "../../Assets/Icon.js";
-import { getPositionsByObjectFit as l } from "../../../shared-utils/three/getPositionsByObjectFit.js";
+import { Image_Play_Icon_With_Text as C, Image_Play_Icon as I } from "../../Assets/Icon.js";
+import { getPositionsByObjectFit as M } from "../../../shared-utils/three/getPositionsByObjectFit.js";
 import "@realsee/five";
 import "../../../shared-utils/threex/domevents/index.js";
 import "@realsee/five/gltf-loader";
@@ -58,7 +58,7 @@ import "lodash.clonedeep";
 import "lodash.isequal";
 import "classnames";
 import "../../../shared-utils/three/GLTFLoader.js";
-class b extends p.Mesh {
+class P extends p.Mesh {
   constructor() {
     super(...arguments);
     n(this, "name", "MediaPlane");
@@ -69,20 +69,20 @@ class b extends p.Mesh {
     return e !== null && e.remove(this), this;
   }
 }
-class ye extends b {
+class ye extends P {
   constructor(e, t, i) {
     super();
     n(this, "name", "PanoTagPluginImagePlane");
-    this.src = e, I(e).then((s) => {
+    this.src = e, T(e).then((s) => {
       var u;
-      const d = new URL(e, location.href).pathname.endsWith(".png"), r = new p.MeshBasicMaterial({ map: s, transparent: d }), o = l((u = i == null ? void 0 : i.objectFit) != null ? u : "contain", t, s.image.width / s.image.height), h = w(...o), m = o.map((f) => f.clone().sub(h)), M = new V(m);
-      this.position.copy(h), this.geometry = M, this.material = r;
+      const d = new URL(e, location.href).pathname.endsWith(".png"), r = new p.MeshBasicMaterial({ map: s, transparent: d }), o = M((u = i == null ? void 0 : i.objectFit) != null ? u : "contain", t, s.image.width / s.image.height), h = L(...o), m = o.map((g) => g.clone().sub(h)), l = new V(m);
+      this.position.copy(h), this.geometry = l, this.material = r;
     }).catch((s) => {
-      console.error({ e: s });
+      console.error(`Imageplane error ${s}`);
     });
   }
 }
-class Ee extends b {
+class we extends P {
   constructor(e, t, i) {
     const { videoCoverSrc: s, objectFit: d = "contain", playButton: r = "withText", paused: o = !0, videoTextureMap: h, ImageTextureMap: m } = i != null ? i : {};
     super();
@@ -102,24 +102,24 @@ class Ee extends b {
     n(this, "buttonMesh");
     n(this, "videoTextureMap");
     n(this, "ImageTextureMap");
-    this.cornerPoints = t, this.src = e, this.buttonSrc = (() => r === "withText" ? C : r === "withoutText" ? T : typeof r == "string" ? r : T)(), this.videoCoverSrc = s, this.objectFit = d, this.videoTextureMap = h, this.ImageTextureMap = m, this.position.copy(w(...t)), this.videoCoverSrc && o ? this.addCoverMesh().then(() => this.addButtonMesh()) : this.addVideoMesh().then(() => {
+    this.cornerPoints = t, this.src = e, this.buttonSrc = (() => r === "withText" ? C : r === "withoutText" ? I : typeof r == "string" ? r : I)(), this.videoCoverSrc = s, this.objectFit = d, this.videoTextureMap = h, this.ImageTextureMap = m, this.position.copy(L(...t)), this.videoCoverSrc && o ? this.addCoverMesh().then(() => this.addButtonMesh()) : this.addVideoMesh().then(() => {
       o ? this.addButtonMesh() : this.play(!0);
     }), this.addEventListener("removed", () => {
       this.remove(...this.children);
     }), this.addEventListener("dispose", () => {
-      var M;
-      this.domEventsListenerTemporaryList = [], (M = this.disposers) == null || M.forEach((u) => u == null ? void 0 : u());
+      var l;
+      this.domEventsListenerTemporaryList = [], (l = this.disposers) == null || l.forEach((u) => u == null ? void 0 : u());
     });
   }
   play(e = !1) {
     return v(this, null, function* () {
-      this.videoMesh || (yield this.addVideoMesh()), this.coverMesh && (this.coverMesh.visible = !1), this.remove(this.buttonMesh), this.videoMesh.visible = !0, this.videoInstance.paused && this.videoInstance.play().catch((t) => {
-        console.error(t);
-      }), this.videoInstance.muted = e, this.render();
+      this.videoMesh || (yield this.addVideoMesh()), this.showPlayUI(), this.videoInstance.paused && this.videoInstance.play().then(() => this.showPlayUI()).catch((t) => {
+        this.pause(), console.error("play error", t);
+      }), this.videoInstance.muted = e, console.log("play render"), this.render();
     });
   }
   pause() {
-    !this.videoInstance || (this.showPauseUI(), this.videoInstance.pause(), this.render());
+    console.log("pause"), this.videoInstance && (this.videoInstance.pause(), this.showPauseUI().then(() => this.render()));
   }
   initialDomEvents(e) {
     this.domEvents || (this.domEvents = e, this.domEventsListenerTemporaryList.forEach((t) => this.addDomEventListener(...t)), this.domEventsListenerTemporaryList = []);
@@ -131,9 +131,12 @@ class Ee extends b {
     });
     this.disposers.push(() => i);
   }
+  showPlayUI() {
+    this.coverMesh && (this.coverMesh.visible = !1), this.remove(this.buttonMesh), this.videoMesh.visible = !0;
+  }
   showPauseUI() {
     return v(this, null, function* () {
-      this.coverMesh ? (this.coverMesh.visible = !0, this.videoMesh && (this.videoMesh.visible = !1)) : (yield this.addCoverMesh(), this.coverMesh && (this.videoMesh.visible = !1)), this.addButtonMesh(), this.render();
+      console.log("showPauseUI"), this.coverMesh ? (this.coverMesh.visible = !0, this.videoMesh && (this.videoMesh.visible = !1)) : (yield this.addCoverMesh(), this.coverMesh && (this.videoMesh.visible = !1)), console.log("addButtonMesh"), this.addButtonMesh().then(() => this.render());
     });
   }
   render() {
@@ -171,15 +174,15 @@ class Ee extends b {
         const t = yield this.getImageTexture(this.videoCoverSrc);
         if (!t)
           return;
-        const i = new p.MeshBasicMaterial({ transparent: !1, map: t }), s = l(this.objectFit, this.cornerPoints, t.image.width / t.image.height), d = new y(s, i);
-        return d.position.copy(new g(0, 0, 0)), d.name = "videoCoverMesh", d;
+        const i = new p.MeshBasicMaterial({ transparent: !1, map: t }), s = M(this.objectFit, this.cornerPoints, t.image.width / t.image.height), d = new y(s, i);
+        return d.position.copy(new f(0, 0, 0)), d.name = "videoCoverMesh", d;
       }))();
       return e && (this.children.includes(this.coverMesh) || (this.add(e), this.coverMesh = e)), e;
     });
   }
   addVideoMesh() {
     return v(this, null, function* () {
-      if (this.children.includes(this.videoMesh))
+      if (console.log("addVideoMesh"), this.children.includes(this.videoMesh))
         return;
       const e = yield (() => v(this, null, function* () {
         if (this.videoMesh)
@@ -187,12 +190,12 @@ class Ee extends b {
         if (!this.src)
           return;
         const i = this.getVideoTexture(this.src), s = new p.MeshBasicMaterial({ transparent: !1, map: i }), d = yield new Promise((o) => {
-          i.metadataLoaded ? o(l(this.objectFit, this.cornerPoints, i.image.videoWidth / i.image.videoHeight)) : i.addEventListener(
+          i.metadataLoaded ? o(M(this.objectFit, this.cornerPoints, i.image.videoWidth / i.image.videoHeight)) : i.addEventListener(
             "videoLoaded",
-            () => o(l(this.objectFit, this.cornerPoints, i.image.videoWidth / i.image.videoHeight))
+            () => o(M(this.objectFit, this.cornerPoints, i.image.videoWidth / i.image.videoHeight))
           );
         }), r = new y(d, s);
-        return r.name = "videoMesh", r.position.copy(new g(0, 0, 0)), r;
+        return r.name = "videoMesh", r.position.copy(new f(0, 0, 0)), r;
       }))();
       if (!e)
         return;
@@ -204,7 +207,7 @@ class Ee extends b {
         this.coverMesh || this.remove(this.buttonMesh), this.render();
       }), t.addEventListener("pause", () => {
         this.showPauseUI(), this.render();
-      }), this.children.includes(this.videoMesh) || (this.add(e), this.videoMesh = e, this.videoInstance = t), e;
+      }), this.children.includes(this.videoMesh) || (this.add(e), this.videoMesh = e, this.videoInstance = t), console.log("mesh added"), e;
     });
   }
   addButtonMesh() {
@@ -212,13 +215,13 @@ class Ee extends b {
       if (this.children.includes(this.buttonMesh))
         return;
       const e = yield (() => v(this, null, function* () {
-        var u, f, E, L;
+        var u, g, w, E;
         if (this.buttonMesh)
           return this.buttonMesh;
-        const t = (f = (u = this.videoMesh) == null ? void 0 : u.geometry.points[0].distanceTo(this.videoMesh.geometry.points[3])) != null ? f : 1 / 0, i = (L = (E = this.coverMesh) == null ? void 0 : E.geometry.points[0].distanceTo(this.coverMesh.geometry.points[3])) != null ? L : 1 / 0, s = this.cornerPoints[0].distanceTo(this.cornerPoints[3]), r = Math.min(t, i, s) / s * 0.3, o = yield this.getImageTexture(this.buttonSrc), h = l("contain", this.cornerPoints, o.image.width / o.image.height), m = new y(h, new F(o));
-        m.position.copy(new g(0, 0, 0)), m.name = "buttonMesh", m.scale.set(r, r, r), this.addAutoBindEventListener(m, "click", () => this.play());
-        const M = new p.Vector3().crossVectors(new p.Vector3().subVectors(h[0], h[1]), new p.Vector3().subVectors(h[0], h[3])).normalize().multiplyScalar(1e-4);
-        return m.position.add(M), m;
+        const t = (g = (u = this.videoMesh) == null ? void 0 : u.geometry.points[0].distanceTo(this.videoMesh.geometry.points[3])) != null ? g : 1 / 0, i = (E = (w = this.coverMesh) == null ? void 0 : w.geometry.points[0].distanceTo(this.coverMesh.geometry.points[3])) != null ? E : 1 / 0, s = this.cornerPoints[0].distanceTo(this.cornerPoints[3]), r = Math.min(t, i, s) / s * 0.3, o = yield this.getImageTexture(this.buttonSrc), h = M("contain", this.cornerPoints, o.image.width / o.image.height), m = new y(h, new F(o));
+        m.position.copy(new f(0, 0, 0)), m.name = "buttonMesh", m.scale.set(r, r, r), this.addAutoBindEventListener(m, "click", () => this.play());
+        const l = new p.Vector3().crossVectors(new p.Vector3().subVectors(h[0], h[1]), new p.Vector3().subVectors(h[0], h[3])).normalize().multiplyScalar(1e-4);
+        return m.position.add(l), m;
       }))();
       return this.children.includes(this.buttonMesh) || (this.add(e), this.buttonMesh = e), e;
     });
@@ -228,7 +231,7 @@ class Ee extends b {
       var i, s;
       if ((i = this.ImageTextureMap) != null && i.has(e))
         return this.ImageTextureMap.get(e);
-      const t = yield I(e);
+      const t = yield T(e);
       return (s = this.ImageTextureMap) == null || s.set(e, t), t;
     });
   }
@@ -242,5 +245,5 @@ class Ee extends b {
 }
 export {
   ye as ImagePlane,
-  Ee as VideoPlane
+  we as VideoPlane
 };

package/libs/base/BasePlugin.js

@@ -4,7 +4,7 @@ var s = (e, r, t) => (a(e, typeof r != "symbol" ? r + "" : r, t), t);
 import { Subscribe as c } from "../shared-utils/Subscribe.js";
 class o {
   constructor(r, t) {
-    s(this, "VERSION", "2.17.1-alpha.2");
+    s(this, "VERSION", "2.17.1-alpha.5");
     s(this, "five");
     s(this, "hooks", new c());
     s(this, "staticPrefix", "//vrlab-static.ljcdn.com");

package/libs/shared-utils/device.d.ts

@@ -1,3 +1,6 @@
 export declare const isIOS: boolean;
+export declare const isAndroid: boolean;
 export declare const isWX: boolean;
 export declare const isIOSWX: boolean;
+export declare const isAndroidWX: boolean;
+export declare const isBrowser: boolean;

package/libs/shared-utils/device.js

@@ -1,5 +1,7 @@
-const e = navigator.userAgent.toLowerCase().indexOf("iphone") !== -1, o = navigator.userAgent.toLowerCase().indexOf("micromessenger") !== -1, s = e && o;
+const e = navigator.userAgent.toLowerCase().indexOf("iphone") !== -1;
+navigator.userAgent.toLowerCase().indexOf("android");
+const o = navigator.userAgent.toLowerCase().indexOf("micromessenger") !== -1, n = e && o;
 export {
-  s as isIOSWX,
+  n as isIOSWX,
   o as isWX
 };

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.info(
-    "%c %c@realsee/dnalogel %cv2.17.1-alpha.2",
+    "%c %c@realsee/dnalogel %cv2.17.1-alpha.5",
     [
       "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/loadVideoTexture.d.ts

@@ -3,7 +3,7 @@ import { Overwrite } from '../../typings/utils.type';
 export default function loadVideoTexture(src: string, videoElement?: HTMLVideoElement): Promise<Overwrite<THREE.VideoTexture, {
     image: HTMLVideoElement;
 }>>;
-export declare function getVideoTexture(src: string, videoElement?: HTMLVideoElement, metadataLoadedCallback?: (texture: THREE.VideoTexture) => void): Overwrite<THREE.VideoTexture, {
+export declare function getVideoTexture(src: string, videoElement?: HTMLVideoElement): Overwrite<THREE.VideoTexture, {
     image: HTMLVideoElement;
     metadataLoaded: boolean;
 }>;

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

@@ -1,20 +1,32 @@
-import * as n from "three";
-import { isWX as a } from "../device.js";
-function p(d, o, u) {
-  let r = !a;
-  const e = o != null ? o : document.createElement("video");
+import * as a from "three";
+import { isWX as d } from "../device.js";
+function s(u, r) {
+  let n = !d;
+  const e = r != null ? r : document.createElement("video");
   e.preload = "metadata", e.crossOrigin = "anonymous", e.muted = !0, e.loop = !0, e.playsInline = !0, e.autoplay = !0;
-  const t = new n.VideoTexture(e);
-  t.minFilter = n.LinearFilter, t.magFilter = n.LinearFilter, t.encoding = n.sRGBEncoding, t.metadataLoaded = !1, e.src = d;
-  const i = () => {
-    e.onloadedmetadata = () => {
-      !r || (u == null || u(t), t.dispatchEvent({ type: "videoLoaded" }), t.metadataLoaded = !0);
-    };
-  }, s = () => {
-    r || (r = !0, i(), e.muted = !0, e.play(), e.pause());
+  const t = new a.VideoTexture(e);
+  t.minFilter = a.LinearFilter, t.magFilter = a.LinearFilter, t.encoding = a.sRGBEncoding, t.metadataLoaded = !1, e.src = u;
+  const o = () => {
+    t.metadataLoaded || (t.dispatchEvent({ type: "videoLoaded" }), t.metadataLoaded = !0);
   };
-  return r ? i() : (document.addEventListener("click", s, { once: !0 }), document.addEventListener("touchstart", s, { once: !0 })), t;
+  if (d || (e.onloadedmetadata = () => {
+    o();
+  }), d) {
+    const i = () => {
+      if (!n) {
+        if (!e.paused) {
+          o();
+          return;
+        }
+        n = !0, console.log("click play"), e.muted = !0, e.play().then(() => {
+          e.pause(), e.currentTime = 0, o();
+        });
+      }
+    };
+    document.addEventListener("click", i, { once: !0 }), document.addEventListener("touchstart", i, { once: !0 });
+  }
+  return t;
 }
 export {
-  p as getVideoTexture
+  s as getVideoTexture
 };

package/package.json

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