@volter/editor-blender 0.1.8 → 0.1.10

package/contributions/blender-header-menus.tsx

@@ -26,8 +26,7 @@
  * WHAT IS DRAWN IS WHAT ACTS. A row Blender draws that this unit does not act
  * on is simply not here — never a row that opens a dialog we do not have, and
  * never one that no-ops. Where a row exists in Blender and is REFUSED here it
- * is drawn disabled with the refusal as its reason: Set Origin ▸ Origin to 3D
- * Cursor (there is no 3D cursor yet) and the four Add rows that want a FILE
+ * is drawn disabled with the refusal as its reason: the four Add rows that want a FILE
  * (Image ▸ Reference…/Background…/Mesh Plane…, Volume ▸ Import OpenVDB… —
  * `BlenderCreatableKind.refusal` carries each sentence). Add is the whole of
  * `VIEW3D_MT_add` now, so "not here" means Blender's menu-search row and
@@ -95,13 +94,9 @@ const ORIGIN_ROWS: readonly {
   // `type` enum's own UI names.
   { label: 'Geometry to Origin', type: 'GEOMETRY_ORIGIN' },
   { label: 'Origin to Geometry', type: 'ORIGIN_GEOMETRY' },
-  {
-    label: 'Origin to 3D Cursor',
-    type: 'ORIGIN_CURSOR',
-    refusal:
-      'There is no 3D cursor in this editor yet, so there is no point to move the origin to. ' +
-      'Blender places it with Shift+Right-click; that gesture is not built here.',
-  },
+  // The cursor is `Scene.cursor`, placed with Shift+Right-click on the model
+  // (`blender-runtime.document.tsx`).
+  { label: 'Origin to 3D Cursor', type: 'ORIGIN_CURSOR' },
 ];
 
 /**

package/contributions/blender-icons.source.mjs

@@ -147,6 +147,13 @@ const OUTLINER_ICON_NAMES = [
   // under names of OURS for the same reason the render pair has them.
   ['outliner-exclude-on', 'checkbox_hlt'],
   ['outliner-exclude-off', 'checkbox_dehlt'],
+  // The navigation cluster's camera button (`view3d_gizmo_navigate.cc`): `VIEW_CAMERA_UNSELECTED`
+  // outside the camera view and `VIEW_CAMERA` in it, under names of OURS for the same reason.
+  ['viewport-camera', 'view_camera_unselected'],
+  ['viewport-camera-view', 'view_camera'],
+  // And, in a camera view, the lock to it: `VIEW_LOCKED` / `VIEW_UNLOCKED`.
+  ['viewport-camera-locked', 'view_locked'],
+  ['viewport-camera-unlocked', 'view_unlocked'],
 ];
 
 const TRACED = new URL('./blender.icons.traced.json', import.meta.url);
@@ -693,11 +700,30 @@ g('magnifying-glass', ring(7.1, 7.1, 3.7, 1.3) + cap(9.9, 9.9, 13.2, 13.2, 1.4))
 // and the round cap floated off as a separate lozenge at 16px — measured in
 // round 1's frame, where the navigation cluster showed a disc and a diamond.
 const zoomLens = (sign) => dot(7.1, 7.1, 4.25) + sign + cap(9.3, 9.3, 13.4, 13.4, 2);
-g(
-  'magnifying-glass-plus',
-  zoomLens(holeBar(7.1, 5.2, 7.1, 9, 1.1) + holeBar(5.2, 7.1, 9, 7.1, 1.1)),
-);
-g('magnifying-glass-minus', zoomLens(holeBar(5.2, 7.1, 9, 7.1, 1.1)));
+// THE PLUS IS ONE HOLE, a cross outline: two crossing hole bars wind the crossing twice, and
+// under nonzero fill that square paints lens-coloured again (the frame showed a pale centre).
+// Its arms are Blender's on `gizmo-select-box.png`'s cluster: 14 device px across a 26 px
+// lens, 2.2 px thick.
+const plusHole = (cx, cy, a, t) =>
+  poly(
+    [
+      [cx - t, cy - a],
+      [cx + t, cy - a],
+      [cx + t, cy - t],
+      [cx + a, cy - t],
+      [cx + a, cy + t],
+      [cx + t, cy + t],
+      [cx + t, cy + a],
+      [cx - t, cy + a],
+      [cx - t, cy + t],
+      [cx - a, cy + t],
+      [cx - a, cy - t],
+      [cx - t, cy - t],
+    ],
+    true,
+  );
+g('magnifying-glass-plus', zoomLens(plusHole(7.1, 7.1, 2.3, 0.36)));
+g('magnifying-glass-minus', zoomLens(holeBar(4.8, 7.1, 9.4, 7.1, 0.72)));
 g('ellipsis', dot(3.6, 8, 1.15) + dot(8, 8, 1.15) + dot(12.4, 8, 1.15));
 g('grip-lines', cap(3, 6.3, 13, 6.3, 1.2) + cap(3, 9.7, 13, 9.7, 1.2));
 g('grip-lines-vertical', cap(6.3, 3, 6.3, 13, 1.2) + cap(9.7, 3, 9.7, 13, 1.2));
@@ -1011,6 +1037,19 @@ const perspectiveGrid = () => {
   );
 };
 g('viewport-projection', perspectiveGrid());
+/*
+ * VIEW_ORTHO, the same toggle in an orthographic view: a flat square grid of three by three
+ * cells, as wide as the perspective trapezoid (32 device px on `gizmo-select-box.png`'s
+ * navigation capsule at 2x) and centred with it, its rules the trapezoid's weight.
+ */
+const orthographicGrid = () => {
+  const lo = 2.61;
+  const hi = 13.41;
+  const w = 0.74;
+  const at = [0, 1, 2, 3].map((i) => lo + ((hi - lo) * i) / 3);
+  return at.map((v) => cap(lo, v, hi, v, w) + cap(v, lo, v, hi, w)).join('');
+};
+g('viewport-orthographic', orthographicGrid());
 g(
   'list',
   dot(3.2, 4.4, 1) +
@@ -1487,6 +1526,35 @@ g(
       [9.3, 4],
     ]),
 );
+/*
+ * SELECT BOX. Measured on `gizmo-select-box.png` (the lit first button, native 2x) and mapped onto
+ * the 16-unit grid with the marquee spanning 1..15: a dashed square, 0.7 units thick, dashes about
+ * 2.3 units with 1.1-unit gaps and an L at each corner, in the selection tools' orange (the
+ * `select` tone, `tonedPath`); inside it a pointer from its tip (6.1, 4.5) down to (6.2, 11.5),
+ * notched at (8.2, 9.4), to (11.2, 9.4).
+ */
+const MARQUEE_T = 0.7;
+const marquee =
+  // corners: an L each
+  rrect(1, 1, 2.7, MARQUEE_T) + rrect(1, 1, MARQUEE_T, 2.5) +
+  rrect(12.3, 1, 2.7, MARQUEE_T) + rrect(14.3, 1, MARQUEE_T, 2.4) +
+  rrect(1, 14.3, 2.5, MARQUEE_T) + rrect(1, 12.4, MARQUEE_T, 2.6) +
+  rrect(12.3, 14.3, 2.7, MARQUEE_T) + rrect(14.3, 12.4, MARQUEE_T, 2.6) +
+  // the dashes between
+  rrect(5, 1, 2.2, MARQUEE_T) + rrect(8.4, 1, 2.3, MARQUEE_T) +
+  rrect(5.5, 14.3, 2.4, MARQUEE_T) + rrect(9, 14.3, 2.4, MARQUEE_T) +
+  rrect(1, 4.6, MARQUEE_T, 2.1) + rrect(1, 8, MARQUEE_T, 2.1) +
+  rrect(14.3, 4.6, MARQUEE_T, 2.1) + rrect(14.3, 8, MARQUEE_T, 2.1);
+g(
+  'tool-select-box',
+  poly([
+    [6.1, 4.5],
+    [11.2, 9.4],
+    [8.2, 9.4],
+    [6.2, 11.5],
+  ]),
+  { tone: 'select', tonedPath: marquee },
+);
 g(
   /**
    * TRANSFORM (all handles). Blender's (button 6): a solid square from
@@ -2442,7 +2510,7 @@ g(
 /** The union `IconCategoryTone` declares (`@vgai/editor-sdk/looks`), and the
  *  reason `blender.style.ts` may narrow this JSON with an assertion: a tone
  *  outside it never reaches the artifact. */
-const TONES = ['object', 'modifier', 'material', 'tool', 'operator', 'data', 'scene', 'collection'];
+const TONES = ['object', 'modifier', 'material', 'tool', 'operator', 'data', 'scene', 'collection', 'select'];
 
 // The outliner's three names, aliased onto the drawings they share with the
 // generic glyphs. Same picture, its own name, so only the outliner is tinted.

package/contributions/blender-outliner-authoring.ts

@@ -57,7 +57,7 @@
  */
 
 import type { BlenderOutlinerRow } from '@volter/blender-engine/browser/rna';
-import type { ToolObject3DDocumentAuthoringFactory } from '@volter/editor-sdk/contributions';
+import type { ToolObject3DDocumentAuthoringFactory } from '@volter/editor-threejs/object3d-contributions';
 import { editorHost } from '@volter/editor-sdk/host';
 import type {
   AuthoringAdapter,
@@ -75,6 +75,7 @@ import type {
   WriteAck,
 } from '@volter/editor-project/adapter';
 import type * as THREE from 'three';
+import { threeObject } from '@volter/editor-threejs/adapter/three-contract';
 import { blenderExecute, blenderRnaSet, beginBlenderGesture, endBlenderGesture } from '../host/blender-runtime-host';
 import {
   blenderEngineSelection,
@@ -302,13 +303,10 @@ function blenderWorldMatrixRows(object: THREE.Object3D, root: THREE.Object3D): n
  * implementation of a primitive's defaults, its vertex count or its shading
  * here; the kind names the operator and the engine does the rest.
  *
- * `location=(0, 0, 0)` IS STATED RATHER THAN DEFAULTED, because Blender's own
- * answer is different: `VIEW3D_MT_add` runs every one of these with
- * `operator_context = 'EXEC_REGION_WIN'` and each `*_add` operator's `invoke`
- * places the new object at the 3D CURSOR. There is no 3D cursor in this editor
- * yet — it is not this unit's (WORK.md §B6) — so the origin is what the rows
- * below ask for explicitly instead of inheriting whatever `scene.cursor`
- * happens to hold. When a cursor arrives, these lose the argument.
+ * A NEW OBJECT LANDS AT THE 3D CURSOR, as in Blender: no row states a
+ * `location`, and an unset one is `scene->cursor.location`
+ * (`editors/object/object_add.cc`, `location_from_view`). The cursor is drawn
+ * and placed on the Model document (`blender-runtime-cursor.ts`).
  *
  * A ROW THAT NEEDS A FILE IS DRAWN DISABLED WITH THE REASON, never as a
  * gesture that cannot complete (the shape B6 set for Set Origin ▸ Origin to 3D
@@ -343,12 +341,6 @@ export interface BlenderCreatableKind {
   readonly group: string | null;
   /** The call, complete. */
   readonly call: string;
-  /** `false` where Blender's operator has NO `location` property to place with:
-   *  the generic add options come from `add_generic_props`
-   *  (`editors/object/object_add.cc:431`), and the two rows here whose operator
-   *  never calls it are `object.quick_fur` and `image.import_as_mesh_planes`.
-   *  Passing one anyway is a `TypeError` from Blender, not a placement. */
-  readonly placesAtOrigin?: boolean;
   /** This editor cannot run the row, and this is the sentence saying why — the
    *  row is drawn DISABLED with it as its reason and the operator is never
    *  called. */
@@ -444,7 +436,6 @@ export const CREATABLE_KINDS: readonly BlenderCreatableKind[] = [
     label: 'Fur',
     group: 'Curve',
     call: 'object.quick_fur',
-    placesAtOrigin: false,
   },
   // `VIEW3D_MT_surface_add`, `space_view3d.py:2484-2492`.
   {
@@ -656,7 +647,6 @@ export const CREATABLE_KINDS: readonly BlenderCreatableKind[] = [
     label: 'Mesh Plane...',
     group: 'Image',
     call: 'image.import_as_mesh_planes',
-    placesAtOrigin: false,
     refusal: needsAFilePicker('An image as a mesh plane', 'CANCELLED, with nothing created'),
   },
   {
@@ -825,11 +815,10 @@ export function blenderCreatableKinds(): readonly BlenderCreatableKind[] {
   return [...CREATABLE_KINDS, ...liveCollectionKinds()];
 }
 
-/** The complete `bpy.ops` expression a kind runs, origin included. */
+/** The complete `bpy.ops` expression a kind runs. */
 function addCall(kind: BlenderCreatableKind): string {
   const [call, ...args] = kind.call.split(', ');
-  const all = kind.placesAtOrigin === false ? args : [...args, 'location=(0, 0, 0)'];
-  return `bpy.ops.${call}(${all.join(', ')})`;
+  return `bpy.ops.${call}(${args.join(', ')})`;
 }
 
 /** A Python string literal for one Blender name. JSON's own escaping is a
@@ -1059,7 +1048,7 @@ export const createBlenderOutlinerAuthoring: ToolObject3DDocumentAuthoringFactor
    */
   const rowIdFor = (id: string): string | null => {
     if (rows().has(id)) return id;
-    const object = defaultAdapter.hierarchy.object3D?.(id) ?? null;
+    const object = threeObject(defaultAdapter.hierarchy, id);
     return object === null ? null : rowIdForObject(object);
   };
 
@@ -1096,7 +1085,7 @@ export const createBlenderOutlinerAuthoring: ToolObject3DDocumentAuthoringFactor
       return row === undefined ? null : nodeFor(row, state.parentOf.get(row.id) ?? null);
     },
     object3D: (id) => objectFor(id),
-    idForObject3D: (object) => rowIdForObject(object),
+    idForObject3D: (object: THREE.Object3D) => rowIdForObject(object),
   };
 
   /** The Blender object NAMES our selection covers — what the door wants. */

package/contributions/blender-palette.source.mjs

@@ -187,14 +187,20 @@ const MAPPING = {
     '#69aa15',
     'the same blend over `.tui.yaxis` #8bdc00 — measured, see axisX.',
   ),
-  // There is no `viewport.axisZ`: `EditorTheme.color.viewport` declares X and
-  // Y only (`packages/editor/src/theme.ts`), because the editor's grid plane
-  // draws two axis lines. `.tui.zaxis` #2890ff is the member a third would
-  // cite when one exists — a palette key no reader reads is a name with no
-  // caller.
+  // There is no `viewport.axisZ`: the grid plane draws two axis lines. The
+  // gizmos carry all three (`gizmo.*`).
   'viewport.selection': rgb('space_view3d.select'),
   'viewport.active': rgb('space_view3d.active'),
 
+  // The transform gizmo draws the theme's axis colours as they are
+  // (`transform_gizmo_3d.cc`, `gizmo_get_axis_color`), and so does the navigation gizmo, mixed
+  // toward the viewport by each ball's depth as it draws (`view3d_gizmo_navigate_type.cc`; the
+  // stage computes the mix, so the measured (245,54,81) of `modeling-object-none.png` is `.tui.xaxis`
+  // at that ball's depth, not a colour of its own).
+  'gizmo.x': rgb('tui.xaxis'),
+  'gizmo.y': rgb('tui.yaxis'),
+  'gizmo.z': rgb('tui.zaxis'),
+
   'region.outliner': rgb('space_outliner.back'),
   'region.properties': rgb('space_properties.back'),
 
@@ -214,6 +220,11 @@ const MAPPING = {
       '`DEF_ICON`, drawn in `.text`. Measured on the reference frames, and a level below ' +
       '`.tui.icon_scene` #cccccc, which is what it sits beside.',
   ),
+  'category.select': held(
+    '#ffaf2a',
+    "Blender's Select Box marquee, baked into the tool icon's geometry (`ops.generic.select_box`), " +
+      'not a theme member. Measured on `gizmo-select-box.png`: (255,175,42).',
+  ),
   'category.operator': held(
     '#95dab2',
     "Blender's edit-mode tool column tints its creating operators green; no theme member carries " +

package/contributions/blender-properties-view.tsx

@@ -383,9 +383,27 @@ function Numeric({
   );
 }
 
-/** X/Y/Z/W — `RNA_property_array_item_char`'s own letters for a vector or
- *  colour; anything longer is numbered, as Blender numbers it. */
-const ARRAY_LETTERS = ['X', 'Y', 'Z', 'W'];
+/** An array component's letter, as `RNA_property_array_item_char` gives it:
+ *  W/X/Y/Z for a quaternion or axis-angle (the angle first), X/Y/Z/W for the
+ *  vector subtypes, R/G/B/A for a colour, and none otherwise, where the
+ *  component is numbered. */
+const VECTOR_SUBTYPES = new Set([
+  'TRANSLATION',
+  'DIRECTION',
+  'XYZ',
+  'XYZ_LENGTH',
+  'EULER',
+  'VELOCITY',
+  'ACCELERATION',
+  'COORDS',
+]);
+function arrayItemChar(subtype: string, index: number): string | undefined {
+  if (subtype === 'QUATERNION' || subtype === 'AXISANGLE') return 'WXYZ'[index];
+  if (index >= 4) return undefined;
+  if (VECTOR_SUBTYPES.has(subtype)) return 'XYZW'[index];
+  if (subtype === 'COLOR' || subtype === 'COLOR_GAMMA') return 'RGBA'[index];
+  return undefined;
+}
 
 /** A field's WHOLE name, for the control's `aria-label` — the property's UI
  *  name (its RNA identifier when it has none), plus the array component's
@@ -393,7 +411,7 @@ const ARRAY_LETTERS = ['X', 'Y', 'Z', 'W'];
  *  component after the first. */
 function fieldName(row: BlenderRnaRow, index?: number): string {
   const name = row.name || row.identifier;
-  return index === undefined ? name : `${name} ${ARRAY_LETTERS[index] ?? index}`;
+  return index === undefined ? name : `${name} ${arrayItemChar(row.subtype, index) ?? index}`;
 }
 
 function colourOf(values: readonly number[]): string {
@@ -499,8 +517,8 @@ function ArrayRows({ row, label, title, write }: WidgetProps & { label: string;
     <>
       {values.map((value, index) => (
         <Row
-          key={`${row.identifier}-${ARRAY_LETTERS[index] ?? index}`}
-          label={componentLabel(label, index, values.length)}
+          key={`${row.identifier}-${index}`}
+          label={componentLabel(label, index, row.subtype)}
           title={title}
           readonly={row.readonly}
           identifier={`${row.identifier}[${index}]`}
@@ -526,9 +544,10 @@ function ArrayRows({ row, label, title, write }: WidgetProps & { label: string;
   );
 }
 
-function componentLabel(label: string, index: number, length: number): string {
-  if (length > ARRAY_LETTERS.length) return index === 0 ? label : `${label} ${index}`;
-  return `${index === 0 ? `${label}  ` : ''}${ARRAY_LETTERS[index]}`;
+function componentLabel(label: string, index: number, subtype: string): string {
+  const letter = arrayItemChar(subtype, index);
+  if (letter === undefined) return index === 0 ? label : `${label} ${index}`;
+  return `${index === 0 ? `${label}  ` : ''}${letter}`;
 }
 
 function widgetFor(props: WidgetProps): React.ReactNode {

package/contributions/blender-runtime-skin.ts

@@ -207,6 +207,12 @@ export class BlenderSkinDirector {
     };
   }
 
+  /** The frame on screen, or null before the clip door has been read (when `frame()` can only
+   *  say 1). */
+  playhead(): number | null {
+    return this.#clip ? this.frame() : null;
+  }
+
   /** The mixer's time as a Blender frame. With no clip the scene's own current
    *  frame stands, which is Blender's answer for a file with no animation. */
   frame(): number {