@realsee/dnalogel 2.16.0-alpha.0 → 2.16.0-alpha.1

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

@@ -1,8 +1,8 @@
 var S = Object.defineProperty;
-var H = (p, d, e) => d in p ? S(p, d, { enumerable: !0, configurable: !0, writable: !0, value: e }) : p[d] = e;
-var a = (p, d, e) => (H(p, typeof d != "symbol" ? d + "" : d, e), e);
-var u = (p, d, e) => new Promise((t, s) => {
-  var h = (i) => {
+var H = (v, c, e) => c in v ? S(v, c, { enumerable: !0, configurable: !0, writable: !0, value: e }) : v[c] = e;
+var h = (v, c, e) => (H(v, typeof c != "symbol" ? c + "" : c, e), e);
+var u = (v, c, e) => new Promise((t, s) => {
+  var a = (i) => {
     try {
       n(e.next(i));
     } catch (o) {
@@ -14,12 +14,12 @@ var u = (p, d, e) => new Promise((t, s) => {
     } catch (o) {
       s(o);
     }
-  }, n = (i) => i.done ? t(i.value) : Promise.resolve(i.value).then(h, r);
-  n((e = e.apply(p, d)).next());
+  }, n = (i) => i.done ? t(i.value) : Promise.resolve(i.value).then(a, r);
+  n((e = e.apply(v, c)).next());
 });
 import * as m from "three";
 import { Vector3 as f } from "three";
-import { centerPoint as l } from "../../../shared-utils/three/centerPoint.js";
+import { centerPoint as g } from "../../../shared-utils/three/centerPoint.js";
 import { loadTexture as w } from "../../../shared-utils/three/loadTexture.js";
 import { QuadrangleGeometry as y } from "../../../shared-utils/three/Quadrangle.js";
 import { loadVideoTexture as F } from "../../../shared-utils/three/loadVideoTexture.js";
@@ -32,31 +32,31 @@ import "../../../shared-utils/threex/domevents/index.js";
 class V extends m.Mesh {
   constructor() {
     super(...arguments);
-    a(this, "name", "MediaPlane");
-    a(this, "src");
+    h(this, "name", "MediaPlane");
+    h(this, "src");
   }
   removeFromParent() {
     const e = this.parent;
     return e !== null && e.remove(this), this;
   }
   setMatrixByCornerPoints(e) {
-    const t = new f().subVectors(e[1], e[0]), s = new f().subVectors(e[3], e[0]), h = l(...e), r = new f().crossVectors(t, s).normalize();
+    const t = new f().subVectors(e[1], e[0]), s = new f().subVectors(e[3], e[0]), a = g(...e), r = new f().crossVectors(t, s).normalize();
     this.lookAt(r);
     const n = this.up.clone().applyQuaternion(this.quaternion), i = s.clone(), o = new f().crossVectors(n, i).normalize();
-    this.rotateOnWorldAxis(o, n.angleTo(i)), this.position.copy(h);
+    this.rotateOnWorldAxis(o, n.angleTo(i)), this.position.copy(a);
   }
 }
 class J extends V {
   constructor(e, t) {
     super();
-    a(this, "name", "PanoTagPluginImagePlane");
+    h(this, "name", "PanoTagPluginImagePlane");
     this.src = e, w(e).then((s) => {
-      const h = s.image.width, r = s.image.height, n = new m.MeshBasicMaterial({ map: s, transparent: !0 }), i = new m.PlaneGeometry(h, r);
+      const a = s.image.width, r = s.image.height, n = new m.MeshBasicMaterial({ map: s, transparent: !0 }), i = new m.PlaneGeometry(a, r);
       this.geometry = i, this.material = n;
-      const o = t[0].distanceTo(t[1]), c = t[1].distanceTo(t[2]);
-      this.scale.set(o / h, c / r, 1);
-      const M = h / r, g = o / c;
-      M > g ? this.scale.set(o / h, o / h, 1) : M < g ? this.scale.set(c / r, c / r, 1) : this.scale.set(o / h, c / r, 1);
+      const o = t[0].distanceTo(t[1]), d = t[1].distanceTo(t[2]);
+      this.scale.set(o / a, d / r, 1);
+      const l = a / r, M = o / d;
+      l > M ? this.scale.set(o / a, o / a, 1) : l < M ? this.scale.set(d / r, d / r, 1) : this.scale.set(o / a, d / r, 1);
     }).catch((s) => {
       console.error({ e: s });
     }), this.setMatrixByCornerPoints(t);
@@ -64,49 +64,55 @@ class J extends V {
 }
 class K extends V {
   constructor(e, t, s) {
-    const { videoCoverSrc: h, objectFit: r = "contain", playButton: n = "withText", videoTextureMap: i, ImageTextureMap: o } = s != null ? s : {};
+    const {
+      videoCoverSrc: a,
+      objectFit: r = "contain",
+      playButton: n = "withText",
+      videoTextureMap: i,
+      ImageTextureMap: o,
+      videoInstance: d = document.createElement("video")
+    } = s != null ? s : {};
     super();
-    a(this, "isVideoPlane", !0);
-    a(this, "name", "PanoTagPluginImagePlane");
-    a(this, "objectFit");
-    a(this, "buttonSrc");
-    a(this, "videoCoverSrc");
-    a(this, "domEvents");
-    a(this, "disposers", []);
-    a(this, "domEventsListenerTemporaryList", []);
-    a(this, "cornerPoints");
-    a(this, "videoInstance");
-    a(this, "videoMesh");
-    a(this, "coverMesh");
-    a(this, "buttonMesh");
-    a(this, "videoTextureMap");
-    a(this, "ImageTextureMap");
-    this.cornerPoints = t, this.src = e, this.buttonSrc = (() => n === "withText" ? R : n === "withoutText" ? P : typeof n == "string" ? n : P)(), this.videoCoverSrc = h, this.objectFit = r, this.videoTextureMap = i, this.ImageTextureMap = o, this.position.copy(l(...t)), this.videoCoverSrc ? this.addCoverMesh().then(() => this.addButtonMesh()) : this.addVideoMesh().then(() => this.addButtonMesh()), this.addEventListener("dispose", () => {
-      var c;
-      this.domEventsListenerTemporaryList = [], (c = this.disposers) == null || c.forEach((M) => M == null ? void 0 : M());
+    h(this, "isVideoPlane", !0);
+    h(this, "name", "PanoTagPluginImagePlane");
+    h(this, "videoInstance");
+    h(this, "objectFit");
+    h(this, "buttonSrc");
+    h(this, "paused", !0);
+    h(this, "videoCoverSrc");
+    h(this, "domEvents");
+    h(this, "disposers", []);
+    h(this, "domEventsListenerTemporaryList", []);
+    h(this, "cornerPoints");
+    h(this, "videoMesh");
+    h(this, "coverMesh");
+    h(this, "buttonMesh");
+    h(this, "videoTextureMap");
+    h(this, "ImageTextureMap");
+    this.cornerPoints = t, this.src = e, this.buttonSrc = (() => n === "withText" ? R : n === "withoutText" ? P : typeof n == "string" ? n : P)(), this.videoInstance = d, this.videoCoverSrc = a, this.objectFit = r, this.videoTextureMap = i, this.ImageTextureMap = o, this.position.copy(g(...t)), this.videoCoverSrc ? this.addCoverMesh().then(() => this.addButtonMesh()) : this.addVideoMesh().then(() => this.addButtonMesh()), this.addEventListener("dispose", () => {
+      var l;
+      this.domEventsListenerTemporaryList = [], (l = this.disposers) == null || l.forEach((M) => M == null ? void 0 : M());
     });
   }
   play() {
     return u(this, null, function* () {
-      var e;
-      this.coverMesh && (this.coverMesh.visible = !1), this.remove(this.buttonMesh), yield this.addVideoMesh(), this.videoMesh && (this.videoMesh.visible = !0), (e = this.videoInstance) == null || e.play(), this.render();
+      !this.paused || (this.paused = !1, this.coverMesh && (this.coverMesh.visible = !1), this.remove(this.buttonMesh), this.videoMesh || (yield this.addVideoMesh()), this.videoMesh.visible = !0, this.videoInstance.play(), this.videoInstance.muted = !1, this.render());
     });
   }
   pause() {
-    var e;
-    this.coverMesh && (this.coverMesh.visible = !0), this.videoMesh && (this.videoMesh.visible = !1), this.addButtonMesh(), (e = this.videoInstance) == null || e.pause(), this.render();
+    this.paused || (this.paused = !0, this.coverMesh && (this.coverMesh.visible = !0, this.videoMesh && (this.videoMesh.visible = !1)), this.addButtonMesh(), this.videoInstance.pause(), this.render());
   }
   initialDomEvents(e) {
     this.domEvents || (this.domEvents = new D(e), this.domEventsListenerTemporaryList.forEach((t) => this.addDomEventListener(...t)), this.domEventsListenerTemporaryList = []);
   }
   initialRenderHooks(e) {
     const t = () => {
-      this.videoMesh && this.videoInstance && (this.videoInstance.paused || (this.videoMesh.needsRender = !0));
+      this.videoMesh && (this.videoInstance.paused || (this.videoMesh.needsRender = !0));
     };
     e.on("renderFrame", t), this.disposers.push(() => e.off("renderFrame", t));
   }
   render() {
-    this.videoMesh && (this.videoMesh.needsRender = !0), this.coverMesh && (this.coverMesh.needsRender = !0), this.buttonMesh && (this.buttonMesh.needsRender = !0), this.videoInstance && this.videoMesh && (this.videoInstance.paused || (this.videoMesh.needsRender = !0));
+    this.videoMesh && (this.videoMesh.needsRender = !0), this.coverMesh && (this.coverMesh.needsRender = !0), this.buttonMesh && (this.buttonMesh.needsRender = !0), this.videoMesh && (this.videoInstance.paused || (this.videoMesh.needsRender = !0));
   }
   addDomEventListener(...e) {
     this.domEvents ? (this.domEvents.addEventListener(...e), this.disposers.push(() => {
@@ -145,17 +151,17 @@ class K extends V {
     return u(this, null, function* () {
       if (this.coverMesh)
         return this.coverMesh;
-      const e = yield this.getCoverTexture(), t = new m.MeshBasicMaterial({ transparent: !0, map: e }), s = T(this.objectFit, this.cornerPoints, e.image.width / e.image.height), h = l(...s), r = s.map((o) => o.clone().sub(h)), n = new y(r, 1), i = new m.Mesh(n, t);
-      return i.name = "videoCoverMesh", i.position.copy(h.clone().sub(this.position)), this.coverMesh = i, i;
+      const e = yield this.getCoverTexture(), t = new m.MeshBasicMaterial({ transparent: !0, map: e }), s = T(this.objectFit, this.cornerPoints, e.image.width / e.image.height), a = g(...s), r = s.map((o) => o.clone().sub(a)), n = new y(r, 1), i = new m.Mesh(n, t);
+      return i.name = "videoCoverMesh", i.position.copy(a.clone().sub(this.position)), this.coverMesh = i, i;
     });
   }
   getVideoMesh() {
     return u(this, null, function* () {
       if (this.videoMesh)
         return this.videoMesh;
-      const e = yield this.getVideoTexture(), t = new m.MeshBasicMaterial({ transparent: !0, map: e }), s = T(this.objectFit, this.cornerPoints, e.image.videoWidth / e.image.videoHeight), h = l(...s), r = s.map((c) => c.clone().sub(h)), n = new y(r, 1), i = new m.Mesh(n, t);
-      i.name = "videoMesh", i.position.copy(h.clone().sub(this.position)), this.addDomEventListener(i, "click", (c) => {
-        console.log("pause"), this.pause();
+      const e = yield this.getVideoTexture(), t = new m.MeshBasicMaterial({ transparent: !0, map: e }), s = T(this.objectFit, this.cornerPoints, e.image.videoWidth / e.image.videoHeight), a = g(...s), r = s.map((d) => d.clone().sub(a)), n = new y(r, 1), i = new m.Mesh(n, t);
+      i.name = "videoMesh", i.position.copy(a.clone().sub(this.position)), this.addDomEventListener(i, "click", (d) => {
+        this.pause();
       });
       const o = e.image;
       return this.videoMesh = i, this.videoInstance = o, i;
@@ -166,18 +172,18 @@ class K extends V {
       var b, E, I, L;
       if (this.buttonMesh)
         return this.buttonMesh;
-      const e = (E = (b = this.videoMesh) == null ? void 0 : b.geometry.points[0].distanceTo(this.videoMesh.geometry.points[3])) != null ? E : 1 / 0, t = (L = (I = this.coverMesh) == null ? void 0 : I.geometry.points[0].distanceTo(this.coverMesh.geometry.points[3])) != null ? L : 1 / 0, s = this.cornerPoints[0].distanceTo(this.cornerPoints[3]), r = Math.min(e, t, s) / s * 0.3, n = yield this.getButtonTexture(), i = new m.MeshBasicMaterial({ transparent: !0, map: n }), o = T("contain", this.cornerPoints, n.image.width / n.image.height), c = l(...o), M = o.map((B) => B.clone().sub(c)), g = new y(M), v = new m.Mesh(g, i);
-      v.name = "buttonMesh", v.scale.set(r, r, r);
+      const e = (E = (b = this.videoMesh) == null ? void 0 : b.geometry.points[0].distanceTo(this.videoMesh.geometry.points[3])) != null ? E : 1 / 0, t = (L = (I = this.coverMesh) == null ? void 0 : I.geometry.points[0].distanceTo(this.coverMesh.geometry.points[3])) != null ? L : 1 / 0, s = this.cornerPoints[0].distanceTo(this.cornerPoints[3]), r = Math.min(e, t, s) / s * 0.3, n = yield this.getButtonTexture(), i = new m.MeshBasicMaterial({ transparent: !0, map: n }), o = T("contain", this.cornerPoints, n.image.width / n.image.height), d = g(...o), l = o.map((B) => B.clone().sub(d)), M = new y(l), p = new m.Mesh(M, i);
+      p.name = "buttonMesh", p.scale.set(r, r, r);
       const x = () => {
-        console.log("play", v.visible, v.parent), this.play();
+        this.play();
       };
-      v.addEventListener("added", () => {
-        this.addDomEventListener(v, "click", x);
-      }), v.addEventListener("removed", () => {
-        this.removeDomEventListener(v, "click", x);
+      p.addEventListener("added", () => {
+        this.addDomEventListener(p, "click", x);
+      }), p.addEventListener("removed", () => {
+        this.removeDomEventListener(p, "click", x);
       });
       const C = new m.Vector3().crossVectors(new m.Vector3().subVectors(o[0], o[1]), new m.Vector3().subVectors(o[0], o[3])).normalize().multiplyScalar(1e-4);
-      return v.position.copy(C), this.buttonMesh = v, v;
+      return p.position.copy(C), this.buttonMesh = p, p;
     });
   }
   getButtonTexture() {
@@ -203,7 +209,7 @@ class K extends V {
       var t, s;
       if ((t = this.videoTextureMap) != null && t.has(this.src))
         return this.videoTextureMap.get(this.src);
-      const e = yield F(this.src);
+      const e = yield F(this.src, this.videoInstance);
       return (s = this.videoTextureMap) == null || s.set(this.src, e), e;
     });
   }

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.16.0-alpha.0");
+    s(this, "VERSION", "2.16.0-alpha.1");
     s(this, "five");
     s(this, "hooks", new c());
     s(this, "staticPrefix", "//vrlab-static.ljcdn.com");

package/libs/index.js

@@ -243,6 +243,13 @@ import "./PanoTagPlugin/utils/planeNormal.js";
 import "./PanoTagPlugin/utils/normalPositionToPositions.js";
 import "./PanoTagPlugin/controller/TagCache.js";
 import "./PanoTagPlugin/utils/device.js";
+import "./PanoTagPlugin/utils/model/mediaPlane.js";
+import "./shared-utils/three/Quadrangle.js";
+import "./shared-utils/math/pointIsRectangle.js";
+import "./shared-utils/three/loadVideoTexture.js";
+import "./PanoTagPlugin/Assets/Icon.js";
+import "./shared-utils/three/getPositionsByObjectFit.js";
+import "./shared-utils/five/FiveDomEvents.js";
 import "./PanoTagPlugin/Components/TagContainer.js";
 import "./PanoTagPlugin/Components/TagItem.js";
 import "./PanoTagPlugin/Components/Tag/index.js";
@@ -256,7 +263,6 @@ import "animejs";
 import "./PanoTagPlugin/utils/search.js";
 import "./PanoTagPlugin/utils/constants.js";
 import "./PanoTagPlugin/Components/Common/Arrow.js";
-import "./PanoTagPlugin/Assets/Icon.js";
 import "./PanoTagPlugin/utils/doUtil.js";
 import "./PanoTagPlugin/Components/Tag/TextTag/TextPlaneTag.js";
 import "./PanoTagPlugin/Components/Common/Text/MText.js";
@@ -308,12 +314,6 @@ import "./PanoTagPlugin/Components/Common/Icon/Icon.js";
 import "./PanoTagPlugin/utils/getImageInfo.js";
 import "./PanoTagPlugin/Components/Tag/CustomTag.js";
 import "./PanoTagPlugin/Components/Common/TagPoint.js";
-import "./PanoTagPlugin/utils/model/mediaPlane.js";
-import "./shared-utils/three/Quadrangle.js";
-import "./shared-utils/math/pointIsRectangle.js";
-import "./shared-utils/three/loadVideoTexture.js";
-import "./shared-utils/three/getPositionsByObjectFit.js";
-import "./shared-utils/five/FiveDomEvents.js";
 import "./shared-utils/three/GLTFLoader.js";
 import "./shared-utils/Object3DHelper/Helper/MoveHelper.js";
 import "./shared-utils/Object3DHelper/Base/BaseHelper.js";

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.info(
-    "%c %c@realsee/dnalogel %cv2.16.0-alpha.0",
+    "%c %c@realsee/dnalogel %cv2.16.0-alpha.1",
     [
       "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

@@ -1,4 +1,4 @@
 import * as THREE from 'three';
-export default function loadVideoTexture(src: string): Promise<Omit<THREE.VideoTexture, 'image'> & {
+export default function loadVideoTexture(src: string, videoElement?: HTMLVideoElement): Promise<Omit<THREE.VideoTexture, 'image'> & {
     image: HTMLVideoElement;
 }>;

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

@@ -1,14 +1,14 @@
-import * as r from "three";
-function i(o) {
-  return new Promise((a, n) => {
-    const e = document.createElement("video");
-    e.preload = "metadata", e.crossOrigin = "anonymous", e.muted = !0, e.loop = !0, e.playsInline = !0, e.autoplay = !0, e.src = o;
-    const t = new r.VideoTexture(e);
-    t.minFilter = r.LinearFilter, t.magFilter = r.LinearFilter, t.format = r.RGBFormat, e.onloadedmetadata = () => {
-      a(t);
+import * as t from "three";
+function u(a, o) {
+  return new Promise((n, i) => {
+    const e = o != null ? o : document.createElement("video");
+    e.preload = "metadata", e.crossOrigin = "anonymous", e.muted = !0, e.loop = !0, e.playsInline = !0, e.autoplay = !0, e.src = a;
+    const r = new t.VideoTexture(e);
+    r.minFilter = t.LinearFilter, r.magFilter = t.LinearFilter, r.encoding = t.sRGBEncoding, e.onloadedmetadata = () => {
+      n(r);
     };
   });
 }
 export {
-  i as loadVideoTexture
+  u as loadVideoTexture
 };

package/package.json

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