@realsee/dnalogel 3.81.9 → 3.81.10-alpha.1

package/libs/CurrentPanoImagePlugin/Controller.d.ts

@@ -10,8 +10,9 @@ export declare class CurrentPanoImagePluginController extends BasePlugin.Control
         yOffset: number;
         yRotate: number;
         imageURL: string;
+        mediaManager?: import("..").PlaybackManager;
         staticPrefix?: string;
-        i18n?: (key: string) => string; /** 插件当前状态 */
+        i18n?: (key: string) => string;
     };
     /** 是否已经被销毁 */
     get disposed(): boolean;

package/libs/ModelTVVideoPlugin/Plugin.js

@@ -1,23 +1,23 @@
-var R = (s, g, e) => new Promise((f, v) => {
-  var b = (l) => {
+var L = (d, A, h) => new Promise((t, y) => {
+  var v = (p) => {
     try {
-      h(e.next(l));
-    } catch (x) {
-      v(x);
+      T(h.next(p));
+    } catch (c) {
+      y(c);
     }
-  }, w = (l) => {
+  }, x = (p) => {
     try {
-      h(e.throw(l));
-    } catch (x) {
-      v(x);
+      T(h.throw(p));
+    } catch (c) {
+      y(c);
     }
-  }, h = (l) => l.done ? f(l.value) : Promise.resolve(l.value).then(b, w);
-  h((e = e.apply(s, g)).next());
+  }, T = (p) => p.done ? t(p.value) : Promise.resolve(p.value).then(v, x);
+  T((h = h.apply(d, A)).next());
 });
-import * as m from "three";
-import { parseModelTVVideoPoints as S } from "./utils/parseData.js";
-import { CSS3DRenderPlugin as z } from "../CSS3DRenderPlugin/index.js";
-import { Image_Play_Icon_With_Text as O } from "../PanoTagPlugin/Assets/Icon.js";
+import * as l from "three";
+import { parseModelTVVideoPoints as W } from "./utils/parseData.js";
+import { CSS3DRenderPlugin as $ } from "../CSS3DRenderPlugin/index.js";
+import { Image_Play_Icon_With_Text as q } from "../PanoTagPlugin/Assets/Icon.js";
 import "./typings.js";
 import "../CSS3DRenderPlugin/Controller.js";
 import "../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
@@ -88,149 +88,204 @@ import "../CSS3DRenderPlugin/utils/three/CSS3DScene.js";
 import "../CSS3DRenderPlugin/utils/getAllCSS3DObject.js";
 import "../CSS3DRenderPlugin/utils/three/CSS3DGroup.js";
 import "../shared-utils/url/defaultUrls.js";
-const tt = (s, { videoElement: g }) => {
-  const e = {
+const ut = (d, { videoElement: A, mediaManager: h }) => {
+  const t = {
     videoMeshes: [],
     videoTextureEnabled: !1,
     videoSource: "",
     rectPoints: [],
     enabled: !1,
-    videoElement: g
-  }, f = z(s), v = /* @__PURE__ */ new Map(), b = (t) => {
-    e.videoTexture && (e.videoTexture.image.muted = t);
-  }, w = () => e.videoTexture ? e.videoTexture.image.muted : !0, h = () => {
-    if (e.enabled || !e.videoTexture)
+    videoElement: A
+  };
+  let y = 0, v, x, T = 0, p;
+  const c = h == null ? void 0 : h.createController({ label: "model-tv", onCancel: () => {
+    T++, p = void 0;
+  } }), g = () => {
+    c == null || c.cancel(), T++, p = void 0, t.videoTexture && (t.videoTexture.image.muted = !0, t.videoTexture.image.pause());
+  }, M = (e = !1, i = !1) => L(void 0, null, function* () {
+    var u;
+    if (!t.videoTexture)
+      return;
+    const r = c == null ? void 0 : c.begin({ userAction: e, audible: !i });
+    if (c && !r)
+      return;
+    p = r;
+    const n = ++T, a = t.videoTexture.image, s = (u = r == null ? void 0 : r.bind(a)) != null ? u : a;
+    s.muted = i;
+    try {
+      yield s.play();
+    } catch (m) {
+      if (r != null && r.signal.aborted || n !== T || r !== p)
+        return;
+      if (m.name === "AbortError") {
+        g();
+        return;
+      }
+      throw g(), m;
+    }
+  }), w = $(d), F = /* @__PURE__ */ new Map(), P = (e, i = !1) => {
+    var a;
+    if (!t.videoTexture)
       return;
-    e.enabled = !0, e.videoMeshes = x(), e.videoMeshes.forEach((i) => s.scene.add(i));
-    const t = () => {
-      if (!e.videoTexture)
+    if (!e) {
+      if (!t.videoTexture.image.paused)
+        return M(i);
+      const s = c == null ? void 0 : c.begin({ userAction: i, audible: !0 });
+      if (c && !s)
+        return;
+      p = s;
+    }
+    const r = t.videoTexture.image, n = (a = p == null ? void 0 : p.bind(r)) != null ? a : r;
+    n.muted = e;
+  }, V = () => t.videoTexture ? t.videoTexture.image.muted : !0, O = () => {
+    if (t.enabled || !t.videoTexture)
+      return;
+    t.enabled = !0, t.videoMeshes = j(), t.videoMeshes.forEach((i) => d.scene.add(i));
+    const e = () => {
+      if (!t.enabled || !t.videoTexture)
         return;
       const i = () => {
-        var n;
-        e.videoTexture && ((n = e.videoTexture) == null || n.image.removeEventListener("timeupdate", i), e.videoTextureEnabled = !0, e.videoMeshes.forEach((o) => {
-          o.material.map !== e.videoTexture && (o.material.map = e.videoTexture);
-        }), s.needsRender = !0);
+        var r;
+        t.videoTexture && ((r = t.videoTexture) == null || r.image.removeEventListener("timeupdate", i), t.videoTextureEnabled = !0, t.videoMeshes.forEach((n) => {
+          n.material.map !== t.videoTexture && (n.material.map = t.videoTexture);
+        }), d.needsRender = !0);
       };
-      e.videoTexture.image.addEventListener("timeupdate", i), e.videoTexture && e.videoMeshes.length && (e.videoTexture.image.play(), e.videoTexture.image.onplay = () => {
-        f.hide();
-      }, e.videoTexture.image.onpause = () => {
-        f.show();
-      }, e.videoTexture.image.onclick = () => {
-        e.videoTexture.image.muted = !1, e.videoTexture.image.play();
+      t.videoTexture.image.addEventListener("timeupdate", i), t.videoTexture && t.videoMeshes.length && (M(!1, t.videoTexture.image.muted), t.videoTexture.image.onplay = () => {
+        w.hide();
+      }, t.videoTexture.image.onpause = () => {
+        w.show();
+      }, t.videoTexture.image.onclick = () => {
+        M(!0);
       });
     };
-    if (s.model.loaded)
-      t();
+    if (d.model.loaded)
+      e();
     else
-      return s.once("modelLoaded", () => t());
-  }, l = () => {
-    e.enabled && (e.enabled = !1, e.videoMeshes.forEach((t) => {
-      t.geometry.dispose(), t.material.dispose(), s.scene.remove(t), e.videoTexture && e.videoTexture.image.pause();
-    }), e.videoMeshes = [], s.needsRender = !0);
-  }, x = () => e.rectPoints.map((t, i) => {
-    const n = new m.BufferGeometry(), o = 128, d = [];
-    d.push(...t[0].toArray());
-    for (let r = 1; r < o; r++)
-      d.push(
-        t[0].x + (t[1].x - t[0].x) * r / o,
-        t[0].y + (t[1].y - t[0].y) * r / o,
-        t[0].z + (t[1].z - t[0].z) * r / o
+      return d.once("modelLoaded", () => e());
+  }, I = () => {
+    y++, v == null || v.abort(), g(), t.enabled && (t.enabled = !1, t.videoMeshes.forEach((e) => {
+      e.geometry.dispose(), e.material.dispose(), d.scene.remove(e), t.videoTexture && t.videoTexture.image.pause();
+    }), t.videoMeshes = [], d.needsRender = !0);
+  }, j = () => t.rectPoints.map((e, i) => {
+    const r = new l.BufferGeometry(), n = 128, a = [];
+    a.push(...e[0].toArray());
+    for (let o = 1; o < n; o++)
+      a.push(
+        e[0].x + (e[1].x - e[0].x) * o / n,
+        e[0].y + (e[1].y - e[0].y) * o / n,
+        e[0].z + (e[1].z - e[0].z) * o / n
       );
-    d.push(...t[1].toArray()), d.push(...t[2].toArray());
-    for (let r = 1; r < o; r++)
-      d.push(
-        t[2].x + (t[3].x - t[2].x) * r / o,
-        t[2].y + (t[3].y - t[2].y) * r / o,
-        t[2].z + (t[3].z - t[2].z) * r / o
+    a.push(...e[1].toArray()), a.push(...e[2].toArray());
+    for (let o = 1; o < n; o++)
+      a.push(
+        e[2].x + (e[3].x - e[2].x) * o / n,
+        e[2].y + (e[3].y - e[2].y) * o / n,
+        e[2].z + (e[3].z - e[2].z) * o / n
       );
-    d.push(...t[3].toArray());
-    const a = [];
-    a.push(0, 1);
-    for (let r = 1; r < o; r++)
-      a.push(0, 1 - r / o);
-    a.push(0, 0), a.push(1, 0);
-    for (let r = 1; r < o; r++)
-      a.push(1, r / o);
-    a.push(1, 1);
-    const c = [];
-    for (let r = 0; r < o; r++)
-      c.push(r, r + 1, o * 2 - r, r, o * 2 - r, o * 2 + 1 - r);
-    n.setAttribute("position", new m.BufferAttribute(new Float32Array(d), 3)), n.setAttribute("uv", new m.BufferAttribute(new Float32Array(a), 2)), n.setIndex(new m.BufferAttribute(new Uint32Array(c), 1));
-    const u = new m.MeshBasicMaterial({
-      map: e.videoTextureEnabled ? e.videoTexture : e.imageTexture,
-      side: m.DoubleSide
-    }), p = new m.Mesh(n, u);
-    p.renderOrder = 1, p.name = `ModelTVVideoPlugin-${i}-${performance.now()}`;
-    const I = [t[1], t[2], t[3], t[0]], y = f.create3DDomContainer(I);
-    if (y != null && y.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", y.container.appendChild(r);
-      const T = document.createElement("img");
-      T.src = O, T.style.width = "200px", T.style.pointerEvents = "auto", T.onclick = () => {
-        e.videoTexture.image.muted = !1, e.videoTexture.image.play();
-      }, r.appendChild(T), v.set(p, y);
+    a.push(...e[3].toArray());
+    const s = [];
+    s.push(0, 1);
+    for (let o = 1; o < n; o++)
+      s.push(0, 1 - o / n);
+    s.push(0, 0), s.push(1, 0);
+    for (let o = 1; o < n; o++)
+      s.push(1, o / n);
+    s.push(1, 1);
+    const u = [];
+    for (let o = 0; o < n; o++)
+      u.push(o, o + 1, n * 2 - o, o, n * 2 - o, n * 2 + 1 - o);
+    r.setAttribute("position", new l.BufferAttribute(new Float32Array(a), 3)), r.setAttribute("uv", new l.BufferAttribute(new Float32Array(s), 2)), r.setIndex(new l.BufferAttribute(new Uint32Array(u), 1));
+    const m = new l.MeshBasicMaterial({
+      map: t.videoTextureEnabled ? t.videoTexture : t.imageTexture,
+      side: l.DoubleSide
+    }), f = new l.Mesh(r, m);
+    f.renderOrder = 1, f.name = `ModelTVVideoPlugin-${i}-${performance.now()}`;
+    const R = [e[1], e[2], e[3], e[0]], b = w.create3DDomContainer(R);
+    if (b != null && b.container) {
+      const o = document.createElement("div");
+      o.classList.add("play-icon"), o.style.width = "100%", o.style.height = "100%", o.style.display = "flex", o.style.justifyContent = "center", o.style.alignItems = "center", o.style.pointerEvents = "none", b.container.appendChild(o);
+      const E = document.createElement("img");
+      E.src = q, E.style.width = "200px", E.style.pointerEvents = "auto", E.onclick = () => {
+        M(!0);
+      }, o.appendChild(E), F.set(f, b);
     }
-    return p;
-  }), F = (t) => {
-    const i = new m.TextureLoader().load(t);
-    return i.minFilter = m.LinearFilter, i.magFilter = m.LinearFilter, i.format = m.RGBFormat, i;
-  }, P = (t, i) => {
-    let n = i;
-    return new Promise((o, d) => {
-      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 m.VideoTexture(n);
-            u.minFilter = m.LinearFilter, u.magFilter = m.LinearFilter, u.format = m.RGBFormat, o(Object.assign(u, { videoSource: t }));
+    return f;
+  }), z = (e) => {
+    const i = new l.TextureLoader().load(e);
+    return i.minFilter = l.LinearFilter, i.magFilter = l.LinearFilter, i.format = l.RGBFormat, i;
+  }, B = (e, i) => {
+    let r = i;
+    return new Promise((n, a) => {
+      const s = new XMLHttpRequest();
+      v == null || v.abort(), v = s, s.onreadystatechange = () => {
+        if (s.readyState === 4)
+          if (s.status === 200) {
+            const u = window.URL || window.webkitURL;
+            r = r || document.createElement("video"), r.crossOrigin = "anonymous", r.muted = !0, r.loop = !0, r.playsInline = !0, x && URL.revokeObjectURL(x), x = u.createObjectURL(s.response), r.src = x;
+            const m = new l.VideoTexture(r);
+            m.minFilter = l.LinearFilter, m.magFilter = l.LinearFilter, m.format = l.RGBFormat, n(Object.assign(m, { videoSource: e }));
           } else
-            d(new Error("Video download Error: " + a.status));
-      }, a.onerror = (c) => d(c), a.open("GET", t), a.responseType = "blob", a.send();
+            a(new Error("Video download Error: " + s.status));
+      }, s.onerror = (u) => a(u), s.onabort = () => a(new DOMException("Video load canceled", "AbortError")), s.open("GET", e), s.responseType = "blob", s.send();
     });
-  }, L = (t, i) => R(void 0, null, function* () {
-    const { video_src: n, video_poster_src: o, points: d } = t;
-    e.videoSource = n, e.rectPoints = S(d).map((a) => a.map(({ x: c, y: u, z: p }) => new m.Vector3(c, u, p))), e.imageTexture = F(o), i && (e.videoElement = i), e.videoTexture = yield P(e.videoSource, e.videoElement), e.enabled = !!t.enable, e.enabled && h();
-  }), E = (t) => {
-    if (!e.enabled)
+  }, _ = (e, i) => L(void 0, null, function* () {
+    const r = ++y;
+    g();
+    const { video_src: n, video_poster_src: a, points: s } = e;
+    t.videoSource = n, t.rectPoints = W(s).map((m) => m.map(({ x: f, y: R, z: b }) => new l.Vector3(f, R, b))), t.imageTexture = z(a), i && (t.videoElement = i);
+    let u;
+    try {
+      u = yield B(t.videoSource, t.videoElement);
+    } catch (m) {
+      if (r !== y)
+        return;
+      throw m;
+    }
+    if (r !== y) {
+      u.dispose();
+      return;
+    }
+    t.videoTexture = u, t.enabled = !1, e.enable && O();
+  }), S = (e) => {
+    if (!t.enabled)
       return;
-    const i = e.videoMeshes;
-    if (!(!i || t.intersectObjects(i).length === 0))
-      return e.videoTexture && (e.videoTexture.image.paused || e.videoTexture.image.pause()), !1;
-  }, M = (t) => {
-    t === "Floorplan" ? f.hide() : f.show();
-  }, A = () => {
-    if (!e.enabled)
+    const i = t.videoMeshes;
+    if (!(!i || e.intersectObjects(i).length === 0))
+      return t.videoTexture && (t.videoTexture.image.paused || g()), !1;
+  }, G = (e) => {
+    e === "Floorplan" ? w.hide() : w.show();
+  }, U = () => {
+    if (!t.enabled)
       return;
-    const t = s.camera.position;
-    if (v.forEach((i, n) => {
-      const o = i.css3DObject.position.clone(), d = o.clone().sub(t).normalize(), a = new m.Raycaster(t, d), c = s.model.intersectRaycaster(a)[0], u = o.distanceTo(t), p = 0.01;
-      c && c.distance + p < u ? i.hide() : i.show();
-    }), !w()) {
-      const i = e.rectPoints.find((n) => {
-        const o = n[0].clone().add(n[1]).add(n[2]).add(n[3]).divideScalar(4);
-        return n.map((d) => d.clone().add(o).divideScalar(2)).filter((d) => {
-          const a = d.distanceTo(t), c = new m.Raycaster(t, d.clone().sub(t).normalize()), u = s.model.intersectRaycaster(c)[0], p = 0.01;
-          return !(u && u.distance + p < a);
+    const e = d.camera.position;
+    if (F.forEach((i, r) => {
+      const n = i.css3DObject.position.clone(), a = n.clone().sub(e).normalize(), s = new l.Raycaster(e, a), u = d.model.intersectRaycaster(s)[0], m = n.distanceTo(e), f = 0.01;
+      u && u.distance + f < m ? i.hide() : i.show();
+    }), !V()) {
+      const i = t.rectPoints.find((r) => {
+        const n = r[0].clone().add(r[1]).add(r[2]).add(r[3]).divideScalar(4);
+        return r.map((a) => a.clone().add(n).divideScalar(2)).filter((a) => {
+          const s = a.distanceTo(e), u = new l.Raycaster(e, a.clone().sub(e).normalize()), m = d.model.intersectRaycaster(u)[0], f = 0.01;
+          return !(m && m.distance + f < s);
         }).length >= 2;
       });
-      (!i || i.length === 0) && b(!0);
+      (!i || i.length === 0) && P(!0);
     }
-  }, V = () => {
-    l(), e.videoTexture = void 0, s.off("modeChange", M), s.off("wantsTapGesture", E), s.off("panoArrived", A), s.off("renderFrame", () => {
-      e.videoMeshes.forEach((t) => {
-        t && (t.needsRender = !0);
+  }, D = () => {
+    var e;
+    I(), g(), c == null || c.dispose(), x && URL.revokeObjectURL(x), (e = t.videoTexture) == null || e.dispose(), t.videoTexture = void 0, d.off("modeChange", G), d.off("wantsTapGesture", S), d.off("panoArrived", U), d.off("renderFrame", () => {
+      t.videoMeshes.forEach((i) => {
+        i && (i.needsRender = !0);
       });
     });
   };
-  return s.on("modeChange", M), s.on("wantsTapGesture", E), s.on("panoArrived", A), s.on("renderFrame", () => {
-    e.videoMeshes.forEach((t) => {
-      t && (t.needsRender = !0);
+  return d.on("modeChange", G), d.on("wantsTapGesture", S), d.on("panoArrived", U), d.on("renderFrame", () => {
+    t.videoMeshes.forEach((e) => {
+      e && (e.needsRender = !0);
     });
-  }), { enable: h, disable: l, load: L, dispose: V, state: e, css3DRenderPlugin: f };
+  }), { enable: O, disable: I, load: _, dispose: D, state: t, css3DRenderPlugin: w, setMuted: P, getMuted: V };
 };
 export {
-  tt as ModelTVVideoPlugin,
-  tt as default
+  ut as ModelTVVideoPlugin,
+  ut as default
 };

package/libs/ModelTVVideoPlugin/typings.d.ts

@@ -1,4 +1,6 @@
+import type { PlaybackManager } from '../shared-utils/playback';
 export interface ModelTVVideoPluginParameterType {
+    mediaManager?: PlaybackManager;
     videoElement?: HTMLVideoElement;
 }
 export declare enum DIRECTION {