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

package/libs/CruisePlugin/Controller.js

@@ -240,7 +240,7 @@ class $ extends C {
   async getPlayPromise(e, t) {
     var r;
     const i = e.data;
-    if ((r = t == null ? void 0 : t.duration) != null || e.start !== void 0 && e.end !== void 0 && e.end - e.start, !!i)
+    if (t.duration = (r = t == null ? void 0 : t.duration) != null ? r : e.start !== void 0 && e.end !== void 0 ? e.end - e.start : void 0, !!i)
       return new Promise((d, s) => {
         let n = !1;
         this.addInterruptListener(() => {

package/libs/ModelTVVideoPlugin/Plugin.js

@@ -18,25 +18,25 @@ const q = (s, { videoElement: E }) => {
     rectPoints: [],
     enabled: !1,
     videoElement: E
-  }, f = I(s), y = /* @__PURE__ */ new Map(), M = (e) => {
+  }, m = I(s), y = /* @__PURE__ */ new Map(), M = (e) => {
     t.videoTexture && (t.videoTexture.image.muted = e);
   }, A = () => t.videoTexture ? t.videoTexture.image.muted : !0, T = () => {
     if (t.enabled || !t.videoTexture)
       return;
-    t.enabled = !0, t.videoMeshes = R(), t.videoMeshes.forEach((n) => s.scene.add(n));
+    t.enabled = !0, t.videoMeshes = R(), t.videoMeshes.forEach((o) => s.scene.add(o));
     const e = () => {
       if (!t.videoTexture)
         return;
-      const n = () => {
+      const o = () => {
         var i;
-        !t.videoTexture || ((i = t.videoTexture) == null || i.image.removeEventListener("timeupdate", n), t.videoTextureEnabled = !0, t.videoMeshes.forEach((o) => {
-          o.material.map !== t.videoTexture && (o.material.map = t.videoTexture);
+        !t.videoTexture || ((i = t.videoTexture) == null || i.image.removeEventListener("timeupdate", o), t.videoTextureEnabled = !0, t.videoMeshes.forEach((n) => {
+          n.material.map !== t.videoTexture && (n.material.map = t.videoTexture);
         }), s.needsRender = !0);
       };
-      t.videoTexture.image.addEventListener("timeupdate", n), t.videoTexture && t.videoMeshes.length && (t.videoTexture.image.play(), t.videoTexture.image.onplay = () => {
-        f.hide();
+      t.videoTexture.image.addEventListener("timeupdate", o), t.videoTexture && t.videoMeshes.length && (t.videoTexture.image.play(), t.videoTexture.image.onplay = () => {
+        m.hide();
       }, t.videoTexture.image.onpause = () => {
-        f.show();
+        m.show();
       }, t.videoTexture.image.onclick = () => {
         t.videoTexture.image.muted = !1, t.videoTexture.image.play();
       });
@@ -49,43 +49,43 @@ const q = (s, { videoElement: E }) => {
     !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);
-  }, R = () => t.rectPoints.map((e, n) => {
-    const i = new d.BufferGeometry(), o = 128, a = [];
+  }, R = () => t.rectPoints.map((e, o) => {
+    const i = new d.BufferGeometry(), n = 128, a = [];
     a.push(...e[0].toArray());
-    for (let r = 1; r < o; r++)
+    for (let r = 1; r < n; r++)
       a.push(
-        e[0].x + (e[1].x - e[0].x) * r / o,
-        e[0].y + (e[1].y - e[0].y) * r / o,
-        e[0].z + (e[1].z - e[0].z) * r / o
+        e[0].x + (e[1].x - e[0].x) * r / n,
+        e[0].y + (e[1].y - e[0].y) * r / n,
+        e[0].z + (e[1].z - e[0].z) * r / n
       );
     a.push(...e[1].toArray()), a.push(...e[2].toArray());
-    for (let r = 1; r < o; r++)
+    for (let r = 1; r < n; r++)
       a.push(
-        e[2].x + (e[3].x - e[2].x) * r / o,
-        e[2].y + (e[3].y - e[2].y) * r / o,
-        e[2].z + (e[3].z - e[2].z) * r / o
+        e[2].x + (e[3].x - e[2].x) * r / n,
+        e[2].y + (e[3].y - e[2].y) * r / n,
+        e[2].z + (e[3].z - e[2].z) * r / n
       );
     a.push(...e[3].toArray());
     const c = [];
     c.push(0, 1);
-    for (let r = 1; r < o; r++)
-      c.push(0, 1 - r / o);
+    for (let r = 1; r < n; r++)
+      c.push(0, 1 - r / n);
     c.push(0, 0), c.push(1, 0);
-    for (let r = 1; r < o; r++)
-      c.push(1, r / o);
+    for (let r = 1; r < n; r++)
+      c.push(1, r / n);
     c.push(1, 1);
     const u = [];
-    for (let r = 0; r < o; r++)
-      u.push(r, r + 1, o * 2 - r, r, o * 2 - r, o * 2 + 1 - r);
+    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 m = new d.MeshBasicMaterial({
+    const f = new d.MeshBasicMaterial({
       map: t.videoTextureEnabled ? t.videoTexture : t.imageTexture,
       side: d.DoubleSide
-    }), x = new d.Mesh(i, m);
-    x.renderOrder = 1, x.name = `ModelTVVideoPlugin-${n}-${performance.now()}`;
-    const S = [e[1], e[2], e[3], e[0]], p = f.create3DDomContainer(S);
+    }), 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);
     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);
@@ -96,47 +96,47 @@ const q = (s, { videoElement: E }) => {
     }
     return x;
   }), F = (e) => {
-    const n = new d.TextureLoader().load(e);
-    return n.minFilter = d.LinearFilter, n.magFilter = d.LinearFilter, n.format = d.RGBFormat, n;
-  }, L = (e, n) => new Promise((i, o) => {
+    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) => {
     const a = new XMLHttpRequest();
     a.onreadystatechange = () => {
       if (a.readyState == 4)
         if (a.status == 200) {
           const c = window.URL || window.webkitURL;
-          n = n || document.createElement("video"), n.crossOrigin = "anonymous", n.muted = !0, n.loop = !0, n.playsInline = !0, n.src = c.createObjectURL(a.response);
-          const u = new d.VideoTexture(n);
+          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 }));
         } else
-          o(new Error("Video download Error: " + a.status));
-    }, a.onerror = (c) => o(c), a.open("GET", e), a.responseType = "blob", a.send();
-  }), P = async (e, n) => {
-    const { video_src: i, video_poster_src: o, points: a } = e;
-    t.videoSource = i, t.rectPoints = z(a).map((c) => c.map(({ x: u, y: l, z: m }) => new d.Vector3(u, l, m))), t.imageTexture = F(o), n && (t.videoElement = n), t.videoTexture = await L(t.videoSource, t.videoElement), t.enabled = !!e.enable, t.enabled && T();
+          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) => {
     if (!t.enabled)
       return;
-    const n = t.videoMeshes;
-    if (!(!n || e.intersectObjects(n).length === 0))
+    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" ? f.hide() : f.show();
+    e === "Floorplan" || t.videoTexture.image.played ? m.hide() : m.show();
   }, w = () => {
     if (!t.enabled)
       return;
     const e = s.camera.position;
-    if (y.forEach((n, i) => {
-      const o = n.css3DObject.position.clone(), a = o.clone().sub(e).normalize(), c = new d.Raycaster(e, a), u = s.model.intersectRaycaster(c)[0], l = o.distanceTo(e), m = 0.01;
-      u && u.distance + m < l ? n.hide() : n.show();
+    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();
     }), !A()) {
-      const n = t.rectPoints.find((i) => {
-        const o = i[0].clone().add(i[1]).add(i[2]).add(i[3]).divideScalar(4);
-        return i.map((a) => a.clone().add(o).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], m = 0.01;
-          return !(l && l.distance + m < c);
+      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);
         }).length >= 2;
       });
-      (!n || n.length === 0) && M(!0);
+      (!o || o.length === 0) && M(!0);
     }
   }, V = () => {
     g(), t.videoTexture = void 0, s.off("modeChange", b), s.off("wantsTapGesture", v), s.off("panoArrived", w), s.off("renderFrame", () => {
@@ -149,7 +149,7 @@ const q = (s, { videoElement: E }) => {
     t.videoMeshes.forEach((e) => {
       e && (e.needsRender = !0);
     });
-  }), { enable: T, disable: g, load: P, dispose: V, state: t, css3DRenderPlugin: f };
+  }), { enable: T, disable: g, load: P, dispose: V, state: t, css3DRenderPlugin: m };
 };
 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.1",
+  "version": "2.0.5-alpha.2",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "build": "sh bin/build-production.sh",