@volter/blender-engine 0.1.95 → 0.1.97

package/browser/session.py

@@ -806,6 +806,8 @@ def _saved_view():
                 "distance": float(region.view_distance),
                 "perspective": region.view_perspective,
                 "shading": space.shading.type,
+                "scene_world": bool(space.shading.use_scene_world),
+                "scene_lights": bool(space.shading.use_scene_lights),
             }
     return None
 
@@ -4901,13 +4903,12 @@ def rna_outliner(selected=None):
         # `add_layer_collections_recursive`: an EXCLUDED collection's objects
         # are not added at all -- it is not in the view layer.
         if not lc.exclude:
-            page, more = _outliner_page(collection.objects)
-            for obj in page:
+            # Fold parenting before paging: a parent may follow its children in
+            # collection order, and must not disappear behind the flat cap.
+            for obj in collection.objects:
                 object_row = _outliner_object(obj, view_layer, seen, chosen, active)
                 place(obj, object_row, row)
                 children.append(object_row)
-            if more:
-                row["more"] = more
         row["children"] = children
         return row
 
@@ -4920,13 +4921,10 @@ def rna_outliner(selected=None):
                                _outliner_key("%s.layer_collection.children" % view_layer_path,
                                              child.collection.name))
                 for child in root.children]
-    page, more = _outliner_page(root.collection.objects)
-    for obj in page:
+    for obj in root.collection.objects:
         object_row = _outliner_object(obj, view_layer, seen, chosen, active)
         place(obj, object_row, scene_collection)
         children.append(object_row)
-    if more:
-        scene_collection["more"] = more
     scene_collection["children"] = children
 
     # `ObjectsChildrenBuilder::make_object_parent_hierarchy_collections`, parents
@@ -4974,6 +4972,18 @@ def rna_outliner(selected=None):
             parent_row["children"].append(duplicate)
             mine.append([duplicate, parent_row, parent_collection])
 
+    # Cap the hierarchy's visible child lists, not the collection's flat input.
+    # Every parent participates in folding even when its child list needs a page.
+    def page_tree(row):
+        children, more = _outliner_page(row.get("children", []))
+        row["children"] = children
+        if more:
+            row["more"] = more
+        for child in children:
+            page_tree(child)
+
+    page_tree(scene_collection)
+
     return {
         "scene": scene_path,
         "viewLayer": view_layer_path,

package/browser/three/blender-runtime-view.ts

@@ -576,6 +576,8 @@ export const frameSchema = z
         perspective: z.enum(['PERSP', 'ORTHO', 'CAMERA']),
         lens: z.number().finite().positive().default(50),
         shading: z.enum(['WIREFRAME', 'SOLID', 'MATERIAL', 'RENDERED']).optional(),
+        scene_world: z.boolean().optional(),
+        scene_lights: z.boolean().optional(),
       })
       .nullable()
       .optional(),
@@ -693,9 +695,18 @@ export class BlenderRuntimeView {
   private readonly lightExtrasRoot = new THREE.Group();
   private readonly emptyExtrasRoot = new THREE.Group();
   private rendered = false;
+  private sceneLights = false;
+  private shadowFit: {
+    camera: THREE.Camera | undefined;
+    cameraMatrix: THREE.Matrix4 | undefined;
+    projection: THREE.Matrix4 | undefined;
+    objects: Map<THREE.Object3D, { matrix: THREE.Matrix4; visible: boolean }>;
+  } | null = null;
   /** The camera the VIEWPORT is held in render lighting through (Blender's Rendered shading),
    *  or null when the viewport shows modeling lighting. See {@link holdRendered}. */
   private heldRendered: (() => THREE.Camera) | null = null;
+  /** Material Preview can use scene lighting while retaining viewport visibility. */
+  private heldVisibility: 'viewport' | 'render' = 'render';
   /** What the World was last composed for ({@link worldKeyFor}), or null when it is cleared:
    *  composing rebuilds its textures, so it happens only when the key changes. */
   private worldApplied: string | null = null;
@@ -881,6 +892,8 @@ export class BlenderRuntimeView {
     readonly projection: 'perspective' | 'orthographic';
     readonly lens: number;
     readonly drawMode: 'wireframe' | 'solid' | 'preview' | 'rendered' | null;
+    readonly sceneWorld: boolean;
+    readonly sceneLights: boolean;
   } | null {
     const saved = this.frame?.view;
     if (!saved) return null;
@@ -896,6 +909,8 @@ export class BlenderRuntimeView {
       projection: saved.perspective === 'ORTHO' ? 'orthographic' : 'perspective',
       lens: saved.lens,
       drawMode: saved.shading ? SAVED_SHADING[saved.shading] : null,
+      sceneWorld: saved.scene_world ?? false,
+      sceneLights: saved.scene_lights ?? false,
     };
   }
 
@@ -1005,7 +1020,16 @@ export class BlenderRuntimeView {
   }
 
   stageMode(): string | null {
-    return this.mode;
+    return this.playing ? 'PLAY' : this.mode;
+  }
+
+  /** PLAY IS A MODE OF THE STAGE: while the document plays, the keys are the player's, and the
+   *  mode this context publishes is what the frame's key rules stand down on
+   *  (`scripts/workbench/generate-keymaps.mjs`, `whenFor`). Blender's own mode returns on stop. */
+  private playing = false;
+
+  setPlaying(playing: boolean): void {
+    this.playing = playing;
   }
 
   /** The inverse: the presented object for a Blender datablock NAME, or null
@@ -1153,15 +1177,26 @@ export class BlenderRuntimeView {
    * ({@link setRendered}) — the scene's own lights, its World behind and around the model,
    * `hide_render` visibility and shadows — seen through `drawCamera()`, the camera the stage
    * draws with (orthographic in an orthographic view). `null` returns the viewport to modeling.
+   * Material Preview passes viewport visibility independently of its lighting choices.
    * A render taken meanwhile ends back in this state rather than in modeling.
    */
-  holdRendered(drawCamera: (() => THREE.Camera) | null): void {
-    if (drawCamera === this.heldRendered) return;
+  private heldSceneLighting: { world: boolean; lights: boolean } | undefined;
+  holdRendered(drawCamera: (() => THREE.Camera) | null, sceneLighting?: { world: boolean; lights: boolean }, visibility: 'viewport' | 'render' = 'render'): void {
+    if (drawCamera === this.heldRendered && sceneLighting?.world === this.heldSceneLighting?.world && sceneLighting?.lights === this.heldSceneLighting?.lights && visibility === this.heldVisibility) return;
     this.heldRendered = drawCamera;
+    this.heldSceneLighting = sceneLighting;
+    this.heldVisibility = visibility;
     if (this.capturing) return;
     this.report(drawCamera === null ? this.applyRendered(false) : this.applyRendered(true, drawCamera()));
   }
 
+  /** Prepare a rendered viewport before revealing its first frame, using the
+   * same lighting/image/World readiness as a photograph. Call after the stage
+   * has attached the root to its scene. */
+  async prepareRendered(camera: THREE.Camera): Promise<void> {
+    await this.applyRendered(true, camera);
+  }
+
   /**
    * Re-apply the held render lighting if the draw camera or the World changed since it was
    * last applied. Cheap when nothing did; the stage calls it every frame it draws.
@@ -1170,7 +1205,8 @@ export class BlenderRuntimeView {
     // A photograph in progress keeps its own state; it returns to this one when it ends.
     if (this.heldRendered === null || this.capturing) return;
     const camera = this.heldRendered();
-    if (this.worldKeyFor(camera) === this.worldApplied) return;
+    const worldKey = this.heldSceneLighting?.world === false ? null : this.worldKeyFor(camera);
+    if (worldKey === this.worldApplied) return;
     this.report(this.applyRendered(true, camera));
   }
 
@@ -1183,7 +1219,12 @@ export class BlenderRuntimeView {
     const ortho = (camera as THREE.OrthographicCamera).isOrthographicCamera;
     // Coarse, so an orbit recomposes a handful of times rather than every frame.
     const turn = ortho ? camera.getWorldDirection(new THREE.Vector3()).toArray().map((v) => v.toFixed(1)).join(',') : '';
-    return `${camera.uuid}:${turn}:${this.worldKey}`;
+    // A stage can announce itself before parenting the model into its Scene.
+    // Retry after that attachment; the first World apply otherwise finds no Scene
+    // and its cached key leaves the viewport with no sky or ambient light.
+    let owner: THREE.Object3D = this.root;
+    while (owner.parent) owner = owner.parent;
+    return `${owner.uuid}:${camera.uuid}:${turn}:${this.worldKey}`;
   }
 
   private report(work: Promise<void>): void {
@@ -1258,6 +1299,10 @@ export class BlenderRuntimeView {
       const start = performance.now();
       this.instances.prepareDraw(camera);
       this.root.updateMatrixWorld(true);
+      // The script/navigation has just posed the camera and the detached
+      // objects. Fit shadows for that draw, rather than the camera's pose
+      // when Rendered shading was first entered. Captures use this path too.
+      if (this.rendered) this.applyShadows(true, camera);
       const opaqueDone = performance.now();
       const motion = this.motionGeometry.prepare(camera, !this.rendered && (this.mode ?? this.frame?.mode) === 'OBJECT' &&
         options?.interactive === true, options?.height ?? 0);
@@ -1321,7 +1366,11 @@ export class BlenderRuntimeView {
   }
 
   private async applyRendered(rendered: boolean, camera?: THREE.Camera): Promise<void> {
-    const extinction = (rendered ? worldMedium(this.frame?.world)?.extinction : null) ?? new THREE.Vector3();
+    // A frame or shading change can replace geometry, visibility and lights.
+    this.shadowFit = null;
+    const sceneWorld = rendered && (this.capturing || this.heldSceneLighting?.world !== false);
+    const sceneLights = rendered && (this.capturing || this.heldSceneLighting?.lights !== false);
+    const extinction = (sceneWorld ? worldMedium(this.frame?.world)?.extinction : null) ?? new THREE.Vector3();
     for (const material of [...this.materials.values(), this.fallback]) applyWorldExtinction(material, extinction);
     // An area light cannot be DRAWN until its lookup tables are uploaded, and a
     // render is one photograph with no second chance at it.
@@ -1329,12 +1378,15 @@ export class BlenderRuntimeView {
     // same way it waits for area-light tables and image decodes: one
     // photograph, no second chance at it.
     this.rendered = rendered;
+    this.sceneLights = sceneLights;
+    // This is the studio rig, not the authored lights. A scene-lit preview
+    // never adds the Solid studio, including World-only Material Preview.
     this.lighting.setRendered(rendered);
     // The scene's world is what a render sees past the geometry AND its
     // ambient light; modeling keeps the document's own backdrop and fill.
     // A photograph always composes its own; the viewport recomposes only when the key changed.
-    const worldKey = rendered && camera ? this.worldKeyFor(camera) : null;
-    if (!rendered) this.world.clear();
+    const worldKey = sceneWorld && camera ? this.worldKeyFor(camera) : null;
+    if (!sceneWorld) this.world.clear();
     else if (this.capturing || worldKey !== this.worldApplied) this.world.apply(this.root, this.frame?.world ?? null, camera);
     this.worldApplied = this.capturing ? null : worldKey;
     this.applyVisibility();
@@ -1372,6 +1424,21 @@ export class BlenderRuntimeView {
    */
   private applyShadows(rendered: boolean, camera?: THREE.Camera): void {
     this.root.updateMatrixWorld(true);
+    const fitted = this.shadowFit;
+    if (rendered && fitted && fitted.camera === camera &&
+      (!camera || (fitted.cameraMatrix?.equals(camera.matrixWorld) && fitted.projection?.equals(camera.projectionMatrix))) &&
+      fitted.objects.size === this.objects.size &&
+      [...this.objects.values()].every(object => {
+        const previous = fitted.objects.get(object);
+        return previous?.visible === object.visible && previous.matrix.equals(object.matrixWorld);
+      })) return;
+    this.shadowFit = rendered ? {
+      camera,
+      cameraMatrix: camera?.matrixWorld.clone(),
+      projection: camera?.projectionMatrix.clone(),
+      objects: new Map([...this.objects.values()].map(object =>
+        [object, { matrix: object.matrixWorld.clone(), visible: object.visible }])),
+    } : null;
     const boxes: THREE.Box3[] = [];
     for (const object of this.objects.values()) {
       const mesh = object as THREE.Mesh;
@@ -1497,12 +1564,14 @@ export class BlenderRuntimeView {
   }
 
   private applyVisibility(): void {
+    const renderVisibility = this.rendered && (this.capturing || this.heldVisibility === 'render');
     for (const obj of this.frame?.objects ?? []) {
       const object = this.objects.get(obj.id);
-      if (object) object.visible = this.rendered ? obj.render_visible : obj.visible;
+      const visible = renderVisibility ? obj.render_visible : obj.visible;
+      if (object) object.visible = visible;
       if (!obj.light) continue;
       const light = this.lights.get(obj.light);
-      if (light) light.visible = this.rendered && obj.render_visible;
+      if (light) light.visible = this.sceneLights && visible;
     }
     // AN OVERLAY IS MODELING CHROME AND IS NEVER PHOTOGRAPHED. The same
     // distinction the loop above draws between what the viewport shows and
@@ -2224,6 +2293,26 @@ export class BlenderRuntimeView {
     };
   }
 
+  /**
+   * A COPY OF THE MODEL THAT NO LONGER FOLLOWS IT, for Play: the graph `follow` builds, from the
+   * frame this view holds now, and handed nothing afterwards. What moves its objects is the
+   * caller's; Blender's data and this view never see it, and disposing it is the whole undo.
+   */
+  detach(): { readonly view: BlenderRuntimeView; dispose(): void } {
+    const detached = new BlenderRuntimeView();
+    if (this.frame) detached.applyFrame(this.fullFrame());
+    let disposed = false;
+    return {
+      view: detached,
+      dispose: () => {
+        if (disposed) return;
+        disposed = true;
+        detached.dispose();
+        detached.root.removeFromParent();
+      },
+    };
+  }
+
   captureSnapshot() {
     const frame = this.fullFrame();
     const source = this.frame!;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@volter/blender-engine",
   "author": "Volter AI, Inc.",
   "license": "GPL-3.0-or-later",
-  "version": "0.1.95",
+  "version": "0.1.97",
   "publishConfig": {
     "access": "public"
   },