feat: multi-material overlays, presentation guides, and release prebuilds

Align control/presentation with presentation screen rect and darkness z-order; sync window titles and session window cleanup. Pack Win/Mac/Linux with npmRebuild disabled and release-native-prep for classic-level and sharp. Co-authored-by: Cursor <cursoragent@cursor.com>
2026-08-03 11:28:18 +08:00
parent 61446dacfc
commit 2979d06f1c
41 changed files with 1060 additions and 252 deletions
@@ -47,6 +47,7 @@ import {
  createEditorWindowDeferred,
  createWindows,
  focusEditorWindow,
+  getPresentationContentSize,
  getSceneDescriptionContent,
  isMultiWindowOpen,
  markAppQuitting,
@@ -61,6 +62,7 @@ import {
  closeSceneEditorWindow,
  closeNpcsWindow,
  sendToAppWindows,
+  syncAllWindowChromeTitles,
  togglePresentationFullscreen,
  waitForEditorWindowReady,
  warmNpcsEditorWindow,
@@ -414,6 +416,10 @@ async function main() {
    closeMultiWindow();
    return { ok: true };
  });
+  registerHandler(ipcChannels.windows.syncChromeTitles, ({ localeTag }) => {
+    syncAllWindowChromeTitles(localeTag);
+    return { ok: true };
+  });
  registerHandler(ipcChannels.windows.togglePresentationFullscreen, () => {
    const isFullScreen = togglePresentationFullscreen();
    return { ok: true, isFullScreen };
@@ -421,6 +427,10 @@ async function main() {
  registerHandler(ipcChannels.windows.getMultiWindowState, () => {
    return { open: isMultiWindowOpen() };
  });
+  registerHandler(ipcChannels.windows.getPresentationContentSize, () => {
+    const size = getPresentationContentSize();
+    return size ?? { width: null, height: null };
+  });
  registerHandler(ipcChannels.windows.openSceneDescription, ({ html }) => {
    openSceneDescriptionWindow(html);
    return { ok: true };
@@ -1,6 +1,7 @@
 import {
  clampMaterialsLayout,
  DEFAULT_MATERIALS_OVERLAY_LAYOUT,
+  defaultLegendLayoutForMaterial,
  type MaterialId,
  type MaterialsOverlayEvent,
  type MaterialsOverlayLayout,
@@ -12,9 +13,10 @@ import {
 function emptyState(): MaterialsOverlayState {
  return {
    revision: 1,
-    activeMaterialId: null,
-    layout: { ...DEFAULT_MATERIALS_OVERLAY_LAYOUT },
-    legendLayout: { ...DEFAULT_MATERIALS_OVERLAY_LAYOUT, cx: 0.82, cy: 0.5, scale: 0.85 },
+    activeMaterialIds: [],
+    layouts: {},
+    legendLayouts: {},
+    focusMaterialId: null,
    zoomTool: null,
  };
 }
@@ -26,14 +28,12 @@ function initialLayout(rotationDeg?: number): MaterialsOverlayLayout {
  });
 }

-function initialLegendLayout(): MaterialsOverlayLayout {
-  return clampMaterialsLayout({
-    ...DEFAULT_MATERIALS_OVERLAY_LAYOUT,
-    cx: 0.82,
-    cy: 0.5,
-    scale: 0.85,
-    rotationDeg: 0,
-  });
+function layoutFor(state: MaterialsOverlayState, materialId: MaterialId): MaterialsOverlayLayout {
+  return state.layouts[materialId] ?? { ...DEFAULT_MATERIALS_OVERLAY_LAYOUT };
+}
+
+function legendLayoutFor(state: MaterialsOverlayState, materialId: MaterialId): MaterialsOverlayLayout {
+  return state.legendLayouts[materialId] ?? defaultLegendLayoutForMaterial();
 }

 export class MaterialsOverlayStore {
@@ -44,14 +44,15 @@ export class MaterialsOverlayStore {
  }

  clear(): MaterialsOverlayState {
-    if (this.state.activeMaterialId === null && this.state.zoomTool === null) {
+    if (this.state.activeMaterialIds.length === 0 && this.state.zoomTool === null) {
      return this.state;
    }
    this.state = {
      revision: this.state.revision + 1,
-      activeMaterialId: null,
-      layout: { ...DEFAULT_MATERIALS_OVERLAY_LAYOUT },
-      legendLayout: initialLegendLayout(),
+      activeMaterialIds: [],
+      layouts: {},
+      legendLayouts: {},
+      focusMaterialId: null,
      zoomTool: null,
    };
    return this.state;
@@ -61,50 +62,98 @@ export class MaterialsOverlayStore {
    switch (event.kind) {
      case 'hide':
        return this.clear();
-      case 'show':
-        this.state = {
-          revision: this.state.revision + 1,
-          activeMaterialId: event.materialId,
-          layout: initialLayout(event.rotationDeg),
-          legendLayout: initialLegendLayout(),
-          zoomTool: this.state.zoomTool,
-        };
-        return this.state;
-      case 'toggle': {
-        if (this.state.activeMaterialId === event.materialId) {
-          return this.clear();
+      case 'show': {
+        if (this.state.activeMaterialIds.includes(event.materialId)) {
+          this.state = {
+            ...this.state,
+            revision: this.state.revision + 1,
+            focusMaterialId: event.materialId,
+          };
+          return this.state;
        }
        this.state = {
          revision: this.state.revision + 1,
-          activeMaterialId: event.materialId,
-          layout: initialLayout(event.rotationDeg),
-          legendLayout: initialLegendLayout(),
+          activeMaterialIds: [...this.state.activeMaterialIds, event.materialId],
+          layouts: {
+            ...this.state.layouts,
+            [event.materialId]: initialLayout(event.rotationDeg),
+          },
+          legendLayouts: {
+            ...this.state.legendLayouts,
+            [event.materialId]: defaultLegendLayoutForMaterial(),
+          },
+          focusMaterialId: event.materialId,
+          zoomTool: this.state.zoomTool,
+        };
+        return this.state;
+      }
+      case 'toggle': {
+        if (this.state.activeMaterialIds.includes(event.materialId)) {
+          const activeMaterialIds = this.state.activeMaterialIds.filter((id) => id !== event.materialId);
+          const layouts = { ...this.state.layouts };
+          const legendLayouts = { ...this.state.legendLayouts };
+          delete layouts[event.materialId];
+          delete legendLayouts[event.materialId];
+          const focusMaterialId =
+            this.state.focusMaterialId === event.materialId
+              ? (activeMaterialIds[activeMaterialIds.length - 1] ?? null)
+              : this.state.focusMaterialId;
+          this.state = {
+            revision: this.state.revision + 1,
+            activeMaterialIds,
+            layouts,
+            legendLayouts,
+            focusMaterialId,
+            zoomTool: activeMaterialIds.length === 0 ? null : this.state.zoomTool,
+          };
+          return this.state;
+        }
+        this.state = {
+          revision: this.state.revision + 1,
+          activeMaterialIds: [...this.state.activeMaterialIds, event.materialId],
+          layouts: {
+            ...this.state.layouts,
+            [event.materialId]: initialLayout(event.rotationDeg),
+          },
+          legendLayouts: {
+            ...this.state.legendLayouts,
+            [event.materialId]: defaultLegendLayoutForMaterial(),
+          },
+          focusMaterialId: event.materialId,
          zoomTool: this.state.zoomTool,
        };
        return this.state;
      }
      case 'layout.set': {
-        if (this.state.activeMaterialId === null) return this.state;
+        if (!this.state.activeMaterialIds.includes(event.materialId)) return this.state;
        this.state = {
          ...this.state,
          revision: this.state.revision + 1,
-          layout: clampMaterialsLayout({
-            ...this.state.layout,
-            ...event.layout,
-          }),
+          focusMaterialId: event.materialId,
+          layouts: {
+            ...this.state.layouts,
+            [event.materialId]: clampMaterialsLayout({
+              ...layoutFor(this.state, event.materialId),
+              ...event.layout,
+            }),
+          },
        };
        return this.state;
      }
      case 'legendLayout.set': {
-        if (this.state.activeMaterialId === null) return this.state;
+        if (!this.state.activeMaterialIds.includes(event.materialId)) return this.state;
        this.state = {
          ...this.state,
          revision: this.state.revision + 1,
-          legendLayout: clampMaterialsLayout({
-            ...this.state.legendLayout,
-            ...event.layout,
-            rotationDeg: 0,
-          }),
+          focusMaterialId: event.materialId,
+          legendLayouts: {
+            ...this.state.legendLayouts,
+            [event.materialId]: clampMaterialsLayout({
+              ...legendLayoutFor(this.state, event.materialId),
+              ...event.layout,
+              rotationDeg: 0,
+            }),
+          },
        };
        return this.state;
      }
@@ -118,10 +167,18 @@ export class MaterialsOverlayStore {
        return this.state;
      }
      case 'zoomAt': {
-        if (this.state.activeMaterialId === null || !this.state.zoomTool) return this.state;
+        if (this.state.activeMaterialIds.length === 0 || !this.state.zoomTool) return this.state;
+        const targetId =
+          (event.materialId && this.state.activeMaterialIds.includes(event.materialId)
+            ? event.materialId
+            : null) ??
+          this.state.focusMaterialId ??
+          this.state.activeMaterialIds[this.state.activeMaterialIds.length - 1] ??
+          null;
+        if (!targetId) return this.state;
        const factor = this.state.zoomTool === 'zoomIn' ? 1.25 : 1 / 1.25;
        const layout: MaterialsOverlayLayout = zoomMaterialsLayoutAt(
-          this.state.layout,
+          layoutFor(this.state, targetId),
          event.nx,
          event.ny,
          factor,
@@ -129,7 +186,11 @@ export class MaterialsOverlayStore {
        this.state = {
          ...this.state,
          revision: this.state.revision + 1,
-          layout,
+          focusMaterialId: targetId,
+          layouts: {
+            ...this.state.layouts,
+            [targetId]: layout,
+          },
        };
        return this.state;
      }
@@ -139,8 +200,29 @@ export class MaterialsOverlayStore {
  }

  ensureMaterialStillExists(materialIds: ReadonlySet<MaterialId>): MaterialsOverlayState {
-    const active = this.state.activeMaterialId;
-    if (active === null || materialIds.has(active)) return this.state;
-    return this.clear();
+    const activeMaterialIds = this.state.activeMaterialIds.filter((id) => materialIds.has(id));
+    if (activeMaterialIds.length === this.state.activeMaterialIds.length) return this.state;
+    if (activeMaterialIds.length === 0) return this.clear();
+    const layouts: Record<string, MaterialsOverlayLayout> = {};
+    const legendLayouts: Record<string, MaterialsOverlayLayout> = {};
+    for (const id of activeMaterialIds) {
+      const layout = this.state.layouts[id];
+      if (layout) layouts[id] = layout;
+      const legend = this.state.legendLayouts[id];
+      if (legend) legendLayouts[id] = legend;
+    }
+    const focusMaterialId =
+      this.state.focusMaterialId && activeMaterialIds.includes(this.state.focusMaterialId)
+        ? this.state.focusMaterialId
+        : (activeMaterialIds[activeMaterialIds.length - 1] ?? null);
+    this.state = {
+      revision: this.state.revision + 1,
+      activeMaterialIds,
+      layouts,
+      legendLayouts,
+      focusMaterialId,
+      zoomTool: this.state.zoomTool,
+    };
+    return this.state;
  }
 }
@@ -1044,7 +1044,7 @@ export class ZipProjectStore {
      for (const asset of staged) {
        assets[asset.id] = asset;
        if (asset.type !== 'audio') continue;
-        campaignAudios.push({ assetId: asset.id, autoplay: true, loop: true });
+        campaignAudios.push({ assetId: asset.id, autoplay: false, loop: false });
      }
      return { ...p, assets, campaignAudios };
    });
@@ -41,7 +41,7 @@ void test('createWindows: окно описания сцены закрывае
  assert.ok(src.includes('closeSceneDescriptionWindow'));
  assert.ok(src.includes("createWindow('sceneDescription'"));
  assert.match(src, /export function closeMultiWindow[\s\S]*closeSceneDescriptionWindow/);
-  assert.match(src, /kind !== 'presentation' && kind !== 'control'[\s\S]*closeSceneDescriptionWindow/);
+  assert.match(src, /kind !== 'presentation'[\s\S]*closeSceneDescriptionWindow/);
 });

 void test('createWindows: окно материалов закрывается с multi-window', () => {
@@ -63,6 +63,12 @@ void test('createWindows: окно НПС закрывается с multi-window
  assert.match(src, /export function closeMultiWindow[\s\S]*closeNpcsWindow/);
 });

+void test('createWindows: закрытие пульта закрывает сессионные окна и презентацию', () => {
+  const src = readCreateWindows();
+  assert.match(src, /kind === 'control'/);
+  assert.match(src, /closePlaySessionAuxiliaryWindows[\s\S]*closePresentationWindow/);
+});
+
 void test('createWindows: production — loadFile для HTML (не только file://)', () => {
  const src = readCreateWindows();
  assert.ok(src.includes('loadFile'));
@@ -2,7 +2,7 @@ import path from 'node:path';

 import { app, BrowserWindow, screen } from 'electron';

-import { windowChromeTitle } from '../../shared/appBranding';
+import { windowChromeTitle, type AppWindowKind } from '../../shared/appBranding';
 import { ipcChannels } from '../../shared/ipc/contracts';

 import { safeConsoleError } from '../safeConsole';
@@ -32,7 +32,16 @@ export const SESSION_STATE_WINDOW_KINDS: readonly WindowKind[] = [

 const windows = new Map<WindowKind, BrowserWindow>();

+/** Язык заголовков окон (из редактора); иначе `app.getLocale()`. */
+let chromeLocaleTagOverride: string | null = null;
+
+function resolveChromeLocaleTag(): string {
+  return chromeLocaleTagOverride ?? app.getLocale();
+}
+
 let appQuitting = false;
+/** Защита от каскада close(control) ↔ close(presentation). */
+let closingPlaySession = false;
 let pendingSceneDescriptionHtml = '';

 /** Окно материалов — только колонка списка. */
@@ -60,6 +69,35 @@ function broadcastMultiWindowStateChanged(open: boolean): void {
  }
 }

+export function getPresentationContentSize(): { width: number; height: number } | null {
+  const pres = windows.get('presentation');
+  if (!pres || pres.isDestroyed()) return null;
+  const [width, height] = pres.getContentSize();
+  if (width <= 0 || height <= 0) return null;
+  return { width, height };
+}
+
+function broadcastPresentationContentSize(): void {
+  const size = getPresentationContentSize();
+  if (!size) return;
+  for (const w of BrowserWindow.getAllWindows()) {
+    if (w.isDestroyed() || w.webContents.isDestroyed()) continue;
+    try {
+      w.webContents.send(ipcChannels.windows.presentationContentSizeChanged, size);
+    } catch {
+      /* ignore */
+    }
+  }
+}
+
+function bindPresentationContentSizeTracking(win: BrowserWindow): void {
+  const emit = () => broadcastPresentationContentSize();
+  win.on('resize', emit);
+  win.on('enter-full-screen', emit);
+  win.on('leave-full-screen', emit);
+  win.webContents.once('did-finish-load', emit);
+}
+
 function sendSceneDescriptionContent(win: BrowserWindow, html: string): void {
  if (win.isDestroyed() || win.webContents.isDestroyed()) return;
  try {
@@ -91,6 +129,51 @@ export function sendToAppWindows(
  }
 }

+function applyWindowChromeTitle(win: BrowserWindow, kind: WindowKind): void {
+  if (win.isDestroyed()) return;
+  win.setTitle(windowChromeTitle(kind as AppWindowKind, resolveChromeLocaleTag()));
+}
+
+export function syncAllWindowChromeTitles(localeTag: string): void {
+  chromeLocaleTagOverride = localeTag.trim() || null;
+  for (const [kind, win] of windows.entries()) {
+    applyWindowChromeTitle(win, kind);
+  }
+}
+
+function bindWindowChromeTitle(win: BrowserWindow, kind: WindowKind): void {
+  const apply = () => applyWindowChromeTitle(win, kind);
+  apply();
+  win.webContents.on('page-title-updated', (event) => {
+    event.preventDefault();
+    apply();
+  });
+  win.webContents.on('did-finish-load', () => {
+    apply();
+  });
+}
+
+/** Закрыть окна сессии, кроме редактора и его дочерних окон. */
+function closePlaySessionAuxiliaryWindows(): void {
+  closeSceneDescriptionWindow();
+  closeMaterialsWindow();
+  closeNpcsWindow();
+}
+
+function closePresentationWindow(): void {
+  const pres = windows.get('presentation');
+  if (pres && !pres.isDestroyed()) {
+    pres.close();
+  }
+}
+
+function closeControlWindow(): void {
+  const ctrl = windows.get('control');
+  if (ctrl && !ctrl.isDestroyed()) {
+    ctrl.close();
+  }
+}
+
 function quitAppFromEditorClose(): void {
  markAppQuitting();
  app.quit();
@@ -272,7 +355,7 @@ function createWindow(kind: WindowKind, opts?: CreateWindowOpts): BrowserWindow
    }
  }

-  win.setTitle(windowChromeTitle(kind, app.getLocale()));
+  bindWindowChromeTitle(win, kind);
  if (
    kind === 'sceneDescription' ||
    kind === 'materials' ||
@@ -307,14 +390,30 @@ function createWindow(kind: WindowKind, opts?: CreateWindowOpts): BrowserWindow
      quitAppFromEditorClose();
    });
  }
+  if (kind === 'control') {
+    win.on('close', () => {
+      if (appQuitting || closingPlaySession) return;
+      closingPlaySession = true;
+      closePlaySessionAuxiliaryWindows();
+      closePresentationWindow();
+    });
+  }
+  if (kind === 'presentation') {
+    bindPresentationContentSizeTracking(win);
+    win.on('close', () => {
+      if (appQuitting || closingPlaySession) return;
+      closingPlaySession = true;
+      closePlaySessionAuxiliaryWindows();
+      closeControlWindow();
+    });
+  }
  win.on('closed', () => windows.delete(kind));
  win.on('closed', () => {
    if (kind !== 'presentation' && kind !== 'control') return;
    const open = windows.has('presentation') || windows.has('control');
    if (!open) {
-      closeSceneDescriptionWindow();
-      closeMaterialsWindow();
-      closeNpcsWindow();
+      closingPlaySession = false;
+      closePlaySessionAuxiliaryWindows();
    }
    broadcastMultiWindowStateChanged(open);
  });
@@ -395,16 +494,19 @@ export function openMultiWindow() {
    createWindow('control', process.platform === 'darwin' ? undefined : { parent: presentation });
  }
  broadcastMultiWindowStateChanged(true);
+  broadcastPresentationContentSize();
 }

 export function closeMultiWindow(): void {
-  closeSceneDescriptionWindow();
-  closeMaterialsWindow();
-  closeNpcsWindow();
+  closingPlaySession = true;
+  closePlaySessionAuxiliaryWindows();
  const pres = windows.get('presentation');
  const ctrl = windows.get('control');
-  if (pres) pres.close();
-  if (ctrl) ctrl.close();
+  if (pres && !pres.isDestroyed()) pres.close();
+  if (ctrl && !ctrl.isDestroyed()) ctrl.close();
+  if (!windows.has('presentation') && !windows.has('control')) {
+    closingPlaySession = false;
+  }
 }

 export function isMultiWindowOpen(): boolean {