@realsee/dnalogel 2.0.5-alpha.2 → 2.0.5-alpha.4

package/libs/ModelTVVideoPlugin/Plugin.js

@@ -1,6 +1,6 @@
 import * as d from "three";
-import { parseModelTVVideoPoints as z } from "./utils/parseData.js";
-import { CSS3DRenderPlugin as I } from "../CSS3DRenderPlugin/index.js";
+import { parseModelTVVideoPoints as I } from "./utils/parseData.js";
+import { CSS3DRenderPlugin as z } from "../CSS3DRenderPlugin/index.js";
 import "./typings.js";
 import "../CSS3DRenderPlugin/Controller.js";
 import "../CSS3DRenderPlugin/CSS3DRender.js";
@@ -10,7 +10,7 @@ import "../CSS3DRenderPlugin/utils/evenNumber.js";
 import "../CSS3DRenderPlugin/utils/positionToVector3.js";
 import "../CSS3DRenderPlugin/utils/CSS3DObjectPlus.js";
 import "../CSS3DRenderPlugin/utils/centerPoint.js";
-const q = (s, { videoElement: E }) => {
+const q = (i, { videoElement: E }) => {
   const t = {
     videoMeshes: [],
     videoTextureEnabled: !1,
@@ -18,39 +18,40 @@ const q = (s, { videoElement: E }) => {
     rectPoints: [],
     enabled: !1,
     videoElement: E
-  }, m = I(s), y = /* @__PURE__ */ new Map(), M = (e) => {
+  }, f = z(i), y = /* @__PURE__ */ new Map(), M = (e) => {
     t.videoTexture && (t.videoTexture.image.muted = e);
-  }, A = () => t.videoTexture ? t.videoTexture.image.muted : !0, T = () => {
+  }, A = () => t.videoTexture ? t.videoTexture.image.muted : !0, x = () => {
     if (t.enabled || !t.videoTexture)
       return;
-    t.enabled = !0, t.videoMeshes = R(), t.videoMeshes.forEach((o) => s.scene.add(o));
+    t.enabled = !0, t.videoMeshes = R(), t.videoMeshes.forEach((o) => i.scene.add(o));
     const e = () => {
       if (!t.videoTexture)
         return;
       const o = () => {
-        var i;
-        !t.videoTexture || ((i = t.videoTexture) == null || i.image.removeEventListener("timeupdate", o), t.videoTextureEnabled = !0, t.videoMeshes.forEach((n) => {
+        var s;
+        !t.videoTexture || ((s = t.videoTexture) == null || s.image.removeEventListener("timeupdate", o), t.videoTextureEnabled = !0, t.videoMeshes.forEach((n) => {
           n.material.map !== t.videoTexture && (n.material.map = t.videoTexture);
-        }), s.needsRender = !0);
+        }), i.needsRender = !0);
       };
       t.videoTexture.image.addEventListener("timeupdate", o), t.videoTexture && t.videoMeshes.length && (t.videoTexture.image.play(), t.videoTexture.image.onplay = () => {
-        m.hide();
+        f.hide();
       }, t.videoTexture.image.onpause = () => {
-        m.show();
+        f.show();
       }, t.videoTexture.image.onclick = () => {
         t.videoTexture.image.muted = !1, t.videoTexture.image.play();
       });
     };
-    if (s.model.loaded)
+    if (i.model.loaded)
       e();
     else
-      return s.once("modelLoaded", () => e());
-  }, g = () => {
+      return i.once("modelLoaded", () => e());
+    b();
+  }, T = () => {
     !t.enabled || (t.enabled = !1, t.videoMeshes.forEach((e) => {
-      e.geometry.dispose(), e.material.dispose(), s.scene.remove(e), t.videoTexture && t.videoTexture.image.pause();
-    }), t.videoMeshes = [], s.needsRender = !0);
+      e.geometry.dispose(), e.material.dispose(), i.scene.remove(e), t.videoTexture && t.videoTexture.image.pause();
+    }), t.videoMeshes = [], i.needsRender = !0);
   }, R = () => t.rectPoints.map((e, o) => {
-    const i = new d.BufferGeometry(), n = 128, a = [];
+    const s = new d.BufferGeometry(), n = 128, a = [];
     a.push(...e[0].toArray());
     for (let r = 1; r < n; r++)
       a.push(
@@ -77,28 +78,26 @@ const q = (s, { videoElement: E }) => {
     const u = [];
     for (let r = 0; r < n; r++)
       u.push(r, r + 1, n * 2 - r, r, n * 2 - r, n * 2 + 1 - r);
-    i.setAttribute("position", new d.BufferAttribute(new Float32Array(a), 3)), i.setAttribute("uv", new d.BufferAttribute(new Float32Array(c), 2)), i.setIndex(new d.BufferAttribute(new Uint32Array(u), 1));
-    const l = new d.AxesHelper(10);
-    s.scene.add(l);
-    const f = new d.MeshBasicMaterial({
+    s.setAttribute("position", new d.BufferAttribute(new Float32Array(a), 3)), s.setAttribute("uv", new d.BufferAttribute(new Float32Array(c), 2)), s.setIndex(new d.BufferAttribute(new Uint32Array(u), 1));
+    const m = new d.MeshBasicMaterial({
       map: t.videoTextureEnabled ? t.videoTexture : t.imageTexture,
       side: d.DoubleSide
-    }), x = new d.Mesh(i, f);
-    x.renderOrder = 1, x.name = `ModelTVVideoPlugin-${o}-${performance.now()}`;
-    const S = [e[1], e[2], e[3], e[0]], p = m.create3DDomContainer(S);
+    }), l = new d.Mesh(s, m);
+    l.renderOrder = 1, l.name = `ModelTVVideoPlugin-${o}-${performance.now()}`;
+    const S = [e[1], e[2], e[3], e[0]], p = f.create3DDomContainer(S);
     if (p != null && p.container) {
       const r = document.createElement("div");
       r.classList.add("play-icon"), r.style.width = "100%", r.style.height = "100%", r.style.display = "flex", r.style.justifyContent = "center", r.style.alignItems = "center", r.style.pointerEvents = "none", p.container.appendChild(r);
       const h = document.createElement("img");
       h.src = "//vrlab-static.ljcdn.com/release/web/play.2ada5b6f.png", h.style.width = "200px", h.style.pointerEvents = "auto", h.onclick = () => {
         t.videoTexture.image.muted = !1, t.videoTexture.image.play();
-      }, r.appendChild(h), y.set(x, p);
+      }, r.appendChild(h), y.set(l, p);
     }
-    return x;
+    return l;
   }), F = (e) => {
     const o = new d.TextureLoader().load(e);
     return o.minFilter = d.LinearFilter, o.magFilter = d.LinearFilter, o.format = d.RGBFormat, o;
-  }, L = (e, o) => new Promise((i, n) => {
+  }, P = (e, o) => new Promise((s, n) => {
     const a = new XMLHttpRequest();
     a.onreadystatechange = () => {
       if (a.readyState == 4)
@@ -106,50 +105,52 @@ const q = (s, { videoElement: E }) => {
           const c = window.URL || window.webkitURL;
           o = o || document.createElement("video"), o.crossOrigin = "anonymous", o.muted = !0, o.loop = !0, o.playsInline = !0, o.src = c.createObjectURL(a.response);
           const u = new d.VideoTexture(o);
-          u.minFilter = d.LinearFilter, u.magFilter = d.LinearFilter, u.format = d.RGBFormat, i(Object.assign(u, { videoSource: e }));
+          u.minFilter = d.LinearFilter, u.magFilter = d.LinearFilter, u.format = d.RGBFormat, s(Object.assign(u, { videoSource: e }));
         } else
           n(new Error("Video download Error: " + a.status));
     }, a.onerror = (c) => n(c), a.open("GET", e), a.responseType = "blob", a.send();
-  }), P = async (e, o) => {
-    const { video_src: i, video_poster_src: n, points: a } = e;
-    t.videoSource = i, t.rectPoints = z(a).map((c) => c.map(({ x: u, y: l, z: f }) => new d.Vector3(u, l, f))), t.imageTexture = F(n), o && (t.videoElement = o), t.videoTexture = await L(t.videoSource, t.videoElement), t.enabled = !!e.enable, t.enabled && T();
-  }, v = (e) => {
+  }), L = async (e, o) => {
+    const { video_src: s, video_poster_src: n, points: a } = e;
+    t.videoSource = s, t.rectPoints = I(a).map((c) => c.map(({ x: u, y: m, z: l }) => new d.Vector3(u, m, l))), t.imageTexture = F(n), o && (t.videoElement = o), t.videoTexture = await P(t.videoSource, t.videoElement), t.enabled = !!e.enable, t.enabled && x();
+  }, g = (e) => {
     if (!t.enabled)
       return;
     const o = t.videoMeshes;
     if (!(!o || e.intersectObjects(o).length === 0))
       return t.videoTexture && (t.videoTexture.image.paused || t.videoTexture.image.pause()), !1;
-  }, b = (e) => {
-    e === "Floorplan" || t.videoTexture.image.played ? m.hide() : m.show();
-  }, w = () => {
+  }, v = (e) => {
+    e === "Floorplan" ? f.hide() : t.videoTexture.image.paused ? f.show() : f.hide();
+  }, b = () => {
     if (!t.enabled)
       return;
-    const e = s.camera.position;
-    if (y.forEach((o, i) => {
-      const n = o.css3DObject.position.clone(), a = n.clone().sub(e).normalize(), c = new d.Raycaster(e, a), u = s.model.intersectRaycaster(c)[0], l = n.distanceTo(e), f = 0.01;
-      u && u.distance + f < l ? o.hide() : o.show();
+    const e = i.camera.position;
+    if (y.forEach((o, s) => {
+      const n = o.css3DObject.position.clone(), a = n.clone().sub(e).normalize(), c = new d.Raycaster(e, a), u = i.model.intersectRaycaster(c)[0], m = n.distanceTo(e), l = 0.01;
+      u && u.distance + l < m ? o.hide() : o.show();
     }), !A()) {
-      const o = t.rectPoints.find((i) => {
-        const n = i[0].clone().add(i[1]).add(i[2]).add(i[3]).divideScalar(4);
-        return i.map((a) => a.clone().add(n).divideScalar(2)).filter((a) => {
-          const c = a.distanceTo(e), u = new d.Raycaster(e, a.clone().sub(e).normalize()), l = s.model.intersectRaycaster(u)[0], f = 0.01;
-          return !(l && l.distance + f < c);
+      const o = t.rectPoints.find((s) => {
+        const n = s[0].clone().add(s[1]).add(s[2]).add(s[3]).divideScalar(4);
+        return s.map((a) => a.clone().add(n).divideScalar(2)).filter((a) => {
+          const c = a.distanceTo(e), u = new d.Raycaster(e, a.clone().sub(e).normalize()), m = i.model.intersectRaycaster(u)[0], l = 0.01;
+          return !(m && m.distance + l < c);
         }).length >= 2;
       });
       (!o || o.length === 0) && M(!0);
     }
+  }, w = () => {
+    b();
   }, V = () => {
-    g(), t.videoTexture = void 0, s.off("modeChange", b), s.off("wantsTapGesture", v), s.off("panoArrived", w), s.off("renderFrame", () => {
+    T(), t.videoTexture = void 0, i.off("modeChange", v), i.off("wantsTapGesture", g), i.off("panoArrived", w), i.off("renderFrame", () => {
       t.videoMeshes.forEach((e) => {
         e && (e.needsRender = !0);
       });
-    });
+    }), y.clear();
   };
-  return s.on("modeChange", b), s.on("wantsTapGesture", v), s.on("panoArrived", w), s.on("renderFrame", () => {
+  return i.on("modeChange", v), i.on("wantsTapGesture", g), i.on("panoArrived", w), i.on("renderFrame", () => {
     t.videoMeshes.forEach((e) => {
       e && (e.needsRender = !0);
     });
-  }), { enable: T, disable: g, load: P, dispose: V, state: t, css3DRenderPlugin: m };
+  }), { enable: x, disable: T, load: L, dispose: V, state: t, css3DRenderPlugin: f };
 };
 export {
   q as ModelTVVideoPlugin,

package/package.json

@@ -9,7 +9,7 @@
   "repository": "https://github.com/realsee-developer/dnalogel.git",
   "description": "如视 VR 看房插件合集",
   "private": false,
-  "version": "2.0.5-alpha.2",
+  "version": "2.0.5-alpha.4",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "build": "sh bin/build-production.sh",