@realsee/dnalogel 3.81.0-alpha.3 → 3.81.0-alpha.4

package/libs/DigitalPerformanceV2Plugin/controller/index.js

@@ -27,7 +27,7 @@ var m = (p, e, t) => new Promise((r, a) => {
   o((t = t.apply(p, e)).next());
 });
 import * as T from "three";
-import { PerformancePlayground as N, getChapterModelDuration as L, getChapterDuration as A } from "../core/Playground.js";
+import { PerformancePlayground as A, getChapterModelDuration as I, getChapterDuration as N } from "../core/Playground.js";
 import { CameraTrack as O } from "../core/CameraTrack.js";
 import "../../DigitalPerformancePlugin/core/DigitalPlayground.js";
 import "@realsee/five/gltf-loader";
@@ -39,7 +39,7 @@ import "../core/PerformanceClock.js";
 import "../core/CameraDirector.js";
 import "../core/FiveModelCameraBridge.js";
 import "../core/CameraSampler.js";
-const V = "Dnalogel-DigitalPerformanceV2Plugin", I = "five-world";
+const V = "Dnalogel-DigitalPerformanceV2Plugin", L = "five-world";
 class $ {
   constructor(e, t = {}) {
     h(this, "five");
@@ -84,7 +84,9 @@ class $ {
      * `null`（整体）表示未启用该能力（不触碰楼层可见性）。由消费方经 `setChapterFloorMap` 注入。
      */
     h(this, "chapterFloorMap", null);
-    this.five = e, this.config = g({ autoPlay: !1, loop: !1, debug: !1 }, t), this.playground = new N(e, this.config.debug), this.unsubClockTick = this.playground.getClock().onTick(() => this.emitProgress());
+    /** five 'modeChange' 楼层重放监听的反订阅句柄（chapterFloorMap 启用时挂载，停用/reset/dispose 时清理） */
+    h(this, "unsubFloorModeChange", null);
+    this.five = e, this.config = g({ autoPlay: !1, loop: !1, debug: !1 }, t), this.playground = new A(e, this.config.debug), this.unsubClockTick = this.playground.getClock().onTick(() => this.emitProgress());
   }
   /** 加载剧本：预加载资源 + 将模型加入 five 场景；autoPlay 时自动播放首章 */
   loadScript(e) {
@@ -235,8 +237,35 @@ class $ {
   setChapterFloorMap(e) {
     if (this.chapterFloorMap = e, e) {
       const t = this.getCurrentChapterIndex();
-      this.applyChapterFloor(t >= 0 ? t : 0);
-    }
+      this.applyChapterFloor(t >= 0 ? t : 0), this.hookFloorModeChange();
+    } else
+      this.unhookFloorModeChange();
+  }
+  /** 监听 five 'modeChange'：模态切换后（延后一帧）重放当前章节楼层，避免被外部 UI 覆盖（只挂一次） */
+  hookFloorModeChange() {
+    if (this.unsubFloorModeChange)
+      return;
+    const e = this.five;
+    if (typeof e.on != "function")
+      return;
+    const t = () => {
+      if (!this.chapterFloorMap)
+        return;
+      (typeof requestAnimationFrame == "function" ? requestAnimationFrame : (a) => setTimeout(a, 0))(() => {
+        if (!this.chapterFloorMap)
+          return;
+        const a = this.getCurrentChapterIndex();
+        this.applyChapterFloor(a >= 0 ? a : 0);
+      });
+    };
+    e.on("modeChange", t), this.unsubFloorModeChange = () => {
+      var r;
+      return (r = e.off) == null ? void 0 : r.call(e, "modeChange", t);
+    };
+  }
+  /** 取消 'modeChange' 楼层重放监听 */
+  unhookFloorModeChange() {
+    this.unsubFloorModeChange && (this.unsubFloorModeChange(), this.unsubFloorModeChange = null);
   }
   /** 按章节楼层映射对指定章节应用楼层可见性（映射未启用时 no-op） */
   applyChapterFloor(e) {
@@ -330,7 +359,7 @@ class $ {
         name: (t = e == null ? void 0 : e.name) != null ? t : "camera",
         type: "camera",
         keyframes: this.serializeKeyframes(e),
-        coordinateSpace: I
+        coordinateSpace: L
       }
     };
   }
@@ -351,7 +380,7 @@ class $ {
           name: (s = a.name) != null ? s : "camera",
           type: "camera",
           keyframes: this.serializeKeyframes(a),
-          coordinateSpace: I
+          coordinateSpace: L
         }
       });
     }), e;
@@ -408,25 +437,25 @@ class $ {
    * 无任何可用模型几何（未加载/无 model player/包围盒空）时返回 undefined。
    */
   deriveChapterModelFramingView(e) {
-    var d, S, w;
+    var d, F, M;
     const t = this.getChapters();
     if (e < 0 || e >= t.length)
       return;
     const r = t[e], a = new T.Box3();
     let s = !1;
-    if (r.players.forEach((b) => {
-      var M, C, v, K;
-      if (b.type !== "model")
+    if (r.players.forEach((S) => {
+      var E, C, v, K;
+      if (S.type !== "model")
         return;
-      const F = b, P = (v = (C = (M = this.playground) == null ? void 0 : M.loader) == null ? void 0 : C.getDigitalHuman) == null ? void 0 : v.call(C, F.model, F.id), y = P == null ? void 0 : P.container;
+      const w = S, P = (v = (C = (E = this.playground) == null ? void 0 : E.loader) == null ? void 0 : C.getDigitalHuman) == null ? void 0 : v.call(C, w.model, w.id), y = P == null ? void 0 : P.container;
       if (!y)
         return;
       (K = y.updateWorldMatrix) == null || K.call(y, !0, !0);
-      const E = new T.Box3().setFromObject(y);
-      E.isEmpty() || (a.union(E), s = !0);
+      const b = new T.Box3().setFromObject(y);
+      b.isEmpty() || (a.union(b), s = !0);
     }), !s || a.isEmpty())
       return;
-    const n = a.getCenter(new T.Vector3()), o = a.getSize(new T.Vector3()).length(), i = (w = (S = (d = this.five).getCurrentState) == null ? void 0 : S.call(d)) != null ? w : {}, l = typeof i.longitude == "number" ? i.longitude : Math.PI / 4, c = typeof i.latitude == "number" ? i.latitude : Math.PI / 5, u = typeof i.fov == "number" && i.fov > 0 ? i.fov : 60, f = this.clamp(o * 2.5, 4, 14);
+    const n = a.getCenter(new T.Vector3()), o = a.getSize(new T.Vector3()).length(), i = (M = (F = (d = this.five).getCurrentState) == null ? void 0 : F.call(d)) != null ? M : {}, l = typeof i.longitude == "number" ? i.longitude : Math.PI / 4, c = typeof i.latitude == "number" ? i.latitude : Math.PI / 5, u = typeof i.fov == "number" && i.fov > 0 ? i.fov : 60, f = this.clamp(o * 2.5, 4, 14);
     return { target: n, longitude: l, latitude: c, distance: f, fov: u };
   }
   /**
@@ -448,7 +477,7 @@ class $ {
     return e ? {
       index: this.getCurrentChapterIndex(),
       name: e.name,
-      duration: L(e)
+      duration: I(e)
     } : { index: -1, name: "", duration: 0 };
   }
   /** 注册当前章节变更监听（current-chapter-changed）；返回反订阅函数 */
@@ -492,7 +521,7 @@ class $ {
   getProgress() {
     const e = this.playground.getClock(), t = e.getTime();
     let r = e.getDuration();
-    r <= 0 && this.state.currentChapter && (r = A(this.state.currentChapter));
+    r <= 0 && this.state.currentChapter && (r = N(this.state.currentChapter));
     const a = this.getChapters(), s = this.state.currentChapter, n = s ? a.findIndex((o) => o === s || o.name === s.name) : -1;
     return { currentTime: t, totalTime: r, currentChapterIndex: n, totalChapters: a.length };
   }
@@ -516,7 +545,7 @@ class $ {
     const t = this.getChapters(), r = [];
     let a = 0;
     for (let s = 0; s < t.length; s++) {
-      const n = L(t[s]), o = a, i = o + n;
+      const n = I(t[s]), o = a, i = o + n;
       r.push({ index: s, name: t[s].name, startTime: o, endTime: i, duration: n }), a = i;
     }
     return this.groupChapterTimeMapCache = r, this.groupChapterTimeMapCacheScript = e, r;
@@ -622,11 +651,11 @@ class $ {
   }
   /** 重置播放（保留已加载资源） */
   reset() {
-    this.playground.reset(), this.state.playing = !1, this.state.continuousPlaying = !1, this.state.currentChapter = null, this.state.selectedShotIndex = null, this.seekRedirect = null, this.chapterFloorMap && (this.showModelFloor(), this.chapterFloorMap = null), this.emitProgress();
+    this.playground.reset(), this.state.playing = !1, this.state.continuousPlaying = !1, this.state.currentChapter = null, this.state.selectedShotIndex = null, this.seekRedirect = null, this.chapterFloorMap && (this.showModelFloor(), this.chapterFloorMap = null), this.unhookFloorModeChange(), this.emitProgress();
   }
   /** 销毁插件、释放资源 */
   dispose() {
-    this.unsubClockTick && (this.unsubClockTick(), this.unsubClockTick = null), this.chapterFloorMap && (this.showModelFloor(), this.chapterFloorMap = null), this.progressListeners.clear(), this.keyframesChangedListeners.clear(), this.currentChapterChangedListeners.clear(), this.groupProgressListeners.clear(), this.cameraEditSnapshot = null, this.playground.dispose();
+    this.unsubClockTick && (this.unsubClockTick(), this.unsubClockTick = null), this.chapterFloorMap && (this.showModelFloor(), this.chapterFloorMap = null), this.unhookFloorModeChange(), this.progressListeners.clear(), this.keyframesChangedListeners.clear(), this.currentChapterChangedListeners.clear(), this.groupProgressListeners.clear(), this.cameraEditSnapshot = null, this.playground.dispose();
   }
   /** 预加载模型 / 动画 / 道具（复用 Shared_Core 加载） */
   preloadResources(e) {

package/libs/base/BasePlugin.js

@@ -23,7 +23,7 @@ let I = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    r(this, "VERSION", "3.81.0-alpha.3");
+    r(this, "VERSION", "3.81.0-alpha.4");
     r(this, "NAME");
     r(this, "five");
     r(this, "workUtil");

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.81.0-alpha.3",
+    "%c %c@realsee/dnalogel %cv3.81.0-alpha.4",
     [
       "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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realsee/dnalogel",
-  "version": "3.81.0-alpha.3",
+  "version": "3.81.0-alpha.4",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",