Render shot editor: camera and frame controls, aspect presets, guides and frame overlay (#6281) (#7232)

* Render shot editor: camera and frame controls, aspect presets, guides and the frame overlay

* Render shot: Shot editor and Scene overview to the approved design

* Distinguish Render stage variants from native window frames

* fix: restore library inspection after clearing shot selection

* test: follow the merged Output Check navigation

* test: inspect Check without requiring a preflight result

* test: cancel Shot removal through its shared dialog action

* fix: remove obsolete Inspector stage form after editor integration

* fix: preserve Appearance Advanced when clearing Wear focus

* test: expect the dedicated Check editor from Scene overview
This commit is contained in:
Nathan Dane
2026-10-29 07:03:24 +00:00
committed by GitHub
parent c7a1cee357
commit d2fcab8432
22 changed files with 2064 additions and 82 deletions
+47
View File
@@ -0,0 +1,47 @@
# Scene overview and Shot editor
The Scene overview replaces the old Scene page. Entering Render with no selection,
clearing the selection, or selecting nothing opens Scene. Selecting a saved shot
opens its Shot editor; the other editors retain their existing adapters during the
selection-based Inspector migration.
Scene follows E1: Stages (Look, Light, Frame, Output), Ready to render, Reminders.
Each stage row summarises current state and navigates through the view commands.
Look opens the object/appearance stage, Light selects Environment, Frame selects
the current saved shot, and Output selects Output. Check now and Render shot use
the same request and command adapters as the stage bar. Open Check opens the
existing diagnostics editor because this branch has no Check selection kind.
The check summary distinguishes unchecked, current and stale results. Renderer
setup progress, failures, unavailable hosts and offline reasons remain visible.
All shots shows the saved-shot count and stays faded with the unavailable queue
reason; it never silently starts an individual render.
Shot follows E7: Name; changed-camera banner and Update/Revert/duplicate/remove;
Camera; Lens (GPU); Exposure; Frame. Camera contains projection, FOV, distance in
subject-size units, target XYZ, yaw/pitch/roll, Frame subject and Look at selection.
Camera controls save through render.settings.set and apply through render.camera.set;
navigation alone leaves the camera changed banner until Update shot or Revert.
Remove always uses the shared confirmation and checks for stale document state.
Lens values are saved to the selected shot's GPU job while retaining its other
options. Depth of field needs GPU path tracing and perspective; aperture and focus
distance remain visible when disabled. Raster exposure and orthographic FOV stay
faded with reasons. Changing to orthographic while saved depth of field is enabled
is rejected by the existing settings validation; disable depth of field first.
Frame retains aspect presets and transient composition guides. Size is read-only;
Edit in Output selects Output, the home of image dimensions.
These two editors use the shared workspace header without the old setup form,
page switcher or pinned job footer. Explicit native-studio resource reviews remain
in the library card, keeping Scene limited to orientation and readiness. The
shared section_method component supplies method badges, with a gallery sample.
New copy is in assets/locales/pending/render-shot-scene.json for en, ja, zh, de, ko.
The Shot Target uses the shared number_fields row cells with equal widths. The
Projection row uses the kit's base label column to leave room for both full
projection labels, and the distance label is shortened to Distance. Layout
regression coverage checks every editor widget at 350 and 320 points of content
width, including disabled controls, equal Target cells and untruncated labels.
Validation uses headless egui harnesses and focused render tests. No running-app
visual review or GPU-device verification is claimed by this change.
+14
View File
@@ -455,6 +455,20 @@ that pending request. Hover uses the shared tooltip with the object and look nam
## Browser scene focus
The existing Camera Inspector page shows a standalone Shot editor when the Browser selection
is a saved shot. Opening it leaves the live camera and saved design unchanged. Camera fields
use `render.camera.set`; Update shot saves that camera and Revert restores the saved camera.
Name, output dimensions and exposure use the existing undoable shot/settings commands.
Distance is shown as a multiple of the visible subject's bounding-box diagonal (one millimetre
for an empty scene). The lens chip uses the camera's vertical FOV and a 24 mm sensor height.
Frame's floating panel offers five aspect presets and Custom, plus composition guides.
Clicking a preset saves its output dimensions in one undo step; Custom preserves dimensions.
`view.render_frame` independently validates and echoes transient aspect/guide preferences;
headless calls never edit a design. Guides are per-document UI state, never saved in design JSON.
The frame and its size/lens chips appear only in Frame or the Shot editor. Product preview,
navigation and picking use the fitted frame aspect; image jobs and the Result canvas omit guides.
The shared Browser lists Environment (with its source), Lights, saved Shots,
Objects and Output (with image dimensions and format). Shots **+** opens the
existing Shots manager; Lights **+**, Solo and Mute remain faded with an explicit
+11
View File
@@ -134,6 +134,11 @@ input and introduce no repaint timer.
## Elements
`aspect_grid` composes three-column `AspectTile` choices with token-sized aspect glyphs,
selection tint and stable targets. `frame_guides` paints a bounded viewport mask, outline,
thirds, a 90% safe area and a centre mark from `FrameGuides`. These are viewport decorations;
callers exclude them from exported images and result canvases.
Module names below describe implementation locations, not caller import paths.
Every inline element/variant has one entry in the light/dark `gallery::ELEMENTS`
table. Panel/Window/Confirm compositions also have dedicated geometry and interaction tests.
@@ -156,6 +161,7 @@ table. Panel/Window/Confirm compositions also have dedicated geometry and intera
| `figure_rows`, `FigureSlot` | A caller-painted figure in the label column beside a stack of captioned expression fields (the Hole dialog's section); the caller gets each field's rect and hover/focus state to draw leaders and light the part it sizes. Fields keep their `dialog:<label>` handles; the block publishes `dialog:figure:<id>` and its picture `dialog:figure_picture:<id>` | `control_height`, `form_label_width`, `font_small`, `form_dim`, `space_2/4`, label gap |
| `linear_color_field` | Linear RGB swatch with precise channel fields; clips only the preview to display gamut and preserves HDR values until edited | `control_height`, `space_4`, shared colour popover |
| `section`, `section_count`, `section_method`, `search_fold`, `divider` | Persisted small-caps disclosure with chevron, optional count or method tag and trailing hairline; `search_fold` is that row for shortcut matches during Preferences search, closed until opened; full-width rule | `control_height`, `dialog_rule`, `font_caption`, tracking, spacing |
| `icon_action` | Icon-only action with an accessible name, tooltip, enabled state and danger variant | Shared icon-label action geometry and ink tokens |
| `list_row` | Picked item with a remove target | `control_height`, `font_label`, icon/spacing tokens |
| `text`, `Text` | Hint, note, report, inline or cell text; see variants below | `font_small/label`, `text/dim/error`, `control_height`, `space_4` |
| `text_lines` | Virtualized read-only licence/report lines, horizontal overflow | `font_small`, `text`, `control_height` |
@@ -174,6 +180,7 @@ table. Panel/Window/Confirm compositions also have dedicated geometry and intera
| `value_pair` | Paired captions/expressions; optional independent field names | row/field tokens, `space_8` |
| `fraction_field`, `scalar_field`, `mixed_scalar_field` | Locale-aware bounded dimensionless values; scalar fields fill their control column; the mixed variant accepts a translated placeholder | form control/font tokens |
| `number_field` | Integer/decimal field with caller range, drag speed and suffix | form control/font tokens |
| `number_fields` | N numeric cells sharing a row's remaining width equally, including gaps; returns each field response in order | `control_height`, inherited item spacing, number-field tokens |
| `length_field`, `angle_field` | Length in design units, angle in degrees | form control/font tokens |
| `slider` + `Slider` options | One token-painted track/thumb over native slider/value interaction; optional step, caller formatting, whole-step manipulation and hidden value editor | `control_height`, `space_24/8/4/2`, form control/font tokens |
| `placement_field` | Stable focus ID; drawing tool owns Enter/Tab validation and completion | `control_fill`, `font_body`, `text`, `control_height`, spacing |
@@ -444,6 +451,10 @@ the kit. The source guard scans both trees without an allowance table; the galle
covers continuous, percent/stepped, integer/no-editor and disabled states in both themes.
Numeric fields use the existing kit `scalar_field`, `length_field`, `angle_field`
or `number_field` rather than constructing a raw `egui::DragValue` at a caller.
For a numeric tuple, call `number_fields(ui, &mut values, range, speed, suffix)`
inside `row`. It divides the remaining control width equally after reserving the
inter-cell gaps, and keeps each cell's editor width and native input minimum local
to that cell. An empty slice draws nothing; responses follow the input order.
Parameters retains its bounded header drag offset while the manager is open,
including frames without a regular feature dialog. The shared Panel bound reserves