@volter/editor-blender 0.1.151 → 0.1.153

package/contributions/blender-timeline.document.tsx

@@ -27,7 +27,7 @@ import {
 } from '../src/timeline-view-state';
 import { blenderSkin, blenderSkinVersion, subscribeBlenderSkin } from './blender-runtime-skin';
 import { PLAY_PANEL_RATIO, PlayModeSwitch } from './blender-play-area';
-import { modelPlayExtension, subscribeModelPlayExtension } from '../src/model-play-extension';
+import { playTool, subscribePlayTool } from '../src/play-tool';
 import { AnimationEditorMenu, BlenderActionEditor, BlenderNlaEditor } from './blender-animation-editors';
 import { modelPlayMode, playModeVersion, servedModelDocument, subscribePlayMode } from '../src/play-mode';
 import {
@@ -293,17 +293,19 @@ export const TIMELINE_VIEW_VERBS: readonly ViewVerb[] = [
 /** This area's id in `model.layout.ts`, the one workspace that places this document. */
 const BOTTOM_AREA = 'timeline';
 
-/** The bottom area swaps animation editors for the Play tool’s Panel. Each mode applies its own area ratio; manual resizing holds until the next switch. Animation unmounts during Game mode and keeps any existing rig bind. */
+/** The bottom area is the Play tool’s Panel under every document but a model in its Animation mode, which shows Blender's animation editors. Each mode applies its own area ratio; manual resizing holds until the next switch. Animation unmounts during Game mode and keeps any existing rig bind. */
 export default function BlenderBottomArea() {
   useSyncExternalStore(subscribePlayMode, playModeVersion, playModeVersion);
   useSyncExternalStore(subscribeTimelineView, timelineViewVersion, timelineViewVersion);
   const documentId = servedModelDocument();
-  const game = documentId !== null && modelPlayMode(documentId) === 'game';
+  const Panel = useSyncExternalStore(subscribePlayTool, () => playTool()?.Panel ?? null, () => null);
+  // (Play is the project's: its Game panel stands under every document, and below a model in its Game mode; a model's
+  // Animation mode is Blender's animation editors)
+  const game = Panel !== null && (documentId === null || modelPlayMode(documentId) === 'game');
   const { editor } = timelineViewState();
   // The Timeline keeps Blender's strip; the Action Editor and NLA list channels, so they take the
   // Game panel's share, as a person would drag the area up to read them.
   const tall = game || editor !== 'timeline';
-  const Panel = useSyncExternalStore(subscribeModelPlayExtension, () => modelPlayExtension()?.Panel ?? null, () => null);
   useEffect(() => editorHost().workspace.setAreaRatio(BOTTOM_AREA, tall ? PLAY_PANEL_RATIO : null), [tall]);
   useEffect(() => () => editorHost().workspace.setAreaRatio(BOTTOM_AREA, null), []);
   if (game) return Panel ? <Panel /> : null;

package/contributions/blender-version.status.tsx

@@ -1,5 +1,6 @@
 /**
- * The VERSION at the far right of the status bar (`workspace.status`).
+ * The VERSION at the far right of the status bar: the item `version`, whose name, side and priority are this
+ * package's `contributes.volter.views.statusbar` entry.
  *
  * Blender's bottom row ends with a status glyph and `5.2.0` — the app's own
  * version, always on screen, so "which build am I looking at" is never a
@@ -43,13 +44,6 @@ import { editorHost } from '@volter/sdk/host';
 import { servingEngine, type ServingEngine } from '@volter/sdk/serving-engine';
 import { useEffect, useState, useSyncExternalStore } from 'react';
 
-export const point = 'workspace.status';
-export const title = 'Version';
-export const align = 'right';
-/** The back of the contributed band: last item on the right, as in Blender.
- *  `tool-loader.ts`'s `MAX_DECLARED_ORDER` is 998. */
-export const order = 998;
-
 export default function BlenderVersionStatus() {
   const { project } = editorHost();
   const version = useSyncExternalStore(

package/contributions/blender.page.ts

@@ -5,16 +5,15 @@
  * this package owns, the parts of the Blender document's bottom area that play's Game panel
  * draws with, and two generic doors onto the document's Blender: its saves, each running a script on the
  * scene it wrote whose files reach the project (and a save asked for where it changed), and an asset library in its preferences. Nothing more. Its type is `@volter/editor-blender/api`'s `BlenderPageApi`. It also
- * registers the package's commands: its session verbs and its views' verbs.
+ * registers the package's commands: its session verbs and its views' verbs, and starts Blender as a project that
+ * holds a model opens.
  */
 import { registerVerbCommands, registerViewCommands } from '@volter/sdk/commands';
 import { registerHierarchyKinds } from '@volter/sdk/hierarchy-kind-icon';
 import type { PluginContext } from '@volter/sdk/plugins';
-import { flushModelDocument, NODE_VIEW_VERBS, setBlenderAssetLibrary, setModelDocumentSaveScript, subscribeModelDocumentSaved } from '../host/blender-runtime-host';
-import { registerModelPlay } from '../src/model-play-extension';
+import { flushModelDocument, heldModelDocument, NODE_VIEW_VERBS, setBlenderAssetLibrary, setModelDocumentSaveScript, startBlenderWithProject, subscribeModelDocumentSaved } from '../host/blender-runtime-host';
+import { registerPlay } from '../src/play-tool';
 import {
-  documentOnScreen,
-  modelDocumentSource,
   modelPlayMode,
   playModeOf,
   playModeVersion,
@@ -44,19 +43,21 @@ export function activate(context: PluginContext) {
   registerViewCommands(context, 'blender-node-view', NODE_VIEW_VERBS);
   registerViewCommands(context, 'timeline', TIMELINE_VIEW_VERBS);
   registerViewCommands(context, 'blender-uv-view', UV_VIEW_VERBS);
+  // Blender starts as a project with a model opens, so opening a model costs its own file's load.
+  context.subscriptions.push({ dispose: startBlenderWithProject() });
   return {
-    registerModelPlay,
-    /** The bottom area's mode, the served model document, its on-screen wait and its source. */
-    playMode: { documentOnScreen, modelDocumentSource, modelPlayMode, playModeOf, playModeVersion, servedModelDocument, subscribePlayMode },
+    registerPlay,
+    /** The bottom area's mode and the model document it serves. */
+    playMode: { modelPlayMode, playModeOf, playModeVersion, servedModelDocument, subscribePlayMode },
     PlayAreaButton,
     PlayModeSwitch,
     switchPlayMode,
     /** The Timeline's chrome, which a panel in the same area draws with. */
     timelineGeometry: { HEADER_HEIGHT, TIMELINE_CHROME, TIMELINE_THEME },
     /** The model document's `.blend` as a file: a script every save runs in its own turn on the scene it wrote, each
-     *  save that landed it in the project, with what that script did and the carry of its files, and a save of the
-     *  project's `.blend` where Blender holds it changed (`flush`). */
-    modelDocument: { setSaveScript: setModelDocumentSaveScript, subscribeSaved: subscribeModelDocumentSaved, flush: flushModelDocument },
+     *  save that landed it in the project, with what that script did and the carry of its files, a save of the
+     *  project's `.blend` where Blender holds it changed (`flush`), and the one it holds (`held`). */
+    modelDocument: { setSaveScript: setModelDocumentSaveScript, subscribeSaved: subscribeModelDocumentSaved, flush: flushModelDocument, held: heldModelDocument },
     /** An asset library every Blender session has, until its removal. */
     setAssetLibrary: setBlenderAssetLibrary,
   };

package/contributions/blender.status.tsx

@@ -1,10 +1,4 @@
-/** Blender-style status hints describe this editor’s viewport mouse bindings: left selects, middle pans, right rotates. They are always visible because there is no hover-scoped keymap publisher. Use SDK theme variables without importing host implementation. */
-
-export const point = 'workspace.status';
-export const title = 'Mouse hints';
-export const align = 'left';
-/** First among contributed left status items, after the host's built-in items. */
-export const order = 0;
+/** Blender-style status hints describe this editor’s viewport mouse bindings: left selects, middle pans, right rotates. They are always visible because there is no hover-scoped keymap publisher. Use SDK theme variables without importing host implementation. The item `mouseHints`, whose name, side and priority are this package's `contributes.volter.views.statusbar` entry. */
 
 /** Which button the glyph lights. */
 type MouseButton = 'left' | 'middle' | 'right';

package/contributions/models.finder.ts

@@ -14,15 +14,10 @@ export const finder = {
         .array(z.string().min(1))
         .min(1)
         .describe('Project-relative globs of the Blender files to list (`src/models/**/*.blend`)'),
-      defaultIn: z
-        .string()
-        .regex(/^[^/].*\/$/)
-        .optional()
-        .describe('A project folder (`levels/`): where exactly one listed Blender file is in it, that file is the default document'),
     })
     .strict(),
   run(
-    selection: { finder: 'modelsFromBlendFiles'; include: readonly string[]; defaultIn?: string },
+    _selection: { finder: 'modelsFromBlendFiles'; include: readonly string[] },
     input: { files?: readonly string[] },
   ) {
     const entries = [];
@@ -38,6 +33,8 @@ export const finder = {
         authorable: true,
         reach: { kind: 'root-mount' as const },
         source: { path },
+        // (the Model document opens a `.blend` not written yet as Blender's empty file, and its first save writes it)
+        opensUnwritten: true,
       });
     }
     if (entries.length === 0) {
@@ -50,10 +47,6 @@ export const finder = {
         reach: { kind: 'root-mount' as const },
       });
     }
-    // (the adapter's author names the folder whose lone file is the default: a std game's one level opens as its document)
-    const within = selection.defaultIn === undefined ? []
-      : (input.files ?? []).filter((path) => path.endsWith('.blend') && path.startsWith(selection.defaultIn!));
-    const only = within.length === 1 ? `model:${within[0]!}` : undefined;
-    return { entries, notes, ...(only === undefined ? {} : { default: only }) };
+    return { entries, notes };
   },
 } as const;

package/dist-node/serving.mjs

@@ -352,7 +352,6 @@ function blenderRoutesPlugin(services) {
       method: "GET",
       match: /^\/__editor\/blender-wasm\/status$/,
       handle: async (_req, res) => {
-        services.allowCrossOriginFrameEmbedding(res);
         json(res, await blenderWasmStatus());
       }
     },
@@ -426,7 +425,6 @@ function blenderRoutesPlugin(services) {
       match: /^\/__editor\/blender-wasm\/([^/]+)$/,
       handle: async (req, res, url) => {
         const file = decodeURIComponent(url.pathname.slice("/__editor/blender-wasm/".length));
-        services.allowCrossOriginFrameEmbedding(res);
         const bundled = BLENDER_WASM_FILES.includes(file);
         if (!bundled && file !== BLENDER_WALI_ARTIFACT) {
           json(res, { error: `The Blender build has no ${file}.` }, 404);