@volter/blender-engine 0.1.35 → 0.1.37

package/browser/protocol.ts

@@ -76,6 +76,9 @@ export type WorkerRequest =
   /** ONE RESTRICTION COLUMN, written (`session.py`'s `outliner_set`). A column
    *  Blender draws on no row of that type is refused by name. */
   | { id: number; op: 'outliner-set'; path: string; column: string; value: boolean }
+  /** A person's shading pick, kept in the file's own 3D View (`session.py`'s `_view_shading`);
+   *  UI state, so it marks nothing changed and rides the next save. */
+  | { id: number; op: 'view-shading'; shading: 'WIREFRAME' | 'SOLID' | 'MATERIAL' | 'RENDERED' }
   | { id: number; op: 'read-file'; path: string }
   | { id: number; op: 'write-file'; path: string; bytes: Uint8Array }
   | { id: number; op: 'list-files'; path: string }

package/browser/runtime.ts

@@ -318,6 +318,12 @@ export class BlenderRuntime {
     })) as BlenderRnaWrite;
   }
 
+  /** Keep a person's shading pick in the file's own 3D View, as UI state (no save of its own). */
+  async viewShading(shading: 'WIREFRAME' | 'SOLID' | 'MATERIAL' | 'RENDERED'): Promise<void> {
+    await this.#ready();
+    await this.#request({ op: 'view-shading', shading });
+  }
+
   /** BLENDER'S VIEW LAYER TREE for the scene — what its Outliner shows, as
    *  rows (`./rna.ts`, `BlenderOutlinerTree`). `selected` is our viewport's
    *  selection by object name; reading it never writes the engine's. */

package/browser/session.py

@@ -760,13 +760,17 @@ def _empty_display(obj):
 
 
 def _saved_view():
-    """The 3D View the file saved, which is where Blender opens it: the `Modeling` workspace's
-    (this editor's Model workspace is Blender's Modeling), else the first 3D View any screen
-    holds. `RegionView3D`'s pivot, rotation (view to world, `(w, x, y, z)`), distance and
-    projection (`PERSP`, `ORTHO`, or `CAMERA` for a view through the scene camera), and the
-    `View3D`'s lens."""
+    """The 3D View the file saved, which is where Blender opens it: the one on the screen the
+    file's window was showing when it was saved (Blender reopens that workspace; a stock file's is
+    `Layout`), else the `Modeling` workspace's (this editor's Model workspace is Blender's
+    Modeling), else the first 3D View any screen holds. `RegionView3D`'s pivot, rotation (view to
+    world, `(w, x, y, z)`), distance and projection (`PERSP`, `ORTHO`, or `CAMERA` for a view
+    through the scene camera), the `View3D`'s lens, and its SHADING TYPE, which Blender reopens
+    with the view: a file saved in Material Preview opens in Material Preview."""
+    screens = [window.screen for wm in bpy.data.window_managers for window in wm.windows
+               if window.screen is not None]
     workspace = bpy.data.workspaces.get("Modeling")
-    screens = list(workspace.screens) if workspace is not None else []
+    screens.extend(workspace.screens if workspace is not None else [])
     screens.extend(bpy.data.screens)
     for screen in screens:
         for area in screen.areas:
@@ -780,10 +784,28 @@ def _saved_view():
                 "rotation": [float(v) for v in region.view_rotation],
                 "distance": float(region.view_distance),
                 "perspective": region.view_perspective,
+                "shading": space.shading.type,
             }
     return None
 
 
+def _view_shading(shading):
+    """A person's shading pick, written where Blender keeps it: the `View3DShading.type` of the 3D
+    View `_saved_view` reads. UI STATE, NOT THE MODEL: nothing is marked changed, so it rides the
+    next save the model's own edits make, as a shading change in Blender is kept only by a save."""
+    screens = [window.screen for wm in bpy.data.window_managers for window in wm.windows
+               if window.screen is not None]
+    workspace = bpy.data.workspaces.get("Modeling")
+    screens.extend(workspace.screens if workspace is not None else [])
+    screens.extend(bpy.data.screens)
+    for screen in screens:
+        for area in screen.areas:
+            if area.type == "VIEW_3D":
+                area.spaces[0].shading.type = shading
+                return {"shading": area.spaces[0].shading.type}
+    return {"shading": None}
+
+
 def _subject_line(scene, view_layer):
     """The 3D Viewport's second overlay line, as `draw_selected_name` (`view3d_draw.cc`) writes it,
     less the two parts that follow the playhead: the tab draws `(frame)` and the marker on it
@@ -4997,6 +5019,8 @@ def _dispatch(request):
             _say("@@VOLTER-ERROR the present after this call failed, so the Model document is "
                  "showing the state before it: " + repr(thrown))
         return answer
+    if op == "view-shading":
+        return _view_shading(request["shading"])
     if op == "rna-set":
         SESSION.mark_changed()
         answer = rna_set(request["path"], request["property"], request["value"],

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

@@ -43,6 +43,13 @@ import {
 } from './blender-runtime-camera-view';
 import { DEFAULT_VIEWPORT_DISPLAY, workbenchMaterial } from './blender-workbench-material';
 
+/** A saved `View3DShading.type` as the stage's draw mode: Material Preview is `preview`. */
+const SAVED_SHADING = {
+  WIREFRAME: 'wireframe',
+  SOLID: 'solid',
+  MATERIAL: 'preview',
+  RENDERED: 'rendered',
+} as const;
 const scalar = z.number().finite();
 const point = z.tuple([scalar, scalar, scalar]);
 const edge = z.tuple([z.number().int().nonnegative(), z.number().int().nonnegative()]);
@@ -547,6 +554,7 @@ export const frameSchema = z
         distance: z.number().finite(),
         perspective: z.enum(['PERSP', 'ORTHO', 'CAMERA']),
         lens: z.number().finite().positive().default(50),
+        shading: z.enum(['WIREFRAME', 'SOLID', 'MATERIAL', 'RENDERED']).optional(),
       })
       .nullable()
       .optional(),
@@ -831,9 +839,14 @@ export class BlenderRuntimeView {
    * direction from the pivot to the eye (the view's +Z, `view_rotation` turning view space into
    * the world: RNA's inverse of `viewquat`), the screen's up (the view's +Y), the distance and
    * the projection. A view saved through the scene camera opens in perspective along the same
-   * axis: looking through a camera is not a view this stage has. Null before a frame or when
-   * the file saved no 3D View.
+   * axis: looking through a camera is not a view this stage has. With it the view's SHADING, the
+   * draw mode Blender reopens it in (null from a file whose view carried none). Null before a
+   * frame or when the file saved no 3D View.
    */
+  noteSavedShading(shading: keyof typeof SAVED_SHADING): void {
+    if (this.frame?.view) this.frame.view.shading = shading;
+  }
+
   savedView(): {
     readonly target: readonly [number, number, number];
     readonly direction: readonly [number, number, number];
@@ -841,6 +854,7 @@ export class BlenderRuntimeView {
     readonly distance: number;
     readonly projection: 'perspective' | 'orthographic';
     readonly lens: number;
+    readonly drawMode: 'wireframe' | 'solid' | 'preview' | 'rendered' | null;
   } | null {
     const saved = this.frame?.view;
     if (!saved) return null;
@@ -855,6 +869,7 @@ export class BlenderRuntimeView {
       distance: saved.distance,
       projection: saved.perspective === 'ORTHO' ? 'orthographic' : 'perspective',
       lens: saved.lens,
+      drawMode: saved.shading ? SAVED_SHADING[saved.shading] : null,
     };
   }
 

package/browser/worker.ts

@@ -508,6 +508,8 @@ async function handle(request: WorkerRequest): Promise<unknown> {
         ...(request.object === undefined ? {} : { object: request.object }),
         ...(request.collection === undefined ? {} : { collection: request.collection }),
       });
+    case 'view-shading':
+      return ask({ op: 'view-shading', shading: request.shading });
     case 'rna-set':
       return ask({
         op: 'rna-set',

package/package.json

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