Skip to content

Free open-source image editor for the browser

Add nested mask and effect layers (#28)

Rodrigo Belfiore2b85114372e8
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 500165e..35237e1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,3 +28,4 @@ jobs:
run: bun run test
- name: Typecheck and build
run: bun run build
+
diff --git a/AGENTS.md b/AGENTS.md
index 362513a..c86d6b9 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -43,7 +43,7 @@ React composes controls and mounts engine outputs. The engine owns GPU resources
## Styling
-Keep Tailwind classes inline. Reuse presentation through components or repeat classes, whichever is simpler; do not share class-string constants across files. Use `cva` for variants and `src/index.css` for app-global tokens such as shadows and typography.
+Keep Tailwind classes inline. Reuse presentation through components or repeat classes, whichever is simpler; do not share class-string constants across files. Use `cva` for variants and `src/index.css` for app-global tokens such as shadows and typography. Text has one size, set on `body` in `src/index.css`; express hierarchy with color and weight, not size.
## GPU invariants
@@ -52,6 +52,7 @@ Keep Tailwind classes inline. Reuse presentation through components or repeat cl
- Keep `.wgsl` beside its owner. The Vite loader and ambient types are configured.
- The working space is linear Rec.2020 in `rgba16float`. Decoders convert into it; display converts out. Processing outputs preserve the input format and primaries unless the operation explicitly converts them.
- The adjustment shader's parameters use UI units. Its fitted constants are calibration data; preserve them when reorganizing code.
+- Layers process the source in stack order; the image layer's adjustments and tone curve run last, on the composite, so a local exposure sees the light a global exposure would compress.
- Preserve HDR headroom through exposure, curves, and vibrance. Exposure clips negatives and applies one luminance gain to all channels. `display()` in `core/image/color.wgsl` maps out-of-gamut colors toward their luminance.
- TIFF and camera RAW use `raw-webgpu`. OpenLight adapts package resources to document ownership; codec implementation and coverage belong to the package.
diff --git a/API.md b/API.md
index 509fdfd..77247a4 100644
--- a/API.md
+++ b/API.md
@@ -34,28 +34,53 @@ Loading calls are queued. XMP import is skipped if no document is ready; an inva
## Editing
-`setAdjustments(change)` updates only the supplied adjustments. Values must be finite numbers within these inclusive ranges. Unknown names and invalid values throw.
+Commands take explicit layer IDs rather than using UI selection. Without an ID, adjustments, the tone curve, and white balance address the base image; color-mixer, Details, and vignette commands use the first matching root effect or create one at the top of the stack; effects nested in other layers stay untouched. Creation and parameter changes are one edit, respecting an open history group.
+
+`setAdjustments(change, id?)` updates only the supplied adjustments on an image or mask. Values must be finite numbers within these inclusive ranges. Unknown names and invalid values throw.
| Adjustment | Range | Default |
| --- | --- | --- |
| `exposure` | -5 to 5 | 0 |
| `contrast`, `highlights`, `shadows`, `whites`, `blacks` | -100 to 100 | 0 |
| `incrementalTemperature`, `incrementalTint`, `vibrance`, `saturation` | -100 to 100 | 0 |
-| `clarity` | -100 to 100 | 0 |
-| `sharpening` | 0 to 150 | 0 |
-| `sharpenRadius` | 0.5 to 3 | 1 |
-`setToneCurve(points)` replaces the tone curve. Each point is `{ x, y }` with coordinates between 0 and 1. Supply at least two points, ordered by `x` with a minimum gap of `1/1024`. The first point must have `x = 0` or `y = 0`; the last must have `x = 1` or `y = 1`. Call `setToneCurve()` to reset it.
+`setToneCurve(points, id?)` replaces the tone curve of an image or mask layer, applied after its basic adjustments. Each point is `{ x, y }` with coordinates between 0 and 1. Supply at least two points, ordered by `x` with a minimum gap of `1/1024`. The first point must have `x = 0` or `y = 0`; the last must have `x = 1` or `y = 1`. Call `setToneCurve()` to reset it.
+
+`setDetails(change, id?)` edits a Details effect: `clarity` (−100 to 100, default 0), `sharpening` (0 to 150, default 0), and `sharpenRadius` (0.5 to 3, default 1). Values must be finite. Like other effect commands, it creates a layer when no matching layer exists.
-`setColorMixer(color, change)` updates one of `red`, `orange`, `yellow`, `green`, `aqua`, `blue`, `purple`, or `magenta`. Supply any of `hue`, `saturation`, and `luminance`, each a finite number from -100 to 100. Other colors and unspecified channels keep their values. `resetColorMixer()` resets every color as one undoable edit. A full shift of 100 rotates hue by 30°, scales saturation from zero to double, or moves luminance by one stop, weighted by each pixel's distance to the color's Oklab hue. Hue and saturation edits preserve luminance, and neutrals are unaffected.
+`setColorMixer(color, change, id?)` updates one of `red`, `orange`, `yellow`, `green`, `aqua`, `blue`, `purple`, or `magenta`. Supply any of `hue`, `saturation`, and `luminance`, each a finite number from -100 to 100. Other colors and unspecified channels keep their values. `resetColorMixer(id?)` resets every color in the matching layer as one undoable edit; without a matching layer it does nothing. A full shift of 100 rotates hue by 30°, scales saturation from zero to double, or moves luminance by one stop, weighted by each pixel's distance to the color's Oklab hue. Hue and saturation edits preserve luminance, and neutrals are unaffected.
-`setVignette({ intensity, softness })` updates either or both values, each a finite number from 0 to 100. Defaults are intensity 0 and softness 50. Intensity 0 bypasses the effect; increasing softness spreads the transition toward the center. The elliptical falloff is centered on the source image, before crop/rotation, independent of viewport zoom and pan. It multiplies linear RGB equally, preserves alpha and HDR headroom, and uses the same processing for preview and export. Double-click either slider to restore its default.
+`setVignette({ intensity, softness }, id?)` updates a vignette layer. Values are finite numbers from 0 to 100; defaults are intensity 0 and softness 50. Without an ID, it updates the first vignette or creates one. Intensity 0 bypasses the effect; increasing softness spreads the transition toward the center. The falloff stays centered on the source image before crop and rotation, independently of viewport zoom and pan. Its position among the effect layers determines processing order. It multiplies linear RGB equally and preserves alpha and HDR headroom.
For RAW sources, `setWhiteBalance({ temperature, tint })` sets absolute Kelvin and DNG tint, preserving unspecified values. Temperature accepts 2000–25000 K and tint accepts -150–150, extending either range to include the file's As Shot value. `setWhiteBalance()` restores that value (the decoder's daylight fallback if camera multipliers are unavailable). Non-RAW sources and invalid values throw. Incremental temperature/tint remain separate RGB adjustments.
Edits update the scene and history synchronously. Rendering may finish later, particularly RAW development. Tests should wait for visible results; `exportImage()` renders and waits for its captured scene independently of the preview.
-`editScene(change)` shallowly merges a partial [Scene](src/core/document/scene.ts) as an undoable edit. Supply complete nested values such as `frame`. This low-level command validates frame geometry only; prefer the adjustment, curve, color-mixer, and white-balance commands for their validation.
+`setFrame(frame)` replaces the complete [ImageFrame](src/core/image/frame.ts) as an undoable edit. Geometry uses finite two-element coordinate pairs, positive dimensions, and nonzero scale. The frame is validated and copied; later changes to the supplied object do not affect the document.
+
+## Layers
+
+`scene.layers` is ordered bottom to top, beginning with the locked image at index 0. Processing layers have `children`, also ordered bottom to top; the image cannot contain layers. Editing supports two levels. Adding, duplicating, moving, and deleting commit an open gesture and record one history entry each. Selecting a layer changes the inspector without adding history; changing selection commits an active gesture. Removing the selected layer or an ancestor returns selection to the image.
+
+Images own basic adjustments and a tone curve. Processing layers edit the source image in stack order; the image layer's adjustments and curve then tone the composite, so a local exposure can recover light that the global exposure pushes past white. An effect processes the image below, then its children. A mask processes its basic adjustments, its tone curve, and child effects, then blends that result with its input using coverage × opacity. A neutral mask with no effects does nothing. Hidden layers and zero opacity bypass the complete branch.
+
+Direct mask children of another mask modify coverage instead of processing image pixels: Add sums coverage, Subtract removes it, clamping to 0–1 after each child in stored order. Each child's opacity scales its contribution. Its stored basic adjustments are inactive in this position. Other children process the image within the combined mask. Layer opacity always controls effect strength, preserving the input image's alpha.
+
+| Method | Behavior |
+| --- | --- |
+| `addLayer(kind, placement?)` | Adds `"exposure"`, `"color-mixer"`, `"details"`, `"vignette"`, or `"mask"`; selects and returns its ID. `{ inside: id }` appends a child to a processing layer; `{ above: id }` inserts directly above that layer among its siblings; without a placement, the layer goes on top of the root stack. Exposure starts at +1 EV, Vignette at intensity 50; Color Mixer, Details, and masks start neutral. |
+| `selectLayer(id)` | Selects any layer. |
+| `setLayer(id, change)` | Updates processing-layer `name`, `visible`, or `opacity` (0–1). |
+| `setExposure(id, value)` | Sets an Exposure layer to -5…5 EV. |
+| `setLayerMask(id, mask)` | Replaces a mask layer's gradient: `{ kind: "linear", start, end }` or `{ kind: "radial", center, radius, angle, feather }`. Geometry uses source pixels; radial angle is degrees and feather is 0–1. |
+| `setMaskOperation(id, operation)` | Sets `"add"` or `"subtract"`; used when this mask is inside another mask. |
+| `duplicateLayer(id)` | Copies a processing layer and its children above itself with independent IDs; selects and returns the new ID. |
+| `moveLayer(id, index, parentId?)` | Moves to a final sibling index, bottom to top. Omit the parent for the root stack, where index 0 is reserved for the image. Image parents, cycles, and third-level nesting are rejected. |
+| `deleteLayer(id)` | Removes a processing layer and its children; undo restores them. |
+
+A linear gradient has full coverage at `start`, zero at `end`; its points must be finite and distinct. A radial gradient covers the ellipse inside `radius`, with positive radii and a feathered falloff toward its edge. Crop, rotation, and viewport navigation do not move it within the document.
+
+The sidebar keeps four sections in every mode: output histogram, layers, controls, and footer. Layers and controls scroll independently; the histogram and footer stay fixed. **L** draws a linear mask; **R** draws a radial mask. Selected masks stay editable: drag the center to move, guides to resize or rotate, and the radial inner handle or Feather slider to soften its edge. Shift constrains drawing; Escape cancels the gesture; Delete/Backspace removes the selected mask. Each gesture is one undo. A new mask shows a red overlay of its coverage until Enter keeps it, Escape removes it, or its first adjustment; **O** and the Overlay button toggle the overlay for any selected mask, and it also shows while drawing or dragging a guide. Add/Subtract menus accept either gradient shape. **+** adds an effect, inside a selected top-level mask or above the selected sibling. Eye buttons toggle visibility; the inspector edits opacity. Drag a layer name to reorder (insertion line) or nest (highlighted row); the base stays locked and nesting is limited to two levels. Double-click a name to rename; the row menu also duplicates, deletes, reorders, or reparents. Image import still replaces the document; multiple image layers and additional blend modes are not implemented.
## History
@@ -108,6 +133,6 @@ The image renders at the document dimensions and downsamples to `longEdge` with
## State
-`getState()` returns a detached snapshot containing `file`, `documentId`, `size`, `frame`, `adjustments`, `whiteBalance`, `toneCurve`, `colorMixer`, `vignette`, `preview`, and `history`. `colorMixer` contains eight-value `hue`, `saturation`, and `luminance` arrays in the color order above, defaulting to zero. `whiteBalance` contains absolute temperature/tint for RAW sources and is undefined for other sources. `file` is the filename, and `history` contains `undoCount` and `redoCount`.
+`getState()` returns a detached snapshot containing `file`, `documentId`, `scene`, `selectedLayerId`, `size`, `frame`, `adjustments`, `whiteBalance`, `details`, `toneCurve`, `colorMixer`, `vignette`, `preview`, and `history`. `scene` contains `frame` and the layer tree. The top-level adjustment, tone-curve, and white-balance values come from `scene.layers[0]`; details, color-mixer, and vignette values describe the first matching root layer from the bottom, or its defaults. `colorMixer` contains eight-value `hue`, `saturation`, and `luminance` arrays in the color order above, defaulting to zero. `whiteBalance` contains absolute temperature/tint for RAW sources and is undefined for other sources. `file` is the filename, and `history` contains `undoCount` and `redoCount`.
-Without a document, `documentId`, `size`, `frame`, and `preview` are undefined. Adjustments and the tone curve use their defaults, and history counts are zero. Mutating the snapshot does not edit the document.
+Without a document, `documentId`, `size`, `frame`, and `preview` are undefined. Adjustments, details, and the tone curve use their defaults, and history counts are zero. Mutating the snapshot does not edit the document.
diff --git a/CONTEXT.md b/CONTEXT.md
index 4004ee5..f1241ba 100644
--- a/CONTEXT.md
+++ b/CONTEXT.md
@@ -6,9 +6,10 @@ OpenLight edits documents containing image content and adjustments.
| --- | --- |
| **Document** | An independent editing session with its own canvas, history, and resources. Opening an image creates a document containing that image. |
| **Scene** | The document's serializable content: canvas geometry, image-source references, and adjustments. Files and GPU resources live outside it. |
+| **Layer** | A source, effect, or mask in the composition. Image layers own basic adjustments; effects process the image below; masks scope their basic adjustments and child effects. Linear and radial child masks add or subtract coverage. Layers compose render nodes without owning textures. |
| **Image source** | An image used as input to the document's composition. It is content within a document. |
| **Edit** | One reversible content change. A continuous slider or curve drag is one edit, as is importing a set of adjustments. |
| **Workspace** | The open-document session. It currently holds at most one document, replaced when another image is opened. |
-| **Mode** | An editor task area: Adjust, Layers, Retouch, Crop, or Export. Switching modes changes tools and panels, not the document. |
+| **Mode** | An editor task area: Adjust, Crop, or Export. Switching modes changes tools and panels, not the document. |
Use these names consistently in code, UI text, and documentation.
diff --git a/PERFORMANCE.md b/PERFORMANCE.md
index d343a08..6ccb383 100644
--- a/PERFORMANCE.md
+++ b/PERFORMANCE.md
@@ -19,12 +19,14 @@ Keep unrelated work off the queue during isolated measurements. Label software a
## Instrumentation
-Import rendering primitives from `@/core/renderer`. [`node`](src/core/renderer/node.ts) defines a pass without a GPU: a stable instance name, shader, and optional vgpu `set` values, sampler descriptors, float storage data, or output size/format. `input` imports a caller-owned texture. `pipeline` connects a list of definitions through the shader's `source` binding; an omitted definition bypasses the effect. A multi-pass feature can supply an image-to-image function instead. `split` builds branches sharing their input, without copying textures. `merge` connects named inputs to a definition; its shader performs the combination. Output geometry defaults to the first input. See [unsharp masking](src/features/adjustments/unsharp-mask.ts) for branches and [app composition](src/app/editor/renderer.ts) for preview/export ordering.
+Import rendering primitives from `@/core/renderer`. [`node`](src/core/renderer/node.ts) defines a pass without a GPU: a stable instance name, shader, and optional vgpu `set` values, sampler descriptors, float storage data, or output size/format. `input` imports a caller-owned texture. `pipeline` connects a list of definitions through the shader's `source` binding; an omitted definition bypasses the effect. A multi-pass feature can supply an image-to-image function instead. `split` builds branches sharing their input, without copying textures. `merge` connects named inputs to a definition; its shader performs the combination. Output geometry defaults to the first input. See [unsharp masking](src/features/details/unsharp-mask.ts) for branches and [app composition](src/app/editor/renderer.ts) for preview/export ordering.
[`createRenderGraph(gpu, timer?)`](src/core/renderer/graph.ts) initializes one vgpu effect per node name on first use, keeps it through bypasses, updates bindings, and owns storage buffers. A name identifies one shader and sampler configuration for the graph's lifetime; distinct passes need distinct names even when they use the same shader. Disposal releases buffers and intermediate targets; vgpu owns its internal effect resources and sampler cache.
The graph executes each reachable node once and reuses compatible targets after their last consumer. Multiple inputs and requested outputs are supported. Requested outputs remain valid until the next render or disposal; imported targets remain owned by the caller. Unneeded targets are released after rendering. `inspect()` reports executed pass names and retained intermediate texture dimensions/formats, excluding source, display, decoder, buffers, and driver allocations. There is no cross-frame result cache or shader fusion.
+Layer composition builds subgraphs without allocating textures for containers. `mixAdjustment` combines an effect with its input using opacity and optional analytical gradients in document coordinates; Add/Subtract child masks use a small storage buffer in that same pass, without mask textures; it preserves input alpha. Node names include stable layer IDs. The display pass tints the previewed mask from the same analytical coverage, so the overlay adds no processing pass. Removed layers release their graph-owned instance handles and storage buffers through `release(prefix)`; bypassed layers keep their instances. vgpu's internal pipeline and uniform caches remain GPU-owned until GPU disposal.
+
For GPU timing, enable the optional `timestamp-query` device feature, create a vgpu `timer(gpu)`, and pass it to the graph or `createEditorRenderer`. The graph instruments every node centrally. Results arrive asynchronously through `timer.onResults`; the caller disposes the timer. `gpu.settled()` covers timing readbacks in isolated runs or teardown. Do not wait after individual nodes during interactive editing. See the [vgpu guide](https://github.com/vercel-labs/vgpu/blob/main/docs/topics/performance-playbook.docs.md#13-time-passes-before-optimizing-timer).
The [benchmark](tests/rendering-benchmark.ts) measures uninstrumented repeated rendering, then profiles nodes in a separate run. Report bypasses and missing samples explicitly. Sum a feature's pass durations only when every pass was measured. The graph works without React and without profiling support; it currently accepts programmatically composed nodes, not user-editable or serialized graphs.
diff --git a/README.md b/README.md
index 3b9671d..8fb91ba 100644
--- a/README.md
+++ b/README.md
@@ -8,15 +8,18 @@ Image processing runs locally with WebGPU. Built with TypeScript and React; requ
- Light and color adjustments, tone curves, clarity, sharpening, and vignette.
- Color Mixer with eight hue, saturation, and luminance ranges.
+- Image adjustments, draggable effect layers, and editable linear/radial masks with child effects and Add/Subtract submasks.
- Crop, rotate, straighten, flip, pan, and zoom.
- Undo/redo, before/after comparison, RGB histogram, and clipping overlays.
- Camera Raw XMP import; HEIC, TIFF at 16-bit and floating-point precision, and camera RAW/DNG with absolute white balance and As Shot reset.
- PNG, JPEG, and WebP export with resizing, live preview, and file size.
-Documents currently live in memory; export saves a flattened image. Layers and Retouch modes are placeholders.
+Documents currently live in memory; export saves a flattened image. Layers support one locked base image and two levels of effects and masks. Color Mixer, Details, Exposure, and Vignette can be added independently.
RAW decoding and GPU development use [raw-webgpu](https://github.com/roprgm/raw-webgpu), which documents format support and limitations. OpenLight owns editing, history and preview/export lifetimes.
+HEIC decoding requires a browser with a WebCodecs HEVC decoder. The HEIC browser test reports a skip when that decoder is unavailable.
+
## Development
```sh
@@ -34,7 +37,7 @@ bunx --no-install playwright install --with-deps chromium
On Linux, installing system dependencies requires administrator access. If Chromium is already installed but libraries such as `libnspr4.so` are missing, run `bunx --no-install playwright install-deps chromium`. In environments without administrator access, use a browser environment with those dependencies supplied. See [Playwright's setup instructions](https://playwright.dev/docs/browsers#install-system-dependencies).
-[playwright.config.ts](playwright.config.ts) starts Vite automatically and selects Chromium's bundled SwiftShader on Linux and Windows. Linux also uses SwiftShader's Vulkan backend for image transfers and offscreen export. These tests execute WebGPU on the CPU without a physical GPU or a separate SwiftShader installation. Use this configuration when testing; another browser session does not inherit its launch flags.
+[playwright.config.ts](playwright.config.ts) starts Vite automatically and selects Chromium's bundled SwiftShader on Linux and Windows. Linux uses SwiftShader's Vulkan backend for image transfers and ANGLE's SwiftShader backend for canvas presentation. These tests execute WebGPU on the CPU without a physical GPU or a separate SwiftShader installation. Use this configuration when testing; another browser session does not inherit its launch flags.
If the environment blocks local ports or browser processes, use its permitted execution mechanism. A launch failure or missing system library is an environment problem, not a shader failure.
@@ -47,7 +50,7 @@ If the environment blocks local ports or browser processes, use its permitted ex
| `bun run test` | Browser-free integration and core unit tests using real modules and `vgpu/mock`. |
| `bun run test:browser` | GPU pixels, UI, and codec integration in Chromium. |
-Run all four for code changes before committing. [CI](.github/workflows/ci.yml) currently checks formatting/lint, Bun tests, and the build; it does not run browser tests.
+Run all four for code changes before committing. [CI](.github/workflows/ci.yml) checks formatting/lint, Bun tests, and the build; browser tests run locally.
During development, select an existing test by path:
@@ -64,6 +67,8 @@ After [browser setup](#browser-setup), run `bun run test:browser --config playwr
Results and rendered PNGs are written under `test-results/benchmarks`; keep generated artifacts out of Git. JSON includes environment details, samples, median/p95, setup, first render, completed-render latency, intermediate texture storage, and per-node GPU timestamps when supported. Timestamp profiling runs separately from the latency comparison. Decoding, display, readback, and image encoding run outside the measured loop. Software-adapter results describe that backend only. A hardware measurement requires a browser configuration that does not force SwiftShader; record the adapter actually used.
+Compare `pipeline` with `pipeline-input` to measure the curve input histogram: the latter retains the image entering the base curve and computes its histogram. Completed latency includes histogram compute and its buffer copy; per-node timestamps cover only image processing.
+
For revision comparisons, use identical fixtures, settings, sampling, and browser configuration in both checkouts. The benchmark is opt-in and excluded from the regular test suite; correctness remains covered by GPU pixel tests and the editing session. See [PERFORMANCE.md](PERFORMANCE.md) for the node contract, measurement scope, and interpretation.
## Scripting
diff --git a/bun.lock b/bun.lock
index 364fb3b..47332b5 100644
--- a/bun.lock
+++ b/bun.lock
@@ -5,6 +5,8 @@
"": {
"name": "openlight",
"dependencies": {
+ "@base-ui/react": "^1.8.0",
+ "@dnd-kit/core": "^6.3.1",
"@fontsource-variable/geist": "^5.3.0",
"@tailwindcss/vite": "^4.3.3",
"@vercel/analytics": "^2.0.1",
@@ -34,6 +36,12 @@
},
},
"packages": {
+ "@babel/runtime": ["@babel/[email protected]", "", {}, "sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw=="],
+
+ "@base-ui/react": ["@base-ui/[email protected]", "", { "dependencies": { "@babel/runtime": "^7.29.7", "@base-ui/utils": "0.4.0", "@floating-ui/react-dom": "^2.1.9", "@floating-ui/utils": "^0.2.12", "use-sync-external-store": "^1.6.0" }, "peerDependencies": { "@date-fns/tz": "^1.2.0", "@types/react": "^17 || ^18 || ^19", "date-fns": "^4.0.0", "react": "^17 || ^18 || ^19", "react-dom": "^17 || ^18 || ^19" }, "optionalPeers": ["@date-fns/tz", "@types/react", "date-fns"] }, "sha512-P0/1sxo6SBVZOklKMIedvTWqw2s2IQzi9x5bIVsXu980cuSOD4NeuRSs+/L7LZQfDkZP/uRZyGPyfFl/B1oH+Q=="],
+
+ "@base-ui/utils": ["@base-ui/[email protected]", "", { "dependencies": { "@babel/runtime": "^7.29.7", "@floating-ui/utils": "^0.2.12", "reselect": "^5.2.0", "use-sync-external-store": "^1.6.0" }, "peerDependencies": { "@types/react": "^17 || ^18 || ^19", "react": "^17 || ^18 || ^19", "react-dom": "^17 || ^18 || ^19" }, "optionalPeers": ["@types/react"] }, "sha512-bO9fz25kKtPf+aZVyfQrC0PDmJdmVni31W2hCS5/Owb+inwdIL3XU26pCPRPlt4LSxZrBgLwubXQXQlKaFEZzw=="],
+
"@biomejs/biome": ["@biomejs/[email protected]", "", { "optionalDependencies": { "@biomejs/cli-darwin-arm64": "2.5.11", "@biomejs/cli-darwin-x64": "2.5.11", "@biomejs/cli-linux-arm64": "2.5.11", "@biomejs/cli-linux-arm64-musl": "2.5.11", "@biomejs/cli-linux-x64": "2.5.11", "@biomejs/cli-linux-x64-musl": "2.5.11", "@biomejs/cli-win32-arm64": "2.5.11", "@biomejs/cli-win32-x64": "2.5.11" }, "bin": { "biome": "bin/biome" } }, "sha512-Tj0dnkLPdW0ASjHfj2D/ZkkvPU2wrFmnE1jWTD2xzV1ycapV1DutbYXk4NDnR3rYTi1ZCbNFD4G2gRMEY65WaA=="],
"@biomejs/cli-darwin-arm64": ["@biomejs/[email protected]", "", { "os": "darwin", "cpu": "arm64" }, "sha512-6SGZxoKbXvUjMn1t6A98HqWISPnGNbYs0R/Rt2JarmXBSev+lva4QxUMWEBX9lX1Wo1XTJ78uk5xVDtG58SRZg=="],
@@ -52,6 +60,20 @@
"@biomejs/cli-win32-x64": ["@biomejs/[email protected]", "", { "os": "win32", "cpu": "x64" }, "sha512-QSQr/KjOgXA7OzXJUWS+oguKyAZ3Q0l/lnlDGbu397eKo83atuWUjBPJrsqbKNF6CARGw8XXJLGzpHC8Ryhd4Q=="],
+ "@dnd-kit/accessibility": ["@dnd-kit/[email protected]", "", { "dependencies": { "tslib": "^2.0.0" }, "peerDependencies": { "react": ">=16.8.0" } }, "sha512-2P+YgaXF+gRsIihwwY1gCsQSYnu9Zyj2py8kY5fFvUM1qm2WA2u639R6YNVfU4GWr+ZM5mqEsfHZZLoRONbemw=="],
+
+ "@dnd-kit/core": ["@dnd-kit/[email protected]", "", { "dependencies": { "@dnd-kit/accessibility": "^3.1.1", "@dnd-kit/utilities": "^3.2.2", "tslib": "^2.0.0" }, "peerDependencies": { "react": ">=16.8.0", "react-dom": ">=16.8.0" } }, "sha512-xkGBRQQab4RLwgXxoqETICr6S5JlogafbhNsidmrkVv2YRs5MLwpjoF2qpiGjQt8S9AoxtIV603s0GIUpY5eYQ=="],
+
+ "@dnd-kit/utilities": ["@dnd-kit/[email protected]", "", { "dependencies": { "tslib": "^2.0.0" }, "peerDependencies": { "react": ">=16.8.0" } }, "sha512-+MKAJEOfaBe5SmV6t34p80MMKhjvUz0vRrvVJbPT0WElzaOJ/1xs+D+KDv+tD/NE5ujfrChEcshd4fLn0wpiqg=="],
+
+ "@floating-ui/core": ["@floating-ui/[email protected]", "", { "dependencies": { "@floating-ui/utils": "^0.2.12" } }, "sha512-0CIZ5itps/8x7BG8dEIhs53BvCUH2PCoogtakwRTut+Arm58sJooJ0AuZhLw2HJYIR5cMLNPBSS728sPho2khQ=="],
+
+ "@floating-ui/dom": ["@floating-ui/[email protected]", "", { "dependencies": { "@floating-ui/core": "^1.8.0", "@floating-ui/utils": "^0.2.12" } }, "sha512-yXSrzeHZBTZadLOlfyhCkJHNeLJnHRnRInwdZ40L7ZiaAtrBwoYlsDrX3v5zB1Utk7CLfzcOVnVVWoXEky7Ceg=="],
+
+ "@floating-ui/react-dom": ["@floating-ui/[email protected]", "", { "dependencies": { "@floating-ui/dom": "^1.8.0" }, "peerDependencies": { "react": ">=16.8.0", "react-dom": ">=16.8.0" } }, "sha512-JDjEFGCpImxDCA7JJKviA0M9+RtmJdj0m/NVU5IMgBK+AmZouAQQ7/+2GLH0GXXY0YMw9oXPB8hKdbPYg5QLYg=="],
+
+ "@floating-ui/utils": ["@floating-ui/[email protected]", "", {}, "sha512-HpCo8tmWzLVad5s2d19EhAz5zqrrQ6s69qd6moPMQvkOuSwDT1YgRfWSVuc4ennqrgv3OHppiOGMQ7oC13yIww=="],
+
"@fontsource-variable/geist": ["@fontsource-variable/[email protected]", "", {}, "sha512-j0m+vLQuG5XAYoHtGCVu0spvlGreR3EzpECUVzkFmI1mTVnAO38l/NEPDCFgZ177JxzYJCLSmTQibIiYPilGrA=="],
"@jridgewell/gen-mapping": ["@jridgewell/[email protected]", "", { "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.0", "@jridgewell/trace-mapping": "^0.3.24" } }, "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA=="],
@@ -276,6 +298,8 @@
"react-dom": ["[email protected]", "", { "dependencies": { "scheduler": "^0.27.0" }, "peerDependencies": { "react": "^19.2.8" } }, "sha512-rVprimfGBG3DR+Tq0IQG2DT5PxKth1WIGDmj5yPmlzr4YBe7uyE+Du4oVqTDXZSHGGGXRtTJEGSSePyQCMBglQ=="],
+ "reselect": ["[email protected]", "", {}, "sha512-XGoLeRAVzUTcJ1qkxPQhDJyIZ5d6zzZD9nT7AEZOaaU9UbWclhycElmhO+VD5bFeLuzhPBaOV2oXC8uG35ZSpg=="],
+
"rolldown": ["[email protected]", "", { "dependencies": { "@oxc-project/types": "=0.147.0", "@rolldown/pluginutils": "^1.0.0" }, "optionalDependencies": { "@rolldown/binding-android-arm-eabi": "1.2.6", "@rolldown/binding-android-arm64": "1.2.6", "@rolldown/binding-darwin-arm64": "1.2.6", "@rolldown/binding-darwin-x64": "1.2.6", "@rolldown/binding-freebsd-x64": "1.2.6", "@rolldown/binding-linux-arm-gnueabihf": "1.2.6", "@rolldown/binding-linux-arm64-gnu": "1.2.6", "@rolldown/binding-linux-arm64-musl": "1.2.6", "@rolldown/binding-linux-ppc64-gnu": "1.2.6", "@rolldown/binding-linux-s390x-gnu": "1.2.6", "@rolldown/binding-linux-x64-gnu": "1.2.6", "@rolldown/binding-linux-x64-musl": "1.2.6", "@rolldown/binding-openharmony-arm64": "1.2.6", "@rolldown/binding-win32-arm64-msvc": "1.2.6", "@rolldown/binding-win32-x64-msvc": "1.2.6" }, "bin": { "rolldown": "./bin/cli.mjs" } }, "sha512-vMM4q3aixf46GiF1Kok8jDPFsEpXgFWGjUHXNkNHNm+Y2adXAG2dbX91jkti3i0ZRsOlcmbuzAz1poObSHCmUA=="],
"scheduler": ["[email protected]", "", {}, "sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q=="],
@@ -288,10 +312,14 @@
"tinyglobby": ["[email protected]", "", { "dependencies": { "fdir": "^6.5.0", "picomatch": "^4.0.4" } }, "sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g=="],
+ "tslib": ["[email protected]", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
+
"typescript": ["[email protected]", "", { "optionalDependencies": { "@typescript/typescript-aix-ppc64": "7.0.2", "@typescript/typescript-darwin-arm64": "7.0.2", "@typescript/typescript-darwin-x64": "7.0.2", "@typescript/typescript-freebsd-arm64": "7.0.2", "@typescript/typescript-freebsd-x64": "7.0.2", "@typescript/typescript-linux-arm": "7.0.2", "@typescript/typescript-linux-arm64": "7.0.2", "@typescript/typescript-linux-loong64": "7.0.2", "@typescript/typescript-linux-mips64el": "7.0.2", "@typescript/typescript-linux-ppc64": "7.0.2", "@typescript/typescript-linux-riscv64": "7.0.2", "@typescript/typescript-linux-s390x": "7.0.2", "@typescript/typescript-linux-x64": "7.0.2", "@typescript/typescript-netbsd-arm64": "7.0.2", "@typescript/typescript-netbsd-x64": "7.0.2", "@typescript/typescript-openbsd-arm64": "7.0.2", "@typescript/typescript-openbsd-x64": "7.0.2", "@typescript/typescript-sunos-x64": "7.0.2", "@typescript/typescript-win32-arm64": "7.0.2", "@typescript/typescript-win32-x64": "7.0.2" }, "bin": { "tsc": "bin/tsc" } }, "sha512-8FYau96o3NKOhbjKi/qNvG/W5jhzxkbdm5sj9AbZ/5T5sWqn3hJgLfGx27sRKZWTvyzCP8dLRBTf5tBTSRVUNA=="],
"undici-types": ["[email protected]", "", {}, "sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ=="],
+ "use-sync-external-store": ["[email protected]", "", { "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-6L+EeigHMQhdaIPNIFUKwfWJSwWFQ8gJbJ2DLOs5sDIegTwR9fRxvnM3uciHKjIZhFz+KAv2emhWMRvDmMcY8A=="],
+
"vgpu": ["[email protected]", "", { "dependencies": { "@modelcontextprotocol/server": "2.0.0", "@vgpu/adapter-mock": "0.3.1", "@vgpu/adapter-node": "0.3.1", "@vgpu/core": "0.3.1", "@vgpu/wgsl": "0.3.1", "@vgpu/wgsl-std": "0.3.1", "@webgpu/types": "^0.1.69", "pixelmatch": "^7.2.0", "pngjs": "^7.0.0", "wgpu-matrix": "^3.4.2", "zod": "^4.4.3" }, "bin": { "vgpu": "bin/vgpu.js" } }, "sha512-NeEETis2aCr0I9/8dy42lueNGNs3GZxL+0OmjLI82wlgPD/4WpW/XNX4xduc+ChxFqOJtjEYsz297VS9GmIuyA=="],
"vgpu-react": ["[email protected]", "", { "peerDependencies": { "react": ">=19", "vgpu": "^0.3.0" } }, "sha512-XtXKQf5fH0ylGFR3LLDDFdmxxGQu9jXnoG02sDfsePH/6N6oM539etWahB8mqzTqWCZfUIFAesqGQXavKrvhsg=="],
diff --git a/package.json b/package.json
index 9f4cd34..dabf5d2 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,8 @@
"test:browser": "playwright test"
},
"dependencies": {
+ "@base-ui/react": "^1.8.0",
+ "@dnd-kit/core": "^6.3.1",
"@fontsource-variable/geist": "^5.3.0",
"@tailwindcss/vite": "^4.3.3",
"@vercel/analytics": "^2.0.1",
diff --git a/playwright.config.ts b/playwright.config.ts
index 5dc080e..0509c7a 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -5,12 +5,11 @@ if (process.platform !== "darwin") {
args.push("--use-webgpu-adapter=swiftshader");
}
if (process.platform === "linux") {
- // Canvas presentation and image copies must use the same software Vulkan backend.
+ // Vulkan enables image transfers; ANGLE's SwiftShader path presents canvases in headless Chromium.
args.push(
"--enable-features=Vulkan",
- "--use-angle=vulkan",
+ "--use-angle=swiftshader",
"--use-vulkan=swiftshader",
- "--disable-vulkan-surface",
);
}
diff --git a/src/app/controls.ts b/src/app/controls.ts
index 1f66331..853752d 100644
--- a/src/app/controls.ts
+++ b/src/app/controls.ts
@@ -8,25 +8,47 @@ import { createImageLoader } from "@/app/loaders/image";
import { createLoaderRegistry } from "@/app/loaders/registry";
import type {
Adjustments,
+ Details,
+ Gradient,
Preview,
- Scene,
+ ProcessingLayer,
ToneCurve,
Vignette,
} from "@/core/document";
import type { WhiteBalance } from "@/core/image";
+import type { ImageFrame } from "@/core/image/frame";
import { setAdjustments } from "@/features/adjustments/edits";
import { defaultAdjustments } from "@/features/adjustments/model";
-import { resetColorMixer, setColorMixer } from "@/features/color-mixer/edits";
+import {
+ changeColorMixer,
+ resetColorMixer,
+ setColorMixer,
+} from "@/features/color-mixer/edits";
import {
defaultMixer,
type MixerChange,
type MixerColor,
} from "@/features/color-mixer/model";
+import { setDetails } from "@/features/details/edits";
+import { defaultDetails, validateDetails } from "@/features/details/model";
+import {
+ addLayer,
+ deleteLayer,
+ duplicateLayer,
+ type LayerPlacement,
+ moveLayer,
+ setExposure,
+ setLayer,
+ setLayerMask,
+ setMaskOperation,
+} from "@/features/layers/edits";
+import { defaultGradient } from "@/features/layers/gradient";
import { defaultCurve } from "@/features/tone-curves/curve";
import { setToneCurve } from "@/features/tone-curves/edits";
-import { setVignette } from "@/features/vignette/edits";
+import { setVignette, validateVignette } from "@/features/vignette/edits";
import { defaultVignette } from "@/features/vignette/model";
import { setWhiteBalance } from "@/features/white-balance/edits";
+import { createLayer, createMask, editEffect } from "./editor/layers";
import type { Workspace } from "./workspace";
/** Imperative commands bound to an explicit workspace, usable without React. */
@@ -43,20 +65,96 @@ export function createControls(gpu: Gpu, workspace: Workspace) {
openFile: (file: File) => files.openFiles([file]),
loadImage: (file: File) => files.loadFile(image, file),
importXmp: (file: File) => files.loadFile(xmp, file),
- setAdjustments: (change: Partial<Adjustments>) =>
- setAdjustments(workspace.getDocument(), change),
+ setDetails(change: Partial<Details>, id?: string) {
+ validateDetails(change);
+ const document = workspace.getDocument();
+ editEffect(
+ document,
+ "details",
+ id,
+ (id) => setDetails(document, change, id),
+ () => ({
+ ...createLayer("details"),
+ details: { ...defaultDetails, ...change },
+ }),
+ );
+ },
+ setAdjustments: (change: Partial<Adjustments>, id?: string) =>
+ setAdjustments(workspace.getDocument(), change, id),
setWhiteBalance: (change?: Partial<WhiteBalance>) =>
setWhiteBalance(workspace.getDocument(), change),
- setToneCurve: (curve?: ToneCurve) =>
- setToneCurve(workspace.getDocument(), curve),
- setColorMixer: (color: MixerColor, change: MixerChange) =>
- setColorMixer(workspace.getDocument(), color, change),
- resetColorMixer: () => resetColorMixer(workspace.getDocument()),
- setVignette: (change: Partial<Vignette>) =>
- setVignette(workspace.getDocument(), change),
- editScene(change: Partial<Scene>) {
+ setToneCurve: (curve?: ToneCurve, id?: string) =>
+ setToneCurve(workspace.getDocument(), curve, id),
+ setColorMixer(color: MixerColor, change: MixerChange, id?: string) {
+ const document = workspace.getDocument();
+ editEffect(
+ document,
+ "color-mixer",
+ id,
+ (id) => setColorMixer(document, color, change, id),
+ () => ({
+ ...createLayer("color-mixer"),
+ colorMixer: changeColorMixer(defaultMixer, color, change),
+ }),
+ );
+ },
+ resetColorMixer(id?: string) {
+ const document = workspace.getDocument();
+ const existing =
+ id ??
+ document.scene
+ .getState()
+ .layers.find((layer) => layer.kind === "color-mixer")?.id;
+ if (existing) {
+ resetColorMixer(document, existing);
+ }
+ },
+ setVignette(change: Partial<Vignette>, id?: string) {
+ const document = workspace.getDocument();
+ editEffect(
+ document,
+ "vignette",
+ id,
+ (id) => setVignette(document, change, id),
+ () => {
+ validateVignette(change);
+ return {
+ ...createLayer("vignette"),
+ vignette: { ...defaultVignette, ...change },
+ };
+ },
+ );
+ },
+ addLayer(kind: ProcessingLayer["kind"], placement?: LayerPlacement) {
const document = workspace.getDocument();
- document.edit({ ...document.scene.getState(), ...change });
+ if (kind !== "mask") {
+ return addLayer(document, createLayer(kind), placement);
+ }
+ const scene = document.scene.getState();
+ const [width, height] = document.resources.get(scene.layers[0].source)
+ .image.size;
+ const mask = createMask(defaultGradient([width, height]));
+ return addLayer(document, mask, placement);
+ },
+ setLayer: (id: string, change: Parameters<typeof setLayer>[2]) =>
+ setLayer(workspace.getDocument(), id, change),
+ setExposure: (id: string, exposure: number) =>
+ setExposure(workspace.getDocument(), id, exposure),
+ setLayerMask: (id: string, mask: Gradient) =>
+ setLayerMask(workspace.getDocument(), id, mask),
+ setMaskOperation: (id: string, operation: "add" | "subtract") =>
+ setMaskOperation(workspace.getDocument(), id, operation),
+ duplicateLayer: (id: string) => duplicateLayer(workspace.getDocument(), id),
+ deleteLayer: (id: string) => deleteLayer(workspace.getDocument(), id),
+ moveLayer: (id: string, index: number, parentId?: string) =>
+ moveLayer(workspace.getDocument(), id, index, parentId),
+ selectLayer: (id: string) => workspace.getDocument().selectLayer(id),
+ setFrame(frame: ImageFrame) {
+ const document = workspace.getDocument();
+ document.edit({
+ ...document.scene.getState(),
+ frame: structuredClone(frame),
+ });
},
setPreview: (change: Partial<Preview>) =>
workspace.getDocument().preview.setState(change),
@@ -74,13 +172,22 @@ export function createControls(gpu: Gpu, workspace: Workspace) {
file,
preview: document?.preview.getState(),
documentId: document?.id,
+ scene,
+ selectedLayerId: document?.selection.getState().layerId,
size: scene?.frame.size,
frame: scene?.frame,
- adjustments: scene?.adjustments ?? defaultAdjustments,
- whiteBalance: scene?.whiteBalance,
- toneCurve: scene?.toneCurve ?? defaultCurve,
- colorMixer: scene?.colorMixer ?? defaultMixer,
- vignette: scene?.vignette ?? defaultVignette,
+ adjustments: scene?.layers[0].adjustments ?? defaultAdjustments,
+ whiteBalance: scene?.layers[0].whiteBalance,
+ details:
+ scene?.layers.find((layer) => layer.kind === "details")?.details ??
+ defaultDetails,
+ toneCurve: scene?.layers[0].toneCurve ?? defaultCurve,
+ colorMixer:
+ scene?.layers.find((layer) => layer.kind === "color-mixer")
+ ?.colorMixer ?? defaultMixer,
+ vignette:
+ scene?.layers.find((layer) => layer.kind === "vignette")?.vignette ??
+ defaultVignette,
history: document?.history.status.getState() ?? {
undoCount: 0,
redoCount: 0,
diff --git a/src/app/editor/actions.tsx b/src/app/editor/actions.tsx
deleted file mode 100644
index 06c07be..0000000
--- a/src/app/editor/actions.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import { ComparisonControl } from "./comparison-control";
-import { HistoryControls } from "./history";
-
-/** Document actions shared by mode panels. */
-export function EditorActions() {
- return (
- <div className="flex shrink-0 items-center gap-2 bg-panel p-3">
- <HistoryControls />
- <ComparisonControl />
- </div>
- );
-}
diff --git a/src/app/editor/adjust/index.tsx b/src/app/editor/adjust/index.tsx
index 8d8cddd..4c10e15 100644
--- a/src/app/editor/adjust/index.tsx
+++ b/src/app/editor/adjust/index.tsx
@@ -1,100 +1,119 @@
-import { useEffect, useMemo } from "react";
+import { useCallback, useEffect, useMemo } from "react";
import { useGpu } from "vgpu-react";
-import { EditorActions } from "@/app/editor/actions";
+import { useStore } from "zustand";
+import { PanelHeader } from "@/components/editor/panel";
import { useRenderer } from "@/components/editor/pipeline";
-import {
- PanelContent,
- useDocument,
- useScene,
-} from "@/components/editor/session";
-import {
- AdjustmentControls,
- TemperatureControls,
-} from "@/features/adjustments/controls";
+import { useDocument, useScene } from "@/components/editor/session";
+import { Slider } from "@/components/ui/slider";
+import { adjustmentTarget, type Layer, type ToneCurve } from "@/core/document";
+import { AdjustmentControls } from "@/features/adjustments/controls";
import { ColorMixerControls } from "@/features/color-mixer/controls";
+import { DetailsControls } from "@/features/details/controls";
import { Histogram } from "@/features/histogram";
import { createHistogram } from "@/features/histogram/histogram";
+import { setExposure } from "@/features/layers/edits";
import { setToneCurve } from "@/features/tone-curves/edits";
import { ToneCurves } from "@/features/tone-curves/tone-curves";
import { VignetteControls } from "@/features/vignette/controls";
import { WhiteBalanceControls } from "@/features/white-balance/controls";
import { useEditGesture } from "@/hooks/use-edit-gesture";
-import { ClippingControls } from "./clipping-controls";
-const histogramColors = ["#f25445", "#6bd175", "#5c8ffa"] as const;
const curveHistogramColors = ["#a3a3a3"] as const;
-function ColorTemperatureControls() {
- const document = useDocument();
- const source = useScene((scene) => scene.source);
- if (document.resources.get(source).raw) {
- return <WhiteBalanceControls />;
- }
- return <TemperatureControls />;
+function CurveInputHistogram({ id }: { id: string }) {
+ const gpu = useGpu();
+ const renderer = useRenderer();
+ const histogram = useMemo(() => createHistogram(gpu), [gpu]);
+ const image = useCallback(() => renderer.inputImage(id), [renderer, id]);
+ useEffect(() => () => histogram.dispose(), [histogram]);
+ return (
+ <Histogram
+ histogram={histogram}
+ image={image}
+ subscribe={renderer.subscribe}
+ colors={curveHistogramColors}
+ working
+ fillOpacity={0.65}
+ aria-label="curve input histogram"
+ className="pointer-events-none absolute inset-0 h-full w-full opacity-25"
+ />
+ );
}
-function ToneCurvesPanel({
- histogram,
-}: {
- histogram: ReturnType<typeof createHistogram>;
-}) {
- const renderer = useRenderer();
- const toneCurve = useScene((scene) => scene.toneCurve);
+function LayerCurve({ id, toneCurve }: { id: string; toneCurve: ToneCurve }) {
const document = useDocument();
return (
- <ToneCurves
- points={toneCurve}
- onChange={(points) => setToneCurve(document, points)}
- >
- <Histogram
- histogram={histogram}
- image={renderer.inputImage}
- subscribe={renderer.subscribe}
- colors={curveHistogramColors}
- working
- fillOpacity={0.65}
- aria-label="input histogram"
- className="pointer-events-none absolute inset-0 h-full w-full opacity-25"
- />
- </ToneCurves>
+ <div className="px-3 pb-3">
+ <hr className="mb-3 border-black/50" />
+ <ToneCurves
+ points={toneCurve}
+ onChange={(points) => setToneCurve(document, points, id)}
+ >
+ <CurveInputHistogram id={id} />
+ </ToneCurves>
+ </div>
);
}
+function SelectedControls({ layer }: { layer: Layer }) {
+ const document = useDocument();
+ switch (layer.kind) {
+ case "details":
+ return <DetailsControls id={layer.id} details={layer.details} />;
+ case "image":
+ return (
+ <>
+ <AdjustmentControls
+ id={layer.id}
+ adjustments={layer.adjustments}
+ temperature={
+ document.resources.get(layer.source).raw && (
+ <WhiteBalanceControls />
+ )
+ }
+ />
+ <LayerCurve id={layer.id} toneCurve={layer.toneCurve} />
+ </>
+ );
+ case "color-mixer":
+ return <ColorMixerControls id={layer.id} mixer={layer.colorMixer} />;
+ case "vignette":
+ return <VignetteControls id={layer.id} vignette={layer.vignette} />;
+ case "exposure":
+ return (
+ <section className="p-3">
+ <Slider
+ label="Exposure"
+ value={layer.exposure}
+ min={-5}
+ max={5}
+ step={0.01}
+ defaultValue={0}
+ onChange={(value) => setExposure(document, layer.id, value)}
+ />
+ </section>
+ );
+ case "mask":
+ return (
+ <>
+ <AdjustmentControls id={layer.id} adjustments={layer.adjustments} />
+ <LayerCurve id={layer.id} toneCurve={layer.toneCurve} />
+ </>
+ );
+ }
+}
+
export function AdjustPanel() {
- const gpu = useGpu();
const document = useDocument();
const gesture = useEditGesture(document.history);
- const renderer = useRenderer();
- const histogram = useMemo(() => createHistogram(gpu), [gpu]);
- useEffect(() => () => histogram.dispose(), [histogram]);
+ const selected = useStore(document.selection, (state) => state.layerId);
+ const target = useScene(
+ (scene) => adjustmentTarget(scene.layers, selected) ?? scene.layers[0],
+ );
return (
- <PanelContent>
- <div className="flex min-h-0 flex-1 flex-col divide-y divide-black">
- <div
- {...gesture}
- className="min-h-0 flex-1 divide-y divide-black overflow-y-auto"
- >
- <section className="relative bg-neutral-900 p-0.5 pb-0">
- <ClippingControls />
- <Histogram
- histogram={histogram}
- image={renderer.outputImage}
- subscribe={renderer.subscribe}
- colors={histogramColors}
- fillOpacity={0.2}
- className="h-30 w-full"
- aria-label="output histogram"
- />
- </section>
- <AdjustmentControls
- curves={<ToneCurvesPanel histogram={histogram} />}
- colorMixer={<ColorMixerControls />}
- temperature={<ColorTemperatureControls />}
- />
- <VignetteControls />
- </div>
- <EditorActions />
- </div>
- </PanelContent>
+ <div {...gesture}>
+ <PanelHeader title="Adjustments" />
+ <SelectedControls layer={target} />
+ </div>
);
}
diff --git a/src/app/editor/canvas.tsx b/src/app/editor/canvas.tsx
index bb15618..66919b3 100644
--- a/src/app/editor/canvas.tsx
+++ b/src/app/editor/canvas.tsx
@@ -1,12 +1,29 @@
import { Image } from "@/components/editor/image";
import { useScene } from "@/components/editor/session";
import { EditorViewport } from "@/components/editor/viewport";
+import { GradientOverlay } from "@/features/layers/gradient-overlay";
+import { useGradientTool } from "@/features/layers/gradient-tool";
+import { LayerToolbar } from "@/features/layers/toolbar";
import { ComparisonDivider } from "./comparison-divider";
export function EditorCanvas() {
+ const tool = useGradientTool();
+ let gradientKey = "selection";
+ if (tool.target?.kind === "new") {
+ gradientKey = `new/${tool.target.shape}/${tool.target.parentId ?? "root"}/${tool.target.operation}`;
+ }
const size = useScene((scene) => scene.frame.size);
return (
- <EditorViewport size={size} overlay={<ComparisonDivider />}>
+ <EditorViewport
+ size={size}
+ overlay={
+ <>
+ <ComparisonDivider />
+ <LayerToolbar />
+ </>
+ }
+ tools={<GradientOverlay key={gradientKey} />}
+ >
<Image original="originalImage" />
</EditorViewport>
);
diff --git a/src/app/editor/adjust/clipping-controls.tsx b/src/app/editor/clipping-controls.tsx
similarity index 79%
rename from src/app/editor/adjust/clipping-controls.tsx
rename to src/app/editor/clipping-controls.tsx
index fdf4872..6023fa2 100644
--- a/src/app/editor/adjust/clipping-controls.tsx
+++ b/src/app/editor/clipping-controls.tsx
@@ -14,7 +14,7 @@ export function ClippingControls() {
aria-label={`Show clipped ${range}`}
title={`Show clipped ${range}`}
aria-pressed={state[range]}
- className="pointer-events-auto flex size-6 items-center justify-center rounded-sm bg-neutral-900/80 p-0 aria-pressed:bg-neutral-700 aria-pressed:text-white"
+ className="pointer-events-auto flex size-6 items-center justify-center rounded-sm bg-neutral-900/80 p-0 opacity-0 transition-opacity group-hover:opacity-100 focus-visible:opacity-100 aria-pressed:bg-neutral-700 aria-pressed:text-white aria-pressed:opacity-100 pointer-coarse:opacity-100"
onClick={() => preview.setState({ [range]: !state[range] })}
>
<svg
diff --git a/src/app/editor/comparison-control.tsx b/src/app/editor/comparison-control.tsx
index b7fdcfc..63e9958 100644
--- a/src/app/editor/comparison-control.tsx
+++ b/src/app/editor/comparison-control.tsx
@@ -58,10 +58,11 @@ export function ComparisonControl() {
return (
<Button
variant="ghost"
+ size="icon"
aria-label="Compare before and after"
aria-pressed={comparison !== "edited"}
title="Compare before and after (hold backslash for original)"
- className="flex size-8 items-center justify-center rounded-md p-0 aria-pressed:bg-neutral-700 aria-pressed:text-neutral-100"
+ className="aria-pressed:bg-neutral-700 aria-pressed:text-neutral-100"
onClick={() =>
preview.setState({
comparison: comparison === "split" ? "edited" : "split",
@@ -71,7 +72,7 @@ export function ComparisonControl() {
<svg
aria-hidden="true"
viewBox="0 0 20 20"
- className="size-5"
+ className="size-4"
fill="none"
stroke="currentColor"
strokeWidth="1.5"
diff --git a/src/app/editor/comparison-divider.tsx b/src/app/editor/comparison-divider.tsx
index 39d06cd..f15e6c7 100644
--- a/src/app/editor/comparison-divider.tsx
+++ b/src/app/editor/comparison-divider.tsx
@@ -63,10 +63,10 @@ export function ComparisonDivider() {
}}
>
<div className="absolute inset-y-0 w-px bg-white/90 shadow-[0_0_3px_#000]" />
- <span className="absolute top-4 right-6 rounded bg-black/50 px-2 py-1 text-[10px] text-white">
+ <span className="absolute right-6 bottom-4 rounded bg-black/50 px-1.5 py-0.5 text-white">
Before
</span>
- <span className="absolute top-4 left-6 rounded bg-black/50 px-2 py-1 text-[10px] text-white">
+ <span className="absolute bottom-4 left-6 rounded bg-black/50 px-1.5 py-0.5 text-white">
After
</span>
<span className="relative flex size-7 items-center justify-center rounded-full border border-white/80 bg-neutral-900 text-white shadow-md group-focus-visible:ring-2 group-focus-visible:ring-white">
diff --git a/src/app/editor/export/export-image.ts b/src/app/editor/export/export-image.ts
index 0b413ff..53d6421 100644
--- a/src/app/editor/export/export-image.ts
+++ b/src/app/editor/export/export-image.ts
@@ -111,7 +111,7 @@ export async function exportImage(
options: ExportOptions = {},
) {
const scene = document.scene.getState();
- const source = document.resources.get(scene.source);
+ const source = document.resources.get(scene.layers[0].source);
const renderer = createEditorRenderer(gpu, source);
try {
await renderer.update(scene);
diff --git a/src/app/editor/export/index.tsx b/src/app/editor/export/index.tsx
index fa9f8f2..fe6e23d 100644
--- a/src/app/editor/export/index.tsx
+++ b/src/app/editor/export/index.tsx
@@ -2,11 +2,8 @@ import { cn } from "cn";
import { type ReactNode, useMemo, useRef, useState } from "react";
import { useGpu } from "vgpu-react";
import { Image } from "@/components/editor/image";
-import {
- PanelContent,
- useDocument,
- useScene,
-} from "@/components/editor/session";
+import { EditorPanel, PanelHeader } from "@/components/editor/panel";
+import { useDocument, useScene } from "@/components/editor/session";
import { EditorViewport } from "@/components/editor/viewport";
import Button from "@/components/ui/button";
import { Field } from "@/components/ui/field";
@@ -14,6 +11,7 @@ import { ScrubInput } from "@/components/ui/scrub-input";
import { Slider } from "@/components/ui/slider";
import Spinner from "@/components/ui/spinner";
import type { Point } from "@/core/image/frame";
+import { useShortcuts } from "@/hooks/use-shortcuts";
import { type ExportFormat, exportImage, exportSize } from "./export-image";
import { useEncodedPreview } from "./preview";
@@ -72,7 +70,7 @@ function FormatSelect({
}) {
return (
<div className="space-y-2">
- <label className="flex items-center justify-between text-neutral-400 text-sm">
+ <label className="flex items-center justify-between text-neutral-400">
Format
<Field className="relative w-28">
<select
@@ -91,7 +89,7 @@ function FormatSelect({
</select>
</Field>
</label>
- <p className="text-neutral-500 text-xs">{value.description}</p>
+ <p className="text-neutral-500">{value.description}</p>
</div>
);
}
@@ -115,7 +113,7 @@ function SizeFields({
const scaleTo = (fraction: number) =>
onChange(Math.max(1, Math.round(maxEdge * fraction)));
return (
- <div className="grid grid-cols-[auto_1fr_1.5rem] items-center gap-x-3 gap-y-2 text-neutral-400 text-sm">
+ <div className="grid grid-cols-[auto_1fr_1.5rem] items-center gap-x-3 gap-y-2 text-neutral-400">
<span>Width</span>
<div className="justify-self-end">
<ScrubInput
@@ -126,7 +124,7 @@ function SizeFields({
onChange={(value) => scaleTo(value / fullWidth)}
/>
</div>
- <span className="text-neutral-500 text-xs">px</span>
+ <span className="text-neutral-500">px</span>
<span>Height</span>
<div className="justify-self-end">
<ScrubInput
@@ -137,7 +135,7 @@ function SizeFields({
onChange={(value) => scaleTo(value / fullHeight)}
/>
</div>
- <span className="text-neutral-500 text-xs">px</span>
+ <span className="text-neutral-500">px</span>
<span>Scale</span>
<div className="justify-self-end">
<ScrubInput
@@ -148,7 +146,7 @@ function SizeFields({
onChange={(value) => scaleTo(value / 100)}
/>
</div>
- <span className="text-neutral-500 text-xs">%</span>
+ <span className="text-neutral-500">%</span>
{children}
</div>
);
@@ -163,7 +161,7 @@ function LoadingOverlay() {
}
/** Shows the encoded file on the canvas; a spinner marks results from earlier settings as loading. */
-export function ExportMode() {
+export function ExportMode({ onClose }: { onClose: () => void }) {
const gpu = useGpu();
const editorDocument = useDocument();
const size = useScene((scene) => scene.frame.size);
@@ -178,6 +176,7 @@ export function ExportMode() {
const options = { format: format.id, quality, longEdge: edge };
const output = useMemo(() => exportSize(size, edge), [size, edge]);
const { encoded, pending } = useEncodedPreview(options);
+ useShortcuts({ escape: onClose });
const save = async () => {
if (exporting.current) {
return;
@@ -208,10 +207,10 @@ export function ExportMode() {
>
{encoded && <Image image={encoded.image} />}
</EditorViewport>
- <PanelContent>
+ <EditorPanel header={<PanelHeader title="Export" onClose={onClose} />}>
<section
aria-label="Export settings"
- className="flex min-h-0 flex-1 flex-col gap-5 overflow-y-auto p-4"
+ className="flex flex-col gap-5 p-4"
>
<FormatSelect value={format} onChange={setFormat} />
{format.lossy && (
@@ -240,12 +239,12 @@ export function ExportMode() {
Save image
</Button>
{error && (
- <p className="text-red-400 text-sm" role="alert">
+ <p className="text-red-400" role="alert">
{error}
</p>
)}
</section>
- </PanelContent>
+ </EditorPanel>
</>
);
}
diff --git a/src/app/editor/header.tsx b/src/app/editor/header.tsx
new file mode 100644
index 0000000..a95383a
--- /dev/null
+++ b/src/app/editor/header.tsx
@@ -0,0 +1,25 @@
+import type { ReactNode } from "react";
+
+/** Identity on the left, document actions on the right; present in every editor state. */
+export function EditorHeader({
+ file,
+ children,
+}: {
+ file?: string;
+ children?: ReactNode;
+}) {
+ return (
+ <header className="flex h-11 shrink-0 items-center gap-3 border-black border-b bg-panel px-3">
+ <span className="flex items-center gap-2">
+ <img src="/logo.svg" alt="" className="size-5" />
+ <span className="font-medium text-neutral-200">OpenLight</span>
+ </span>
+ {file && (
+ <span className="min-w-0 truncate text-neutral-500" title={file}>
+ {file}
+ </span>
+ )}
+ <div className="ml-auto flex items-center gap-1">{children}</div>
+ </header>
+ );
+}
diff --git a/src/app/editor/histogram.tsx b/src/app/editor/histogram.tsx
new file mode 100644
index 0000000..3850779
--- /dev/null
+++ b/src/app/editor/histogram.tsx
@@ -0,0 +1,32 @@
+import { useEffect, useMemo } from "react";
+import { useGpu } from "vgpu-react";
+import { useRenderer } from "@/components/editor/pipeline";
+import { Histogram } from "@/features/histogram";
+import { createHistogram } from "@/features/histogram/histogram";
+import { ClippingControls } from "./clipping-controls";
+
+const colors = ["#f25445", "#6bd175", "#5c8ffa"] as const;
+
+export function ImageHistogram() {
+ const gpu = useGpu();
+ const renderer = useRenderer();
+ const histogram = useMemo(() => createHistogram(gpu), [gpu]);
+ useEffect(() => () => histogram.dispose(), [histogram]);
+ return (
+ <section
+ aria-label="Image histogram"
+ className="group relative shrink-0 border-b border-black bg-neutral-900"
+ >
+ <ClippingControls />
+ <Histogram
+ histogram={histogram}
+ image={renderer.outputImage}
+ subscribe={renderer.subscribe}
+ colors={colors}
+ fillOpacity={0.2}
+ className="h-25 w-full"
+ aria-label="output histogram"
+ />
+ </section>
+ );
+}
diff --git a/src/app/editor/history.tsx b/src/app/editor/history.tsx
index e851f60..44b3fbc 100644
--- a/src/app/editor/history.tsx
+++ b/src/app/editor/history.tsx
@@ -17,7 +17,8 @@ export function HistoryControls() {
<fieldset aria-label="History" className="flex items-center gap-0.5">
<Button
variant="ghost"
- className="flex size-8 items-center justify-center rounded-md p-0 disabled:pointer-events-none disabled:opacity-25"
+ size="icon"
+ className="disabled:pointer-events-none disabled:opacity-25"
aria-label="Undo"
title="Undo (Ctrl/⌘ Z)"
disabled={!undoCount}
@@ -29,7 +30,8 @@ export function HistoryControls() {
</Button>
<Button
variant="ghost"
- className="flex size-8 items-center justify-center rounded-md p-0 disabled:pointer-events-none disabled:opacity-25"
+ size="icon"
+ className="disabled:pointer-events-none disabled:opacity-25"
aria-label="Redo"
title="Redo (Ctrl/⌘ Shift Z)"
disabled={!redoCount}
diff --git a/src/app/editor/index.tsx b/src/app/editor/index.tsx
index 794ff96..e3d42ca 100644
--- a/src/app/editor/index.tsx
+++ b/src/app/editor/index.tsx
@@ -1,33 +1,135 @@
+import type { ReactNode } from "react";
import type { Workspace } from "@/app/workspace";
+import { EditorPanel } from "@/components/editor/panel";
import { RendererProvider } from "@/components/editor/pipeline";
-import { DocumentProvider, EditorPanel } from "@/components/editor/session";
+import { DocumentProvider, useDocument } from "@/components/editor/session";
+import Button from "@/components/ui/button";
import ResizablePanel from "@/components/ui/resizable-panel";
import Spinner from "@/components/ui/spinner";
+import type { EffectLayer, Gradient } from "@/core/document";
+import { findLayer } from "@/core/document";
+import { LayersControls } from "@/features/layers/controls";
+import { addLayer } from "@/features/layers/edits";
+import {
+ GradientProvider,
+ useGradientTool,
+} from "@/features/layers/gradient-tool";
+import { useShortcuts } from "@/hooks/use-shortcuts";
import { EditorCanvas } from "./canvas";
+import { ComparisonControl } from "./comparison-control";
+import { EditorHeader } from "./header";
+import { ImageHistogram } from "./histogram";
+import { HistoryControls } from "./history";
+import { createLayer, createMask } from "./layers";
import { ModeRail } from "./mode-rail";
-import { ModeProvider, useMode } from "./modes";
+import { type Mode, ModeProvider, modes, useMode } from "./modes";
import { createEditorRenderer } from "./renderer";
+function EditorSidebar({ children }: { children: ReactNode }) {
+ const document = useDocument();
+ function add(kind: EffectLayer["kind"]) {
+ const scene = document.scene.getState();
+ const selected = document.selection.getState().layerId;
+ const layer = findLayer(scene.layers, selected);
+ const placement =
+ layer?.kind === "mask" && scene.layers.includes(layer)
+ ? { inside: selected }
+ : { above: selected };
+ addLayer(document, createLayer(kind), placement);
+ }
+ return (
+ <EditorPanel
+ header={<ImageHistogram />}
+ footer={<LayersControls onAdd={add} />}
+ >
+ {children}
+ </EditorPanel>
+ );
+}
+
+/** A View replaces the canvas and sidebar; a Panel fills the sidebar beside the canvas. */
function ModeView() {
- const { mode } = useMode();
+ const { mode, setMode } = useMode();
+ const tool = useGradientTool();
+ useShortcuts({
+ l: () => {
+ setMode(modes[0]);
+ tool.draw();
+ },
+ r: () => {
+ setMode(modes[0]);
+ tool.draw("radial");
+ },
+ });
+ function close() {
+ setMode(modes[0]);
+ if (window.document.activeElement instanceof HTMLElement) {
+ window.document.activeElement.blur();
+ }
+ }
if ("View" in mode) {
- return <mode.View />;
+ return <mode.View onClose={close} />;
}
return (
<>
<EditorCanvas />
- <mode.Panel />
+ <EditorSidebar>
+ <mode.Panel />
+ </EditorSidebar>
</>
);
}
-function DocumentEditor() {
+function ExportButton() {
+ const { mode, setMode } = useMode();
+ const target: Mode = mode.id === "export" ? modes[0] : modes[2];
+ return (
+ <Button
+ aria-pressed={mode.id === "export"}
+ title="Export (E)"
+ className="ml-1 aria-pressed:bg-neutral-600"
+ onClick={() => setMode(target)}
+ >
+ Export
+ </Button>
+ );
+}
+
+function DocumentEditor({ file }: { file: string }) {
+ const document = useDocument();
+ function addMask(
+ mask: Gradient,
+ target: { parentId?: string; operation: "add" | "subtract" },
+ ) {
+ const scene = document.scene.getState();
+ const selected = document.selection.getState().layerId;
+ // A new top-level mask goes above the selection's root ancestor.
+ const root =
+ scene.layers.find((item) => findLayer([item], selected)) ??
+ scene.layers[0];
+ const placement = target.parentId
+ ? { inside: target.parentId }
+ : { above: root.id };
+ addLayer(document, createMask(mask, target.operation), placement);
+ }
return (
- <ModeProvider>
- <ModeView />
- <EditorPanel />
- <ModeRail />
- </ModeProvider>
+ <GradientProvider onCreate={addMask}>
+ <ModeProvider>
+ <EditorHeader file={file}>
+ <HistoryControls />
+ <hr
+ aria-orientation="vertical"
+ className="mx-1 h-4 w-px border-0 bg-neutral-600"
+ />
+ <ComparisonControl />
+ <ExportButton />
+ </EditorHeader>
+ <div className="flex min-h-0 flex-1 flex-col md:flex-row">
+ <ModeRail />
+ <ModeView />
+ </div>
+ </ModeProvider>
+ </GradientProvider>
);
}
@@ -47,23 +149,26 @@ function EditorContent({ state }: EditorProps) {
return (
<DocumentProvider key={state.document.id} value={state.document}>
<RendererProvider createRenderer={createEditorRenderer}>
- <DocumentEditor />
+ <DocumentEditor file={state.file} />
</RendererProvider>
</DocumentProvider>
);
}
return (
<>
- <div className="grid flex-1 place-items-center">
- <LoadingStatus state={state} />
+ <EditorHeader file={state.file} />
+ <div className="flex min-h-0 flex-1 flex-col md:flex-row">
+ <div className="grid flex-1 place-items-center">
+ <LoadingStatus state={state} />
+ </div>
+ <ResizablePanel />
</div>
- <ResizablePanel />
</>
);
}
export default function Editor({ state }: EditorProps) {
return (
- <main className="flex h-dvh flex-col md:flex-row">
+ <main className="flex h-dvh flex-col">
<EditorContent state={state} />
</main>
);
diff --git a/src/app/editor/layers.ts b/src/app/editor/layers.ts
new file mode 100644
index 0000000..cc19250
--- /dev/null
+++ b/src/app/editor/layers.ts
@@ -0,0 +1,71 @@
+import type {
+ EditorDocument,
+ EffectLayer,
+ Gradient,
+ MaskLayer,
+ ProcessingLayer,
+} from "@/core/document";
+import { defaultAdjustments } from "@/features/adjustments/model";
+import { defaultMixer } from "@/features/color-mixer/model";
+import { defaultDetails } from "@/features/details/model";
+import { defaultCurve } from "@/features/tone-curves/curve";
+
+function baseLayer() {
+ return { id: crypto.randomUUID(), visible: true, opacity: 1, children: [] };
+}
+
+export function createLayer<K extends EffectLayer["kind"]>(
+ kind: K,
+): Extract<EffectLayer, { kind: K }>;
+export function createLayer(kind: EffectLayer["kind"]): EffectLayer {
+ const base = baseLayer();
+ switch (kind) {
+ case "details":
+ return { ...base, kind, name: "Details", details: { ...defaultDetails } };
+ case "exposure":
+ return { ...base, kind, name: "Exposure", exposure: 1 };
+ case "vignette":
+ return {
+ ...base,
+ kind,
+ name: "Vignette",
+ vignette: { intensity: 50, softness: 50 },
+ };
+ case "color-mixer":
+ return { ...base, kind, name: "Color Mixer", colorMixer: defaultMixer };
+ default:
+ throw Error("Unknown layer kind.");
+ }
+}
+
+export function createMask(
+ mask: Gradient,
+ operation: MaskLayer["operation"] = "add",
+): MaskLayer {
+ return {
+ ...baseLayer(),
+ kind: "mask",
+ name: mask.kind === "radial" ? "Radial Gradient" : "Linear Gradient",
+ operation,
+ adjustments: { ...defaultAdjustments },
+ toneCurve: defaultCurve,
+ mask,
+ };
+}
+
+/** Convenience commands address the first root effect of a kind or create one on top of the stack. */
+export function editEffect(
+ document: EditorDocument,
+ kind: ProcessingLayer["kind"],
+ id: string | undefined,
+ edit: (id: string) => void,
+ create: () => ProcessingLayer,
+) {
+ const scene = document.scene.getState();
+ const existing = id ?? scene.layers.find((layer) => layer.kind === kind)?.id;
+ if (existing) {
+ edit(existing);
+ return;
+ }
+ document.edit({ ...scene, layers: [...scene.layers, create()] });
+}
diff --git a/src/app/editor/mode-rail.tsx b/src/app/editor/mode-rail.tsx
index 3301cce..110800d 100644
--- a/src/app/editor/mode-rail.tsx
+++ b/src/app/editor/mode-rail.tsx
@@ -7,17 +7,17 @@ function ModeTab({ entry }: { entry: Mode }) {
return (
<Tab
selected={entry === mode}
+ size="icon"
+ aria-label={entry.label}
title={`${entry.label} (${entry.key.toUpperCase()})`}
onClick={() => setMode(entry)}
- className="flex min-w-16 flex-1 flex-col items-center gap-0.5 rounded-md px-0 py-1.5 md:min-w-0 md:flex-none md:py-2"
>
<entry.Icon className="size-5" />
- {entry.label}
</Tab>
);
}
-/** A column at the window's right edge on desktop, a scrollable bar below the panel on mobile. Letter shortcuts work anywhere. */
+/** Icon tabs in a column at the window's left edge on desktop, a bar above the canvas on mobile; titles carry the label and shortcut. */
export function ModeRail() {
const { setMode } = useMode();
useShortcuts(
@@ -26,19 +26,14 @@ export function ModeRail() {
),
);
const editing = modes.filter((entry) => entry.group === "edit");
- const output = modes.filter((entry) => entry.group === "output");
return (
<TabList
aria-label="Editor mode"
- className="shrink-0 overflow-auto border-black border-t bg-panel p-2 shadow-ridge md:w-17.5 md:flex-col md:border-t-0 md:border-l"
+ className="shrink-0 overflow-auto border-black border-b bg-panel p-1.5 md:w-11 md:flex-col md:border-r md:border-b-0"
>
{editing.map((entry) => (
<ModeTab key={entry.id} entry={entry} />
))}
- <div className="my-1 w-px shrink-0 bg-black md:my-0 md:w-auto md:flex-1 md:bg-transparent" />
- {output.map((entry) => (
- <ModeTab key={entry.id} entry={entry} />
- ))}
</TabList>
);
}
diff --git a/src/app/editor/modes.tsx b/src/app/editor/modes.tsx
index 08065ac..26b4ded 100644
--- a/src/app/editor/modes.tsx
+++ b/src/app/editor/modes.tsx
@@ -1,12 +1,9 @@
import { createContext, type ReactNode, useContext, useState } from "react";
-import { PanelContent } from "@/components/editor/session";
import { AdjustIcon } from "@/components/icons/adjust";
import { CropIcon } from "@/components/icons/crop";
import { ExportIcon } from "@/components/icons/export";
-import { LayersIcon } from "@/components/icons/layers";
-import { RetouchIcon } from "@/components/icons/retouch";
import { CropEditor } from "@/features/crop/view";
-import { EditorActions } from "./actions";
+import { useGradientTool } from "@/features/layers/gradient-tool";
import { AdjustPanel } from "./adjust";
import { ExportMode } from "./export";
@@ -23,19 +20,6 @@ export function useMode() {
return context;
}
-function PlaceholderPanel() {
- return (
- <PanelContent>
- <div className="flex min-h-0 flex-1 flex-col divide-y divide-black">
- <p className="grid flex-1 place-items-center text-neutral-500 text-sm">
- Coming soon
- </p>
- <EditorActions />
- </div>
- </PanelContent>
- );
-}
-
const adjust = {
id: "adjust",
label: "Adjust",
@@ -45,40 +29,19 @@ const adjust = {
Panel: AdjustPanel,
} as const;
-function CropMode() {
- const { setMode } = useMode();
- return <CropEditor onClose={() => setMode(adjust)} />;
-}
-
/**
- * A mode edits over the shared canvas through a Panel, or brings its own View when it needs another viewport.
- * Output modes sit at the end of the rail, apart from editing modes.
+ * A mode edits over the shared canvas through a Panel, or brings its own View with a viewport and panel.
+ * The output mode opens from the header rather than the rail.
*/
export const modes = [
adjust,
- {
- id: "layers",
- label: "Layers",
- key: "l",
- Icon: LayersIcon,
- group: "edit",
- Panel: PlaceholderPanel,
- },
- {
- id: "retouch",
- label: "Retouch",
- key: "r",
- Icon: RetouchIcon,
- group: "edit",
- Panel: PlaceholderPanel,
- },
{
id: "crop",
label: "Crop",
key: "c",
Icon: CropIcon,
group: "edit",
- View: CropMode,
+ View: CropEditor,
},
{
id: "export",
@@ -93,6 +56,11 @@ export const modes = [
export type Mode = (typeof modes)[number];
export function ModeProvider({ children }: { children: ReactNode }) {
- const [mode, setMode] = useState<Mode>(adjust);
+ const [mode, updateMode] = useState<Mode>(adjust);
+ const tool = useGradientTool();
+ function setMode(mode: Mode) {
+ tool.close();
+ updateMode(mode);
+ }
return <ModeContext value={{ mode, setMode }}>{children}</ModeContext>;
}
diff --git a/src/app/editor/renderer.ts b/src/app/editor/renderer.ts
index 5b07cb8..a47ba7e 100644
--- a/src/app/editor/renderer.ts
+++ b/src/app/editor/renderer.ts
@@ -1,18 +1,130 @@
import type { Gpu, Timer } from "vgpu";
+import type { MaskLayer, ProcessingLayer } from "@/core/document";
import type { ImageSource } from "@/core/image";
import {
createRenderer,
input,
+ mixAdjustment,
pipeline,
+ type RenderImage,
transformImages,
} from "@/core/renderer";
+import { exposure } from "@/features/adjustments/exposure";
+import { defaultAdjustments } from "@/features/adjustments/model";
import { adjustments } from "@/features/adjustments/pass";
-import { unsharpMask } from "@/features/adjustments/unsharp-mask";
import { colorMixer } from "@/features/color-mixer/pass";
+import { unsharpMask } from "@/features/details/unsharp-mask";
import { toneCurves } from "@/features/tone-curves/pass";
import { vignette } from "@/features/vignette/pass";
-/** The same graph composition powers the editing preview and export. */
+function maskAdjustments(layer: MaskLayer) {
+ const name = `layer/${layer.id}`;
+ const values = layer.adjustments;
+ const hasOtherAdjustments = Object.entries(values).some(
+ ([key, value]) =>
+ key !== "exposure" && value !== Reflect.get(defaultAdjustments, key),
+ );
+ if (hasOtherAdjustments) {
+ return adjustments(values, `${name}/adjustments`);
+ }
+ return exposure(`${name}/exposure`, values.exposure);
+}
+
+type Composition = {
+ image: RenderImage;
+ input?: RenderImage;
+};
+
+function composeLayer(
+ below: RenderImage,
+ layer: ProcessingLayer,
+ inputId?: string,
+): Composition {
+ if (!layer.visible || layer.opacity === 0) {
+ return { image: below };
+ }
+ const name = `layer/${layer.id}`;
+ let input: RenderImage | undefined;
+ let edited = below;
+ switch (layer.kind) {
+ case "details":
+ edited = pipeline(below, [
+ unsharpMask(`${name}/clarity`, layer.details.clarity / 200, 64, 16),
+ unsharpMask(
+ `${name}/sharpen`,
+ layer.details.sharpening / 50,
+ layer.details.sharpenRadius,
+ ),
+ ]);
+ break;
+ case "mask": {
+ const adjusted = pipeline(below, [maskAdjustments(layer)]);
+ if (layer.id === inputId) {
+ input = adjusted;
+ }
+ edited = pipeline(adjusted, [
+ toneCurves(layer.toneCurve, `${name}/curves`),
+ ]);
+ break;
+ }
+ case "exposure":
+ edited = pipeline(below, [exposure(`${name}/exposure`, layer.exposure)]);
+ break;
+ case "vignette":
+ edited = pipeline(below, [vignette(layer.vignette, `${name}/vignette`)]);
+ break;
+ case "color-mixer":
+ edited = pipeline(below, [
+ colorMixer(layer.colorMixer, `${name}/color-mixer`),
+ ]);
+ break;
+ }
+ const masks: MaskLayer[] = [];
+ for (const child of layer.children) {
+ if (layer.kind === "mask" && child.kind === "mask") {
+ if (child.visible && child.opacity > 0) {
+ masks.push(child);
+ }
+ } else {
+ const childComposition = composeLayer(edited, child, inputId);
+ edited = childComposition.image;
+ input ??= childComposition.input;
+ }
+ }
+
+ return {
+ image: mixAdjustment(
+ `${name}/mix`,
+ below,
+ edited,
+ layer.opacity,
+ layer.kind === "mask" ? layer.mask : undefined,
+ masks,
+ ),
+ input,
+ };
+}
+
+function composeLayers(
+ below: RenderImage,
+ layers: readonly ProcessingLayer[],
+ inputId?: string,
+): Composition {
+ let image = below;
+ let input: RenderImage | undefined;
+ for (const layer of layers) {
+ const composition = composeLayer(image, layer, inputId);
+ image = composition.image;
+ input ??= composition.input;
+ }
+ return { image, input };
+}
+
+/**
+ * Pure layer composition shares the same graph for preview, crop, and export.
+ * Layers process the source; the image layer's adjustments and curve then tone the composite,
+ * so a local exposure still sees the light a global exposure would push past white.
+ */
export function createEditorRenderer(
gpu: Gpu,
source: ImageSource,
@@ -21,24 +133,30 @@ export function createEditorRenderer(
return createRenderer(
gpu,
source,
- (image, scene) => {
- const adjusted = pipeline(image, [adjustments(scene.adjustments)]);
+ (image, scene, inputId) => {
+ const [sourceLayer, ...layers] = scene.layers;
+ const name = `layer/${sourceLayer.id}`;
+ const children = composeLayers(image, sourceLayer.children, inputId);
+ const composition = composeLayers(children.image, layers, inputId);
+ const adjusted = pipeline(composition.image, [
+ adjustments(sourceLayer.adjustments, `${name}/adjustments`),
+ ]);
const full = pipeline(adjusted, [
- toneCurves(scene.toneCurve),
- colorMixer(scene.colorMixer),
- vignette(scene.vignette),
- unsharpMask("clarity", scene.adjustments.clarity / 200, 64, 16),
- unsharpMask(
- "sharpen",
- scene.adjustments.sharpening / 50,
- scene.adjustments.sharpenRadius,
- ),
+ toneCurves(sourceLayer.toneCurve, `${name}/curves`),
]);
- const [original, beforeCurves, output] = transformImages(
- [input(source.image), adjusted, full],
+ const [original, output] = transformImages(
+ [input(source.image), full],
scene.frame,
);
- return { original, input: beforeCurves, full, output };
+ return {
+ original,
+ full,
+ output,
+ input:
+ inputId === sourceLayer.id
+ ? adjusted
+ : (children.input ?? composition.input),
+ };
},
timer,
);
diff --git a/src/app/loaders/camera-raw-xmp.ts b/src/app/loaders/camera-raw-xmp.ts
index bd9de6e..dd0313f 100644
--- a/src/app/loaders/camera-raw-xmp.ts
+++ b/src/app/loaders/camera-raw-xmp.ts
@@ -1,18 +1,20 @@
+import { createLayer, editEffect } from "@/app/editor/layers";
import type { Workspace } from "@/app/workspace";
-import type { Adjustments } from "@/core/document";
+import type { Adjustments, EditorDocument } from "@/core/document";
import { setAdjustments } from "@/features/adjustments/edits";
import {
type CameraRawXmp,
isCameraRawXmp,
readCameraRawXmp,
} from "@/features/camera-raw-xmp/xmp";
+import { setDetails } from "@/features/details/edits";
+import { defaultDetails, validateDetails } from "@/features/details/model";
import type { FileLoader } from "./registry";
function toAdjustments(xmp: CameraRawXmp): Partial<Adjustments> {
const adjustments: Partial<Adjustments> = {
exposure: xmp.exposure2012,
contrast: xmp.contrast2012,
- clarity: xmp.clarity2012,
highlights: xmp.highlights2012,
shadows: xmp.shadows2012,
whites: xmp.whites2012,
@@ -25,6 +27,27 @@ function toAdjustments(xmp: CameraRawXmp): Partial<Adjustments> {
);
}
+function applyClarity(document: EditorDocument, clarity: number) {
+ validateDetails({ clarity });
+ const scene = document.scene.getState();
+ if (
+ clarity === 0 &&
+ !scene.layers.some((layer) => layer.kind === "details")
+ ) {
+ return;
+ }
+ editEffect(
+ document,
+ "details",
+ undefined,
+ (id) => setDetails(document, { clarity }, id),
+ () => ({
+ ...createLayer("details"),
+ details: { ...defaultDetails, clarity },
+ }),
+ );
+}
+
export function createCameraRawXmpLoader(workspace: Workspace): FileLoader {
return {
kind: "settings",
@@ -34,10 +57,22 @@ export function createCameraRawXmpLoader(workspace: Workspace): FileLoader {
throw new Error("importXmp requires a File.");
}
const document = workspace.getDocument();
- const adjustments = toAdjustments(readCameraRawXmp(await file.text()));
- if (workspace.state.getState().document === document) {
- document.history.commit();
+ const xmp = readCameraRawXmp(await file.text());
+ const adjustments = toAdjustments(xmp);
+ if (workspace.state.getState().document !== document) {
+ return;
+ }
+ document.history.commit();
+ document.history.begin();
+ try {
setAdjustments(document, adjustments);
+ if (xmp.clarity2012 !== undefined) {
+ applyClarity(document, xmp.clarity2012);
+ }
+ document.history.commit();
+ } catch (error) {
+ document.history.cancel();
+ throw error;
}
},
};
diff --git a/src/app/loaders/image.ts b/src/app/loaders/image.ts
index bd4e871..8451718 100644
--- a/src/app/loaders/image.ts
+++ b/src/app/loaders/image.ts
@@ -22,10 +22,18 @@ export function createImageLoader(gpu: Gpu, workspace: Workspace): FileLoader {
return createDocument(
{
frame: imageFrame(decoded.image.size),
- whiteBalance: decoded.raw?.asShot,
- source,
- adjustments: { ...defaultAdjustments },
- toneCurve: defaultCurve,
+ layers: [
+ {
+ kind: "image",
+ name: file.name,
+ children: [],
+ id: crypto.randomUUID(),
+ whiteBalance: decoded.raw?.asShot,
+ source,
+ adjustments: { ...defaultAdjustments },
+ toneCurve: defaultCurve,
+ },
+ ],
},
resources,
);
diff --git a/src/components/editor/image.tsx b/src/components/editor/image.tsx
index 4b4fe55..7c3c19b 100644
--- a/src/components/editor/image.tsx
+++ b/src/components/editor/image.tsx
@@ -6,10 +6,10 @@ import type { ImageFrame } from "@/core/image/frame";
import { createDisplay } from "@/core/renderer";
import { fitScale } from "@/hooks/use-pan-zoom";
import { useRenderer } from "./pipeline";
-import { useDocument } from "./session";
+import { useDocument, useScene } from "./session";
import { useViewport } from "./viewport";
-type Output = "fullImage" | "inputImage" | "outputImage" | "originalImage";
+type Output = "fullImage" | "outputImage" | "originalImage";
/** Mount a pipeline output or any target; a supplied frame places the full source behind it. */
export function Image({
@@ -25,9 +25,15 @@ export function Image({
const gpu = useGpu();
const canvas = useCanvas();
const camera = useViewport();
- const preview = useStore(useDocument().preview);
+ const document = useDocument();
+ const preview = useStore(document.preview);
+ const sceneFrame = useScene((scene) => scene.frame);
+ const sourceSize = document.resources.get(
+ useScene((scene) => scene.layers[0].source),
+ ).image.size;
const renderer = useRenderer();
const display = useMemo(() => createDisplay(gpu), [gpu]);
+ useEffect(() => () => display.dispose(), [display]);
const render = useFrame((frame) => {
const before = original && renderer[original]();
const target = typeof image === "string" ? renderer[image]() : image;
@@ -45,9 +51,17 @@ export function Image({
original: before,
split: preview.comparison === "split" ? preview.split : -1,
clipping: preview,
+ overlay: preview.maskOverlay && {
+ ...preview.maskOverlay,
+ frame: sceneFrame,
+ sourceSize,
+ },
});
});
useEffect(() => renderer.subscribe(render), [renderer, render]);
- useEffect(() => render(), [render, camera, preview, geometry, image]);
+ useEffect(
+ () => render(),
+ [render, camera, preview, geometry, image, sceneFrame, sourceSize],
+ );
return null;
}
diff --git a/src/components/editor/panel.tsx b/src/components/editor/panel.tsx
new file mode 100644
index 0000000..70347fd
--- /dev/null
+++ b/src/components/editor/panel.tsx
@@ -0,0 +1,69 @@
+import type { KeyboardEventHandler, ReactNode } from "react";
+import { CloseIcon } from "@/components/icons/close";
+import Button from "@/components/ui/button";
+import ResizablePanel from "@/components/ui/resizable-panel";
+import { ScrollArea } from "@/components/ui/scroll-area";
+import { useEditorSession } from "./session";
+
+/** The resizable side panel: a fixed header, scrolling controls, and a fixed footer. */
+export function EditorPanel({
+ header,
+ children,
+ footer,
+ onKeyDown,
+}: {
+ header?: ReactNode;
+ children: ReactNode;
+ footer?: ReactNode;
+ onKeyDown?: KeyboardEventHandler<HTMLElement>;
+}) {
+ const { width, onWidthChange } = useEditorSession();
+ return (
+ <ResizablePanel
+ width={width}
+ onWidthChange={onWidthChange}
+ className="flex min-h-0 flex-col"
+ onKeyDown={onKeyDown}
+ >
+ {header}
+ <ScrollArea
+ fade
+ className="flex-1"
+ role="region"
+ aria-label="Editor controls"
+ >
+ {children}
+ </ScrollArea>
+ {footer}
+ </ResizablePanel>
+ );
+}
+
+/** A title with optional actions and a close button, sized to the panel row. */
+export function PanelHeader({
+ title,
+ children,
+ onClose,
+}: {
+ title: string;
+ children?: ReactNode;
+ onClose?: () => void;
+}) {
+ return (
+ <div className="flex h-10 shrink-0 items-center gap-1 border-b border-black/50 pr-1.5 pl-3">
+ <h2 className="flex-1 font-medium text-neutral-200">{title}</h2>
+ {children}
+ {onClose && (
+ <Button
+ variant="ghost"
+ size="icon"
+ aria-label="Close"
+ title="Close (Esc)"
+ onClick={onClose}
+ >
+ <CloseIcon className="size-4" />
+ </Button>
+ )}
+ </div>
+ );
+}
diff --git a/src/components/editor/pipeline.tsx b/src/components/editor/pipeline.tsx
index 8dc4a44..c48012a 100644
--- a/src/components/editor/pipeline.tsx
+++ b/src/components/editor/pipeline.tsx
@@ -8,6 +8,7 @@ import {
} from "react";
import type { Gpu } from "vgpu";
import { useGpu } from "vgpu-react";
+import { adjustmentTarget } from "@/core/document";
import type { ImageSource } from "@/core/image";
import type { createRenderer } from "@/core/renderer";
import { useDocument, useScene } from "./session";
@@ -28,7 +29,7 @@ function RendererError({ message }: { message: string }) {
return (
<p
role="alert"
- className="fixed bottom-4 left-4 rounded bg-neutral-900 px-3 py-2 text-red-300 text-sm"
+ className="fixed bottom-4 left-4 rounded bg-neutral-900 px-3 py-2 text-red-300"
>
Renderer error: {message}
</p>
@@ -49,7 +50,7 @@ export function RendererProvider({
}: RendererProviderProps) {
const gpu = useGpu();
const document = useDocument();
- const sourceId = useScene((scene) => scene.source);
+ const sourceId = useScene((scene) => scene.layers[0].source);
const source = document.resources.get(sourceId);
const renderer = useMemo(
() => createRenderer(gpu, source),
@@ -59,19 +60,34 @@ export function RendererProvider({
useEffect(() => {
let active = true;
+ let requestedScene: ReturnType<typeof document.scene.getState> | undefined;
+ let requestedInput: string | undefined;
const render = () => {
+ const scene = document.scene.getState();
+ const target = adjustmentTarget(
+ scene.layers,
+ document.selection.getState().layerId,
+ );
+ const input = target && "toneCurve" in target ? target.id : undefined;
+ if (scene === requestedScene && input === requestedInput) {
+ return;
+ }
+ requestedScene = scene;
+ requestedInput = input;
setError(undefined);
- renderer.update(document.scene.getState()).catch((error) => {
+ renderer.update(scene, input).catch((error) => {
if (active) {
setError(String(error));
}
});
};
- const unsubscribe = document.scene.subscribe(render);
+ const unsubscribeScene = document.scene.subscribe(render);
+ const unsubscribeSelection = document.selection.subscribe(render);
render();
return () => {
active = false;
- unsubscribe();
+ unsubscribeScene();
+ unsubscribeSelection();
renderer.dispose();
};
}, [renderer, document]);
diff --git a/src/components/editor/session.tsx b/src/components/editor/session.tsx
index 1721e5b..362ee05 100644
--- a/src/components/editor/session.tsx
+++ b/src/components/editor/session.tsx
@@ -5,9 +5,7 @@ import {
useMemo,
useState,
} from "react";
-import { createPortal } from "react-dom";
import { useStore } from "zustand";
-import ResizablePanel from "@/components/ui/resizable-panel";
import type { EditorDocument, Scene } from "@/core/document";
import { createCamera } from "@/hooks/use-pan-zoom";
@@ -16,8 +14,6 @@ const Session = createContext<{
camera: ReturnType<typeof createCamera>;
width: number;
onWidthChange: (width: number) => void;
- panel: HTMLElement | null;
- panelRef: (panel: HTMLElement | null) => void;
} | null>(null);
export function useEditorSession() {
@@ -44,29 +40,10 @@ export function DocumentProvider({
}) {
const size = useStore(value.scene, (scene) => scene.frame.size);
const camera = useMemo(createCamera, [size[0], size[1]]);
- const [width, onWidthChange] = useState(288);
- const [panel, panelRef] = useState<HTMLElement | null>(null);
+ const [width, onWidthChange] = useState(320);
return (
- <Session
- value={{ document: value, camera, width, onWidthChange, panel, panelRef }}
- >
+ <Session value={{ document: value, camera, width, onWidthChange }}>
{children}
</Session>
);
}
-
-/** The resizable panel; the active tool fills it through PanelContent. */
-export function EditorPanel() {
- const { width, onWidthChange, panelRef } = useEditorSession();
- return (
- <ResizablePanel width={width} onWidthChange={onWidthChange}>
- <div ref={panelRef} className="flex h-full flex-col" />
- </ResizablePanel>
- );
-}
-
-/** A tool's panel content, rendered into the EditorPanel. */
-export function PanelContent({ children }: { children: ReactNode }) {
- const { panel } = useEditorSession();
- return panel && createPortal(children, panel);
-}
diff --git a/src/components/editor/viewport.tsx b/src/components/editor/viewport.tsx
index f7f752a..8974130 100644
--- a/src/components/editor/viewport.tsx
+++ b/src/components/editor/viewport.tsx
@@ -21,7 +21,7 @@ function ZoomControl() {
const percent = Math.round(scale * devicePixelRatio * 100);
return (
<div className="absolute right-3 bottom-3">
- <div className="flex items-center rounded-full bg-neutral-900/65 p-0.5 shadow-md backdrop-blur-sm">
+ <div className="flex items-center rounded-full bg-neutral-800/80 p-0.5 backdrop-blur-sm">
<Button
variant="ghost"
aria-label="Zoom out"
@@ -60,17 +60,19 @@ export function EditorViewport({
constrain = true,
children,
overlay,
+ tools,
}: {
size: Point;
constrain?: boolean;
children: ReactNode;
overlay?: ReactNode;
+ tools?: ReactNode;
}) {
const { camera } = useEditorSession();
const viewport = usePanZoom(camera, size, { constrain });
return (
<section
- className="relative min-h-0 min-w-0 flex-1 overflow-hidden p-6"
+ className="@container relative min-h-0 min-w-0 flex-1 overflow-hidden p-6"
aria-label="Image canvas"
>
<Viewport value={viewport}>
@@ -83,6 +85,7 @@ export function EditorViewport({
<Canvas className="absolute -inset-6 size-[calc(100%+3rem)]">
{children}
</Canvas>
+ {tools}
</div>
{overlay}
<ZoomControl />
diff --git a/src/components/icons/close.tsx b/src/components/icons/close.tsx
new file mode 100644
index 0000000..b82ab3e
--- /dev/null
+++ b/src/components/icons/close.tsx
@@ -0,0 +1,9 @@
+import { Icon, type IconProps } from "./icon";
+
+export function CloseIcon(props: IconProps) {
+ return (
+ <Icon viewBox="0 0 20 20" {...props}>
+ <path d="m5 5 10 10M15 5 5 15" />
+ </Icon>
+ );
+}
diff --git a/src/components/icons/layers.tsx b/src/components/icons/layers.tsx
deleted file mode 100644
index 6b5aedd..0000000
--- a/src/components/icons/layers.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Icon, type IconProps } from "./icon";
-
-export function LayersIcon(props: IconProps) {
- return (
- <Icon viewBox="0 0 20 20" {...props}>
- <path d="m10 2 7 4-7 4-7-4z" />
- <path d="m3 10 7 4 7-4M3 14l7 4 7-4" />
- </Icon>
- );
-}
diff --git a/src/components/icons/retouch.tsx b/src/components/icons/retouch.tsx
deleted file mode 100644
index a6aaea5..0000000
--- a/src/components/icons/retouch.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Icon, type IconProps } from "./icon";
-
-export function RetouchIcon(props: IconProps) {
- return (
- <Icon viewBox="0 0 20 20" {...props}>
- <g transform="rotate(45 10 10)">
- <rect x="6" y="2" width="8" height="16" rx="4" />
- <path d="M6 7h8M6 13h8M8.5 10h.01M11.5 10h.01" />
- </g>
- </Icon>
- );
-}
diff --git a/src/components/ui/button.tsx b/src/components/ui/button.tsx
index 78d33b4..6770579 100644
--- a/src/components/ui/button.tsx
+++ b/src/components/ui/button.tsx
@@ -3,7 +3,7 @@ import { cn } from "cn";
import type { ComponentProps } from "react";
const button = cva(
- "cursor-pointer rounded-md px-4 py-1.5 text-xs transition-colors focus-visible:outline-2 focus-visible:outline-offset-3 focus-visible:outline-neutral-400",
+ "cursor-pointer rounded-md transition-colors focus-visible:outline-2 focus-visible:outline-offset-3 focus-visible:outline-neutral-400",
{
variants: {
variant: {
@@ -12,19 +12,25 @@ const button = cva(
ghost:
"text-neutral-400 hover:bg-neutral-700/50 hover:text-neutral-100 active:bg-neutral-700",
},
+ /** Both sizes pad 6 px vertically, so text and 16 px icons produce the same height. */
+ size: {
+ default: "px-4 py-1.5",
+ icon: "grid place-items-center p-1.5",
+ },
},
- defaultVariants: { variant: "default" },
+ defaultVariants: { variant: "default", size: "default" },
},
);
export default function Button({
className,
variant,
+ size,
...props
}: ComponentProps<"button"> & VariantProps<typeof button>) {
return (
<button
- className={cn(button({ variant }), className)}
+ className={cn(button({ variant, size }), className)}
type="button"
{...props}
/>
diff --git a/src/components/ui/collapsible.tsx b/src/components/ui/collapsible.tsx
deleted file mode 100644
index c4dbe8a..0000000
--- a/src/components/ui/collapsible.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import { type ReactNode, useId, useState } from "react";
-
-/** Accessible disclosure with animated height and keyboard-safe collapsed content. */
-export function Collapsible({
- title,
- children,
- defaultOpen = true,
-}: {
- title: string;
- children: ReactNode;
- defaultOpen?: boolean;
-}) {
- const [open, setOpen] = useState(defaultOpen);
- const id = useId();
- return (
- <section className="shadow-ridge">
- <button
- type="button"
- aria-expanded={open}
- aria-controls={id}
- onClick={() => setOpen(!open)}
- className="flex w-full cursor-pointer items-center gap-1 px-3 py-2.5 text-left text-sm text-neutral-300 transition-colors hover:bg-white/3 hover:text-neutral-100 outline-none focus-visible:bg-white/8 focus-visible:text-white"
- >
- <svg
- aria-hidden="true"
- viewBox="0 0 18 18"
- fill="none"
- stroke="currentColor"
- strokeWidth="1.5"
- strokeLinecap="round"
- strokeLinejoin="round"
- data-open={open}
- className="size-4 shrink-0 text-neutral-500 transition-transform duration-200 ease-out data-[open=true]:rotate-90 motion-reduce:transition-none"
- >
- <path d="m7 5 4 4-4 4" />
- </svg>
- {title}
- </button>
- <div
- id={id}
- inert={!open}
- data-open={open}
- className="invisible grid grid-rows-[0fr] transition-[grid-template-rows,visibility] duration-200 ease-out data-[open=true]:visible data-[open=true]:grid-rows-[1fr] motion-reduce:transition-none"
- >
- <div className="min-h-0 overflow-hidden">
- <div className="px-4 pt-1 pb-4">{children}</div>
- </div>
- </div>
- </section>
- );
-}
diff --git a/src/components/ui/resizable-panel.tsx b/src/components/ui/resizable-panel.tsx
index 76bf17e..39d8a82 100644
--- a/src/components/ui/resizable-panel.tsx
+++ b/src/components/ui/resizable-panel.tsx
@@ -10,7 +10,7 @@ type ResizablePanelProps = ComponentProps<"aside"> & {
/** Bottom half on mobile; right-side panel with a draggable left edge on desktop. */
export default function ResizablePanel({
- width = 288,
+ width = 320,
onWidthChange,
min = 240,
max = 400,
@@ -26,14 +26,14 @@ export default function ResizablePanel({
return (
<aside
className={cn(
- "relative h-1/2 shrink-0 bg-panel shadow-ridge max-md:w-full! max-md:border-t max-md:border-neutral-600 md:h-auto",
+ "relative h-1/2 shrink-0 bg-panel max-md:w-full! max-md:border-t max-md:border-black md:h-auto",
className,
)}
style={{ width, ...style }}
{...props}
>
<div
- className="absolute inset-y-0 -left-1 hidden w-2 cursor-col-resize touch-none after:absolute after:inset-y-0 after:left-1 after:w-px after:bg-black hover:after:bg-neutral-600 after:transition-colors after:duration-200 md:block"
+ className="absolute inset-y-0 -left-1 z-20 hidden w-2 cursor-col-resize touch-none after:absolute after:inset-y-0 after:left-1 after:w-px after:bg-black hover:after:bg-neutral-600 after:transition-colors after:duration-200 md:block"
onPointerDown={(event) =>
event.currentTarget.setPointerCapture(event.pointerId)
}
diff --git a/src/components/ui/scroll-area.tsx b/src/components/ui/scroll-area.tsx
new file mode 100644
index 0000000..c63fb3d
--- /dev/null
+++ b/src/components/ui/scroll-area.tsx
@@ -0,0 +1,40 @@
+import { ScrollArea as Primitive } from "@base-ui/react/scroll-area";
+import { cn } from "cn";
+import type { ComponentProps } from "react";
+
+type ScrollAreaProps = ComponentProps<"div"> & {
+ viewportClassName?: string;
+ /** Shade an edge while content is clipped beyond it. */
+ fade?: boolean;
+};
+
+export function ScrollArea({
+ children,
+ className,
+ viewportClassName,
+ fade = false,
+ ...props
+}: ScrollAreaProps) {
+ return (
+ <Primitive.Root
+ className={cn("relative min-h-0 overflow-hidden", className)}
+ {...props}
+ >
+ <Primitive.Viewport
+ className={cn(
+ "h-full overscroll-contain focus-visible:outline focus-visible:outline-neutral-500 focus-visible:-outline-offset-1",
+ fade &&
+ "before:pointer-events-none before:sticky before:top-0 before:z-10 before:-mb-6 before:block before:h-6 before:bg-linear-to-b before:from-black/40 before:opacity-0 before:transition-opacity data-overflow-y-start:before:opacity-100 after:pointer-events-none after:sticky after:bottom-0 after:z-10 after:-mt-6 after:block after:h-6 after:bg-linear-to-t after:from-black/40 after:opacity-0 after:transition-opacity data-overflow-y-end:after:opacity-100",
+ viewportClassName,
+ )}
+ >
+ <Primitive.Content style={{ minWidth: 0 }}>
+ {children}
+ </Primitive.Content>
+ </Primitive.Viewport>
+ <Primitive.Scrollbar className="group z-10 my-1 mr-px flex w-1.5 justify-center">
+ <Primitive.Thumb className="w-1 rounded-full bg-neutral-400/60 group-hover:bg-neutral-300 group-data-scrolling:bg-neutral-300" />
+ </Primitive.Scrollbar>
+ </Primitive.Root>
+ );
+}
diff --git a/src/components/ui/scrub-input.tsx b/src/components/ui/scrub-input.tsx
index c196e01..19002a9 100644
--- a/src/components/ui/scrub-input.tsx
+++ b/src/components/ui/scrub-input.tsx
@@ -100,10 +100,7 @@ export function ScrubInput({
return (
<label
- className={cn(
- "flex items-center gap-2 text-neutral-400 text-sm",
- className,
- )}
+ className={cn("flex items-center gap-2 text-neutral-400", className)}
>
{label}
<Field className="w-16 max-w-full" variant={variant}>
diff --git a/src/components/ui/slider.tsx b/src/components/ui/slider.tsx
index 971cf31..349df3e 100644
--- a/src/components/ui/slider.tsx
+++ b/src/components/ui/slider.tsx
@@ -1,3 +1,5 @@
+import { cva } from "class-variance-authority";
+import { cn } from "cn";
import { ScrubInput } from "./scrub-input";
type SliderProps = {
@@ -11,8 +13,36 @@ type SliderProps = {
defaultValue?: number;
/** CSS color stops painting the bar left to right, e.g. ["#46f", "#fc3"]. */
stops?: string[];
+ unit?: string;
+ /** "panel" stacks the bar under its label; "toolbar" keeps one row and drops the bar in a narrow container. */
+ variant?: "panel" | "toolbar";
+ className?: string;
};
+const root = cva("items-center text-neutral-400", {
+ variants: {
+ variant: {
+ panel: "grid grid-cols-[1fr_auto] gap-y-0.5",
+ toolbar: "flex gap-2",
+ },
+ },
+});
+const field = cva("relative z-10 flex items-center gap-1", {
+ variants: { variant: { panel: "", toolbar: "order-last" } },
+});
+const track = cva(
+ "relative h-1 min-w-11 rounded-full bg-neutral-900 shadow-groove",
+ {
+ variants: {
+ variant: { panel: "col-span-2 my-1", toolbar: "w-20 @max-2xl:hidden" },
+ },
+ },
+);
+const range = cva(
+ "absolute top-1/2 w-full -translate-y-1/2 touch-pan-y appearance-none bg-transparent outline-none [&:focus-visible::-webkit-slider-thumb]:ring-2 [&:focus-visible::-webkit-slider-thumb]:ring-sky-300 [&:focus-visible::-moz-range-thumb]:ring-2 [&:focus-visible::-moz-range-thumb]:ring-sky-300 [&::-webkit-slider-runnable-track]:bg-transparent [&::-webkit-slider-thumb]:appearance-none [&::-webkit-slider-thumb]:size-3 [&::-webkit-slider-thumb]:rounded-full [&::-webkit-slider-thumb]:bg-neutral-100 [&::-webkit-slider-thumb]:ring-1 [&::-webkit-slider-thumb]:ring-neutral-800 [&::-moz-range-track]:bg-transparent [&::-moz-range-thumb]:size-2.5 [&::-moz-range-thumb]:rounded-full [&::-moz-range-thumb]:border-0 [&::-moz-range-thumb]:bg-neutral-100 [&::-moz-range-thumb]:ring-1 [&::-moz-range-thumb]:ring-neutral-800",
+ { variants: { variant: { panel: "h-11", toolbar: "h-7" } } },
+);
+
/** Labeled slider paired with a scrubbable numeric field. */
export function Slider({
label,
@@ -23,6 +53,9 @@ export function Slider({
step = 1,
defaultValue,
stops,
+ unit,
+ variant = "panel",
+ className,
}: SliderProps) {
const gradient = stops && {
background: `linear-gradient(to right, ${stops.join()})`,
@@ -30,11 +63,12 @@ export function Slider({
const reset = () => defaultValue !== undefined && onChange(defaultValue);
return (
- <div className="grid grid-cols-[1fr_auto] items-center gap-y-0.5 text-neutral-400 text-sm">
+ <div className={cn(root({ variant }), className)}>
<span>{label}</span>
- <div className="relative z-10">
+ <div className={field({ variant })}>
<ScrubInput
aria-label={label}
+ className={variant === "toolbar" ? "w-9" : undefined}
max={max}
min={min}
onChange={onChange}
@@ -42,18 +76,19 @@ export function Slider({
value={value}
variant="text"
/>
+ {unit && <span className="text-neutral-500">{unit}</span>}
</div>
- <div
- className="relative col-span-2 my-1 h-1 min-w-11 rounded-full bg-neutral-900 shadow-groove"
- style={gradient}
- >
+ <div className={track({ variant })} style={gradient}>
<input
aria-label={label}
- className="absolute top-1/2 h-11 w-full -translate-y-1/2 touch-pan-y appearance-none bg-transparent outline-none focus-visible:ring-1 focus-visible:ring-neutral-100/50 [&::-webkit-slider-runnable-track]:bg-transparent [&::-webkit-slider-thumb]:appearance-none [&::-webkit-slider-thumb]:size-3 [&::-webkit-slider-thumb]:rounded-full [&::-webkit-slider-thumb]:bg-neutral-100 [&::-webkit-slider-thumb]:ring-1 [&::-webkit-slider-thumb]:ring-neutral-800 [&::-moz-range-track]:bg-transparent [&::-moz-range-thumb]:size-2.5 [&::-moz-range-thumb]:rounded-full [&::-moz-range-thumb]:border-0 [&::-moz-range-thumb]:bg-neutral-100 [&::-moz-range-thumb]:ring-1 [&::-moz-range-thumb]:ring-neutral-800"
+ className={range({ variant })}
max={max}
min={min}
onChange={(event) => onChange(event.currentTarget.valueAsNumber)}
onDoubleClick={reset}
+ onKeyDown={(event) =>
+ event.key === "Enter" && event.currentTarget.blur()
+ }
step={step}
type="range"
value={value}
diff --git a/src/components/ui/tree-drag.tsx b/src/components/ui/tree-drag.tsx
new file mode 100644
index 0000000..429d4fe
--- /dev/null
+++ b/src/components/ui/tree-drag.tsx
@@ -0,0 +1,133 @@
+import {
+ type CollisionDetection,
+ DndContext,
+ type DragMoveEvent,
+ DragOverlay,
+ MouseSensor,
+ pointerWithin,
+ TouchSensor,
+ useDraggable,
+ useDroppable,
+ useSensor,
+ useSensors,
+} from "@dnd-kit/core";
+import { createContext, type ReactNode, useContext, useState } from "react";
+
+export type TreeDrop = {
+ id: string;
+ target: string;
+ position: "before" | "after" | "inside";
+};
+const Context = createContext<{ drop: TreeDrop | null; active: string | null }>(
+ { drop: null, active: null },
+);
+
+type TreeDragProps = {
+ children: ReactNode;
+ canDrop: (drop: TreeDrop) => boolean;
+ onDrop: (drop: TreeDrop) => void;
+ label: (id: string) => string;
+};
+
+const collision: CollisionDetection = (args) =>
+ pointerWithin(args).map((hit) => ({
+ ...hit,
+ data: { ...hit.data, pointerY: args.pointerCoordinates?.y },
+ }));
+
+/** Gesture ownership only. The caller defines tree constraints and commits the move. */
+export function TreeDrag({ children, canDrop, onDrop, label }: TreeDragProps) {
+ const [active, setActive] = useState<string | null>(null);
+ const [drop, setDrop] = useState<TreeDrop | null>(null);
+ const sensors = useSensors(
+ useSensor(MouseSensor, { activationConstraint: { distance: 6 } }),
+ useSensor(TouchSensor, {
+ activationConstraint: { delay: 180, tolerance: 6 },
+ }),
+ );
+ function locate(event: DragMoveEvent): TreeDrop | null {
+ if (
+ !event.over ||
+ typeof event.active.id !== "string" ||
+ typeof event.over.id !== "string"
+ ) {
+ return null;
+ }
+ const rect = event.over.rect;
+ const y = event.collisions?.[0]?.data?.pointerY;
+ if (typeof y !== "number") {
+ return null;
+ }
+ const fraction = (y - rect.top) / rect.height;
+ let position: TreeDrop["position"] = "inside";
+ if (fraction < 0.25) {
+ position = "before";
+ }
+ if (fraction > 0.75) {
+ position = "after";
+ }
+ // A line beneath an expanded header would falsely imply moving above its children.
+ if (position === "after" && event.over.data.current?.expanded) {
+ return null;
+ }
+ const next = { id: event.active.id, target: event.over.id, position };
+ return canDrop(next) ? next : null;
+ }
+ function clear() {
+ setActive(null);
+ setDrop(null);
+ }
+ return (
+ <DndContext
+ sensors={sensors}
+ collisionDetection={collision}
+ onDragStart={({ active }) => {
+ if (typeof active.id === "string") {
+ setActive(active.id);
+ }
+ }}
+ onDragMove={(event) => setDrop(locate(event))}
+ onDragOver={(event) => setDrop(locate(event))}
+ onDragCancel={clear}
+ onDragEnd={() => {
+ if (drop) {
+ onDrop(drop);
+ }
+ clear();
+ }}
+ accessibility={{
+ screenReaderInstructions: {
+ draggable:
+ "Drag to reorder or nest. Use the layer actions menu to move with the keyboard.",
+ },
+ }}
+ >
+ <Context value={{ active, drop }}>{children}</Context>
+ <DragOverlay dropAnimation={null}>
+ {active && (
+ <div className="max-w-64 rounded border border-neutral-500 bg-neutral-700 px-3 py-2 shadow-lg">
+ {label(active)}
+ </div>
+ )}
+ </DragOverlay>
+ </DndContext>
+ );
+}
+
+export function useTreeDragItem(
+ id: string,
+ { disabled = false, expanded = false } = {},
+) {
+ const { active, drop } = useContext(Context);
+ const draggable = useDraggable({ id, disabled });
+ const droppable = useDroppable({ id, data: { expanded } });
+ return {
+ ref: (element: HTMLDivElement | null) => {
+ draggable.setNodeRef(element);
+ droppable.setNodeRef(element);
+ },
+ handle: { ...draggable.attributes, ...draggable.listeners },
+ dragging: active === id,
+ drop: drop?.target === id ? drop.position : undefined,
+ };
+}
diff --git a/src/core/document/index.ts b/src/core/document/index.ts
index 6ee85d5..1c518f8 100644
--- a/src/core/document/index.ts
+++ b/src/core/document/index.ts
@@ -1,53 +1,97 @@
import { createStore } from "zustand/vanilla";
-import { shallow } from "zustand/vanilla/shallow";
-import { frameValues, validateFrame } from "@/core/image/frame";
+import { validateFrame } from "@/core/image/frame";
import { createHistory } from "./history";
import { createResources } from "./resources";
-import type { Scene } from "./scene";
+import type { Gradient, MaskModifier, Scene } from "./scene";
+import { findLayer } from "./tree";
export type {
Adjustments,
ColorMixer,
CurvePoint,
+ Details,
+ EffectLayer,
+ Gradient,
+ ImageLayer,
+ Layer,
+ LinearGradient,
+ MaskLayer,
+ MaskModifier,
+ ProcessingLayer,
+ RadialGradient,
Scene,
ToneCurve,
Vignette,
} from "./scene";
+export {
+ adjustmentTarget,
+ editLayer,
+ findLayer,
+ locateLayer,
+ updateLayer,
+ walkLayers,
+} from "./tree";
export { createResources };
+export type MaskPreview = {
+ readonly mask: Gradient;
+ readonly modifiers: readonly MaskModifier[];
+};
+
export type Preview = {
comparison: "edited" | "original" | "split";
split: number;
shadows: boolean;
highlights: boolean;
+ /** The mask whose coverage the display tints red. */
+ maskOverlay?: MaskPreview;
};
-function equal(a: Scene, b: Scene) {
+/** Scenes contain only plain values; unchanged branches keep their identity. */
+function equal(a: unknown, b: unknown): boolean {
+ if (a === b) {
+ return true;
+ }
+ if (
+ !a ||
+ !b ||
+ typeof a !== "object" ||
+ typeof b !== "object" ||
+ Array.isArray(a) !== Array.isArray(b)
+ ) {
+ return false;
+ }
+ const keys = Object.keys(a);
return (
- a.source === b.source &&
- shallow(frameValues(a.frame), frameValues(b.frame)) &&
- shallow(a.adjustments, b.adjustments) &&
- shallow(a.whiteBalance, b.whiteBalance) &&
- shallow(a.vignette, b.vignette) &&
- shallow(a.colorMixer?.hue, b.colorMixer?.hue) &&
- shallow(a.colorMixer?.saturation, b.colorMixer?.saturation) &&
- shallow(a.colorMixer?.luminance, b.colorMixer?.luminance) &&
- a.toneCurve.length === b.toneCurve.length &&
- a.toneCurve.every((point, i) => shallow(point, b.toneCurve[i]))
+ keys.length === Object.keys(b).length &&
+ keys.every(
+ (key) =>
+ Object.hasOwn(b, key) &&
+ equal(Reflect.get(a, key), Reflect.get(b, key)),
+ )
);
}
/** One independent editing session. No React, decoders, or file workflows. */
export function createDocument(initial: Scene, resources = createResources()) {
const scene = createStore(() => initial);
+ const selection = createStore(() => ({ layerId: initial.layers[0].id }));
const { update, ...history } = createHistory(
scene,
equal,
100,
(retained) => {
- resources.retain(new Set(retained.map((state) => state.source)));
+ resources.retain(
+ new Set(retained.map((state) => state.layers[0].source)),
+ );
},
);
+ const unsubscribe = scene.subscribe((state) => {
+ const id = selection.getState().layerId;
+ if (!findLayer(state.layers, id)) {
+ selection.setState({ layerId: state.layers[0].id });
+ }
+ });
let closed = false;
return {
id: crypto.randomUUID(),
@@ -56,6 +100,17 @@ export function createDocument(initial: Scene, resources = createResources()) {
getInitialState: scene.getInitialState,
subscribe: scene.subscribe,
},
+ selection,
+ selectLayer(layerId: string) {
+ const state = scene.getState();
+ if (!findLayer(state.layers, layerId)) {
+ throw Error("Layer is unavailable.");
+ }
+ if (selection.getState().layerId !== layerId) {
+ history.commit();
+ selection.setState({ layerId });
+ }
+ },
preview: createStore<Preview>(() => ({
comparison: "edited",
split: 0.5,
@@ -76,6 +131,7 @@ export function createDocument(initial: Scene, resources = createResources()) {
return;
}
closed = true;
+ unsubscribe();
history.clear();
resources.dispose();
},
diff --git a/src/core/document/scene.ts b/src/core/document/scene.ts
index 0b29e87..c8e9d17 100644
--- a/src/core/document/scene.ts
+++ b/src/core/document/scene.ts
@@ -1,5 +1,5 @@
import type { WhiteBalance } from "@/core/image";
-import type { ImageFrame } from "@/core/image/frame";
+import type { ImageFrame, Point } from "@/core/image/frame";
export type Adjustments = {
exposure: number;
@@ -12,6 +12,9 @@ export type Adjustments = {
blacks: number;
vibrance: number;
saturation: number;
+};
+
+export type Details = {
clarity: number;
sharpening: number;
sharpenRadius: number;
@@ -33,13 +36,58 @@ export type Vignette = {
readonly softness: number;
};
-/** Serializable document content. Image bytes and GPU resources live elsewhere. */
-export type Scene = {
- readonly frame: ImageFrame;
+export type ImageLayer = {
+ readonly kind: "image";
+ readonly id: string;
+ readonly name: string;
readonly source: string;
readonly whiteBalance?: Readonly<WhiteBalance>;
readonly adjustments: Readonly<Adjustments>;
readonly toneCurve: ToneCurve;
- readonly colorMixer?: ColorMixer;
- readonly vignette?: Vignette;
+ readonly children: readonly ProcessingLayer[];
+};
+
+/** Endpoints in the original document canvas, independent of crop and rotation. */
+export type LinearGradient = {
+ readonly kind: "linear";
+ readonly start: Point;
+ readonly end: Point;
+};
+export type RadialGradient = {
+ readonly kind: "radial";
+ readonly center: Point;
+ readonly radius: Point;
+ readonly angle: number;
+ readonly feather: number;
+};
+export type Gradient = LinearGradient | RadialGradient;
+export type ProcessingLayer = {
+ readonly id: string;
+ readonly name: string;
+ readonly visible: boolean;
+ readonly opacity: number;
+ readonly children: readonly ProcessingLayer[];
+} & (
+ | { readonly kind: "details"; readonly details: Readonly<Details> }
+ | { readonly kind: "exposure"; readonly exposure: number }
+ | { readonly kind: "vignette"; readonly vignette: Vignette }
+ | { readonly kind: "color-mixer"; readonly colorMixer: ColorMixer }
+ | {
+ readonly kind: "mask";
+ readonly operation: "add" | "subtract";
+ readonly mask: Gradient;
+ readonly adjustments: Readonly<Adjustments>;
+ readonly toneCurve: ToneCurve;
+ }
+);
+export type MaskLayer = Extract<ProcessingLayer, { kind: "mask" }>;
+/** A child mask that adds to or subtracts from its parent's coverage. */
+export type MaskModifier = Pick<MaskLayer, "mask" | "operation" | "opacity">;
+export type EffectLayer = Exclude<ProcessingLayer, MaskLayer>;
+export type Layer = ImageLayer | ProcessingLayer;
+
+/** The sole image source is pinned below the ordered processing tree. */
+export type Scene = {
+ readonly frame: ImageFrame;
+ readonly layers: readonly [ImageLayer, ...ProcessingLayer[]];
};
diff --git a/src/core/document/tree.ts b/src/core/document/tree.ts
new file mode 100644
index 0000000..58f8d42
--- /dev/null
+++ b/src/core/document/tree.ts
@@ -0,0 +1,96 @@
+import type { EditorDocument } from "./index";
+import type { Layer, ProcessingLayer, Scene } from "./scene";
+
+export function walkLayers(layers: readonly Layer[]): Layer[] {
+ return layers.flatMap((layer) => [layer, ...walkLayers(layer.children)]);
+}
+
+type LayerLocation = {
+ layer: Layer;
+ siblings: readonly Layer[];
+ parent?: Layer;
+};
+
+export function locateLayer(
+ layers: readonly Layer[],
+ id: string,
+ parent?: Layer,
+): LayerLocation | undefined {
+ for (const layer of layers) {
+ if (layer.id === id) {
+ return { layer, siblings: layers, parent };
+ }
+ const child = locateLayer(layer.children, id, layer);
+ if (child) {
+ return child;
+ }
+ }
+ return undefined;
+}
+
+export function findLayer(layers: readonly Layer[], id: string) {
+ return locateLayer(layers, id)?.layer;
+}
+
+/** A mask inside a mask only shapes coverage; its parent owns the adjustments and curve. */
+export function adjustmentTarget(layers: readonly Layer[], id: string) {
+ const location = locateLayer(layers, id);
+ if (!location) {
+ return undefined;
+ }
+ const { layer, parent } = location;
+ return layer.kind === "mask" && parent?.kind === "mask" ? parent : layer;
+}
+
+function updateChildren(
+ layers: readonly ProcessingLayer[],
+ id: string,
+ update: (layer: Layer) => Layer,
+): readonly ProcessingLayer[] {
+ return layers.map((layer) => {
+ if (layer.id === id) {
+ const next = update(layer);
+ if (next.kind === "image") {
+ throw Error("An image cannot replace a processing layer.");
+ }
+ return next;
+ }
+ const children = updateChildren(layer.children, id, update);
+ return children.every((child, index) => child === layer.children[index])
+ ? layer
+ : { ...layer, children };
+ });
+}
+
+export function updateLayer(
+ scene: Scene,
+ id: string,
+ update: (layer: Layer) => Layer,
+): Scene {
+ if (!findLayer(scene.layers, id)) {
+ throw Error("Layer is unavailable.");
+ }
+ const [image, ...layers] = scene.layers;
+ const children = updateChildren(image.children, id, update);
+ const base = image.id === id ? update(image) : image;
+ if (base.kind !== "image") {
+ throw Error("The image layer is pinned.");
+ }
+ return {
+ ...scene,
+ layers: [
+ children.every((child, index) => child === image.children[index])
+ ? base
+ : { ...base, children },
+ ...updateChildren(layers, id, update),
+ ],
+ };
+}
+
+export function editLayer(
+ document: EditorDocument,
+ id: string,
+ update: (layer: Layer) => Layer,
+) {
+ document.edit(updateLayer(document.scene.getState(), id, update));
+}
diff --git a/src/core/image/frame.ts b/src/core/image/frame.ts
index fed440f..777749b 100644
--- a/src/core/image/frame.ts
+++ b/src/core/image/frame.ts
@@ -30,7 +30,16 @@ export function frameValues(frame: ImageFrame) {
export function validateFrame(frame: ImageFrame) {
if (
- !frameValues(frame).every(Number.isFinite) ||
+ !frame ||
+ ![frame.center, frame.size, frame.scale].every(
+ (point) =>
+ Array.isArray(point) &&
+ point.length === 2 &&
+ Number.isFinite(point[0]) &&
+ Number.isFinite(point[1]),
+ ) ||
+ !Number.isFinite(frame.rotation) ||
+ !Number.isFinite(frame.angle) ||
frame.size.some((value) => value < 1) ||
frame.scale.some((value) => value === 0)
) {
@@ -48,6 +57,15 @@ export function sourceOffset(frame: ImageFrame, x: number, y: number): Point {
];
}
+/** Output offset of a source-pixel offset: the inverse of sourceOffset. */
+export function outputOffset(frame: ImageFrame, dx: number, dy: number): Point {
+ const angle = ((frame.rotation + frame.angle) * Math.PI) / 180;
+ return [
+ (Math.cos(angle) * dx - Math.sin(angle) * dy) / frame.scale[0],
+ (Math.sin(angle) * dx + Math.cos(angle) * dy) / frame.scale[1],
+ ];
+}
+
/** Affine UV mapping used by image display and resampling, independent of editing tools. */
export function frameTransform(
frame: ImageFrame,
diff --git a/src/core/renderer/blend/coverage.wgsl b/src/core/renderer/blend/coverage.wgsl
new file mode 100644
index 0000000..b6be11c
--- /dev/null
+++ b/src/core/renderer/blend/coverage.wgsl
@@ -0,0 +1,11 @@
+// Coverage of one gradient at a source-pixel position: 1 at a linear start or inside a radial
+// ellipse, 0 past the linear end or the feathered radial edge. Kind 1 is linear, 2 radial.
+export fn gradientCoverage(position: vec2f, first: vec2f, second: vec2f, kind: u32, feather: f32, angle: f32) -> f32 {
+ if (kind == 2u) {
+ let delta = position - first;
+ let local = vec2f(cos(angle) * delta.x + sin(angle) * delta.y, -sin(angle) * delta.x + cos(angle) * delta.y);
+ return 1.0 - smoothstep(1.0 - max(feather, 0.0001), 1.0, length(local / second));
+ }
+ let direction = second - first;
+ return 1.0 - clamp(dot(position - first, direction) / dot(direction, direction), 0.0, 1.0);
+}
diff --git a/src/core/renderer/blend/index.ts b/src/core/renderer/blend/index.ts
new file mode 100644
index 0000000..6f4b90c
--- /dev/null
+++ b/src/core/renderer/blend/index.ts
@@ -0,0 +1,78 @@
+import type { Gradient, MaskModifier } from "@/core/document";
+import { merge, node, type RenderImage } from "@/core/renderer/node";
+import shader from "./mix.wgsl";
+
+const emptyModifiers = new Float32Array(8);
+
+/** Uniform fields for one gradient; kind 0 means full coverage. */
+export function gradientParams(mask?: Gradient) {
+ if (mask?.kind === "radial") {
+ return {
+ kind: 2,
+ first: mask.center,
+ second: mask.radius,
+ feather: mask.feather,
+ angle: (mask.angle * Math.PI) / 180,
+ };
+ }
+ return {
+ kind: Number(!!mask),
+ first: mask?.start ?? [0, 0],
+ second: mask?.end ?? [1, 0],
+ feather: 0,
+ angle: 0,
+ };
+}
+
+/** Two vec4 per modifier: geometry, then signed strength, kind, feather, and angle. */
+export function modifierData(modifiers: readonly MaskModifier[]) {
+ if (!modifiers.length) {
+ return emptyModifiers;
+ }
+ const data = new Float32Array(modifiers.length * 8);
+ modifiers.forEach(({ mask, opacity, operation }, index) => {
+ const { first, second, kind, feather, angle } = gradientParams(mask);
+ data.set(
+ [
+ ...first,
+ ...second,
+ operation === "add" ? opacity : -opacity,
+ kind,
+ feather,
+ angle,
+ ],
+ index * 8,
+ );
+ });
+ return data;
+}
+
+/** Interpolates an adjustment result without changing image coverage or HDR headroom. */
+export function mixAdjustment(
+ name: string,
+ original: RenderImage,
+ edited: RenderImage,
+ opacity: number,
+ mask?: Gradient,
+ modifiers: readonly MaskModifier[] = [],
+) {
+ if (original === edited || opacity === 0) {
+ return original;
+ }
+ if (opacity === 1 && !mask) {
+ return edited;
+ }
+ return merge(
+ { original, edited },
+ node(name, shader, {
+ storage: { modifiers: modifierData(modifiers) },
+ set: {
+ params: {
+ opacity,
+ ...gradientParams(mask),
+ modifierCount: modifiers.length,
+ },
+ },
+ }),
+ );
+}
diff --git a/src/core/renderer/blend/mix.wgsl b/src/core/renderer/blend/mix.wgsl
new file mode 100644
index 0000000..5a18758
--- /dev/null
+++ b/src/core/renderer/blend/mix.wgsl
@@ -0,0 +1,31 @@
+import { gradientCoverage } from "./coverage.wgsl";
+
+struct Params {
+ opacity: f32,
+ kind: u32,
+ first: vec2f,
+ second: vec2f,
+ feather: f32,
+ angle: f32,
+ modifierCount: u32,
+}
+@group(0) @binding(0) var original: texture_2d<f32>;
+@group(0) @binding(1) var edited: texture_2d<f32>;
+@group(0) @binding(2) var<uniform> params: Params;
+@group(0) @binding(3) var<storage, read> modifiers: array<vec4f>;
+
+@fragment fn fs_main(@builtin(position) position: vec4f) -> @location(0) vec4f {
+ let before = textureLoad(original, vec2i(position.xy), 0);
+ let after = textureLoad(edited, vec2i(position.xy), 0);
+ var coverage = 1.0;
+ if (params.kind != 0u) {
+ coverage = gradientCoverage(position.xy, params.first, params.second, params.kind, params.feather, params.angle);
+ for (var i = 0u; i < params.modifierCount; i++) {
+ let points = modifiers[i * 2u];
+ let settings = modifiers[i * 2u + 1u];
+ coverage = clamp(coverage + gradientCoverage(position.xy, points.xy, points.zw, u32(settings.y), settings.z, settings.w) * settings.x, 0.0, 1.0);
+ }
+ }
+ coverage *= params.opacity;
+ return vec4f(mix(before.rgb, after.rgb, coverage), before.a);
+}
diff --git a/src/core/renderer/display/display.wgsl b/src/core/renderer/display/display.wgsl
index ae30079..03c2d85 100644
--- a/src/core/renderer/display/display.wgsl
+++ b/src/core/renderer/display/display.wgsl
@@ -10,6 +10,8 @@ export struct View {
highlights: u32,
}
export const background = vec3f(0.09);
+// #f25445 as displayed; the overlay mixes after encoding, on the final sRGB color.
+const overlayTint = vec3f(0.949, 0.329, 0.271);
export fn imagePoint(view: View, uv: vec2f) -> vec2f {
let scale = min(min(view.fitSize.x / view.imageSize.x, view.fitSize.y / view.imageSize.y), 2.0) * view.zoom;
@@ -28,3 +30,7 @@ export fn previewColor(sample: vec4f, view: View) -> vec3f {
}
return mix(background, color, sample.a);
}
+/** Tints a displayed color by mask coverage: untouched at 0, half red at 1. */
+export fn maskTint(color: vec3f, coverage: f32) -> vec3f {
+ return mix(color, overlayTint, coverage * 0.5);
+}
diff --git a/src/core/renderer/display/image.wgsl b/src/core/renderer/display/image.wgsl
index ae95c09..fa00313 100644
--- a/src/core/renderer/display/image.wgsl
+++ b/src/core/renderer/display/image.wgsl
@@ -1,5 +1,16 @@
-import { View, imagePoint, previewColor, background } from "./display.wgsl";
+import { View, imagePoint, previewColor, background, maskTint } from "./display.wgsl";
import { Transform, sourcePoint } from "../transform/transform.wgsl";
+import { gradientCoverage } from "../blend/coverage.wgsl";
+
+struct MaskOverlay {
+ kind: u32,
+ first: vec2f,
+ second: vec2f,
+ feather: f32,
+ angle: f32,
+ modifierCount: u32,
+ sourceSize: vec2f,
+}
@group(0) @binding(0) var<uniform> view: View;
@group(0) @binding(1) var source: texture_2d<f32>;
@@ -7,12 +18,30 @@ import { Transform, sourcePoint } from "../transform/transform.wgsl";
@group(0) @binding(3) var<uniform> transform: Transform;
@group(0) @binding(4) var original: texture_2d<f32>;
@group(0) @binding(5) var<uniform> split: f32;
+@group(0) @binding(6) var<uniform> maskTransform: Transform;
+@group(0) @binding(7) var<uniform> overlay: MaskOverlay;
+@group(0) @binding(8) var<storage, read> modifiers: array<vec4f>;
+
+// The same analytical coverage the mix pass applies, evaluated in source pixels.
+fn overlayCoverage(uv: vec2f) -> f32 {
+ let position = sourcePoint(maskTransform, uv) * overlay.sourceSize;
+ var coverage = gradientCoverage(position, overlay.first, overlay.second, overlay.kind, overlay.feather, overlay.angle);
+ for (var i = 0u; i < overlay.modifierCount; i++) {
+ let points = modifiers[i * 2u];
+ let settings = modifiers[i * 2u + 1u];
+ coverage = clamp(coverage + gradientCoverage(position, points.xy, points.zw, u32(settings.y), settings.z, settings.w) * settings.x, 0.0, 1.0);
+ }
+ return coverage;
+}
@fragment fn fs_main(@location(0) uv: vec2f) -> @location(0) vec4f {
let p = sourcePoint(transform, imagePoint(view, uv));
let edited = textureSampleLevel(source, sourceSampler, p, 0.0);
let before = textureSampleLevel(original, sourceSampler, p, 0.0);
- let color = previewColor(select(edited, before, uv.x < split), view);
+ var color = previewColor(select(edited, before, uv.x < split), view);
+ if (overlay.kind != 0u) {
+ color = maskTint(color, overlayCoverage(p));
+ }
let inside = all(p >= vec2f(0.0)) && all(p <= vec2f(1.0));
return vec4f(select(background, color, inside), 1.0);
}
diff --git a/src/core/renderer/display/index.ts b/src/core/renderer/display/index.ts
index 7d6d56b..a22d755 100644
--- a/src/core/renderer/display/index.ts
+++ b/src/core/renderer/display/index.ts
@@ -1,13 +1,29 @@
-import { effect, type Frame, type Gpu, sampler, type Target } from "vgpu";
+import {
+ type Buffer,
+ effect,
+ type Frame,
+ type Gpu,
+ sampler,
+ type Target,
+} from "vgpu";
+import type { Gradient, MaskModifier } from "@/core/document";
import {
frameTransform,
type ImageFrame,
imageFrame,
} from "@/core/image/frame";
+import { gradientParams, modifierData } from "@/core/renderer/blend";
import shader from "./image.wgsl";
export type View = { zoom: number; pan: readonly [number, number] };
export type Clipping = { shadows: boolean; highlights: boolean };
+/** A mask to tint over the displayed image; its geometry lives in source pixels. */
+export type MaskOverlay = {
+ mask: Gradient;
+ modifiers: readonly MaskModifier[];
+ frame: ImageFrame;
+ sourceSize: readonly number[];
+};
type DisplayOptions = {
view: View;
viewport?: readonly number[];
@@ -15,24 +31,42 @@ type DisplayOptions = {
original?: Target;
split?: number;
clipping?: Clipping;
+ overlay?: MaskOverlay;
};
-/** Display any transformed image with optional comparison and clipping indicators. */
+/** Display any transformed image with optional comparison, clipping indicators, and mask overlay. */
export function createDisplay(gpu: Gpu) {
const draw = effect(gpu, shader, {
set: {
sourceSampler: sampler(gpu, { magFilter: "linear", minFilter: "linear" }),
},
});
- return (
+ let modifiers: Buffer | undefined;
+ function writeModifiers(overlay?: MaskOverlay) {
+ const data = modifierData(overlay?.modifiers ?? []);
+ if (!modifiers || modifiers.options.size < data.byteLength) {
+ modifiers?.dispose();
+ modifiers = gpu.device.createBuffer({
+ size: data.byteLength,
+ usage: ["storage", "copy_dst"],
+ });
+ draw.set({ modifiers });
+ }
+ if (overlay) {
+ modifiers.write(data);
+ }
+ }
+ function display(
frame: Frame,
canvas: Target & { dpr: number },
image: Target,
options: DisplayOptions,
- ) => {
+ ) {
const geometry = options.frame ?? imageFrame(image.size);
const viewport =
options.viewport ?? canvas.size.map((value) => value / canvas.dpr);
+ const overlay = options.overlay;
+ writeModifiers(overlay);
frame.pass(
canvas,
draw.set({
@@ -49,7 +83,22 @@ export function createDisplay(gpu: Gpu) {
shadows: Number(options.clipping?.shadows ?? false),
highlights: Number(options.clipping?.highlights ?? false),
},
+ maskTransform: frameTransform(
+ overlay?.frame ?? geometry,
+ overlay?.sourceSize ?? image.size,
+ ),
+ overlay: {
+ ...gradientParams(overlay?.mask),
+ modifierCount: overlay?.modifiers.length ?? 0,
+ sourceSize: overlay?.sourceSize ?? image.size,
+ },
}),
);
- };
+ }
+ return Object.assign(display, {
+ dispose() {
+ modifiers?.dispose();
+ modifiers = undefined;
+ },
+ });
}
diff --git a/src/core/renderer/graph.ts b/src/core/renderer/graph.ts
index b783d0d..97a9063 100644
--- a/src/core/renderer/graph.ts
+++ b/src/core/renderer/graph.ts
@@ -116,6 +116,17 @@ export function createRenderGraph(gpu: Gpu, timer?: Timer) {
return image;
}
return {
+ /** Retire removed composition instances; bypassed instances remain reusable. */
+ release(prefix: string) {
+ for (const [name, pass] of effects) {
+ if (name.startsWith(prefix)) {
+ for (const buffer of pass.buffers.values()) {
+ buffer.dispose();
+ }
+ effects.delete(name);
+ }
+ }
+ },
render(outputs: readonly RenderImage[]) {
if (disposed) {
throw Error("Render graph is closed.");
diff --git a/src/core/renderer/index.ts b/src/core/renderer/index.ts
index affccca..92e7d7d 100644
--- a/src/core/renderer/index.ts
+++ b/src/core/renderer/index.ts
@@ -1,10 +1,16 @@
-import type { Gpu, Timer } from "vgpu";
-import type { Scene } from "@/core/document";
+import type { Gpu, Target, Timer } from "vgpu";
+import { type Scene, walkLayers } from "@/core/document";
import type { ImageSource, WhiteBalance } from "@/core/image";
import { createRenderGraph } from "./graph";
import { input, type RenderImage } from "./node";
-export { type Clipping, createDisplay, type View } from "./display";
+export { mixAdjustment } from "./blend";
+export {
+ type Clipping,
+ createDisplay,
+ type MaskOverlay,
+ type View,
+} from "./display";
export {
input,
merge,
@@ -24,11 +30,17 @@ export { createRenderGraph };
export type SceneProcessing = (
source: RenderImage,
scene: Scene,
+ inputId?: string,
) => {
original: RenderImage;
- input: RenderImage;
full: RenderImage;
output: RenderImage;
+ input?: RenderImage;
+};
+
+type RenderRequest = {
+ scene: Scene;
+ inputId?: string;
};
function sameBalance(a: WhiteBalance | undefined, b: WhiteBalance | undefined) {
@@ -47,23 +59,34 @@ export function createRenderer(
const release = resource.retain();
const raw = resource.raw?.createPass();
let original = source;
- let previewInput = source;
let full = source;
const listeners = new Set<() => void>();
let rendered = false;
let output = source;
+ let inspected: { id: string; image: Target } | undefined;
let balance = resource.raw?.asShot;
- let next: Scene | undefined;
+ let next: RenderRequest | undefined;
let pending: Promise<void> | undefined;
let disposed = false;
- function render(scene: Scene) {
- const images = compose(input(raw?.render() ?? source), scene);
- [original, previewInput, full, output] = graph.render([
+ let instances = new Set<string>();
+ function render({ scene, inputId }: RenderRequest) {
+ const active = new Set(walkLayers(scene.layers).map((layer) => layer.id));
+ for (const id of instances) {
+ if (!active.has(id)) {
+ graph.release(`layer/${id}/`);
+ }
+ }
+ instances = active;
+ const images = compose(input(raw?.render() ?? source), scene, inputId);
+ const targets = graph.render([
images.original,
- images.input,
images.full,
images.output,
+ ...(images.input ? [images.input] : []),
]);
+ [original, full, output] = targets;
+ inspected =
+ inputId && targets[3] ? { id: inputId, image: targets[3] } : undefined;
rendered = true;
for (const listener of listeners) {
listener();
@@ -72,9 +95,10 @@ export function createRenderer(
/** Only calibration crosses the worker; each renderer owns its GPU RAW pass. */
async function develop() {
while (next && !disposed) {
- const scene = next;
+ const request = next;
next = undefined;
- const selected = scene.whiteBalance ?? resource.raw?.asShot;
+ const { scene } = request;
+ const selected = scene.layers[0].whiteBalance ?? resource.raw?.asShot;
if (raw && selected && !sameBalance(balance, selected)) {
await raw.prepare(selected);
if (disposed) {
@@ -83,19 +107,19 @@ export function createRenderer(
balance = selected;
}
if (!next) {
- render(scene);
+ render(request);
}
}
}
- async function update(scene: Scene): Promise<void> {
+ async function update(scene: Scene, inputId?: string): Promise<void> {
if (disposed) {
throw Error("Renderer is closed.");
}
if (!resource.raw) {
- render(scene);
+ render({ scene, inputId });
return;
}
- next = scene;
+ next = { scene, inputId };
pending ??= develop()
.catch((error) => {
if (!next) {
@@ -105,7 +129,7 @@ export function createRenderer(
.finally(() => {
pending = undefined;
if (next && !disposed) {
- return update(next);
+ return update(next.scene, next.inputId);
}
});
return pending;
@@ -113,9 +137,10 @@ export function createRenderer(
return {
originalImage: () => original,
- inputImage: () => previewInput,
fullImage: () => full,
outputImage: () => output,
+ inputImage: (id: string) =>
+ inspected?.id === id ? inspected.image : undefined,
inspect: graph.inspect,
subscribe(listener: () => void) {
listeners.add(listener);
diff --git a/src/features/adjustments/controls.tsx b/src/features/adjustments/controls.tsx
index 7ea0840..ef02e9f 100644
--- a/src/features/adjustments/controls.tsx
+++ b/src/features/adjustments/controls.tsx
@@ -1,16 +1,11 @@
-import type { ComponentProps, ReactNode } from "react";
-import { useDocument, useScene } from "@/components/editor/session";
-import { Collapsible } from "@/components/ui/collapsible";
+import type { ReactNode } from "react";
+import { useDocument } from "@/components/editor/session";
import { Slider } from "@/components/ui/slider";
import type { Adjustments } from "@/core/document";
import { setAdjustments } from "./edits";
-import {
- adjustmentLimits,
- adjustmentMinimums,
- defaultAdjustments,
-} from "./model";
+import { adjustmentLimits, defaultAdjustments } from "./model";
-const stops = {
+const stops: Partial<Record<keyof Adjustments, string[]>> = {
incrementalTemperature: ["#4a6fc3", "#c3b84a"],
incrementalTint: ["#5ab34a", "#b34ab3"],
saturation: [
@@ -22,90 +17,71 @@ const stops = {
],
};
-type AdjustmentSliderProps = Pick<
- ComponentProps<typeof Slider>,
- "label" | "step" | "stops"
-> & {
- name: keyof Adjustments;
-};
+const tone = [
+ ["exposure", "Exposure"],
+ ["contrast", "Contrast"],
+ ["highlights", "Highlights"],
+ ["shadows", "Shadows"],
+ ["whites", "Whites"],
+ ["blacks", "Blacks"],
+] as const;
+const color = [
+ ["incrementalTemperature", "Temp"],
+ ["incrementalTint", "Tint"],
+ ["vibrance", "Vibrance"],
+ ["saturation", "Saturation"],
+] as const;
+type Control = (typeof tone)[number] | (typeof color)[number];
-function AdjustmentSlider({ name, ...props }: AdjustmentSliderProps) {
- const value = useScene((scene) => scene.adjustments[name]);
+function AdjustmentSliders({
+ id,
+ adjustments,
+ controls,
+}: {
+ id: string;
+ adjustments: Readonly<Adjustments>;
+ controls: readonly Control[];
+}) {
const document = useDocument();
- return (
- <Slider
- {...props}
- value={value}
- onChange={(value) => setAdjustments(document, { [name]: value })}
- defaultValue={defaultAdjustments[name]}
- min={adjustmentMinimums[name] ?? -adjustmentLimits[name]}
- max={adjustmentLimits[name]}
- />
- );
-}
-
-export function TemperatureControls() {
- return (
- <>
- <AdjustmentSlider
- name="incrementalTemperature"
- label="Temp"
- stops={stops.incrementalTemperature}
- />
- <AdjustmentSlider
- name="incrementalTint"
- label="Tint"
- stops={stops.incrementalTint}
+ return controls.map(([name, label]) => {
+ const step = name === "exposure" ? 0.01 : 1;
+ const gradient = name === "vibrance" ? stops.saturation : stops[name];
+ return (
+ <Slider
+ key={name}
+ label={label}
+ value={adjustments[name]}
+ step={step}
+ stops={gradient}
+ min={-adjustmentLimits[name]}
+ max={adjustmentLimits[name]}
+ defaultValue={defaultAdjustments[name]}
+ onChange={(value) => setAdjustments(document, { [name]: value }, id)}
/>
- </>
- );
+ );
+ });
}
+/** The temperature slot replaces the incremental temperature and tint sliders. */
export function AdjustmentControls({
- curves,
- colorMixer,
+ id,
+ adjustments,
temperature,
}: {
- curves: ReactNode;
- colorMixer: ReactNode;
- temperature: ReactNode;
+ id: string;
+ adjustments: Readonly<Adjustments>;
+ temperature?: ReactNode;
}) {
return (
- <>
- <Collapsible title="Light">
- <div className="flex flex-col gap-2">
- <AdjustmentSlider name="exposure" label="Exposure" step={0.01} />
- <AdjustmentSlider name="contrast" label="Contrast" />
- <AdjustmentSlider name="highlights" label="Highlights" />
- <AdjustmentSlider name="shadows" label="Shadows" />
- <AdjustmentSlider name="whites" label="Whites" />
- <AdjustmentSlider name="blacks" label="Blacks" />
- </div>
- <div className="pt-3">{curves}</div>
- </Collapsible>
- <Collapsible title="Color">
- <div className="flex flex-col gap-2">
- {temperature}
- <AdjustmentSlider
- name="vibrance"
- label="Vibrance"
- stops={stops.saturation}
- />
- <AdjustmentSlider
- name="saturation"
- label="Saturation"
- stops={stops.saturation}
- />
- </div>
- </Collapsible>
- {colorMixer}
- <Collapsible title="Details">
- <div className="flex flex-col gap-2">
- <AdjustmentSlider name="clarity" label="Clarity" />
- <AdjustmentSlider name="sharpening" label="Sharpening" />
- <AdjustmentSlider name="sharpenRadius" label="Radius" step={0.1} />
- </div>
- </Collapsible>
- </>
+ <section className="flex flex-col gap-2 p-3">
+ <AdjustmentSliders id={id} adjustments={adjustments} controls={tone} />
+ <hr className="my-1 border-black/50" />
+ {temperature}
+ <AdjustmentSliders
+ id={id}
+ adjustments={adjustments}
+ controls={temperature ? color.slice(2) : color}
+ />
+ </section>
);
}
diff --git a/src/features/adjustments/edits.ts b/src/features/adjustments/edits.ts
index bc1ffd2..d5aca18 100644
--- a/src/features/adjustments/edits.ts
+++ b/src/features/adjustments/edits.ts
@@ -1,9 +1,14 @@
-import type { Adjustments, EditorDocument } from "@/core/document";
-import { adjustmentLimits, adjustmentMinimums } from "./model";
+import {
+ type Adjustments,
+ type EditorDocument,
+ editLayer,
+} from "@/core/document";
+import { adjustmentLimits } from "./model";
export function setAdjustments(
document: EditorDocument,
change: Partial<Adjustments>,
+ id = document.scene.getState().layers[0].id,
) {
for (const [name, value] of Object.entries(change)) {
const limit = Reflect.get(adjustmentLimits, name);
@@ -12,11 +17,17 @@ export function setAdjustments(
typeof value !== "number" ||
!Number.isFinite(value) ||
value > limit ||
- value < (Reflect.get(adjustmentMinimums, name) ?? -limit)
+ value < -limit
) {
throw new Error(`Invalid adjustment: ${name}.`);
}
}
- const scene = document.scene.getState();
- document.edit({ ...scene, adjustments: { ...scene.adjustments, ...change } });
+ editLayer(document, id, (layer) => {
+ if (layer.kind !== "image" && layer.kind !== "mask") {
+ throw Error("Select an image or mask layer.");
+ }
+ const adjustments = { ...layer.adjustments, ...change };
+
+ return { ...layer, adjustments };
+ });
}
diff --git a/src/features/adjustments/exposure.ts b/src/features/adjustments/exposure.ts
new file mode 100644
index 0000000..18c411f
--- /dev/null
+++ b/src/features/adjustments/exposure.ts
@@ -0,0 +1,9 @@
+import { node } from "@/core/renderer";
+import shader from "./exposure.wgsl";
+
+export function exposure(name: string, value: number) {
+ if (value === 0) {
+ return;
+ }
+ return node(name, shader, { set: { exposure: value } });
+}
diff --git a/src/features/adjustments/exposure.wgsl b/src/features/adjustments/exposure.wgsl
new file mode 100644
index 0000000..9f6a2c0
--- /dev/null
+++ b/src/features/adjustments/exposure.wgsl
@@ -0,0 +1,7 @@
+import { adjustExposure } from "./prepare.wgsl";
+@group(0) @binding(0) var source: texture_2d<f32>;
+@group(0) @binding(1) var<uniform> exposure: f32;
+@fragment fn fs_main(@builtin(position) position: vec4f) -> @location(0) vec4f {
+ let pixel = textureLoad(source, vec2i(position.xy), 0);
+ return vec4f(adjustExposure(pixel.rgb, exposure), pixel.a);
+}
diff --git a/src/features/adjustments/model.ts b/src/features/adjustments/model.ts
index 6a5ad37..1aa581d 100644
--- a/src/features/adjustments/model.ts
+++ b/src/features/adjustments/model.ts
@@ -11,9 +11,6 @@ export const defaultAdjustments: Adjustments = {
blacks: 0,
vibrance: 0,
saturation: 0,
- clarity: 0,
- sharpening: 0,
- sharpenRadius: 1,
};
export const adjustmentLimits: Adjustments = {
@@ -27,12 +24,4 @@ export const adjustmentLimits: Adjustments = {
blacks: 100,
vibrance: 100,
saturation: 100,
- clarity: 100,
- sharpening: 150,
- sharpenRadius: 3,
-};
-
-export const adjustmentMinimums: Partial<Adjustments> = {
- sharpening: 0,
- sharpenRadius: 0.5,
};
diff --git a/src/features/adjustments/pass.ts b/src/features/adjustments/pass.ts
index b9d06f0..626ff62 100644
--- a/src/features/adjustments/pass.ts
+++ b/src/features/adjustments/pass.ts
@@ -2,8 +2,8 @@ import type { Adjustments } from "@/core/document";
import { node } from "@/core/renderer";
import shader from "./adjustments.wgsl";
-export function adjustments(values: Adjustments) {
- return node("adjustments", shader, {
+export function adjustments(values: Adjustments, name = "adjustments") {
+ return node(name, shader, {
set: { adjustments: values },
samplers: { sourceSampler: { minFilter: "linear", magFilter: "linear" } },
});
diff --git a/src/features/adjustments/prepare.wgsl b/src/features/adjustments/prepare.wgsl
index 3a58444..42df163 100644
--- a/src/features/adjustments/prepare.wgsl
+++ b/src/features/adjustments/prepare.wgsl
@@ -28,7 +28,7 @@ fn exposeGray(light: f32, stops: f32) -> f32 {
// Every channel scales by the gain of the pixel's luminance, so hue holds at any exposure.
// Negatives, from wide-gamut sources or noise below black, clip here.
-fn adjustExposure(color: vec3f, stops: f32) -> vec3f {
+export fn adjustExposure(color: vec3f, stops: f32) -> vec3f {
let clipped = max(color, vec3f(0.0));
let light = luminance(clipped);
if light <= 0.0 { return clipped; }
diff --git a/src/features/color-mixer/controls.tsx b/src/features/color-mixer/controls.tsx
index 0cd509c..ff1a2ab 100644
--- a/src/features/color-mixer/controls.tsx
+++ b/src/features/color-mixer/controls.tsx
@@ -1,11 +1,11 @@
import { useId, useState } from "react";
-import { useDocument, useScene } from "@/components/editor/session";
-import { Collapsible } from "@/components/ui/collapsible";
+import { useDocument } from "@/components/editor/session";
import { ScrubInput } from "@/components/ui/scrub-input";
import { Tab, TabList } from "@/components/ui/tabs";
import { VerticalSlider } from "@/components/ui/vertical-slider";
+import type { ColorMixer } from "@/core/document";
import { setColorMixer } from "./edits";
-import { channels, colors, defaultMixer, type MixerChannel } from "./model";
+import { channels, colors, type MixerChannel } from "./model";
function gradient(hue: number, channel: MixerChannel) {
if (channel === "hue") {
@@ -20,18 +20,19 @@ function gradient(hue: number, channel: MixerChannel) {
function ColorSlider({
index,
channel,
+ value,
+ layerId,
}: {
index: number;
channel: MixerChannel;
+ value: number;
+ layerId: string;
}) {
const document = useDocument();
- const value = useScene(
- (scene) => (scene.colorMixer ?? defaultMixer)[channel][index],
- );
const color = colors[index];
const label = `${color.label} ${channel}`;
const change = (value: number) =>
- setColorMixer(document, color.id, { [channel]: value });
+ setColorMixer(document, color.id, { [channel]: value }, layerId);
return (
<div
className="flex min-w-0 flex-col items-center gap-1"
@@ -39,7 +40,7 @@ function ColorSlider({
>
<ScrubInput
aria-label={`${label} value`}
- className="w-full leading-4 [&>span]:px-0 [&_input]:text-center [&_input]:text-[11px] [&_input]:tracking-tight"
+ className="w-full leading-4 [&>span]:px-0 [&_input]:text-center [&_input]:tracking-tight"
variant="text"
value={value}
onChange={change}
@@ -60,11 +61,17 @@ function ColorSlider({
);
}
-function MixerPanel() {
+export function ColorMixerControls({
+ id: layerId,
+ mixer,
+}: {
+ id: string;
+ mixer: ColorMixer;
+}) {
const [channel, setChannel] = useState<MixerChannel>("hue");
const id = useId();
return (
- <>
+ <section className="p-3">
<TabList
aria-label="Color Mixer adjustment"
className="mb-3 gap-0.5 rounded-md bg-neutral-900 p-0.5 shadow-groove"
@@ -89,17 +96,15 @@ function MixerPanel() {
className="grid grid-cols-8"
>
{colors.map((color, index) => (
- <ColorSlider key={color.id} index={index} channel={channel} />
+ <ColorSlider
+ key={color.id}
+ index={index}
+ channel={channel}
+ value={mixer[channel][index]}
+ layerId={layerId}
+ />
))}
</div>
- </>
- );
-}
-
-export function ColorMixerControls() {
- return (
- <Collapsible title="Color Mixer">
- <MixerPanel />
- </Collapsible>
+ </section>
);
}
diff --git a/src/features/color-mixer/edits.ts b/src/features/color-mixer/edits.ts
index 7d447b7..abc0c43 100644
--- a/src/features/color-mixer/edits.ts
+++ b/src/features/color-mixer/edits.ts
@@ -1,15 +1,18 @@
-import type { EditorDocument } from "@/core/document";
+import {
+ type ColorMixer,
+ type EditorDocument,
+ editLayer,
+} from "@/core/document";
import {
channels,
colors,
defaultMixer,
- isNeutral,
type MixerChange,
type MixerColor,
} from "./model";
-export function setColorMixer(
- document: EditorDocument,
+export function changeColorMixer(
+ current: ColorMixer,
color: MixerColor,
change: MixerChange,
) {
@@ -27,8 +30,6 @@ export function setColorMixer(
throw new Error(`Invalid color mixer adjustment: ${name}.`);
}
}
- const scene = document.scene.getState();
- const current = scene.colorMixer ?? defaultMixer;
const next = { ...current };
for (const { id } of channels) {
const value = change[id];
@@ -36,15 +37,31 @@ export function setColorMixer(
next[id] = current[id].with(index, value);
}
}
- if (channels.every(({ id }) => current[id] === next[id])) {
- return;
- }
- document.edit({ ...scene, colorMixer: isNeutral(next) ? undefined : next });
+ return next;
}
-export function resetColorMixer(document: EditorDocument) {
- const scene = document.scene.getState();
- if (scene.colorMixer) {
- document.edit({ ...scene, colorMixer: undefined });
- }
+export function setColorMixer(
+ document: EditorDocument,
+ color: MixerColor,
+ change: MixerChange,
+ id: string,
+) {
+ editLayer(document, id, (layer) => {
+ if (layer.kind !== "color-mixer") {
+ throw Error("Select a color mixer layer.");
+ }
+ return {
+ ...layer,
+ colorMixer: changeColorMixer(layer.colorMixer, color, change),
+ };
+ });
+}
+
+export function resetColorMixer(document: EditorDocument, id: string) {
+ editLayer(document, id, (layer) => {
+ if (layer.kind !== "color-mixer") {
+ throw Error("Select a color mixer layer.");
+ }
+ return { ...layer, colorMixer: defaultMixer };
+ });
}
diff --git a/src/features/color-mixer/pass.ts b/src/features/color-mixer/pass.ts
index 4297639..ca03013 100644
--- a/src/features/color-mixer/pass.ts
+++ b/src/features/color-mixer/pass.ts
@@ -3,11 +3,11 @@ import { node } from "@/core/renderer";
import shader from "./mixer.wgsl";
import { colors, isNeutral } from "./model";
-export function colorMixer(mixer?: ColorMixer) {
+export function colorMixer(mixer?: ColorMixer, name = "color-mixer") {
if (!mixer || isNeutral(mixer)) {
return;
}
- return node("color-mixer", shader, {
+ return node(name, shader, {
storage: {
settings: new Float32Array(
colors.flatMap(({ angle }, index) => [
diff --git a/src/features/crop/view.tsx b/src/features/crop/view.tsx
index f5757af..65e125e 100644
--- a/src/features/crop/view.tsx
+++ b/src/features/crop/view.tsx
@@ -1,10 +1,7 @@
import { useState } from "react";
import { Image } from "@/components/editor/image";
-import {
- PanelContent,
- useDocument,
- useEditorSession,
-} from "@/components/editor/session";
+import { EditorPanel, PanelHeader } from "@/components/editor/panel";
+import { useDocument, useEditorSession } from "@/components/editor/session";
import { EditorViewport } from "@/components/editor/viewport";
import { FlipIcon } from "@/components/icons/flip";
import { RotateIcon } from "@/components/icons/rotate";
@@ -31,7 +28,7 @@ export function CropEditor({ onClose }: { onClose: () => void }) {
const [ratio, setRatio] = useState<number | null>(
frame.size[0] / frame.size[1],
);
- const sourceId = document.scene.getState().source;
+ const sourceId = document.scene.getState().layers[0].source;
const [width, height] = document.resources.get(sourceId).image.size;
const source: Point = [width, height];
function fitView() {
@@ -93,98 +90,95 @@ export function CropEditor({ onClose }: { onClose: () => void }) {
onChange={setFrame}
/>
</EditorViewport>
- <PanelContent>
- <section
- aria-label="Crop tool"
- className="flex min-h-0 flex-1 flex-col bg-panel"
- onKeyDown={(event) => {
- if (
- event.key === "Enter" &&
- event.target instanceof Element &&
- event.target.closest("button")
- ) {
- event.stopPropagation();
- }
- }}
- >
- <div className="flex-1 space-y-5 overflow-y-auto p-4">
- <label className="flex items-center justify-between text-sm text-neutral-400">
- Aspect ratio
- <Field className="relative w-24">
- <select
- aria-label="Aspect ratio"
- value={ratio ?? "free"}
- className="w-full cursor-pointer bg-transparent px-1 text-neutral-100 outline-none [color-scheme:dark]"
- onChange={(event) => changeRatio(event.currentTarget.value)}
- >
- <option value="free">Free</option>
- {custom && <option value={ratio}>Current</option>}
- {Object.entries(ratios).map(([label, value]) => (
- <option key={label} value={value}>
- {label}
- </option>
- ))}
- </select>
- </Field>
- </label>
- <section
- aria-label="Rotate and flip image"
- className="grid grid-cols-4 items-center gap-2"
- >
- <h3 className="col-span-3 text-xs font-medium text-neutral-400">
- Rotate & flip
- </h3>
- <Button
- variant="ghost"
- className="justify-self-end px-2 py-1"
- onClick={reset}
+ <EditorPanel
+ header={<PanelHeader title="Crop" onClose={onClose} />}
+ onKeyDown={(event) => {
+ // Enter on a panel button is its click; the crop handles still apply.
+ if (
+ event.key === "Enter" &&
+ event.target instanceof Element &&
+ event.target.closest("button")
+ ) {
+ event.stopPropagation();
+ }
+ }}
+ footer={
+ <div className="border-t border-black p-3">
+ <Button className="w-full py-2" onClick={apply}>
+ Apply crop
+ </Button>
+ </div>
+ }
+ >
+ <section aria-label="Crop tool" className="space-y-5 p-4">
+ <label className="flex items-center justify-between text-neutral-400">
+ Aspect ratio
+ <Field className="relative w-24">
+ <select
+ aria-label="Aspect ratio"
+ value={ratio ?? "free"}
+ className="w-full cursor-pointer bg-transparent px-1 text-neutral-100 outline-none [color-scheme:dark]"
+ onChange={(event) => changeRatio(event.currentTarget.value)}
>
- Reset
- </Button>
+ <option value="free">Free</option>
+ {custom && <option value={ratio}>Current</option>}
+ {Object.entries(ratios).map(([label, value]) => (
+ <option key={label} value={value}>
+ {label}
+ </option>
+ ))}
+ </select>
+ </Field>
+ </label>
+ <section
+ aria-label="Rotate and flip image"
+ className="grid grid-cols-4 items-center gap-2"
+ >
+ <h3 className="col-span-3 text-neutral-400">Rotate & flip</h3>
+ <Button
+ variant="ghost"
+ className="justify-self-end px-2 py-1"
+ onClick={reset}
+ >
+ Reset
+ </Button>
- {actions.map((action) => {
- const Icon = "turn" in action ? RotateIcon : FlipIcon;
+ {actions.map((action) => {
+ const Icon = "turn" in action ? RotateIcon : FlipIcon;
- return (
- <Button
- key={action.label}
- variant="ghost"
- aria-label={action.label}
- title={action.label}
- className="flex h-9 items-center justify-center gap-1 rounded-md px-1"
- onClick={() => applyAction(action)}
- >
- <Icon style={{ transform: action.transform }} />
- {"turn" in action && <span className="text-xs">90°</span>}
- </Button>
- );
- })}
- </section>
- <Slider
- label="Rotation"
- min={-45}
- max={45}
- step={0.1}
- value={frame.angle}
- defaultValue={0}
- onChange={(angle) => setFrame(rotate(frame, angle, source))}
- />
- <p className="text-xs text-neutral-500">
- Drag edges or corners to crop, inside to move, outside to rotate.
- Space + drag to pan; Ctrl/⌘ + scroll to zoom.
- </p>
- <p className="text-xs tabular-nums text-neutral-400">
- {frame.size.map(Math.round).join(" × ")} px
- </p>
- </div>
- <div className="flex justify-end gap-2 border-t border-black p-3">
- <Button variant="ghost" className="px-3" onClick={onClose}>
- Cancel
- </Button>
- <Button onClick={apply}>Apply crop</Button>
- </div>
+ return (
+ <Button
+ key={action.label}
+ variant="ghost"
+ aria-label={action.label}
+ title={action.label}
+ className="flex h-9 items-center justify-center gap-1 rounded-md px-1"
+ onClick={() => applyAction(action)}
+ >
+ <Icon style={{ transform: action.transform }} />
+ {"turn" in action && <span>90°</span>}
+ </Button>
+ );
+ })}
+ </section>
+ <Slider
+ label="Rotation"
+ min={-45}
+ max={45}
+ step={0.1}
+ value={frame.angle}
+ defaultValue={0}
+ onChange={(angle) => setFrame(rotate(frame, angle, source))}
+ />
+ <p className="text-neutral-500">
+ Drag edges or corners to crop, inside to move, outside to rotate.
+ Space + drag to pan; Ctrl/⌘ + scroll to zoom.
+ </p>
+ <p className="tabular-nums text-neutral-400">
+ {frame.size.map(Math.round).join(" × ")} px
+ </p>
</section>
- </PanelContent>
+ </EditorPanel>
</>
);
}
diff --git a/src/features/details/controls.tsx b/src/features/details/controls.tsx
new file mode 100644
index 0000000..c686b6a
--- /dev/null
+++ b/src/features/details/controls.tsx
@@ -0,0 +1,36 @@
+import { useDocument } from "@/components/editor/session";
+import { Slider } from "@/components/ui/slider";
+import type { Details } from "@/core/document";
+import { setDetails } from "./edits";
+import { defaultDetails, detailLimits } from "./model";
+
+export function DetailsControls({
+ id,
+ details,
+}: {
+ id: string;
+ details: Readonly<Details>;
+}) {
+ const document = useDocument();
+ const controls = [
+ ["clarity", "Clarity", 1],
+ ["sharpening", "Sharpening", 1],
+ ["sharpenRadius", "Radius", 0.1],
+ ] as const;
+ return (
+ <section className="flex flex-col gap-2 p-3">
+ {controls.map(([name, label, step]) => (
+ <Slider
+ key={name}
+ label={label}
+ value={details[name]}
+ min={detailLimits[name][0]}
+ max={detailLimits[name][1]}
+ step={step}
+ defaultValue={defaultDetails[name]}
+ onChange={(value) => setDetails(document, { [name]: value }, id)}
+ />
+ ))}
+ </section>
+ );
+}
diff --git a/src/features/details/edits.ts b/src/features/details/edits.ts
new file mode 100644
index 0000000..d12f685
--- /dev/null
+++ b/src/features/details/edits.ts
@@ -0,0 +1,16 @@
+import { type Details, type EditorDocument, editLayer } from "@/core/document";
+import { validateDetails } from "./model";
+
+export function setDetails(
+ document: EditorDocument,
+ change: Partial<Details>,
+ id: string,
+) {
+ validateDetails(change);
+ editLayer(document, id, (layer) => {
+ if (layer.kind !== "details") {
+ throw Error("Select a Details layer.");
+ }
+ return { ...layer, details: { ...layer.details, ...change } };
+ });
+}
diff --git a/src/features/details/model.ts b/src/features/details/model.ts
new file mode 100644
index 0000000..a2a76fb
--- /dev/null
+++ b/src/features/details/model.ts
@@ -0,0 +1,29 @@
+import type { Details } from "@/core/document";
+
+export const defaultDetails: Details = {
+ clarity: 0,
+ sharpening: 0,
+ sharpenRadius: 1,
+};
+export const detailLimits = {
+ clarity: [-100, 100],
+ sharpening: [0, 150],
+ sharpenRadius: [0.5, 3],
+} as const;
+
+export function validateDetails(change: Partial<Details>) {
+ for (const [name, value] of Object.entries(change)) {
+ const limits = Object.entries(detailLimits).find(
+ ([key]) => key === name,
+ )?.[1];
+ if (
+ !limits ||
+ typeof value !== "number" ||
+ !Number.isFinite(value) ||
+ value < limits[0] ||
+ value > limits[1]
+ ) {
+ throw Error(`Invalid detail adjustment: ${name}.`);
+ }
+ }
+}
diff --git a/src/features/adjustments/unsharp-mask.ts b/src/features/details/unsharp-mask.ts
similarity index 100%
rename from src/features/adjustments/unsharp-mask.ts
rename to src/features/details/unsharp-mask.ts
diff --git a/src/features/adjustments/unsharp-mask.wgsl b/src/features/details/unsharp-mask.wgsl
similarity index 100%
rename from src/features/adjustments/unsharp-mask.wgsl
rename to src/features/details/unsharp-mask.wgsl
diff --git a/src/features/histogram/histogram.ts b/src/features/histogram/histogram.ts
index e81ff1e..6db9c13 100644
--- a/src/features/histogram/histogram.ts
+++ b/src/features/histogram/histogram.ts
@@ -27,7 +27,7 @@ export function createHistogram(gpu: Gpu) {
read,
attach(
svg: SVGSVGElement,
- image: () => Target,
+ image: () => Target | undefined,
colors: readonly [string] | readonly [string, string, string],
working = false,
) {
@@ -56,10 +56,21 @@ export function createHistogram(gpu: Gpu) {
try {
do {
requested = false;
- const values = await read(image(), working, colors.length);
+ const source = image();
+ if (!source) {
+ for (const { polygon, polyline } of curves) {
+ polygon.setAttribute("points", "");
+ polyline.setAttribute("points", "");
+ }
+ return;
+ }
+ const values = await read(source, working, colors.length);
if (!plot.isConnected) {
return;
}
+ if (requested) {
+ continue;
+ }
curves.forEach(({ polygon, polyline }, channel) => {
const points = Array.from(
values.subarray(channel * 256, (channel + 1) * 256),
diff --git a/src/features/histogram/index.tsx b/src/features/histogram/index.tsx
index 01288d8..0cd3baa 100644
--- a/src/features/histogram/index.tsx
+++ b/src/features/histogram/index.tsx
@@ -4,7 +4,7 @@ import type { createHistogram } from "./histogram";
type Props = ComponentProps<"svg"> & {
histogram: ReturnType<typeof createHistogram>;
- image: () => Target;
+ image: () => Target | undefined;
subscribe: (listener: () => void) => () => void;
colors: readonly [string] | readonly [string, string, string];
working?: boolean;
diff --git a/src/features/layers/controls.tsx b/src/features/layers/controls.tsx
new file mode 100644
index 0000000..aac0a4f
--- /dev/null
+++ b/src/features/layers/controls.tsx
@@ -0,0 +1,373 @@
+import { type ComponentProps, useEffect, useState } from "react";
+import { useStore } from "zustand";
+import { PanelHeader } from "@/components/editor/panel";
+import { useDocument, useScene } from "@/components/editor/session";
+import { Icon } from "@/components/icons/icon";
+import { ScrollArea } from "@/components/ui/scroll-area";
+import {
+ TreeDrag,
+ type TreeDrop,
+ useTreeDragItem,
+} from "@/components/ui/tree-drag";
+import {
+ type EffectLayer,
+ findLayer,
+ type Layer,
+ type ProcessingLayer,
+} from "@/core/document";
+import type { Point } from "@/core/image/frame";
+import { layerDrop } from "./drop";
+import { moveLayer, setLayer } from "./edits";
+import { useGradientTool } from "./gradient-tool";
+import { LayerActions, LayerMenu } from "./menu";
+import { ImageThumbnail, MaskThumbnail } from "./thumbnails";
+
+function EffectSymbol({ kind }: { kind: ProcessingLayer["kind"] }) {
+ switch (kind) {
+ case "color-mixer":
+ return (
+ <>
+ <circle cx="9" cy="9" r="5" />
+ <circle cx="15" cy="9" r="5" />
+ <circle cx="12" cy="15" r="5" />
+ </>
+ );
+ case "details":
+ return <path d="m4 18 8-14 8 14H4Zm8-8v6" />;
+ case "vignette":
+ return (
+ <>
+ <circle cx="12" cy="12" r="8" />
+ <circle cx="12" cy="12" r="3" />
+ </>
+ );
+ default:
+ return (
+ <>
+ <circle cx="12" cy="12" r="8" />
+ <path d="M12 4a8 8 0 0 1 0 16Z" fill="currentColor" stroke="none" />
+ </>
+ );
+ }
+}
+
+function LayerThumbnail({ layer, size }: { layer: Layer; size: Point }) {
+ if (layer.kind === "image") {
+ return <ImageThumbnail />;
+ }
+ if (layer.kind === "mask") {
+ return <MaskThumbnail mask={layer.mask} size={size} />;
+ }
+ return (
+ <span className="grid size-8 shrink-0 place-items-center rounded border border-black/50 bg-neutral-950/40 text-neutral-400">
+ <Icon className="size-4">
+ <EffectSymbol kind={layer.kind} />
+ </Icon>
+ </span>
+ );
+}
+
+function LayerName({
+ layer,
+ onSelect,
+ dragHandle,
+}: {
+ layer: Layer;
+ onSelect: () => void;
+ dragHandle: ComponentProps<"button">;
+}) {
+ const document = useDocument();
+ const [renaming, setRenaming] = useState(false);
+ if (renaming) {
+ return (
+ <input
+ aria-label="Layer name"
+ ref={(input) => input?.select()}
+ defaultValue={layer.name}
+ className="min-w-0 flex-1 rounded border border-neutral-500 bg-neutral-900 px-1 text-neutral-100 outline-none"
+ onKeyDown={(event) => {
+ if (event.key === "Enter") {
+ event.currentTarget.blur();
+ }
+ if (event.key === "Escape") {
+ event.currentTarget.value = layer.name;
+ event.currentTarget.blur();
+ }
+ }}
+ onBlur={(event) => {
+ const name = event.currentTarget.value.trim();
+ if (name && name !== layer.name) {
+ setLayer(document, layer.id, { name });
+ }
+ setRenaming(false);
+ }}
+ />
+ );
+ }
+ function rename() {
+ if (layer.kind !== "image") {
+ setRenaming(true);
+ }
+ }
+ return (
+ <button
+ {...dragHandle}
+ type="button"
+ aria-label={layer.name}
+ title={layer.name}
+ onClick={onSelect}
+ onDoubleClick={rename}
+ className="min-w-0 flex-1 self-stretch truncate text-left touch-manipulation cursor-grab active:cursor-grabbing"
+ >
+ {layer.name}
+ </button>
+ );
+}
+
+function LayerRow({
+ layer,
+ siblings,
+ parent,
+ depth,
+ selected,
+ size,
+ onSelect,
+}: {
+ layer: Layer;
+ siblings: readonly Layer[];
+ parent?: Layer;
+ depth: number;
+ selected: string;
+ size: Point;
+ onSelect: (id: string) => void;
+}) {
+ const document = useDocument();
+ const [collapsed, setCollapsed] = useState(false);
+ const isImage = layer.kind === "image";
+ const visible = isImage || layer.visible;
+ useEffect(() => {
+ if (findLayer(layer.children, selected)) {
+ setCollapsed(false);
+ }
+ }, [layer.children, selected]);
+ const expanded = !collapsed;
+ const drag = useTreeDragItem(layer.id, {
+ disabled: isImage,
+ expanded: expanded && layer.children.length > 0,
+ });
+ const dragHandle = isImage ? {} : drag.handle;
+ const chevronStyle = { transform: expanded ? "rotate(90deg)" : undefined };
+ const isSubmask = layer.kind === "mask" && parent?.kind === "mask";
+ const maskSign =
+ layer.kind === "mask" && layer.operation === "subtract" ? "−" : "+";
+ let expandLabel = `Expand ${layer.name}`;
+ if (expanded) {
+ expandLabel = `Collapse ${layer.name}`;
+ }
+ return (
+ <>
+ <div
+ ref={drag.ref}
+ data-drop={drag.drop}
+ data-dragging={drag.dragging}
+ data-selected={selected === layer.id}
+ data-hidden={!visible}
+ style={{ paddingLeft: depth * 12 }}
+ className="group relative flex h-10 items-center border-b border-black/50 pr-1 text-neutral-300 pointer-coarse:h-12 data-[selected=false]:hover:bg-white/5 data-[selected=true]:bg-neutral-700 data-[hidden=true]:text-neutral-500 data-[dragging=true]:opacity-40 data-[drop=inside]:ring-1 data-[drop=inside]:ring-blue-400 data-[drop=inside]:ring-inset data-[drop=before]:before:absolute data-[drop=before]:before:inset-x-0 data-[drop=before]:before:-top-px data-[drop=before]:before:border-t-2 data-[drop=before]:before:border-blue-400 data-[drop=after]:after:absolute data-[drop=after]:after:inset-x-0 data-[drop=after]:after:-bottom-px data-[drop=after]:after:border-b-2 data-[drop=after]:after:border-blue-400"
+ >
+ <button
+ type="button"
+ aria-label={`Show ${layer.name}`}
+ aria-pressed={visible}
+ disabled={isImage}
+ onClick={() => {
+ if (!isImage) {
+ setLayer(document, layer.id, { visible: !visible });
+ }
+ }}
+ className="grid h-full w-8 shrink-0 place-items-center text-neutral-400 hover:text-neutral-100 disabled:text-neutral-600 aria-[pressed=false]:text-neutral-600 pointer-coarse:w-11"
+ >
+ <Icon className="size-3.5">
+ <path d="M2 12s3.5-6 10-6 10 6 10 6-3.5 6-10 6S2 12 2 12Z" />
+ <circle cx="12" cy="12" r="3" />
+ </Icon>
+ </button>
+ <button
+ type="button"
+ aria-label={`Select ${layer.name}`}
+ onClick={() => onSelect(layer.id)}
+ className="mr-2 shrink-0"
+ >
+ <LayerThumbnail layer={layer} size={size} />
+ </button>
+ <LayerName
+ layer={layer}
+ onSelect={() => onSelect(layer.id)}
+ dragHandle={dragHandle}
+ />
+ {isSubmask && (
+ <span
+ title={layer.operation}
+ className="grid size-6 shrink-0 place-items-center text-neutral-500"
+ >
+ {maskSign}
+ </span>
+ )}
+ {layer.children.length > 0 && (
+ <button
+ type="button"
+ aria-label={expandLabel}
+ aria-expanded={expanded}
+ onClick={() => setCollapsed(expanded)}
+ className="grid size-6 shrink-0 place-items-center text-neutral-500 hover:text-neutral-200"
+ >
+ <Icon className="size-3 transition-transform" style={chevronStyle}>
+ <path d="m9 5 7 7-7 7" />
+ </Icon>
+ </button>
+ )}
+ {layer.kind === "image" && (
+ <span
+ title="Base image is locked"
+ className="grid size-7 shrink-0 place-items-center text-neutral-500"
+ >
+ <Icon className="size-3.5">
+ <rect x="6" y="10" width="12" height="10" rx="2" />
+ <path d="M8 10V7a4 4 0 0 1 8 0v3" />
+ </Icon>
+ </span>
+ )}
+ {layer.kind !== "image" && (
+ <LayerActions
+ layer={layer}
+ siblings={siblings}
+ parent={parent}
+ onSelect={onSelect}
+ />
+ )}
+ </div>
+ {expanded &&
+ layer.children
+ .toReversed()
+ .map((child) => (
+ <LayerRow
+ key={child.id}
+ layer={child}
+ siblings={layer.children}
+ parent={layer}
+ depth={depth + 1}
+ selected={selected}
+ size={size}
+ onSelect={onSelect}
+ />
+ ))}
+ </>
+ );
+}
+
+export function LayersControls({
+ onAdd,
+}: {
+ onAdd: (kind: EffectLayer["kind"]) => void;
+}) {
+ const document = useDocument();
+ const scene = useScene((scene) => scene);
+ const selected = useStore(document.selection, (state) => state.layerId);
+ const size = document.resources.get(scene.layers[0].source).image.size;
+ const tool = useGradientTool();
+ function select(id: string) {
+ tool.close();
+ document.selectLayer(id);
+ }
+ function drop(target: TreeDrop) {
+ const position = layerDrop(document.scene.getState(), target);
+ if (position) {
+ moveLayer(document, target.id, position.index, position.parentId);
+ select(target.id);
+ }
+ }
+
+ return (
+ <section
+ aria-label="Layers"
+ className="grid max-h-1/2 min-h-30 shrink-0 grid-rows-[auto_minmax(0,1fr)] border-t border-black bg-panel"
+ onKeyDown={(event) => {
+ // Escape closes an open menu before the mask shortcuts see it.
+ const menu = event.currentTarget.querySelector<HTMLElement>(
+ "[popover]:popover-open",
+ );
+ if (event.key === "Escape" && menu) {
+ menu.hidePopover();
+ event.stopPropagation();
+ }
+ }}
+ >
+ <PanelHeader title="Layers">
+ <button
+ type="button"
+ aria-label="Add linear mask"
+ title="Draw a linear mask (L)"
+ onClick={() => tool.draw()}
+ className="grid size-7 place-items-center rounded-md text-neutral-400 hover:bg-neutral-700 hover:text-neutral-100 pointer-coarse:size-10"
+ >
+ <Icon className="size-4">
+ <rect x="4" y="4" width="16" height="16" rx="2" />
+ <circle cx="12" cy="12" r="4" fill="currentColor" stroke="none" />
+ </Icon>
+ </button>
+ <button
+ type="button"
+ aria-label="Add radial mask"
+ title="Draw a radial mask (R)"
+ onClick={() => tool.draw("radial")}
+ className="grid size-7 place-items-center rounded-md text-neutral-400 hover:bg-neutral-700 hover:text-neutral-100 pointer-coarse:size-10"
+ >
+ <Icon className="size-4">
+ <ellipse cx="12" cy="12" rx="9" ry="6" />
+ <circle cx="12" cy="12" r="2" fill="currentColor" stroke="none" />
+ </Icon>
+ </button>
+ <LayerMenu
+ label="Add effect"
+ icon={
+ <Icon className="size-4">
+ <path d="M12 4v16M4 12h16" />
+ </Icon>
+ }
+ >
+ <button type="submit" onClick={() => onAdd("details")}>
+ Details
+ </button>
+ <button type="submit" onClick={() => onAdd("exposure")}>
+ Exposure
+ </button>
+ <button type="submit" onClick={() => onAdd("color-mixer")}>
+ Color Mixer
+ </button>
+ <button type="submit" onClick={() => onAdd("vignette")}>
+ Vignette
+ </button>
+ </LayerMenu>
+ </PanelHeader>
+ <ScrollArea fade>
+ <TreeDrag
+ canDrop={(target) => Boolean(layerDrop(scene, target))}
+ onDrop={drop}
+ label={(id) => findLayer(scene.layers, id)?.name ?? id}
+ >
+ {scene.layers.toReversed().map((layer) => (
+ <LayerRow
+ key={layer.id}
+ layer={layer}
+ siblings={scene.layers}
+ depth={0}
+ selected={selected}
+ size={[size[0], size[1]]}
+ onSelect={select}
+ />
+ ))}
+ </TreeDrag>
+ </ScrollArea>
+ </section>
+ );
+}
diff --git a/src/features/layers/drop.ts b/src/features/layers/drop.ts
new file mode 100644
index 0000000..9af8828
--- /dev/null
+++ b/src/features/layers/drop.ts
@@ -0,0 +1,50 @@
+import { findLayer, locateLayer, type Scene } from "@/core/document";
+
+export type LayerDrop = {
+ id: string;
+ target: string;
+ position: "before" | "after" | "inside";
+};
+
+/** Resolve visual top-to-bottom placement into the document's bottom-to-top sibling index. */
+export function layerDrop(
+ scene: Scene,
+ drop: LayerDrop,
+): { index: number; parentId?: string } | undefined {
+ const source = findLayer(scene.layers, drop.id);
+ const location = locateLayer(scene.layers, drop.target);
+ if (
+ !source ||
+ source.kind === "image" ||
+ !location ||
+ findLayer([source], location.layer.id)
+ ) {
+ return;
+ }
+ const target = location.layer;
+ if (drop.position === "inside") {
+ if (
+ source.children.length ||
+ target.kind === "image" ||
+ !scene.layers.includes(target)
+ ) {
+ return;
+ }
+ return {
+ parentId: target.id,
+ index: target.children.filter((item) => item.id !== source.id).length,
+ };
+ }
+ const { siblings, parent } = location;
+ if (parent && source.children.length) {
+ return;
+ }
+ const remaining = siblings.filter((item) => item.id !== source.id);
+ const index =
+ remaining.findIndex((item) => item.id === target.id) +
+ Number(drop.position === "before");
+ if (!parent && index === 0) {
+ return;
+ }
+ return { parentId: parent?.id, index };
+}
diff --git a/src/features/layers/edits.ts b/src/features/layers/edits.ts
new file mode 100644
index 0000000..26b830a
--- /dev/null
+++ b/src/features/layers/edits.ts
@@ -0,0 +1,266 @@
+import {
+ type EditorDocument,
+ editLayer,
+ findLayer,
+ type Gradient,
+ type Layer,
+ locateLayer,
+ type ProcessingLayer,
+ type Scene,
+ updateLayer,
+ walkLayers,
+} from "@/core/document";
+
+function validateMask(mask: Gradient) {
+ if (mask.kind === "radial") {
+ if (
+ mask.center.length !== 2 ||
+ mask.radius.length !== 2 ||
+ ![...mask.center, ...mask.radius, mask.angle, mask.feather].every(
+ Number.isFinite,
+ ) ||
+ mask.radius.some((value) => value <= 0) ||
+ mask.feather < 0 ||
+ mask.feather > 1
+ ) {
+ throw Error(
+ "A radial gradient needs positive radii, finite geometry, and feather from 0 to 1.",
+ );
+ }
+ return;
+ }
+ if (
+ mask.kind !== "linear" ||
+ mask.start.length !== 2 ||
+ mask.end.length !== 2 ||
+ ![...mask.start, ...mask.end].every(Number.isFinite) ||
+ (mask.start[0] === mask.end[0] && mask.start[1] === mask.end[1])
+ ) {
+ throw Error("A gradient needs two distinct finite points.");
+ }
+}
+
+function processingLayer(document: EditorDocument, id: string) {
+ const layer = findLayer(document.scene.getState().layers, id);
+ if (!layer || layer.kind === "image") {
+ throw Error("Processing layer is unavailable.");
+ }
+ return layer;
+}
+
+function changeChildren(
+ scene: Scene,
+ parentId: string | undefined,
+ change: (layers: readonly ProcessingLayer[]) => readonly ProcessingLayer[],
+): Scene {
+ const [image, ...layers] = scene.layers;
+ if (!parentId) {
+ return { ...scene, layers: [image, ...change(layers)] };
+ }
+ if (parentId === image.id) {
+ throw Error("The image layer cannot contain layers.");
+ }
+ return updateLayer(scene, parentId, (layer) => ({
+ ...layer,
+ children: change(layer.children),
+ }));
+}
+
+function validateDepth(layers: readonly Layer[]) {
+ if (
+ layers.some((layer) =>
+ layer.children.some((child) => child.children.length > 0),
+ )
+ ) {
+ throw Error("Layers support two levels: a parent and its children.");
+ }
+}
+
+/** Above a sibling, inside a processing layer, or on top of the root stack. */
+export type LayerPlacement = { above: string } | { inside: string };
+
+function placementIndex(
+ scene: Scene,
+ placement?: LayerPlacement,
+): { parentId?: string; index?: number } {
+ if (placement === undefined) {
+ return {};
+ }
+ if (typeof placement !== "object" || placement === null) {
+ throw Error("Invalid layer placement.");
+ }
+ if ("inside" in placement) {
+ return { parentId: placement.inside };
+ }
+ const location = locateLayer(scene.layers, placement.above);
+ if (!location) {
+ throw Error("Layer is unavailable.");
+ }
+ const index =
+ location.siblings.findIndex((item) => item.id === location.layer.id) +
+ (location.parent ? 1 : 0);
+ return { parentId: location.parent?.id, index };
+}
+
+/** Structural commands commit an open gesture and record one entry each. */
+export function addLayer(
+ document: EditorDocument,
+ layer: ProcessingLayer,
+ placement?: LayerPlacement,
+) {
+ const scene = document.scene.getState();
+ const existing = new Set(walkLayers(scene.layers).map((item) => item.id));
+ for (const item of walkLayers([layer])) {
+ if (existing.has(item.id)) {
+ throw Error("Layer IDs must be unique.");
+ }
+ existing.add(item.id);
+ }
+ const { parentId, index } = placementIndex(scene, placement);
+ const next = changeChildren(scene, parentId, (layers) =>
+ layers.toSpliced(index ?? layers.length, 0, layer),
+ );
+ validateDepth(next.layers);
+ document.history.commit();
+ document.edit(next);
+ document.selectLayer(layer.id);
+ return layer.id;
+}
+
+export function setLayer(
+ document: EditorDocument,
+ id: string,
+ change: Partial<Pick<ProcessingLayer, "visible" | "opacity" | "name">>,
+) {
+ if (
+ Object.keys(change).some(
+ (key) => !["visible", "opacity", "name"].includes(key),
+ ) ||
+ Object.values(change).some((value) => value === undefined) ||
+ (change.opacity !== undefined &&
+ (!Number.isFinite(change.opacity) ||
+ change.opacity < 0 ||
+ change.opacity > 1)) ||
+ (change.visible !== undefined && typeof change.visible !== "boolean") ||
+ (change.name !== undefined &&
+ (typeof change.name !== "string" || !change.name.trim()))
+ ) {
+ throw Error("Invalid layer settings.");
+ }
+ processingLayer(document, id);
+ editLayer(document, id, (layer) => ({ ...layer, ...change }));
+}
+
+export function setExposure(
+ document: EditorDocument,
+ id: string,
+ exposure: number,
+) {
+ if (!Number.isFinite(exposure) || Math.abs(exposure) > 5) {
+ throw Error("Exposure must be between -5 and 5 EV.");
+ }
+ editLayer(document, id, (layer) => {
+ if (layer.kind !== "exposure") {
+ throw Error("Select an exposure layer.");
+ }
+ return { ...layer, exposure };
+ });
+}
+
+export function setLayerMask(
+ document: EditorDocument,
+ id: string,
+ mask: Gradient,
+) {
+ validateMask(mask);
+ editLayer(document, id, (layer) => {
+ if (layer.kind !== "mask") {
+ throw Error("Select a mask layer.");
+ }
+ return { ...layer, mask: structuredClone(mask) };
+ });
+}
+
+export function setMaskOperation(
+ document: EditorDocument,
+ id: string,
+ operation: "add" | "subtract",
+) {
+ if (operation !== "add" && operation !== "subtract") {
+ throw Error("Choose Add or Subtract for a mask.");
+ }
+ editLayer(document, id, (layer) => {
+ if (layer.kind !== "mask") {
+ throw Error("Select a mask layer.");
+ }
+ return { ...layer, operation };
+ });
+}
+
+export function duplicateLayer(document: EditorDocument, id: string) {
+ const source = processingLayer(document, id);
+ function clone(layer: ProcessingLayer): ProcessingLayer {
+ return {
+ ...structuredClone(layer),
+ id: crypto.randomUUID(),
+ children: layer.children.map(clone),
+ };
+ }
+ const layer = { ...clone(source), name: `${source.name} copy` };
+ const scene = document.scene.getState();
+ const parent = locateLayer(scene.layers, id)?.parent?.id;
+ const next = changeChildren(scene, parent, (layers) =>
+ layers.toSpliced(layers.findIndex((item) => item.id === id) + 1, 0, layer),
+ );
+ validateDepth(next.layers);
+ document.history.commit();
+ document.edit(next);
+ document.selectLayer(layer.id);
+ return layer.id;
+}
+
+export function deleteLayer(document: EditorDocument, id: string) {
+ processingLayer(document, id);
+ const scene = document.scene.getState();
+ const next = changeChildren(
+ scene,
+ locateLayer(scene.layers, id)?.parent?.id,
+ (layers) => layers.filter((layer) => layer.id !== id),
+ );
+ validateDepth(next.layers);
+ document.history.commit();
+ document.edit(next);
+}
+
+/** Index is the final sibling position, ordered bottom to top; the root image occupies index zero. */
+export function moveLayer(
+ document: EditorDocument,
+ id: string,
+ index: number,
+ parentId?: string,
+) {
+ const layer = processingLayer(document, id);
+ const scene = document.scene.getState();
+ if (parentId && findLayer([layer], parentId)) {
+ throw Error("A layer cannot contain itself.");
+ }
+ const removed = changeChildren(
+ scene,
+ locateLayer(scene.layers, id)?.parent?.id,
+ (layers) => layers.filter((item) => item.id !== id),
+ );
+ const next = changeChildren(removed, parentId, (layers) => {
+ const position = parentId ? index : index - 1;
+ if (
+ !Number.isInteger(position) ||
+ position < 0 ||
+ position > layers.length
+ ) {
+ throw Error("Invalid layer position.");
+ }
+ return layers.toSpliced(position, 0, layer);
+ });
+ validateDepth(next.layers);
+ document.history.commit();
+ document.edit(next);
+}
diff --git a/src/features/layers/gradient-guides.tsx b/src/features/layers/gradient-guides.tsx
new file mode 100644
index 0000000..5cd0c32
--- /dev/null
+++ b/src/features/layers/gradient-guides.tsx
@@ -0,0 +1,242 @@
+import rotateCursor from "@/components/icons/rotate-cursor.svg?raw";
+import type { Gradient, RadialGradient } from "@/core/document";
+import type { Point } from "@/core/image/frame";
+import { type GradientHandle, radialPoint } from "./gradient";
+
+const rotationCursor = `url("data:image/svg+xml,${encodeURIComponent(rotateCursor)}") 12 12, crosshair`;
+
+function resizeCursor(from: Point, to: Point) {
+ const angle = Math.atan2(to[1] - from[1], to[0] - from[0]);
+ const direction = (Math.round(angle / (Math.PI / 4)) + 4) % 4;
+ return ["ew-resize", "nwse-resize", "ns-resize", "nesw-resize"][direction];
+}
+
+function Handle({
+ point,
+ handle,
+ label,
+ cursor = "grab",
+}: {
+ point: Point;
+ handle: GradientHandle;
+ label: string;
+ cursor?: string;
+}) {
+ return (
+ <g className="group/handle" style={{ cursor }}>
+ <title>{label}</title>
+ <circle
+ cx={point[0]}
+ cy={point[1]}
+ r="12"
+ fill="transparent"
+ data-gradient-handle={handle}
+ aria-label={label}
+ className="pointer-events-auto"
+ />
+ <circle
+ cx={point[0]}
+ cy={point[1]}
+ r="4"
+ fill="white"
+ stroke="#171717"
+ className="group-hover/handle:fill-sky-300"
+ />
+ </g>
+ );
+}
+
+function Guide({
+ point,
+ direction,
+ handle,
+ cursor,
+}: {
+ point: Point;
+ direction: Point;
+ handle: GradientHandle;
+ cursor: string;
+}) {
+ const line = {
+ x1: point[0] - direction[0],
+ y1: point[1] - direction[1],
+ x2: point[0] + direction[0],
+ y2: point[1] + direction[1],
+ };
+ return (
+ <g>
+ <line {...line} stroke="black" strokeOpacity="0.6" strokeWidth="3" />
+ <line {...line} stroke="white" strokeOpacity="0.9" />
+ <line
+ {...line}
+ stroke="transparent"
+ strokeWidth="16"
+ data-gradient-handle={handle}
+ aria-label={`Gradient ${handle} guide`}
+ className="[pointer-events:stroke]"
+ style={{ cursor }}
+ />
+ </g>
+ );
+}
+
+function LinearGuides({
+ startPoint,
+ endPoint,
+ extent,
+}: {
+ startPoint: Point;
+ endPoint: Point;
+ extent: number;
+}) {
+ const dx = endPoint[0] - startPoint[0],
+ dy = endPoint[1] - startPoint[1];
+ const length = Math.max(1, Math.hypot(dx, dy));
+ const direction: Point = [(-dy / length) * extent, (dx / length) * extent];
+ const center: Point = [
+ (startPoint[0] + endPoint[0]) / 2,
+ (startPoint[1] + endPoint[1]) / 2,
+ ];
+ return (
+ <g>
+ <title>Linear gradient guides</title>
+ <Guide
+ point={startPoint}
+ direction={direction}
+ handle="start"
+ cursor={resizeCursor(startPoint, endPoint)}
+ />
+ <Guide
+ point={endPoint}
+ direction={direction}
+ handle="end"
+ cursor={resizeCursor(startPoint, endPoint)}
+ />
+ <Guide
+ point={center}
+ direction={direction}
+ handle="rotate"
+ cursor={rotationCursor}
+ />
+ <Handle point={center} handle="move" label="Move gradient" />
+ </g>
+ );
+}
+
+function RadialGuides({
+ mask,
+ screen,
+}: {
+ mask: RadialGradient;
+ screen: (point: Point) => Point;
+}) {
+ const center = screen(mask.center);
+ const right = screen(radialPoint(mask, 1, 0));
+ const bottom = screen(radialPoint(mask, 0, 1));
+ const feather = screen(radialPoint(mask, 1 - mask.feather, 0));
+ const showFeather =
+ Math.min(
+ Math.hypot(feather[0] - center[0], feather[1] - center[1]),
+ Math.hypot(feather[0] - right[0], feather[1] - right[1]),
+ ) >= 24;
+ const rotationRadius =
+ 1 +
+ 24 / Math.max(1, Math.hypot(bottom[0] - center[0], bottom[1] - center[1]));
+ const transform = `matrix(${right[0] - center[0]},${right[1] - center[1]},${bottom[0] - center[0]},${bottom[1] - center[1]},${center[0]},${center[1]})`;
+ return (
+ <g>
+ <title>Radial gradient guides</title>
+ <g transform={transform} fill="none" stroke="white">
+ <circle
+ r="1"
+ fill="transparent"
+ stroke="none"
+ data-gradient-handle="move"
+ aria-label="Move radial gradient"
+ className="pointer-events-auto cursor-grab hover:fill-white/5"
+ />
+ <circle
+ r="1"
+ stroke="black"
+ strokeOpacity="0.6"
+ strokeWidth="3"
+ vectorEffect="non-scaling-stroke"
+ />
+ <circle r="1" strokeOpacity="0.9" vectorEffect="non-scaling-stroke" />
+ <circle
+ r={1 - mask.feather}
+ strokeDasharray="4 3"
+ strokeOpacity="0.8"
+ vectorEffect="non-scaling-stroke"
+ />
+ <path
+ d={`M0 -1V${-rotationRadius}`}
+ vectorEffect="non-scaling-stroke"
+ />
+ </g>
+ <Handle point={center} handle="move" label="Move gradient" />
+ <Handle
+ point={right}
+ handle="radius-x"
+ label="Radial right radius"
+ cursor={resizeCursor(center, right)}
+ />
+ <Handle
+ point={screen(radialPoint(mask, -1, 0))}
+ handle="radius-x"
+ label="Radial left radius"
+ cursor={resizeCursor(center, right)}
+ />
+ <Handle
+ point={bottom}
+ handle="radius-y"
+ label="Radial bottom radius"
+ cursor={resizeCursor(center, bottom)}
+ />
+ <Handle
+ point={screen(radialPoint(mask, 0, -1))}
+ handle="radius-y"
+ label="Radial top radius"
+ cursor={resizeCursor(center, bottom)}
+ />
+ <Handle
+ point={screen(radialPoint(mask, 0, -rotationRadius))}
+ handle="rotate"
+ label="Rotate radial gradient"
+ cursor={rotationCursor}
+ />
+ {showFeather && (
+ <Handle
+ point={feather}
+ handle="feather"
+ label="Radial feather"
+ cursor={resizeCursor(center, right)}
+ />
+ )}
+ </g>
+ );
+}
+
+export function GradientGuides({
+ mask,
+ screen,
+ extent,
+}: {
+ mask: Gradient;
+ screen: (point: Point) => Point;
+ extent: number;
+}) {
+ return (
+ <svg className="pointer-events-none absolute inset-0 size-full overflow-visible">
+ <title>Gradient guides</title>
+ {mask.kind === "linear" && (
+ <LinearGuides
+ startPoint={screen(mask.start)}
+ endPoint={screen(mask.end)}
+ extent={extent}
+ />
+ )}
+ {mask.kind === "radial" && <RadialGuides mask={mask} screen={screen} />}
+ </svg>
+ );
+}
diff --git a/src/features/layers/gradient-overlay.tsx b/src/features/layers/gradient-overlay.tsx
new file mode 100644
index 0000000..de886f9
--- /dev/null
+++ b/src/features/layers/gradient-overlay.tsx
@@ -0,0 +1,267 @@
+import { type PointerEvent, useEffect, useMemo, useRef, useState } from "react";
+import { useStore } from "zustand";
+import { useDocument, useScene } from "@/components/editor/session";
+import { useViewport } from "@/components/editor/viewport";
+import { findLayer, type Gradient, type MaskLayer } from "@/core/document";
+import { outputOffset, type Point, sourceOffset } from "@/core/image/frame";
+import { useShortcuts } from "@/hooks/use-shortcuts";
+import { deleteLayer, setLayerMask } from "./edits";
+import {
+ drawGradient,
+ type GradientHandle,
+ gradientHandles,
+ moveGradient,
+} from "./gradient";
+import { GradientGuides } from "./gradient-guides";
+import { useGradientTool } from "./gradient-tool";
+
+type Drag = {
+ pointer: number;
+ from: Point;
+ to: Point;
+ mask: Gradient;
+ handle: GradientHandle | "new";
+ id: string;
+};
+
+export function GradientOverlay() {
+ const document = useDocument();
+ const tool = useGradientTool();
+ const camera = useViewport();
+ const frame = useScene((scene) => scene.frame);
+ const selected = useStore(document.selection, (state) => state.layerId);
+ const layer = useScene((scene) => {
+ const item = findLayer(scene.layers, selected);
+ return item?.kind === "mask" ? item : undefined;
+ });
+ const mask = layer?.mask;
+ const [draft, setDraft] = useState<Gradient | null>(null);
+ const dragging = useRef<Drag | null>(null);
+ const [dragCursor, setDragCursor] = useState<string>();
+ function cancel() {
+ if (dragging.current && dragging.current.handle !== "new") {
+ document.history.cancel();
+ }
+ dragging.current = null;
+ setDraft(null);
+ setDragCursor(undefined);
+ tool.close();
+ }
+ useEffect(
+ () => () => {
+ if (dragging.current && dragging.current.handle !== "new") {
+ document.history.cancel();
+ }
+ },
+ [document],
+ );
+ function remove() {
+ cancel();
+ if (mask) {
+ deleteLayer(document, selected);
+ }
+ }
+ function dismiss() {
+ if (dragging.current || tool.target) {
+ cancel();
+ return;
+ }
+ if (tool.overlay === "new" && mask) {
+ deleteLayer(document, selected);
+ }
+ tool.setOverlay("hidden");
+ }
+ function toggleOverlay() {
+ tool.setOverlay(tool.overlay === "hidden" ? "shown" : "hidden");
+ }
+ useShortcuts({
+ escape: dismiss,
+ ...(tool.overlay === "hidden"
+ ? {}
+ : { enter: () => tool.setOverlay("hidden") }),
+ ...(mask ? { o: toggleOverlay, delete: remove, backspace: remove } : {}),
+ });
+ function documentPoint(event: PointerEvent): Point {
+ const box = camera.ref.current?.getBoundingClientRect();
+ if (!box) {
+ return frame.center;
+ }
+ const offset = sourceOffset(
+ frame,
+ (event.clientX - box.left - box.width / 2 - camera.view.pan[0]) /
+ camera.scale,
+ (event.clientY - box.top - box.height / 2 - camera.view.pan[1]) /
+ camera.scale,
+ );
+ return [frame.center[0] + offset[0], frame.center[1] + offset[1]];
+ }
+ function screenPoint(point: Point): Point {
+ const [x, y] = outputOffset(
+ frame,
+ point[0] - frame.center[0],
+ point[1] - frame.center[1],
+ );
+ return [
+ camera.viewport[0] / 2 + camera.view.pan[0] + x * camera.scale,
+ camera.viewport[1] / 2 + camera.view.pan[1] + y * camera.scale,
+ ];
+ }
+ function start(event: PointerEvent<HTMLDivElement>) {
+ if (event.button !== 0 || !event.isPrimary || camera.panMode) {
+ return;
+ }
+ const target =
+ event.target instanceof Element
+ ? event.target
+ .closest("[data-gradient-handle]")
+ ?.getAttribute("data-gradient-handle")
+ : null;
+ const handle = gradientHandles.find((handle) => handle === target);
+ if (!tool.target && (!mask || !handle)) {
+ return;
+ }
+ const from = documentPoint(event);
+ if (tool.target) {
+ dragging.current = {
+ pointer: event.pointerId,
+ from,
+ to: from,
+ mask: drawGradient(tool.target.shape, from, from),
+ handle: "new",
+ id: selected,
+ };
+ setDraft(dragging.current.mask);
+ } else if (mask && handle) {
+ document.history.commit();
+ document.history.begin();
+ dragging.current = {
+ pointer: event.pointerId,
+ from,
+ to: from,
+ mask,
+ handle,
+ id: selected,
+ };
+ }
+ const cursor =
+ event.target instanceof Element
+ ? getComputedStyle(event.target).cursor
+ : "grab";
+ const activeCursor = cursor === "grab" ? "grabbing" : cursor;
+ setDragCursor(tool.target ? "crosshair" : activeCursor);
+ event.preventDefault();
+ event.stopPropagation();
+ event.currentTarget.setPointerCapture(event.pointerId);
+ }
+ function move(event: PointerEvent<HTMLDivElement>) {
+ const drag = dragging.current;
+ if (!drag || drag.pointer !== event.pointerId) {
+ return;
+ }
+ const point = documentPoint(event);
+ drag.to = point;
+ if (drag.handle === "new") {
+ const next = drawGradient(
+ drag.mask.kind,
+ drag.from,
+ point,
+ event.shiftKey,
+ );
+ drag.mask = next;
+ setDraft(next);
+ } else {
+ setLayerMask(
+ document,
+ drag.id,
+ moveGradient(drag.mask, drag.handle, drag.from, point),
+ );
+ }
+ }
+ function finish(event: PointerEvent<HTMLDivElement>) {
+ const drag = dragging.current;
+ if (!drag || drag.pointer !== event.pointerId) {
+ return;
+ }
+ // Commit the last preview; pointerup must not reinterpret geometry or Shift.
+ if (drag.handle === "new") {
+ const point = drag.to;
+ const distance =
+ Math.hypot(point[0] - drag.from[0], point[1] - drag.from[1]) *
+ camera.scale;
+ if (distance >= 3 && tool.target) {
+ tool.create(drag.mask, tool.target);
+ }
+ } else {
+ document.history.commit();
+ }
+ dragging.current = null;
+ setDraft(null);
+ setDragCursor(undefined);
+ tool.close();
+ event.currentTarget.releasePointerCapture(event.pointerId);
+ }
+ const visible = draft ?? mask;
+ const preview =
+ !!draft || dragCursor !== undefined || tool.overlay !== "hidden";
+ const children = layer?.children;
+ const modifiers = useMemo(
+ () =>
+ draft
+ ? []
+ : (children?.filter(
+ (child): child is MaskLayer =>
+ child.kind === "mask" && child.visible && child.opacity > 0,
+ ) ?? []),
+ [draft, children],
+ );
+ const shown = visible && preview && !camera.panMode;
+ useEffect(() => {
+ document.preview.setState({
+ maskOverlay: shown ? { mask: visible, modifiers } : undefined,
+ });
+ }, [document, shown, visible, modifiers]);
+ useEffect(
+ () => () => document.preview.setState({ maskOverlay: undefined }),
+ [document],
+ );
+ const cursor = dragCursor ?? (tool.target ? "crosshair" : undefined);
+ const pointerEvents =
+ (tool.target || dragCursor) && !camera.panMode ? "auto" : "none";
+ return (
+ <div
+ role="application"
+ aria-label="Gradient mask canvas"
+ className="absolute inset-0 touch-none data-[cursor=true]:[&_*]:cursor-[inherit]!"
+ data-cursor={!!cursor}
+ style={{ pointerEvents, cursor }}
+ onDoubleClick={(event) => event.stopPropagation()}
+ onPointerDown={start}
+ onPointerMove={move}
+ onPointerUp={finish}
+ onPointerCancel={cancel}
+ onLostPointerCapture={() => {
+ if (dragging.current) {
+ cancel();
+ }
+ }}
+ >
+ {visible && !camera.panMode && (
+ <GradientGuides
+ mask={visible}
+ screen={screenPoint}
+ extent={Math.hypot(...camera.viewport)}
+ />
+ )}
+ {tool.overlay === "new" && !tool.target && (
+ <p className="pointer-events-none absolute bottom-3 left-3 rounded-full bg-neutral-800/80 px-3 py-1.5 text-white backdrop-blur-sm">
+ Adjust the mask · Enter to keep · Esc to remove · O toggles overlay
+ </p>
+ )}
+ {tool.target && (
+ <p className="pointer-events-none absolute bottom-3 left-3 rounded-full bg-neutral-800/80 px-3 py-1.5 text-white backdrop-blur-sm">
+ Drag to draw · Shift to constrain · Esc to cancel
+ </p>
+ )}
+ </div>
+ );
+}
diff --git a/src/features/layers/gradient-tool.tsx b/src/features/layers/gradient-tool.tsx
new file mode 100644
index 0000000..5cc1782
--- /dev/null
+++ b/src/features/layers/gradient-tool.tsx
@@ -0,0 +1,107 @@
+import {
+ createContext,
+ type ReactNode,
+ useContext,
+ useEffect,
+ useState,
+} from "react";
+import { useDocument } from "@/components/editor/session";
+import { findLayer, type Gradient, type MaskLayer } from "@/core/document";
+
+type NewMask = {
+ kind: "new";
+ shape: Gradient["kind"];
+ parentId?: string;
+ operation: "add" | "subtract";
+};
+
+/** "new" previews a just-drawn mask until Enter, Escape, or its first adjustment. */
+type Overlay = "hidden" | "shown" | "new";
+
+const GradientTool = createContext<{
+ target: NewMask | null;
+ overlay: Overlay;
+ draw: (shape?: Gradient["kind"]) => void;
+ add: (
+ parentId: string,
+ operation: "add" | "subtract",
+ shape: Gradient["kind"],
+ ) => void;
+ close: () => void;
+ create: (mask: Gradient, target: NewMask) => void;
+ setOverlay: (overlay: Overlay) => void;
+} | null>(null);
+
+export function useGradientTool() {
+ const tool = useContext(GradientTool);
+ if (!tool) {
+ throw new Error("A gradient tool provider is required.");
+ }
+ return tool;
+}
+
+/** Geometry edits keep the preview; effect edits end it. */
+function adjusted(before: MaskLayer, after: MaskLayer) {
+ return (
+ before.adjustments !== after.adjustments ||
+ before.toneCurve !== after.toneCurve ||
+ before.children !== after.children ||
+ before.opacity !== after.opacity
+ );
+}
+
+export function GradientProvider({
+ children,
+ onCreate,
+}: {
+ children: ReactNode;
+ onCreate: (mask: Gradient, target: NewMask) => void;
+}) {
+ const [target, setTarget] = useState<NewMask | null>(null);
+ const [overlay, setOverlay] = useState<Overlay>("hidden");
+ const document = useDocument();
+ useEffect(
+ () =>
+ document.selection.subscribe(() => {
+ setTarget(null);
+ setOverlay("hidden");
+ }),
+ [document],
+ );
+ useEffect(
+ () =>
+ document.scene.subscribe((scene, previous) => {
+ const id = document.selection.getState().layerId;
+ const before = findLayer(previous.layers, id);
+ const after = findLayer(scene.layers, id);
+ if (
+ before?.kind === "mask" &&
+ after?.kind === "mask" &&
+ adjusted(before, after)
+ ) {
+ setOverlay("hidden");
+ }
+ }),
+ [document],
+ );
+ return (
+ <GradientTool
+ value={{
+ target,
+ overlay,
+ draw: (shape = "linear") =>
+ setTarget({ kind: "new", shape, operation: "add" }),
+ add: (parentId, operation, shape) =>
+ setTarget({ kind: "new", shape, parentId, operation }),
+ close: () => setTarget(null),
+ create: (mask, target) => {
+ onCreate(mask, target);
+ setOverlay("new");
+ },
+ setOverlay,
+ }}
+ >
+ {children}
+ </GradientTool>
+ );
+}
diff --git a/src/features/layers/gradient.ts b/src/features/layers/gradient.ts
new file mode 100644
index 0000000..504f44b
--- /dev/null
+++ b/src/features/layers/gradient.ts
@@ -0,0 +1,174 @@
+import type { Gradient, LinearGradient, RadialGradient } from "@/core/document";
+import type { Point } from "@/core/image/frame";
+
+export const gradientHandles = [
+ "move",
+ "start",
+ "end",
+ "rotate",
+ "radius-x",
+ "radius-y",
+ "feather",
+] as const;
+export type GradientHandle = (typeof gradientHandles)[number];
+
+export function drawGradient(
+ kind: Gradient["kind"],
+ from: Point,
+ to: Point,
+ constrain = false,
+): Gradient {
+ const dx = to[0] - from[0];
+ const dy = to[1] - from[1];
+ if (kind === "radial") {
+ const radius: Point = [
+ Math.max(1, Math.abs(dx)),
+ Math.max(1, Math.abs(dy)),
+ ];
+ if (constrain) {
+ return {
+ kind,
+ center: from,
+ radius: [Math.max(...radius), Math.max(...radius)],
+ angle: 0,
+ feather: 0.5,
+ };
+ }
+ return { kind, center: from, radius, angle: 0, feather: 0.5 };
+ }
+ if (!constrain) {
+ return { kind, start: from, end: to };
+ }
+ const end: Point =
+ Math.abs(dx) > Math.abs(dy) ? [to[0], from[1]] : [from[0], to[1]];
+ return { kind, start: from, end };
+}
+
+function rotate(point: Point, angle: number): Point {
+ return [
+ point[0] * Math.cos(angle) - point[1] * Math.sin(angle),
+ point[0] * Math.sin(angle) + point[1] * Math.cos(angle),
+ ];
+}
+
+/** Map an ellipse's unit coordinates into the source image. */
+export function radialPoint(mask: RadialGradient, x: number, y: number): Point {
+ const offset = rotate(
+ [x * mask.radius[0], y * mask.radius[1]],
+ (mask.angle * Math.PI) / 180,
+ );
+ return [mask.center[0] + offset[0], mask.center[1] + offset[1]];
+}
+
+function moveLinear(
+ mask: LinearGradient,
+ handle: GradientHandle,
+ from: Point,
+ to: Point,
+): LinearGradient {
+ const dx = to[0] - from[0];
+ const dy = to[1] - from[1];
+ if (handle === "move") {
+ return {
+ ...mask,
+ start: [mask.start[0] + dx, mask.start[1] + dy],
+ end: [mask.end[0] + dx, mask.end[1] + dy],
+ };
+ }
+ const vx = mask.end[0] - mask.start[0];
+ const vy = mask.end[1] - mask.start[1];
+ const length = Math.hypot(vx, vy);
+ if (handle === "rotate") {
+ const center: Point = [
+ (mask.start[0] + mask.end[0]) / 2,
+ (mask.start[1] + mask.end[1]) / 2,
+ ];
+ const angle =
+ Math.atan2(to[1] - center[1], to[0] - center[0]) -
+ Math.atan2(from[1] - center[1], from[0] - center[0]);
+ const offset = rotate([vx / 2, vy / 2], angle);
+ return {
+ ...mask,
+ start: [center[0] - offset[0], center[1] - offset[1]],
+ end: [center[0] + offset[0], center[1] + offset[1]],
+ };
+ }
+ if (handle !== "start" && handle !== "end") {
+ return mask;
+ }
+ const amount = (dx * vx + dy * vy) / length;
+ const distance =
+ handle === "start"
+ ? Math.min(amount, length - 1)
+ : Math.max(amount, 1 - length);
+ const point: Point = [
+ mask[handle][0] + (vx / length) * distance,
+ mask[handle][1] + (vy / length) * distance,
+ ];
+ return { ...mask, [handle]: point };
+}
+
+export function moveGradient(
+ mask: Gradient,
+ handle: GradientHandle,
+ from: Point,
+ to: Point,
+): Gradient {
+ if (mask.kind === "linear") {
+ return moveLinear(mask, handle, from, to);
+ }
+ const dx = to[0] - from[0];
+ const dy = to[1] - from[1];
+ if (handle === "move") {
+ return { ...mask, center: [mask.center[0] + dx, mask.center[1] + dy] };
+ }
+ if (handle === "rotate") {
+ const angle =
+ Math.atan2(to[1] - mask.center[1], to[0] - mask.center[0]) -
+ Math.atan2(from[1] - mask.center[1], from[0] - mask.center[0]);
+ return { ...mask, angle: mask.angle + (angle * 180) / Math.PI };
+ }
+ const angle = (-mask.angle * Math.PI) / 180;
+ const delta = rotate([dx, dy], angle);
+ const origin = rotate(
+ [from[0] - mask.center[0], from[1] - mask.center[1]],
+ angle,
+ );
+ if (handle === "radius-x") {
+ return {
+ ...mask,
+ radius: [
+ Math.max(1, mask.radius[0] + delta[0] * Math.sign(origin[0])),
+ mask.radius[1],
+ ],
+ };
+ }
+ if (handle === "radius-y") {
+ return {
+ ...mask,
+ radius: [
+ mask.radius[0],
+ Math.max(1, mask.radius[1] + delta[1] * Math.sign(origin[1])),
+ ],
+ };
+ }
+ if (handle === "feather") {
+ return {
+ ...mask,
+ feather: Math.max(
+ 0,
+ Math.min(1, mask.feather - delta[0] / mask.radius[0]),
+ ),
+ };
+ }
+ return mask;
+}
+
+/** A horizontal gradient across the middle of an image. */
+export function defaultGradient(size: Point): LinearGradient {
+ return {
+ kind: "linear",
+ start: [size[0] * 0.2, size[1] * 0.5],
+ end: [size[0] * 0.8, size[1] * 0.5],
+ };
+}
diff --git a/src/features/layers/mask-fill.tsx b/src/features/layers/mask-fill.tsx
new file mode 100644
index 0000000..f9d103d
--- /dev/null
+++ b/src/features/layers/mask-fill.tsx
@@ -0,0 +1,66 @@
+import type { Gradient } from "@/core/document";
+
+// Samples across the feather band follow the mix shader's smoothstep.
+const samples = [0, 0.25, 0.5, 0.75, 1];
+
+function coverageStops(mask: Gradient): [number, number][] {
+ if (mask.kind === "linear") {
+ return [
+ [0, 1],
+ [1, 0],
+ ];
+ }
+ return samples.map((t) => [
+ 1 - mask.feather + t * mask.feather,
+ 1 - t * t * (3 - 2 * t),
+ ]);
+}
+
+/** An SVG gradient in document coordinates whose opacity follows the mask's coverage. */
+export function MaskFill({
+ id,
+ mask,
+ color = "white",
+ alpha = (coverage: number) => coverage,
+}: {
+ id: string;
+ mask: Gradient;
+ color?: string;
+ alpha?: (coverage: number) => number;
+}) {
+ const stops = coverageStops(mask).map(([offset, coverage]) => (
+ <stop
+ key={`${offset}/${coverage}`}
+ offset={offset}
+ stopColor={color}
+ stopOpacity={alpha(coverage)}
+ />
+ ));
+ if (mask.kind === "radial") {
+ const transform = `translate(${mask.center[0]} ${mask.center[1]}) rotate(${mask.angle}) scale(${mask.radius[0]} ${mask.radius[1]})`;
+ return (
+ <radialGradient
+ id={id}
+ gradientUnits="userSpaceOnUse"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientTransform={transform}
+ >
+ {stops}
+ </radialGradient>
+ );
+ }
+ return (
+ <linearGradient
+ id={id}
+ gradientUnits="userSpaceOnUse"
+ x1={mask.start[0]}
+ y1={mask.start[1]}
+ x2={mask.end[0]}
+ y2={mask.end[1]}
+ >
+ {stops}
+ </linearGradient>
+ );
+}
diff --git a/src/features/layers/menu.tsx b/src/features/layers/menu.tsx
new file mode 100644
index 0000000..1004742
--- /dev/null
+++ b/src/features/layers/menu.tsx
@@ -0,0 +1,166 @@
+import { cva } from "class-variance-authority";
+import { type ReactNode, useId, useRef } from "react";
+import { useDocument, useScene } from "@/components/editor/session";
+import { Icon } from "@/components/icons/icon";
+import { findLayer, type Layer, type ProcessingLayer } from "@/core/document";
+import { deleteLayer, duplicateLayer, moveLayer } from "./edits";
+
+const trigger = cva(
+ "grid shrink-0 place-items-center text-neutral-400 hover:text-neutral-100",
+ {
+ variants: {
+ variant: {
+ row: "size-7 rounded hover:bg-neutral-600/40 pointer-coarse:size-10",
+ pill: "h-7 rounded-full px-2.5 hover:bg-white/10 pointer-coarse:h-9",
+ },
+ },
+ },
+);
+
+export function LayerMenu({
+ label,
+ children,
+ icon,
+ variant = "row",
+}: {
+ label: string;
+ children: ReactNode;
+ icon: ReactNode;
+ variant?: "row" | "pill";
+}) {
+ const id = useId();
+ const popover = useRef<HTMLDivElement>(null);
+ return (
+ <>
+ <button
+ type="button"
+ aria-label={label}
+ title={label}
+ popoverTarget={id}
+ className={trigger({ variant })}
+ >
+ {icon}
+ </button>
+ <div
+ id={id}
+ ref={popover}
+ popover="auto"
+ className="fixed inset-auto z-50 m-0 [position-area:bottom_span-left] max-h-[calc(100dvh-1rem)] min-w-40 overflow-y-auto rounded-md [position-try-fallbacks:flip-block] border border-neutral-600 bg-neutral-800 p-1 text-neutral-200 shadow-xl [&_button]:block [&_button]:w-full [&_button]:rounded [&_button]:px-2 [&_button]:py-1.5 [&_button]:text-left [&_button:hover]:bg-neutral-700 [&_button:disabled]:text-neutral-600"
+ >
+ <form
+ onSubmit={(event) => {
+ event.preventDefault();
+ popover.current?.hidePopover();
+ }}
+ >
+ {children}
+ </form>
+ </div>
+ </>
+ );
+}
+
+export function LayerActions({
+ layer,
+ siblings,
+ parent,
+ onSelect,
+}: {
+ layer: ProcessingLayer;
+ siblings: readonly Layer[];
+ parent?: Layer;
+ onSelect: (id: string) => void;
+}) {
+ const document = useDocument();
+ const layers = useScene((scene) => scene.layers);
+ const index = siblings.findIndex((item) => item.id === layer.id);
+ const containers = layers.filter(
+ (item) =>
+ layer.children.length === 0 &&
+ item.kind !== "image" &&
+ item.id !== parent?.id &&
+ !findLayer([layer], item.id),
+ );
+ const bottom = !parent ? 1 : 0;
+ function moveOut() {
+ if (!parent) {
+ return;
+ }
+ const index = layers.findIndex((item) => item.id === parent.id);
+ moveLayer(document, layer.id, index + 1);
+ }
+ return (
+ <LayerMenu
+ label={`${layer.name} actions`}
+ icon={
+ <Icon className="size-4">
+ <path
+ d="M5 12h.01M12 12h.01M19 12h.01"
+ strokeWidth="3"
+ strokeLinecap="round"
+ />
+ </Icon>
+ }
+ >
+ <button
+ type="submit"
+ disabled={index === siblings.length - 1}
+ onClick={() => moveLayer(document, layer.id, index + 1, parent?.id)}
+ >
+ Move up
+ </button>
+ <button
+ type="submit"
+ disabled={index === bottom}
+ onClick={() => moveLayer(document, layer.id, index - 1, parent?.id)}
+ >
+ Move down
+ </button>
+ {parent && (
+ <button type="submit" onClick={moveOut}>
+ Move out
+ </button>
+ )}
+ {containers.length > 0 && (
+ <label className="flex items-center justify-between gap-3 px-2 py-1.5">
+ Move into
+ <select
+ aria-label={`Move ${layer.name} into`}
+ value=""
+ className="min-w-0 max-w-32 bg-neutral-800"
+ onChange={(event) => {
+ const target = findLayer(layers, event.target.value);
+ if (target) {
+ moveLayer(
+ document,
+ layer.id,
+ target.children.length,
+ target.id,
+ );
+ }
+ }}
+ >
+ <option value="" disabled>
+ Choose layer
+ </option>
+ {containers.map((item) => (
+ <option key={item.id} value={item.id}>
+ {item.name}
+ </option>
+ ))}
+ </select>
+ </label>
+ )}
+ <div className="my-1 border-t border-neutral-700" />
+ <button
+ type="submit"
+ onClick={() => onSelect(duplicateLayer(document, layer.id))}
+ >
+ Duplicate
+ </button>
+ <button type="submit" onClick={() => deleteLayer(document, layer.id)}>
+ Delete
+ </button>
+ </LayerMenu>
+ );
+}
diff --git a/src/features/layers/thumbnails.tsx b/src/features/layers/thumbnails.tsx
new file mode 100644
index 0000000..5f43d70
--- /dev/null
+++ b/src/features/layers/thumbnails.tsx
@@ -0,0 +1,83 @@
+import { useEffect, useId, useMemo, useRef, useState } from "react";
+import { frame, surface } from "vgpu";
+import { useGpu } from "vgpu-react";
+import { useDocument, useScene } from "@/components/editor/session";
+import type { Gradient } from "@/core/document";
+import type { Point } from "@/core/image/frame";
+import { createDisplay } from "@/core/renderer";
+import { MaskFill } from "./mask-fill";
+
+/** A small original-image snapshot, rendered once when the source changes. */
+export function ImageThumbnail() {
+ const gpu = useGpu();
+ const document = useDocument();
+ const sourceId = useScene((scene) => scene.layers[0].source);
+ const source = document.resources.get(sourceId);
+ const display = useMemo(() => createDisplay(gpu), [gpu]);
+ useEffect(() => () => display.dispose(), [display]);
+ const canvas = useRef<HTMLCanvasElement>(null);
+ const [error, setError] = useState<string>();
+ useEffect(() => {
+ const image = new OffscreenCanvas(64, 64);
+ const output = surface(gpu, image, { size: [64, 64], dpr: 1 });
+ const release = source.retain();
+ let active = true;
+ async function draw() {
+ try {
+ frame(gpu, (frame) =>
+ display(frame, output, source.image, {
+ view: { zoom: 1, pan: [0, 0] },
+ }),
+ );
+ await gpu.gpu.queue.onSubmittedWorkDone();
+ if (active) {
+ const context = canvas.current?.getContext("2d");
+ if (!context) {
+ throw Error("Cannot draw image thumbnail.");
+ }
+ const bitmap = image.transferToImageBitmap();
+ context.drawImage(bitmap, 0, 0);
+ bitmap.close();
+ }
+ } catch (error) {
+ if (active) {
+ setError(String(error));
+ }
+ } finally {
+ output.dispose();
+ release();
+ }
+ }
+ void draw();
+ return () => {
+ active = false;
+ };
+ }, [gpu, source, display]);
+ return (
+ <canvas
+ ref={canvas}
+ width={64}
+ height={64}
+ aria-label="Original image thumbnail"
+ title={error ?? "Original image"}
+ className="size-8 shrink-0 rounded-sm border border-neutral-600 bg-neutral-950"
+ />
+ );
+}
+
+export function MaskThumbnail({ mask, size }: { mask: Gradient; size: Point }) {
+ const id = useId();
+ return (
+ <svg
+ aria-label="Gradient mask thumbnail"
+ role="img"
+ viewBox={`0 0 ${size[0]} ${size[1]}`}
+ className="size-8 shrink-0 rounded-sm border border-neutral-600 bg-neutral-950"
+ >
+ <defs>
+ <MaskFill id={id} mask={mask} />
+ </defs>
+ <rect width={size[0]} height={size[1]} fill={`url(#${id})`} />
+ </svg>
+ );
+}
diff --git a/src/features/layers/toolbar.tsx b/src/features/layers/toolbar.tsx
new file mode 100644
index 0000000..c2ea54c
--- /dev/null
+++ b/src/features/layers/toolbar.tsx
@@ -0,0 +1,132 @@
+import { useStore } from "zustand";
+import { useDocument, useScene } from "@/components/editor/session";
+import { Slider } from "@/components/ui/slider";
+import { findLayer, locateLayer, type MaskLayer } from "@/core/document";
+import { useEditGesture } from "@/hooks/use-edit-gesture";
+import { setLayer, setLayerMask, setMaskOperation } from "./edits";
+import { useGradientTool } from "./gradient-tool";
+import { LayerMenu } from "./menu";
+
+function MaskOptions({ layer }: { layer: MaskLayer }) {
+ const document = useDocument();
+ const tool = useGradientTool();
+ const parent = useScene(
+ (scene) => locateLayer(scene.layers, layer.id)?.parent,
+ );
+ const isSubmask = parent?.kind === "mask";
+ return (
+ <>
+ <hr
+ aria-orientation="vertical"
+ className="h-4 w-px border-0 bg-white/15"
+ />
+ <button
+ type="button"
+ aria-pressed={tool.overlay !== "hidden"}
+ title="Show mask overlay (O)"
+ onClick={() =>
+ tool.setOverlay(tool.overlay === "hidden" ? "shown" : "hidden")
+ }
+ className="h-7 rounded-full px-2.5 text-neutral-400 hover:bg-white/10 hover:text-neutral-100 aria-pressed:bg-white/15 aria-pressed:text-neutral-100 pointer-coarse:h-9"
+ >
+ Overlay
+ </button>
+ {layer.mask.kind === "radial" && (
+ <Slider
+ label="Feather"
+ value={layer.mask.feather * 100}
+ min={0}
+ max={100}
+ defaultValue={50}
+ unit="%"
+ variant="toolbar"
+ onChange={(value) => {
+ if (layer.mask.kind === "radial") {
+ setLayerMask(document, layer.id, {
+ ...layer.mask,
+ feather: value / 100,
+ });
+ }
+ }}
+ />
+ )}
+ {isSubmask && (
+ <select
+ aria-label="Mask operation"
+ title="Combine with the parent mask"
+ value={layer.operation}
+ className="h-7 rounded-full bg-white/10 px-2.5 text-neutral-200 hover:bg-white/15"
+ onChange={(event) => {
+ const operation = event.target.value;
+ if (operation === "add" || operation === "subtract") {
+ setMaskOperation(document, layer.id, operation);
+ }
+ }}
+ >
+ <option value="add">Add</option>
+ <option value="subtract">Subtract</option>
+ </select>
+ )}
+ {!parent &&
+ (["add", "subtract"] as const).map((operation) => {
+ const label =
+ operation === "add" ? "Add to mask" : "Subtract from mask";
+ const text = operation === "add" ? "Add" : "Subtract";
+ return (
+ <LayerMenu
+ variant="pill"
+ key={operation}
+ label={label}
+ icon={<span>{text}</span>}
+ >
+ <button
+ type="submit"
+ onClick={() => tool.add(layer.id, operation, "linear")}
+ >
+ Linear gradient
+ </button>
+ <button
+ type="submit"
+ onClick={() => tool.add(layer.id, operation, "radial")}
+ >
+ Radial gradient
+ </button>
+ </LayerMenu>
+ );
+ })}
+ </>
+ );
+}
+
+export function LayerToolbar() {
+ const document = useDocument();
+ const gesture = useEditGesture(document.history);
+ const selected = useStore(document.selection, (state) => state.layerId);
+ const layer = useScene(
+ (scene) => findLayer(scene.layers, selected) ?? scene.layers[0],
+ );
+ if (layer.kind === "image") {
+ return null;
+ }
+ return (
+ <fieldset
+ aria-label="Layer options"
+ {...gesture}
+ className="absolute top-3 left-3 flex max-w-[calc(100%-1.5rem)] flex-wrap items-center gap-x-3 gap-y-1 rounded-full bg-neutral-800/80 p-1 pl-2.5 backdrop-blur-sm"
+ >
+ <Slider
+ label="Opacity"
+ value={layer.opacity * 100}
+ min={0}
+ max={100}
+ defaultValue={100}
+ unit="%"
+ variant="toolbar"
+ onChange={(value) =>
+ setLayer(document, layer.id, { opacity: value / 100 })
+ }
+ />
+ {layer.kind === "mask" && <MaskOptions layer={layer} />}
+ </fieldset>
+ );
+}
diff --git a/src/features/tone-curves/edits.ts b/src/features/tone-curves/edits.ts
index c68860a..757f264 100644
--- a/src/features/tone-curves/edits.ts
+++ b/src/features/tone-curves/edits.ts
@@ -1,13 +1,20 @@
-import type { EditorDocument, ToneCurve } from "@/core/document";
+import {
+ type EditorDocument,
+ editLayer,
+ type ToneCurve,
+} from "@/core/document";
import { defaultCurve, validateCurve } from "./curve";
export function setToneCurve(
document: EditorDocument,
points: ToneCurve = defaultCurve,
+ id = document.scene.getState().layers[0].id,
) {
validateCurve(points);
- document.edit({
- ...document.scene.getState(),
- toneCurve: points.map((point) => ({ ...point })),
+ editLayer(document, id, (layer) => {
+ if (layer.kind !== "image" && layer.kind !== "mask") {
+ throw Error("Select an image or mask layer.");
+ }
+ return { ...layer, toneCurve: points.map((point) => ({ ...point })) };
});
}
diff --git a/src/features/tone-curves/graph.tsx b/src/features/tone-curves/graph.tsx
index 21b80c6..3c26fd2 100644
--- a/src/features/tone-curves/graph.tsx
+++ b/src/features/tone-curves/graph.tsx
@@ -2,6 +2,8 @@ import {
type KeyboardEvent,
type MouseEvent,
type PointerEvent,
+ useEffect,
+ useRef,
useState,
} from "react";
import type { CurvePoint, ToneCurve } from "@/core/document";
@@ -13,13 +15,32 @@ import {
sampleCurve,
} from "./curve";
-function gridLines(spacing: number) {
- return Array.from({ length: 256 / spacing - 1 }, (_, index) => {
- const position = (index + 1) * spacing;
- return `M${position} 0V256 M0 ${position}H256`;
+function gridLines(divisions: number, [width, height]: readonly number[]) {
+ return Array.from({ length: divisions - 1 }, (_, index) => {
+ const x = ((index + 1) * width) / divisions;
+ const y = ((index + 1) * height) / divisions;
+ return `M${x} 0V${height} M0 ${y}H${width}`;
}).join(" ");
}
+/** The graph draws in pixels so lines and points keep their weight at any box aspect. */
+function useBoxSize(ref: React.RefObject<SVGSVGElement | null>) {
+ const [size, setSize] = useState<readonly [number, number]>([256, 256]);
+ useEffect(() => {
+ const element = ref.current;
+ if (!element) {
+ return;
+ }
+ const observer = new ResizeObserver(([entry]) => {
+ const { width, height } = entry.contentRect;
+ setSize([width, height]);
+ });
+ observer.observe(element);
+ return () => observer.disconnect();
+ }, [ref]);
+ return size;
+}
+
function position(event: MouseEvent<SVGSVGElement>): CurvePoint {
const bounds = event.currentTarget.getBoundingClientRect();
return {
@@ -35,9 +56,11 @@ type GraphProps = {
export function Graph({ points, onChange }: GraphProps) {
const [selected, select] = useState<number | null>(null);
+ const svg = useRef<SVGSVGElement>(null);
+ const [width, height] = useBoxSize(svg);
const line = Array.from(
sampleCurve(points, 257),
- (y, x) => `${x},${256 * (1 - y)}`,
+ (y, x) => `${(x / 256) * width},${height * (1 - y)}`,
).join(" ");
function move(index: number, point: CurvePoint) {
onChange(moveCurvePoint(points, index, point));
@@ -51,10 +74,13 @@ export function Graph({ points, onChange }: GraphProps) {
}
function hitTest(event: MouseEvent<SVGSVGElement>) {
const point = position(event);
- const size = event.currentTarget.getBoundingClientRect().width;
+ const bounds = event.currentTarget.getBoundingClientRect();
return points.findIndex(
(candidate) =>
- Math.hypot(candidate.x - point.x, candidate.y - point.y) * size <= 12,
+ Math.hypot(
+ (candidate.x - point.x) * bounds.width,
+ (candidate.y - point.y) * bounds.height,
+ ) <= 12,
);
}
function doubleClick(event: MouseEvent<SVGSVGElement>) {
@@ -140,26 +166,24 @@ export function Graph({ points, onChange }: GraphProps) {
move(selected, position(event));
}
}}
+ ref={svg}
role="application"
tabIndex={-1}
- viewBox="0 0 256 256"
>
<path
- d={gridLines(8)}
+ d={gridLines(32, [width, height])}
fill="none"
stroke="white"
strokeOpacity="0.04"
- vectorEffect="non-scaling-stroke"
/>
<path
- d={gridLines(32)}
+ d={gridLines(8, [width, height])}
fill="none"
stroke="white"
strokeOpacity="0.07"
- vectorEffect="non-scaling-stroke"
/>
<path
- d="M0 256L256 0"
+ d={`M0 ${height}L${width} 0`}
fill="none"
stroke="#a3a3a3"
strokeDasharray="3 4"
@@ -175,8 +199,8 @@ export function Graph({ points, onChange }: GraphProps) {
{points.map((point, index) => (
<circle
className="fill-neutral-800 stroke-neutral-200 data-[selected=true]:fill-neutral-100"
- cx={point.x * 256}
- cy={(1 - point.y) * 256}
+ cx={point.x * width}
+ cy={(1 - point.y) * height}
data-selected={selected === index}
key={point.x}
r="4"
diff --git a/src/features/tone-curves/pass.ts b/src/features/tone-curves/pass.ts
index 19005f3..08297ef 100644
--- a/src/features/tone-curves/pass.ts
+++ b/src/features/tone-curves/pass.ts
@@ -3,11 +3,11 @@ import { node } from "@/core/renderer";
import { sampleCurve } from "./curve";
import shader from "./curves.wgsl";
-export function toneCurves(points: ToneCurve) {
+export function toneCurves(points: ToneCurve, name = "curves") {
if (points.every((point) => point.x === point.y)) {
return;
}
- return node("curves", shader, {
+ return node(name, shader, {
storage: { curve: sampleCurve(points, 1024) },
});
}
diff --git a/src/features/tone-curves/tone-curves.tsx b/src/features/tone-curves/tone-curves.tsx
index 7075024..44e1b6d 100644
--- a/src/features/tone-curves/tone-curves.tsx
+++ b/src/features/tone-curves/tone-curves.tsx
@@ -14,18 +14,18 @@ export function ToneCurves({ points, onChange, children }: ToneCurvesProps) {
return (
<section aria-label="Curves" className="space-y-2.5">
<div className="flex items-center justify-between">
- <h2 className="text-sm text-neutral-400">Curves</h2>
+ <h2 className="text-neutral-400">Curves</h2>
<Button
variant="ghost"
aria-label="Reset curve"
- className="px-2 py-1 text-xs"
+ className="px-2 py-1"
onClick={() => onChange(defaultCurve)}
>
Reset
</Button>
</div>
<div className="px-0.5">
- <div className="relative aspect-square rounded border border-black bg-neutral-900 shadow-groove">
+ <div className="relative aspect-square max-h-60 w-full rounded border border-black bg-neutral-900 shadow-groove">
{children}
<Graph onChange={onChange} points={points} />
</div>
diff --git a/src/features/vignette/controls.tsx b/src/features/vignette/controls.tsx
index dc92ead..0ea07d8 100644
--- a/src/features/vignette/controls.tsx
+++ b/src/features/vignette/controls.tsx
@@ -1,32 +1,35 @@
-import { useDocument, useScene } from "@/components/editor/session";
-import { Collapsible } from "@/components/ui/collapsible";
+import { useDocument } from "@/components/editor/session";
import { Slider } from "@/components/ui/slider";
+import type { Vignette } from "@/core/document";
import { setVignette } from "./edits";
import { defaultVignette } from "./model";
-export function VignetteControls() {
+export function VignetteControls({
+ id,
+ vignette,
+}: {
+ id: string;
+ vignette: Vignette;
+}) {
const document = useDocument();
- const vignette = useScene((scene) => scene.vignette ?? defaultVignette);
return (
- <Collapsible title="Vignette">
- <div className="flex flex-col gap-2">
- <Slider
- label="Intensity"
- value={vignette.intensity}
- onChange={(intensity) => setVignette(document, { intensity })}
- min={0}
- max={100}
- defaultValue={defaultVignette.intensity}
- />
- <Slider
- label="Softness"
- value={vignette.softness}
- onChange={(softness) => setVignette(document, { softness })}
- min={0}
- max={100}
- defaultValue={defaultVignette.softness}
- />
- </div>
- </Collapsible>
+ <section className="flex flex-col gap-2 p-3">
+ <Slider
+ label="Intensity"
+ value={vignette.intensity}
+ onChange={(intensity) => setVignette(document, { intensity }, id)}
+ min={0}
+ max={100}
+ defaultValue={defaultVignette.intensity}
+ />
+ <Slider
+ label="Softness"
+ value={vignette.softness}
+ onChange={(softness) => setVignette(document, { softness }, id)}
+ min={0}
+ max={100}
+ defaultValue={defaultVignette.softness}
+ />
+ </section>
);
}
diff --git a/src/features/vignette/edits.ts b/src/features/vignette/edits.ts
index cadb98e..6704501 100644
--- a/src/features/vignette/edits.ts
+++ b/src/features/vignette/edits.ts
@@ -1,10 +1,6 @@
-import type { EditorDocument, Vignette } from "@/core/document";
-import { defaultVignette } from "./model";
+import { type EditorDocument, editLayer, type Vignette } from "@/core/document";
-export function setVignette(
- document: EditorDocument,
- change: Partial<Vignette>,
-) {
+export function validateVignette(change: Partial<Vignette>) {
for (const [name, value] of Object.entries(change)) {
if (
(name !== "intensity" && name !== "softness") ||
@@ -16,14 +12,18 @@ export function setVignette(
throw new Error(`Invalid vignette adjustment: ${name}.`);
}
}
- const scene = document.scene.getState();
- const current = scene.vignette ?? defaultVignette;
- const next = { ...current, ...change };
- if (
- next.intensity === current.intensity &&
- next.softness === current.softness
- ) {
- return;
- }
- document.edit({ ...scene, vignette: next });
+}
+
+export function setVignette(
+ document: EditorDocument,
+ change: Partial<Vignette>,
+ id: string,
+) {
+ validateVignette(change);
+ editLayer(document, id, (layer) => {
+ if (layer.kind !== "vignette") {
+ throw Error("Select a vignette layer.");
+ }
+ return { ...layer, vignette: { ...layer.vignette, ...change } };
+ });
}
diff --git a/src/features/vignette/pass.ts b/src/features/vignette/pass.ts
index fe4b8c2..2a328b4 100644
--- a/src/features/vignette/pass.ts
+++ b/src/features/vignette/pass.ts
@@ -2,11 +2,9 @@ import type { Vignette } from "@/core/document";
import { node } from "@/core/renderer";
import shader from "./vignette.wgsl";
-export function vignette(settings?: Vignette) {
+export function vignette(settings?: Vignette, name = "vignette") {
if (!settings || settings.intensity === 0) {
return;
}
- return node("vignette", shader, {
- set: { params: settings },
- });
+ return node(name, shader, { set: { params: settings } });
}
diff --git a/src/features/white-balance/controls.tsx b/src/features/white-balance/controls.tsx
index 05a1576..88ffaa2 100644
--- a/src/features/white-balance/controls.tsx
+++ b/src/features/white-balance/controls.tsx
@@ -4,8 +4,8 @@ import { setWhiteBalance, whiteBalanceLimits } from "./edits";
export function WhiteBalanceControls() {
const document = useDocument();
- const source = useScene((scene) => scene.source);
- const selected = useScene((scene) => scene.whiteBalance);
+ const source = useScene((scene) => scene.layers[0].source);
+ const selected = useScene((scene) => scene.layers[0].whiteBalance);
const asShot = document.resources.get(source).raw?.asShot;
if (!asShot) {
return null;
@@ -16,7 +16,7 @@ export function WhiteBalanceControls() {
<>
<button
type="button"
- className="cursor-pointer self-end text-neutral-400 text-xs hover:text-neutral-100"
+ className="cursor-pointer self-end text-neutral-400 hover:text-neutral-100"
onClick={() => setWhiteBalance(document)}
>
As Shot
diff --git a/src/features/white-balance/edits.ts b/src/features/white-balance/edits.ts
index a256b32..012995d 100644
--- a/src/features/white-balance/edits.ts
+++ b/src/features/white-balance/edits.ts
@@ -1,4 +1,4 @@
-import type { EditorDocument } from "@/core/document";
+import { type EditorDocument, editLayer } from "@/core/document";
import type { WhiteBalance } from "@/core/image";
export function whiteBalanceLimits(asShot: WhiteBalance) {
@@ -31,14 +31,19 @@ export function setWhiteBalance(
change?: Partial<WhiteBalance>,
) {
const scene = document.scene.getState();
- const asShot = document.resources.get(scene.source).raw?.asShot;
+ const asShot = document.resources.get(scene.layers[0].source).raw?.asShot;
if (!asShot) {
throw Error("This image does not support RAW white balance.");
}
let whiteBalance = asShot;
if (change) {
- whiteBalance = { ...(scene.whiteBalance ?? asShot), ...change };
+ whiteBalance = { ...(scene.layers[0].whiteBalance ?? asShot), ...change };
validateWhiteBalance(whiteBalance, asShot);
}
- document.edit({ ...scene, whiteBalance });
+ editLayer(document, scene.layers[0].id, (layer) => {
+ if (layer.kind !== "image") {
+ throw Error("Select the image layer.");
+ }
+ return { ...layer, whiteBalance };
+ });
}
diff --git a/src/index.css b/src/index.css
index 28ee5c6..76a9c7f 100644
--- a/src/index.css
+++ b/src/index.css
@@ -24,7 +24,9 @@
body {
overflow: hidden;
- font: 15px var(--font-sans);
+ font-family: var(--font-sans);
+ font-size: var(--text-xs);
+ line-height: var(--text-xs--line-height);
color: var(--color-neutral-100);
background: var(--color-neutral-900);
text-shadow: 0 1px 1px rgb(0 0 0 / 0.25);
diff --git a/tests/clarity.e2e.ts b/tests/clarity.e2e.ts
index 7f3efb0..8c60222 100644
--- a/tests/clarity.e2e.ts
+++ b/tests/clarity.e2e.ts
@@ -86,7 +86,7 @@ test("detail filters follow Gaussian unsharp masking and preserve flat fields an
),
];
for (const adjustment of settings) {
- api.setAdjustments(adjustment);
+ api.setDetails(adjustment);
steps.push({
left,
right,
@@ -101,7 +101,7 @@ test("detail filters follow Gaussian unsharp masking and preserve flat fields an
await load(127, 65, '<rect width="127" height="65" fill="#737373"/>');
const flat = [];
for (const clarity of [-100, 0, 100]) {
- api.setAdjustments({ clarity, sharpening: 150, sharpenRadius: 3 });
+ api.setDetails({ clarity, sharpening: 150, sharpenRadius: 3 });
flat.push(
...(await read([
[0, 0],
@@ -124,7 +124,7 @@ test("detail filters follow Gaussian unsharp masking and preserve flat fields an
const neutral = await read(positions);
const alpha = [];
for (const clarity of [-100, 100]) {
- api.setAdjustments({ clarity, sharpening: 150, sharpenRadius: 3 });
+ api.setDetails({ clarity, sharpening: 150, sharpenRadius: 3 });
alpha.push(await read(positions));
}
return { steps, flat, neutral, alpha };
diff --git a/tests/color-mixer-editing.ts b/tests/color-mixer-editing.ts
index dea7e7a..c369fa6 100644
--- a/tests/color-mixer-editing.ts
+++ b/tests/color-mixer-editing.ts
@@ -5,6 +5,11 @@ import { box, drag } from "./pointer";
export async function colorMixerEditing(page: Page) {
const state = () => page.evaluate(() => window.openlight.getState());
await test.step("color mixer switches channels, groups vertical drags, exports selected colors and resets", async () => {
+ await page.getByRole("button", { name: "Add effect", exact: true }).click();
+ await page
+ .locator("[popover]:popover-open")
+ .getByRole("button", { name: "Color Mixer", exact: true })
+ .click();
const before = (await state()).history.undoCount;
const hue = page.getByRole("slider", { name: "Blue hue", exact: true });
await hue.scrollIntoViewIfNeeded();
@@ -76,4 +81,5 @@ export async function colorMixerEditing(page: Page) {
await page.keyboard.press("ControlOrMeta+Shift+z");
await expect(saturation).toHaveValue("0");
});
+ await page.getByRole("button", { name: "photo.svg", exact: true }).click();
}
diff --git a/tests/color-mixer.test.ts b/tests/color-mixer.test.ts
index 3ed5df2..2a73afb 100644
--- a/tests/color-mixer.test.ts
+++ b/tests/color-mixer.test.ts
@@ -6,6 +6,7 @@ import { createImageSource } from "@/core/image";
import { imageFrame } from "@/core/image/frame";
import { defaultAdjustments } from "@/features/adjustments/model";
import { resetColorMixer, setColorMixer } from "@/features/color-mixer/edits";
+import { defaultMixer } from "@/features/color-mixer/model";
import { defaultCurve } from "@/features/tone-curves/curve";
test("color edits validate, group, cancel and reset while renderers reuse and release their outputs", async () => {
@@ -13,63 +14,97 @@ test("color edits validate, group, cancel and reset while renderers reuse and re
const image = target(gpu, { size: [32, 16], format: "rgba16float" });
const source = createImageSource(image);
const document = createDocument({
- source: "photo",
frame: imageFrame(image.size),
- adjustments: defaultAdjustments,
- toneCurve: defaultCurve,
+ layers: [
+ {
+ kind: "image",
+ name: "Photo",
+ children: [
+ {
+ id: "mixer",
+ kind: "color-mixer",
+ name: "Color Mixer",
+ opacity: 1,
+ visible: true,
+ children: [],
+ colorMixer: defaultMixer,
+ },
+ ],
+ id: "base",
+ source: "photo",
+ adjustments: defaultAdjustments,
+ toneCurve: defaultCurve,
+ },
+ ],
});
const renderer = createEditorRenderer(gpu, source);
try {
await renderer.update(document.scene.getState());
- const original = renderer.outputImage();
- setColorMixer(document, "blue", { hue: 0 });
- resetColorMixer(document);
+ setColorMixer(document, "blue", { hue: 0 }, "mixer");
+ resetColorMixer(document, "mixer");
expect(document.history.status.getState().undoCount).toBe(0);
document.history.begin();
- setColorMixer(document, "blue", { hue: 10 });
- setColorMixer(document, "blue", { hue: 25, saturation: -20 });
+ setColorMixer(document, "blue", { hue: 10 }, "mixer");
+ setColorMixer(document, "blue", { hue: 25, saturation: -20 }, "mixer");
document.history.commit();
expect(document.history.status.getState().undoCount).toBe(1);
const scene = document.scene.getState();
- expect(scene.colorMixer?.hue[5]).toBe(25);
- expect(scene.colorMixer?.saturation[5]).toBe(-20);
+ const mixer = scene.layers[0].children[0];
+ expect(mixer?.kind === "color-mixer" && mixer.colorMixer.hue[5]).toBe(25);
+ expect(
+ mixer?.kind === "color-mixer" && mixer.colorMixer.saturation[5],
+ ).toBe(-20);
await renderer.update(scene);
+ expect(renderer.inspect().passes).toEqual([
+ "layer/mixer/color-mixer",
+ "layer/base/adjustments",
+ ]);
const edited = renderer.outputImage();
- expect(edited).not.toBe(original);
expect(edited.format).toBe("rgba16float");
const calls = getMockGPUDeviceInstrumentation(gpu.gpu).calls;
const pipelines = calls.createRenderPipeline;
- setColorMixer(document, "blue", { hue: 25 });
+ setColorMixer(document, "blue", { hue: 25 }, "mixer");
expect(document.history.status.getState().undoCount).toBe(1);
document.history.begin();
- setColorMixer(document, "red", { luminance: 100 });
+ setColorMixer(document, "red", { luminance: 100 }, "mixer");
document.history.cancel();
expect(document.scene.getState()).toEqual(scene);
document.history.undo();
await renderer.update(document.scene.getState());
- expect(renderer.outputImage()).toBe(original);
+ expect(renderer.inspect().passes).toEqual(["layer/base/adjustments"]);
document.history.redo();
await renderer.update(document.scene.getState());
- expect(renderer.inspect().passes).toEqual(["adjustments", "color-mixer"]);
+ expect(renderer.inspect().passes).toEqual([
+ "layer/mixer/color-mixer",
+ "layer/base/adjustments",
+ ]);
expect(calls.createRenderPipeline).toBe(pipelines);
for (const value of [NaN, Infinity, -101, 101]) {
- expect(() => setColorMixer(document, "red", { hue: value })).toThrow(
- "Invalid",
- );
+ expect(() =>
+ setColorMixer(document, "red", { hue: value }, "mixer"),
+ ).toThrow("Invalid");
}
expect(() =>
- Reflect.apply(setColorMixer, undefined, [document, "pink", { hue: 2 }]),
+ Reflect.apply(setColorMixer, undefined, [
+ document,
+ "pink",
+ { hue: 2 },
+ "mixer",
+ ]),
).toThrow("Invalid");
expect(() =>
Reflect.apply(setColorMixer, undefined, [
document,
"red",
{ contrast: 2 },
+ "mixer",
]),
).toThrow("Invalid");
expect(document.scene.getState()).toEqual(scene);
- resetColorMixer(document);
- expect(document.scene.getState().colorMixer).toBeUndefined();
+ resetColorMixer(document, "mixer");
+ expect(document.scene.getState().layers[0].children[0]).toMatchObject({
+ colorMixer: defaultMixer,
+ });
document.history.undo();
expect(document.scene.getState()).toEqual(scene);
renderer.dispose();
diff --git a/tests/documents.test.ts b/tests/documents.test.ts
index 6c2c7ed..088724c 100644
--- a/tests/documents.test.ts
+++ b/tests/documents.test.ts
@@ -6,15 +6,24 @@ import { createImageSource } from "@/core/image";
import { imageFrame } from "@/core/image/frame";
import { setAdjustments } from "@/features/adjustments/edits";
import { defaultAdjustments } from "@/features/adjustments/model";
+import { validateDetails } from "@/features/details/model";
import { defaultCurve } from "@/features/tone-curves/curve";
import { setToneCurve } from "@/features/tone-curves/edits";
function document() {
return createDocument({
frame: imageFrame([32, 32]),
- source: "image-1",
- adjustments: { ...defaultAdjustments },
- toneCurve: defaultCurve,
+ layers: [
+ {
+ kind: "image",
+ name: "Photo",
+ children: [],
+ id: "base",
+ source: "image-1",
+ adjustments: { ...defaultAdjustments },
+ toneCurve: defaultCurve,
+ },
+ ],
});
}
@@ -28,7 +37,7 @@ test("documents edit independently without React, retain bounded history, and re
{ sharpenRadius: 3.1 },
{ sharpenRadius: NaN },
]) {
- expect(() => setAdjustments(first, change)).toThrow("Invalid adjustment");
+ expect(() => validateDetails(change)).toThrow("Invalid detail adjustment");
}
setAdjustments(first, { exposure: 1 });
@@ -39,8 +48,14 @@ test("documents edit independently without React, retain bounded history, and re
];
setToneCurve(first, points);
points[1].y = 0.2;
- expect(first.scene.getState().toneCurve[1].y).toBe(0.7);
- expect(second.scene.getState().adjustments.exposure).toBe(0);
+ expect(first.scene.getState().layers[0]).toMatchObject({
+ toneCurve: [
+ { x: 0, y: 0 },
+ { x: 0.5, y: 0.7 },
+ { x: 1, y: 1 },
+ ],
+ });
+ expect(second.scene.getState().layers[0].adjustments.exposure).toBe(0);
expect(second.history.status.getState().undoCount).toBe(0);
const unchanged = first.scene.getState();
for (const curve of [
@@ -80,7 +95,9 @@ test("documents edit independently without React, retain bounded history, and re
}
expect(first.scene.getState()).toBe(unchanged);
first.history.undo();
- expect(first.scene.getState().toneCurve).toEqual(defaultCurve);
+ expect(first.scene.getState().layers[0]).toMatchObject({
+ toneCurve: defaultCurve,
+ });
for (let i = 0; i < 150; i++) setAdjustments(first, { exposure: i % 2 });
expect(first.history.status.getState().undoCount).toBe(100);
for (let i = 0; i < 100; i++) first.history.undo();
@@ -118,11 +135,17 @@ test("documents edit independently without React, retain bounded history, and re
resources.add(file, createImageSource(target(gpu, { size: [2, 2] })));
const source = add();
const doc = createDocument(
- { ...document().scene.getState(), source },
+ {
+ ...document().scene.getState(),
+ layers: [{ ...document().scene.getState().layers[0], source }],
+ },
resources,
);
const replace = (source: string) =>
- doc.edit({ ...doc.scene.getState(), source });
+ doc.edit({
+ ...doc.scene.getState(),
+ layers: [{ ...doc.scene.getState().layers[0], source }],
+ });
const canceled = add();
doc.history.begin();
replace(canceled);
@@ -134,7 +157,7 @@ test("documents edit independently without React, retain bounded history, and re
doc.history.undo();
expect(resources.get(branch)).toBeDefined();
doc.history.redo();
- expect(doc.scene.getState().source).toBe(branch);
+ expect(doc.scene.getState().layers[0].source).toBe(branch);
doc.history.undo();
setAdjustments(doc, { exposure: 1 });
expect(() => resources.get(branch)).toThrow("unavailable");
diff --git a/tests/editing.e2e.ts b/tests/editing.e2e.ts
index 3fb3e7d..495629c 100644
--- a/tests/editing.e2e.ts
+++ b/tests/editing.e2e.ts
@@ -31,14 +31,16 @@ test("edit a photo, inspect the preview and histograms, undo changes, and export
page,
browser,
}) => {
- test.setTimeout(60_000);
+ test.setTimeout(180_000);
const state = () => page.evaluate(() => window.openlight.getState());
await page.goto("/");
await expect(page.getByRole("button", { name: "Open image" })).toBeVisible();
await page
.locator('input[type="file"]')
.setInputFiles("tests/fixtures/photo.svg");
- const canvas = page.locator("canvas");
+ const canvas = page
+ .getByRole("region", { name: "Image canvas" })
+ .locator("canvas");
const output = page
.getByLabel("output histogram", { exact: true })
.locator("polyline")
@@ -52,25 +54,19 @@ test("edit a photo, inspect the preview and histograms, undo changes, and export
const initial = await state();
expect((await readImage(page)).center).toEqual([128, 128, 128, 255]);
- await test.step("adjustment sections collapse independently without changing the scene", async () => {
- for (const [title, label] of [
- ["Light", "Exposure"],
- ["Color", "Temp"],
- ["Details", "Clarity"],
- ]) {
- const summary = page.getByRole("button", { name: title, exact: true });
- const control = page.getByRole("slider", { name: label, exact: true });
- await summary.click();
- await expect(summary).toHaveAttribute("aria-expanded", "false");
- await expect(control).toBeHidden();
- if (title === "Light")
- await expect(
- page.getByRole("region", { name: "Curves", exact: true }),
- ).toBeHidden();
- expect(await state()).toEqual(initial);
- await summary.press("Enter");
- await expect(control).toBeVisible();
- }
+ await test.step("image adjustments share a single section", async () => {
+ await expect(
+ page.getByRole("heading", { name: "Adjustments", exact: true }),
+ ).toBeVisible();
+ await expect(
+ page.getByRole("slider", { name: "Clarity", exact: true }),
+ ).toHaveCount(0);
+ await expect(
+ page.getByRole("slider", { name: "Exposure", exact: true }),
+ ).toBeVisible();
+ await expect(
+ page.getByRole("slider", { name: "Temp", exact: true }),
+ ).toBeVisible();
});
await test.step("zoomed rendering reaches the edges of the editor viewport", async () => {
@@ -309,6 +305,11 @@ test("edit a photo, inspect the preview and histograms, undo changes, and export
await colorMixerEditing(page);
await test.step("clarity changes local contrast and histogram, then undoes and resets", async () => {
+ await page.getByRole("button", { name: "Add effect", exact: true }).click();
+ await page
+ .locator("[popover]:popover-open")
+ .getByRole("button", { name: "Details", exact: true })
+ .click();
const field = page.getByRole("textbox", { name: "Clarity", exact: true });
const slider = page.getByRole("slider", { name: "Clarity", exact: true });
await field.fill("100");
@@ -360,13 +361,14 @@ test("edit a photo, inspect the preview and histograms, undo changes, and export
window.openlight.setAdjustments({ exposure: -1 }),
);
const adjusted = await readImage(page);
+ await page.getByRole("button", { name: "photo.svg", exact: true }).click();
const graph = page.getByRole("application", { name: "Tone curve" });
- await graph.scrollIntoViewIfNeeded();
- const input = page
- .getByLabel("input histogram", { exact: true })
+ const curveHistogram = page
+ .getByLabel("curve input histogram", { exact: true })
.locator("polyline");
- await expect(input).toHaveAttribute("points", /,\d{1,2}\./);
- const inputBefore = await input.getAttribute("points");
+ await graph.scrollIntoViewIfNeeded();
+ await expect(curveHistogram).toHaveAttribute("points", /,\d{1,2}\./);
+ const curveInput = await curveHistogram.getAttribute("points");
const before = await page.evaluate(
() => window.openlight.getState().history.undoCount,
);
@@ -379,8 +381,8 @@ test("edit a photo, inspect the preview and histograms, undo changes, and export
8,
);
await expect(graph.locator("circle")).toHaveCount(3);
+ await expect(curveHistogram).toHaveAttribute("points", curveInput ?? "");
expect((await state()).history.undoCount).toBe(before + 1);
- await expect(input).toHaveAttribute("points", inputBefore ?? "");
const curved = await readImage(page);
const curve = await page.evaluate(
() => window.openlight.getState().toneCurve,
@@ -429,23 +431,63 @@ test("edit a photo, inspect the preview and histograms, undo changes, and export
}
});
+ await page.getByRole("button", { name: "photo.svg", exact: true }).click();
+ await test.step("a mask's curve input clears while the mask is hidden and returns on undo", async () => {
+ await page.evaluate(() => {
+ const api = window.openlight;
+ const mask = api.addLayer("mask");
+ api.setLayer(mask, { name: "Curve input mask" });
+ api.setAdjustments({ exposure: 1 }, mask);
+ });
+ const plot = page
+ .getByLabel("curve input histogram", { exact: true })
+ .locator("polyline");
+ await expect(plot).toHaveAttribute("points", /,\d{1,2}\./);
+ const points = await plot.getAttribute("points");
+ await page
+ .getByRole("button", { name: "Show Curve input mask", exact: true })
+ .click();
+ await expect(plot).toHaveAttribute("points", "");
+ await page.getByRole("button", { name: "Undo", exact: true }).click();
+ await expect(plot).toHaveAttribute("points", points ?? "");
+ await page.evaluate(() => {
+ const api = window.openlight;
+ const mask = api.getState().selectedLayerId;
+ if (!mask) throw Error("Missing mask selection.");
+ api.deleteLayer(mask);
+ });
+ });
+ await page.getByRole("button", { name: "photo.svg", exact: true }).click();
await test.step("mode bar switches panels by click, arrow keys, and letters", async () => {
const modes = page.getByRole("tablist", { name: "Editor mode" });
const selected = modes.getByRole("tab", { selected: true });
- await expect(selected).toHaveText("Adjust");
- await modes.getByRole("tab", { name: "Layers" }).click();
- await expect(selected).toHaveText("Layers");
- await expect(page.getByText("Coming soon")).toBeVisible();
- await page.keyboard.press("ArrowRight");
- await expect(selected).toHaveText("Retouch");
- await expect(selected).toBeFocused();
- await page.keyboard.press("ArrowLeft");
+ await expect(selected).toHaveAccessibleName("Adjust");
+ const exportButton = page.getByRole("button", {
+ name: "Export",
+ exact: true,
+ });
+ await exportButton.click();
+ await expect(exportButton).toHaveAttribute("aria-pressed", "true");
+ await expect(
+ page.getByRole("region", { name: "Export settings" }),
+ ).toBeVisible();
+ await expect(
+ page.getByRole("region", { name: "Layers", exact: true }),
+ ).toHaveCount(0);
+ await page.getByRole("button", { name: "Close", exact: true }).click();
+ await expect(selected).toHaveAccessibleName("Adjust");
+ await expect(
+ page.getByRole("region", { name: "Layers", exact: true }),
+ ).toBeVisible();
+ await modes.getByRole("tab", { name: "Crop" }).click();
+ await expect(selected).toHaveAccessibleName("Crop");
await page.keyboard.press("ArrowLeft");
- await expect(selected).toHaveText("Adjust");
- await page.keyboard.press("l");
- await expect(selected).toHaveText("Layers");
+ await expect(selected).toHaveAccessibleName("Adjust");
+ await expect(selected).toBeFocused();
+ await page.keyboard.press("e");
+ await expect(exportButton).toHaveAttribute("aria-pressed", "true");
await page.keyboard.press("a");
- await expect(selected).toHaveText("Adjust");
+ await expect(selected).toHaveAccessibleName("Adjust");
await expect(page.getByRole("slider", { name: "Exposure" })).toBeVisible();
});
@@ -459,10 +501,7 @@ test("edit a photo, inspect the preview and histograms, undo changes, and export
const rotation = panel.getByRole("slider", { name: "Rotation", exact: true });
async function setFrame(change: Partial<ImageFrame> = {}) {
const frame = { ...imageFrame([1200, 800]), ...change };
- await page.evaluate(
- (frame) => window.openlight.editScene({ frame }),
- frame,
- );
+ await page.evaluate((frame) => window.openlight.setFrame(frame), frame);
}
async function expectImage(size: number[], corner: number) {
@@ -477,8 +516,8 @@ test("edit a photo, inspect the preview and histograms, undo changes, and export
const before = await state();
await open.click();
await aspect.selectOption({ label: "Square" });
- await panel
- .getByRole("button", { name: "Cancel", exact: true })
+ await page
+ .getByRole("button", { name: "Close", exact: true })
.press("Enter");
await expect(panel).toBeHidden();
expect((await state()).frame).toEqual(before.frame);
@@ -490,7 +529,7 @@ test("edit a photo, inspect the preview and histograms, undo changes, and export
await expect(panel).toBeVisible();
expect((await state()).frame).toEqual(before.frame);
await reset.press("Enter");
- await panel.getByRole("button", { name: "Apply crop" }).press("Enter");
+ await page.getByRole("button", { name: "Apply crop" }).press("Enter");
await expect(panel).toBeHidden();
expect((await state()).frame).toEqual(before.frame);
expect((await state()).history).toEqual(before.history);
@@ -555,7 +594,7 @@ test("edit a photo, inspect the preview and histograms, undo changes, and export
expect(resized.width).toBeCloseTo(bounds.width - widthChange, 0);
expect(resized.height).toBeCloseTo(bounds.height - heightChange, 0);
expectCentered(resized, bounds);
- await panel.getByRole("button", { name: "Apply crop" }).click();
+ await page.getByRole("button", { name: "Apply crop" }).click();
const frame = (await state()).frame;
if (!frame) throw new Error("Missing cropped frame");
const exported = await readImage(page);
@@ -660,7 +699,7 @@ test("edit a photo, inspect the preview and histograms, undo changes, and export
await open.click();
await panel.getByRole("button", { name: "Rotate clockwise" }).click();
await panel.getByRole("button", { name: "Rotate clockwise" }).click();
- await panel.getByRole("button", { name: "Apply crop" }).click();
+ await page.getByRole("button", { name: "Apply crop" }).click();
await expectImage([800, 1200], 32);
await open.click();
await reset.click();
@@ -674,7 +713,7 @@ test("edit a photo, inspect the preview and histograms, undo changes, and export
await expectImage([1200, 800], 32);
await open.click();
await reset.click();
- await panel.getByRole("button", { name: "Apply crop" }).click();
+ await page.getByRole("button", { name: "Apply crop" }).click();
await expect.poll(() => canvas.screenshot()).toEqual(original);
});
@@ -892,6 +931,8 @@ test("edit a photo, inspect the preview and histograms, undo changes, and export
shadows: 30,
whites: 10,
blacks: -5,
+ });
+ window.openlight.setDetails({
clarity: -50,
sharpening: 100,
sharpenRadius: 1,
@@ -911,7 +952,7 @@ test("edit a photo, inspect the preview and histograms, undo changes, and export
await canvas.hover();
await zoom(page, Math.E);
const panel = page.getByRole("region", { name: "Export settings" });
- await page.getByRole("tab", { name: "Export" }).click();
+ await page.getByRole("button", { name: "Export", exact: true }).click();
const quality = panel.getByRole("textbox", { name: "Quality" });
async function save(name: string) {
const pending = page.waitForEvent("download");
diff --git a/tests/heic.e2e.ts b/tests/heic.e2e.ts
index 339f4c3..f89a736 100644
--- a/tests/heic.e2e.ts
+++ b/tests/heic.e2e.ts
@@ -9,6 +9,15 @@ test("loads a HEIC image with the expected dimensions and pixels", async ({
);
await page.goto("/");
await page.waitForFunction(() => window.openlight);
+ const supported = await page.evaluate(async () => {
+ if (!("VideoDecoder" in window)) {
+ return false;
+ }
+ // Main Still Picture profile used by patches.heic.
+ return (await VideoDecoder.isConfigSupported({ codec: "hvc1.3.e.L30" }))
+ .supported;
+ });
+ test.skip(!supported, "This browser has no HEVC Main Still Picture decoder.");
const result = await page.evaluate(
async (bytes) => {
await window.openlight.loadImage(
diff --git a/tests/images.ts b/tests/images.ts
index f756c94..d7e3dde 100644
--- a/tests/images.ts
+++ b/tests/images.ts
@@ -26,11 +26,14 @@ export async function readImage(page: Page, bytes?: Uint8Array) {
);
}
-/** Sample the displayed canvas, including preview-only overlays. */
-export async function readPreview(page: Page) {
- const bytes = await page.locator("canvas").screenshot();
+/** Sample the displayed canvas, including preview-only overlays; `offset` moves the sampled pixel from the center. */
+export async function readPreview(page: Page, offset = [0, 0]) {
+ const bytes = await page
+ .getByRole("region", { name: "Image canvas" })
+ .locator("canvas")
+ .screenshot();
return page.evaluate(
- async (bytes) => {
+ async ([bytes, offset]) => {
const image = await createImageBitmap(new Blob([new Uint8Array(bytes)]));
const canvas = new OffscreenCanvas(image.width, image.height);
const context = canvas.getContext("2d");
@@ -50,14 +53,18 @@ export async function readPreview(page: Page) {
}
return {
center: [
- ...context.getImageData(canvas.width / 2, canvas.height / 2, 1, 1)
- .data,
+ ...context.getImageData(
+ canvas.width / 2 + offset[0],
+ canvas.height / 2 + offset[1],
+ 1,
+ 1,
+ ).data,
],
red,
blue,
};
},
- [...bytes],
+ [[...bytes], offset] as const,
);
}
diff --git a/tests/layer-drop.test.ts b/tests/layer-drop.test.ts
new file mode 100644
index 0000000..14f2805
--- /dev/null
+++ b/tests/layer-drop.test.ts
@@ -0,0 +1,109 @@
+import { expect, test } from "bun:test";
+import { createLayer, createMask } from "@/app/editor/layers";
+import type { Scene } from "@/core/document";
+import { imageFrame } from "@/core/image/frame";
+import { defaultAdjustments } from "@/features/adjustments/model";
+import { type LayerDrop, layerDrop } from "@/features/layers/drop";
+import { defaultGradient } from "@/features/layers/gradient";
+import { defaultCurve } from "@/features/tone-curves/curve";
+
+const gradient = defaultGradient([32, 16]);
+const exposure = { ...createLayer("exposure"), id: "exposure" };
+const vignette = { ...createLayer("vignette"), id: "vignette" };
+const details = { ...createLayer("details"), id: "details" };
+const mask = {
+ ...createMask(gradient),
+ id: "mask",
+ children: [exposure, vignette],
+};
+const other = { ...createMask(gradient), id: "other", children: [details] };
+const top = { ...createLayer("exposure"), id: "top" };
+const scene: Scene = {
+ frame: imageFrame([32, 16]),
+ layers: [
+ {
+ kind: "image",
+ id: "image",
+ name: "Photo",
+ source: "photo",
+ adjustments: defaultAdjustments,
+ toneCurve: defaultCurve,
+ children: [],
+ },
+ mask,
+ other,
+ top,
+ ],
+};
+
+// Drop positions are visual, top to bottom; results are bottom-to-top sibling indices.
+test.each<[string, LayerDrop, ReturnType<typeof layerDrop>]>([
+ [
+ "above a root sibling",
+ { id: "top", target: "mask", position: "before" },
+ { index: 2 },
+ ],
+ [
+ "below a root sibling",
+ { id: "top", target: "mask", position: "after" },
+ { index: 1 },
+ ],
+ [
+ "above the image",
+ { id: "vignette", target: "image", position: "before" },
+ { index: 1 },
+ ],
+ [
+ "into a mask",
+ { id: "top", target: "mask", position: "inside" },
+ { parentId: "mask", index: 2 },
+ ],
+ [
+ "above a nested sibling",
+ { id: "top", target: "exposure", position: "before" },
+ { parentId: "mask", index: 1 },
+ ],
+ [
+ "below a nested sibling",
+ { id: "top", target: "exposure", position: "after" },
+ { parentId: "mask", index: 0 },
+ ],
+ [
+ "below the image",
+ { id: "vignette", target: "image", position: "after" },
+ undefined,
+ ],
+ [
+ "into the image",
+ { id: "top", target: "image", position: "inside" },
+ undefined,
+ ],
+ [
+ "the image itself",
+ { id: "image", target: "top", position: "before" },
+ undefined,
+ ],
+ [
+ "a parent into its child",
+ { id: "mask", target: "exposure", position: "inside" },
+ undefined,
+ ],
+ [
+ "a parent into another mask",
+ { id: "mask", target: "other", position: "inside" },
+ undefined,
+ ],
+ [
+ "a parent beside a nested layer",
+ { id: "mask", target: "details", position: "before" },
+ undefined,
+ ],
+ ["onto itself", { id: "top", target: "top", position: "inside" }, undefined],
+ [
+ "an unknown target",
+ { id: "top", target: "missing", position: "before" },
+ undefined,
+ ],
+])("layerDrop rejects or resolves %s", (_, drop, expected) => {
+ expect(layerDrop(scene, drop)).toEqual(expected);
+});
diff --git a/tests/layers.e2e.ts b/tests/layers.e2e.ts
new file mode 100644
index 0000000..76a00d5
--- /dev/null
+++ b/tests/layers.e2e.ts
@@ -0,0 +1,445 @@
+import { writeFile } from "node:fs/promises";
+import type { Page } from "@playwright/test";
+import { expect, test } from "./fixtures";
+import { readImage, readPreview } from "./images";
+import { box, drag } from "./pointer";
+
+async function samples(page: Page) {
+ return page.evaluate(async () => {
+ const image = await createImageBitmap(await window.openlight.exportImage());
+ const canvas = new OffscreenCanvas(image.width, image.height);
+ const context = canvas.getContext("2d");
+ if (!context) {
+ throw new Error("Cannot read layer output.");
+ }
+ context.drawImage(image, 0, 0);
+ image.close();
+ return [100, 700].map((y) => [...context.getImageData(600, y, 1, 1).data]);
+ });
+}
+
+test("draw a mask, edit its child effects, reorder layers and undo", async ({
+ page,
+}, info) => {
+ test.setTimeout(90_000);
+ await page.setViewportSize({ width: 1440, height: 1000 });
+ const state = () => page.evaluate(() => window.openlight.getState());
+ async function setField(name: string, value: string) {
+ const field = page.getByRole("textbox", { name, exact: true });
+ await field.fill(value);
+ await field.press("Enter");
+ }
+ async function action(name: string, command: string) {
+ await page
+ .getByRole("button", { name: `${name} actions`, exact: true })
+ .click();
+ await page
+ .locator("[popover]:popover-open")
+ .getByRole("button", { name: command, exact: true })
+ .click();
+ }
+ async function dragLayer(name: string, target: string, fraction: number) {
+ const from = await box(
+ page
+ .getByRole("region", { name: "Layers", exact: true })
+ .getByRole("button", { name, exact: true }),
+ );
+ const row = page
+ .locator("[data-selected]")
+ .filter({ has: page.getByRole("button", { name: target, exact: true }) });
+ const to = await box(row);
+ await drag(
+ page,
+ [from.x + from.width / 2, from.y + from.height / 2],
+ [to.x + to.width / 2, to.y + to.height * fraction],
+ );
+ }
+ async function saveExport(name: string) {
+ const bytes = await page.evaluate(async () => [
+ ...new Uint8Array(
+ await (await window.openlight.exportImage()).arrayBuffer(),
+ ),
+ ]);
+ await writeFile(info.outputPath(name), new Uint8Array(bytes));
+ }
+ await page.goto("/");
+ await page
+ .locator('input[type="file"]')
+ .setInputFiles("tests/fixtures/photo.svg");
+ await expect(
+ page.getByRole("textbox", { name: "Exposure", exact: true }),
+ ).toHaveValue("0.00");
+ await test.step("Details is an optional effect, separate from image adjustments", async () => {
+ await expect(
+ page.getByRole("heading", { name: "Adjustments", exact: true }),
+ ).toBeVisible();
+ await expect(
+ page.getByRole("textbox", { name: "Clarity", exact: true }),
+ ).toHaveCount(0);
+ await page.getByRole("button", { name: "Add effect", exact: true }).click();
+ await page
+ .locator("[popover]:popover-open")
+ .getByRole("button", { name: "Details", exact: true })
+ .click();
+ await setField("Clarity", "-100");
+ expect((await readImage(page)).corner[0]).toBeGreaterThan(0);
+ await page.getByRole("button", { name: "Undo", exact: true }).click();
+ expect((await readImage(page)).corner).toEqual([0, 0, 0, 255]);
+ await page.getByRole("button", { name: "Undo", exact: true }).click();
+ });
+ const original = await samples(page);
+ await test.step("a local exposure recovers light the global exposure pushed past white", async () => {
+ // Export pixels at the gray field and the light band, both inside the radial mask below.
+ const tones = () =>
+ page.evaluate(async () => {
+ const image = await createImageBitmap(
+ await window.openlight.exportImage(),
+ );
+ const canvas = new OffscreenCanvas(image.width, image.height);
+ const context = canvas.getContext("2d");
+ if (!context) throw new Error("Cannot read layer output.");
+ context.drawImage(image, 0, 0);
+ image.close();
+ return [600, 1100].map(
+ (x) => context.getImageData(x, 700, 1, 1).data[0],
+ );
+ });
+ const [gray, band] = await tones();
+ expect([gray, band]).toEqual([128, 224]);
+ await page.evaluate(() => window.openlight.setAdjustments({ exposure: 2 }));
+ expect((await tones())[0]).toBeGreaterThan(200);
+ await page.evaluate(() => {
+ const api = window.openlight;
+ const mask = api.addLayer("mask");
+ api.setLayerMask(mask, {
+ kind: "radial",
+ center: [850, 700],
+ radius: [400, 200],
+ angle: 0,
+ feather: 0,
+ });
+ api.setAdjustments({ exposure: -2 }, mask);
+ });
+ const recovered = await tones();
+ expect(Math.abs(recovered[0] - gray)).toBeLessThan(30);
+ expect(Math.abs(recovered[1] - band)).toBeLessThan(30);
+ expect(recovered[1] - recovered[0]).toBeGreaterThan(0.6 * (band - gray));
+ expect((await samples(page))[0][0]).toBeGreaterThan(200);
+ await page.evaluate(() => {
+ for (let i = 0; i < 4; i++) window.openlight.undo();
+ });
+ expect(await samples(page)).toEqual(original);
+ });
+ await page.screenshot({ path: info.outputPath("layers-before-ui.png") });
+ await saveExport("layers-before-export.png");
+ await page
+ .getByRole("button", { name: "Add linear mask", exact: true })
+ .click();
+ const overlay = page.getByLabel("Gradient mask canvas", { exact: true });
+ const bounds = await box(overlay);
+ const scale = Math.min(bounds.width / 1200, bounds.height / 800, 2);
+ const center = [bounds.x + bounds.width / 2, bounds.y + bounds.height / 2];
+ const from = [center[0], center[1] - 200 * scale];
+ const to = [center[0], center[1] + 200 * scale];
+ await test.step("cancellation is empty; drawing creates a mask with its own adjustments", async () => {
+ await page.mouse.move(from[0], from[1]);
+ await page.mouse.down();
+ await page.mouse.move(to[0], to[1]);
+ await page.keyboard.press("Escape");
+ await page.mouse.up();
+ expect((await state()).scene?.layers).toHaveLength(1);
+ // Sample above the center, clear of the guide lines and the move handle.
+ async function maskPreview() {
+ const { center } = await readPreview(page, [0, -100 * scale]);
+ return {
+ shown: (await state()).preview?.maskOverlay !== undefined,
+ tinted: center[0] > center[1] + 30,
+ };
+ }
+ await page.keyboard.press("l");
+ await drag(page, from, to);
+ await expect.poll(maskPreview).toEqual({ shown: true, tinted: true });
+ await page.keyboard.press("Escape");
+ expect((await state()).scene?.layers).toHaveLength(1);
+ await expect.poll(maskPreview).toEqual({ shown: false, tinted: false });
+ await page.keyboard.press("l");
+ await drag(page, from, to);
+ await expect.poll(maskPreview).toEqual({ shown: true, tinted: true });
+ await page.keyboard.press("Enter");
+ await expect.poll(maskPreview).toEqual({ shown: false, tinted: false });
+ await page.keyboard.press("o");
+ await expect.poll(maskPreview).toEqual({ shown: true, tinted: true });
+ const layers = (await state()).scene?.layers;
+ expect(layers).toHaveLength(2);
+ expect(layers?.[1]).toMatchObject({
+ kind: "mask",
+ children: [],
+ });
+ await setField("Exposure", "1");
+ await expect.poll(maskPreview).toEqual({ shown: false, tinted: false });
+ const [top, bottom] = await samples(page);
+ expect(top[0]).toBeGreaterThan(170);
+ expect(bottom).toEqual([128, 128, 128, 255]);
+ await setField("Temp", "20");
+ const warmed = await samples(page);
+ expect(warmed[0][0]).toBeGreaterThan(warmed[0][2]);
+ await page.getByRole("button", { name: "Undo", exact: true }).click();
+ expect(await samples(page)).toEqual([top, bottom]);
+ await setField("Exposure", "2");
+ expect((await samples(page))[0][0]).toBeGreaterThan(top[0] + 20);
+ });
+ await test.step("selected gradient guides move, resize and rotate with atomic undo and cancellation", async () => {
+ const before = await state();
+ const pixels = await samples(page);
+ await drag(page, center, [center[0], center[1] - 150 * scale]);
+ expect((await state()).history.undoCount).toBe(
+ before.history.undoCount + 1,
+ );
+ expect(await samples(page)).not.toEqual(pixels);
+ await page.keyboard.press("ControlOrMeta+z");
+ expect((await state()).scene).toEqual(before.scene);
+ expect(await samples(page)).toEqual(pixels);
+ await drag(page, from, [from[0], from[1] - 50 * scale]);
+ expect((await state()).scene).not.toEqual(before.scene);
+ await page.keyboard.press("ControlOrMeta+z");
+ await drag(page, [center[0] + 80, center[1]], [center[0], center[1] + 80]);
+ const rotated = (await state()).scene?.layers[1];
+ expect(rotated?.kind).toBe("mask");
+ if (rotated?.kind === "mask" && rotated.mask.kind === "linear") {
+ expect(
+ Math.abs(rotated.mask.end[1] - rotated.mask.start[1]),
+ ).toBeLessThan(1);
+ }
+ await page.keyboard.press("ControlOrMeta+z");
+ await page.mouse.move(center[0], center[1]);
+ await page.mouse.down();
+ await page.mouse.move(center[0] + 50, center[1] + 50);
+ await page.keyboard.press("Escape");
+ await page.mouse.up();
+ expect((await state()).scene).toEqual(before.scene);
+ await page.keyboard.press("Delete");
+ expect((await state()).scene?.layers).toHaveLength(1);
+ await page.keyboard.press("ControlOrMeta+z");
+ expect((await state()).scene).toEqual(before.scene);
+ });
+ await test.step("mask opacity and visibility apply to the complete branch", async () => {
+ await page
+ .getByRole("button", { name: "Linear Gradient", exact: true })
+ .dblclick();
+ await setField("Layer name", "Sky");
+ const masked = await samples(page);
+ await setField("Opacity", "0");
+ expect(await samples(page)).toEqual(original);
+ await page.getByRole("button", { name: "Undo", exact: true }).click();
+ expect(await samples(page)).toEqual(masked);
+ await page.getByRole("button", { name: "Show Sky", exact: true }).click();
+ expect(await samples(page)).toEqual(original);
+ await page.getByRole("button", { name: "Show Sky", exact: true }).click();
+ expect(await samples(page)).toEqual(masked);
+ });
+ await test.step("a subtracting child changes coverage and Add restores the masked region", async () => {
+ const masked = await samples(page);
+ await page
+ .getByRole("button", { name: "Subtract from mask", exact: true })
+ .click();
+ await page
+ .locator("[popover]:popover-open")
+ .getByRole("button", { name: "Linear gradient", exact: true })
+ .click();
+ await drag(page, from, to);
+ expect((await samples(page))[0]).toEqual(original[0]);
+ const operation = page.getByRole("combobox", {
+ name: "Mask operation",
+ exact: true,
+ });
+ await operation.selectOption("add");
+ expect((await samples(page))[0]).toEqual(masked[0]);
+ await page.getByRole("button", { name: "Undo", exact: true }).click();
+ expect((await samples(page))[0]).toEqual(original[0]);
+ await page.getByRole("button", { name: "Undo", exact: true }).click();
+ expect(await samples(page)).toEqual(masked);
+ await page.getByRole("button", { name: "Sky", exact: true }).click();
+ });
+
+ await test.step("child effects can leave the mask, reorder and return through undo", async () => {
+ const masked = await samples(page);
+ await page.getByRole("button", { name: "Add effect", exact: true }).click();
+ await page.keyboard.press("Escape");
+ await expect(page.locator("[popover]:popover-open")).toHaveCount(0);
+ await page.getByRole("button", { name: "Add effect", exact: true }).click();
+ await page
+ .locator("[popover]:popover-open")
+ .getByRole("button", { name: "Vignette", exact: true })
+ .click();
+ expect(
+ (await state()).scene?.layers[1].children.map((layer) => layer.kind),
+ ).toEqual(["vignette"]);
+ await setField("Intensity", "80");
+ const nested = await samples(page);
+ expect(nested[0][0]).toBeLessThan(masked[0][0]);
+ expect(nested[1]).toEqual(masked[1]);
+ const beforeMove = (await state()).history.undoCount;
+ await dragLayer("Vignette", "Sky", 0.1);
+ expect((await state()).history.undoCount).toBe(beforeMove + 1);
+ expect((await state()).scene?.layers).toHaveLength(3);
+ expect((await samples(page))[1][0]).toBeLessThan(masked[1][0]);
+ await dragLayer("Vignette", "photo.svg", 0.1);
+ expect((await state()).scene?.layers[1].kind).toBe("vignette");
+ await dragLayer("Vignette", "Sky", 0.5);
+ expect(await samples(page)).toEqual(nested);
+ await page.getByRole("button", { name: "Undo", exact: true }).click();
+ await page.getByRole("button", { name: "Undo", exact: true }).click();
+ await page.getByRole("button", { name: "Undo", exact: true }).click();
+ expect(await samples(page)).toEqual(nested);
+ await action("Vignette", "Delete");
+ expect(await samples(page)).toEqual(masked);
+ await page.getByRole("button", { name: "Undo", exact: true }).click();
+ expect((await state()).scene?.layers[1].children).toHaveLength(1);
+ });
+ await page.getByRole("button", { name: "Sky", exact: true }).click();
+ await page.screenshot({ path: info.outputPath("layers-after-ui.png") });
+ await saveExport("layers-after-export.png");
+ await test.step("radial masks edit locally, resize, feather, rotate, subtract and undo", async () => {
+ const before = await readImage(page);
+ const beforeSamples = await samples(page);
+ await page.keyboard.press("r");
+ await drag(page, center, [
+ center[0] + 220 * scale,
+ center[1] + 120 * scale,
+ ]);
+ await setField("Exposure", "1");
+ expect((await readImage(page)).center[0]).toBeGreaterThan(
+ before.center[0] + 20,
+ );
+ expect((await samples(page))[1]).toEqual(beforeSamples[1]);
+ await page.screenshot({ path: info.outputPath("radial-ui.png") });
+ await saveExport("radial-export.png");
+ const edited = await state();
+ await page.mouse.move(center[0] + 40, center[1] + 30);
+ await expect(
+ page.getByLabel("Move radial gradient", { exact: true }),
+ ).toHaveCSS("cursor", "grab");
+ await page.mouse.down();
+ await expect(overlay).toHaveCSS("cursor", "grabbing");
+ await page.mouse.move(center[0] + 40 + 300 * scale, center[1] + 30, {
+ steps: 8,
+ });
+ const preview = (await state()).scene;
+ await page.mouse.up();
+ expect((await state()).scene).toEqual(preview);
+ expect((await state()).history.undoCount).toBe(
+ edited.history.undoCount + 1,
+ );
+ expect((await readImage(page)).center).toEqual(before.center);
+ await page.keyboard.press("ControlOrMeta+z");
+ expect((await state()).scene).toEqual(edited.scene);
+ await expect(
+ page.getByLabel("Radial right radius", { exact: true }),
+ ).toHaveCSS("cursor", "ew-resize");
+ await expect(
+ page.getByLabel("Rotate radial gradient", { exact: true }),
+ ).toHaveCSS("cursor", /url/);
+ const radius = await box(
+ page.getByLabel("Radial right radius", { exact: true }),
+ );
+ await drag(
+ page,
+ [radius.x + radius.width / 2, radius.y + radius.height / 2],
+ [radius.x + radius.width / 2 - 60, radius.y + radius.height / 2],
+ );
+ expect((await state()).scene).not.toEqual(edited.scene);
+ await page.keyboard.press("ControlOrMeta+z");
+ const options = page.getByRole("group", { name: "Layer options" });
+ await expect(
+ options.getByRole("slider", { name: "Opacity", exact: true }),
+ ).toBeVisible();
+ await expect(
+ options.getByRole("slider", { name: "Feather", exact: true }),
+ ).toBeVisible();
+ await expect(
+ options.getByRole("textbox", { name: "Feather", exact: true }),
+ ).toBeVisible();
+ const panel = page.getByRole("region", { name: "Editor controls" });
+ await expect(
+ panel.getByRole("heading", { name: "Adjustments", exact: true }),
+ ).toBeVisible();
+ await expect(
+ panel.getByRole("textbox", { name: "Feather", exact: true }),
+ ).toHaveCount(0);
+ await setField("Feather", "80");
+ await page.getByRole("button", { name: "Undo", exact: true }).click();
+ await expect(
+ page.getByRole("textbox", { name: "Feather", exact: true }),
+ ).toHaveValue("50");
+ const rotation = await box(
+ page.getByLabel("Rotate radial gradient", { exact: true }),
+ );
+ await drag(
+ page,
+ [rotation.x + rotation.width / 2, rotation.y + rotation.height / 2],
+ [center[0] + 150 * scale, center[1]],
+ );
+ const rotated = (await state()).scene?.layers.at(-1);
+ expect(
+ rotated?.kind === "mask" &&
+ rotated.mask.kind === "radial" &&
+ Math.abs(rotated.mask.angle - 90) < 1,
+ ).toBe(true);
+ await page.keyboard.press("ControlOrMeta+z");
+ await page
+ .getByRole("button", { name: "Subtract from mask", exact: true })
+ .click();
+ await page
+ .locator("[popover]:popover-open")
+ .getByRole("button", { name: "Radial gradient", exact: true })
+ .click();
+ await drag(page, center, [
+ center[0] + 220 * scale,
+ center[1] + 120 * scale,
+ ]);
+ expect((await readImage(page)).center).toEqual(before.center);
+ await page.keyboard.press("Delete");
+ expect((await readImage(page)).center[0]).toBeGreaterThan(
+ before.center[0] + 20,
+ );
+ await page.keyboard.press("ControlOrMeta+z");
+ expect((await readImage(page)).center).toEqual(before.center);
+ });
+ await test.step("guide clicks and mobile drawing keep the preview stable", async () => {
+ await page
+ .getByRole("button", { name: "Select Radial Gradient", exact: true })
+ .first()
+ .click();
+ await page.getByRole("button", { name: "Zoom in", exact: true }).click();
+ const zoom = page.getByTitle("Fit to view");
+ const percent = await zoom.innerText();
+ await page.getByLabel("Move gradient", { exact: true }).dblclick();
+ await expect(zoom).toHaveText(percent);
+ await zoom.click();
+ await page.setViewportSize({ width: 390, height: 844 });
+ await page.getByRole("button", { name: "photo.svg", exact: true }).click();
+ await page.keyboard.press("r");
+ await expect(overlay).toHaveCSS("cursor", "crosshair");
+ const view = await box(overlay);
+ const x = view.x + view.width / 2,
+ y = view.y + view.height / 2;
+ await page.mouse.move(x, y);
+ await page.mouse.down();
+ await page.keyboard.down("Shift");
+ await page.mouse.move(x + 65, y + 35);
+ const pin = page.getByLabel("Move gradient", { exact: true });
+ const drawn = await box(pin);
+ await page.keyboard.up("Shift");
+ await page.mouse.up();
+ expect(await box(pin)).toEqual(drawn);
+ const result = await state();
+ const layer = result.scene?.layers.find(
+ (item) => item.id === result.selectedLayerId,
+ );
+ expect(
+ layer?.kind === "mask" &&
+ layer.mask.kind === "radial" &&
+ layer.mask.radius[0] === layer.mask.radius[1],
+ ).toBe(true);
+ });
+});
diff --git a/tests/layers.test.ts b/tests/layers.test.ts
new file mode 100644
index 0000000..2ebdd3f
--- /dev/null
+++ b/tests/layers.test.ts
@@ -0,0 +1,208 @@
+import { expect, test } from "bun:test";
+import { getMockGPUDeviceInstrumentation, init, target } from "vgpu/mock";
+import { createControls } from "@/app/controls";
+import { createLayer, createMask } from "@/app/editor/layers";
+import { createEditorRenderer } from "@/app/editor/renderer";
+import { createWorkspace } from "@/app/workspace";
+import {
+ createDocument,
+ createResources,
+ findLayer,
+ walkLayers,
+} from "@/core/document";
+import { createImageSource } from "@/core/image";
+import { imageFrame } from "@/core/image/frame";
+import { defaultAdjustments } from "@/features/adjustments/model";
+import { layerDrop } from "@/features/layers/drop";
+import {
+ addLayer,
+ deleteLayer,
+ duplicateLayer,
+ moveLayer,
+ setExposure,
+ setLayer,
+ setLayerMask,
+} from "@/features/layers/edits";
+import { defaultGradient } from "@/features/layers/gradient";
+import { defaultCurve } from "@/features/tone-curves/curve";
+
+test("nested layers compose in order, move atomically, and duplicate with independent IDs", async () => {
+ const gpu = await init();
+ const source = createImageSource(
+ target(gpu, { size: [32, 16], format: "rgba16float" }),
+ );
+ const resources = createResources();
+ const sourceId = resources.add(new File([], "photo.png"), source);
+ const document = createDocument(
+ {
+ frame: imageFrame(source.image.size),
+ layers: [
+ {
+ kind: "image",
+ id: "base",
+ name: "Photo",
+ source: sourceId,
+ adjustments: defaultAdjustments,
+ toneCurve: defaultCurve,
+ children: [],
+ },
+ ],
+ },
+ resources,
+ );
+ const workspace = createWorkspace();
+ await workspace.open("photo.png", async () => document);
+ const controls = createControls(gpu, workspace);
+ const renderer = createEditorRenderer(gpu, source);
+ try {
+ const original = document.scene.getState();
+ controls.beginEdit();
+ controls.setAdjustments({ exposure: 1 });
+ controls.setColorMixer("blue", { saturation: -20 });
+ expect(() => controls.setToneCurve([])).toThrow();
+ controls.cancelEdit();
+ expect(document.scene.getState()).toEqual(original);
+ expect(document.history.status.getState()).toEqual({
+ undoCount: 0,
+ redoCount: 0,
+ });
+ expect(document.selection.getState().layerId).toBe("base");
+ controls.setVignette({ softness: 75 });
+ expect(document.scene.getState().layers[1]).toMatchObject({
+ vignette: { intensity: 0, softness: 75 },
+ });
+ controls.undo();
+ for (const field of ["center", "size", "scale"]) {
+ for (const value of [[8], [8, 8, 8], [], [8, NaN], null]) {
+ expect(() =>
+ Reflect.apply(controls.setFrame, undefined, [
+ { ...original.frame, [field]: value },
+ ]),
+ ).toThrow("Invalid image frame");
+ }
+ }
+ const size: [number, number] = [8, 8];
+ const frame = { ...original.frame, size };
+ controls.setFrame(frame);
+ const cropped = document.scene.getState();
+ frame.size[0] = 99;
+ expect(cropped.frame.size).toEqual([8, 8]);
+ controls.setFrame(structuredClone(cropped.frame));
+ expect(document.scene.getState()).toBe(cropped);
+ const defaultMask = controls.addLayer("mask");
+ expect(
+ findLayer(document.scene.getState().layers, defaultMask),
+ ).toMatchObject({ mask: { start: [6.4, 8], end: [25.6, 8] } });
+ controls.undo();
+ controls.undo();
+ const mask = addLayer(document, createMask(defaultGradient([32, 16])));
+ const exposure = addLayer(document, createLayer("exposure"), {
+ inside: mask,
+ });
+ const vignette = addLayer(document, createLayer("vignette"), {
+ inside: mask,
+ });
+ expect(document.scene.getState().layers[0]).toBe(original.layers[0]);
+ const unchangedScene = document.scene.getState();
+ document.edit(structuredClone(unchangedScene));
+ expect(document.scene.getState()).toBe(unchangedScene);
+ document.history.begin();
+ setExposure(document, exposure, 2);
+ setExposure(document, exposure, 3);
+ document.selectLayer("base");
+ document.history.undo();
+ expect(findLayer(document.scene.getState().layers, exposure)).toMatchObject(
+ { exposure: 1 },
+ );
+ expect(document.selection.getState().layerId).toBe("base");
+ await renderer.update(document.scene.getState());
+ expect(renderer.inspect().passes).toEqual([
+ `layer/${exposure}/exposure`,
+ `layer/${vignette}/vignette`,
+ `layer/${mask}/mix`,
+ "layer/base/adjustments",
+ ]);
+ const calls = getMockGPUDeviceInstrumentation(gpu.gpu).calls;
+ const compiled = calls.createRenderPipeline;
+ setLayer(document, mask, { visible: false });
+ await renderer.update(document.scene.getState());
+ expect(renderer.inspect().passes).toEqual(["layer/base/adjustments"]);
+ setLayer(document, mask, { visible: true, opacity: 0.5 });
+ await renderer.update(document.scene.getState());
+ expect(calls.createRenderPipeline).toBe(compiled);
+ const duplicate = duplicateLayer(document, mask);
+ const copy = findLayer(document.scene.getState().layers, duplicate);
+ expect(copy?.children.map((layer) => layer.kind)).toEqual([
+ "exposure",
+ "vignette",
+ ]);
+ const ids = walkLayers(document.scene.getState().layers).map(
+ (layer) => layer.id,
+ );
+ expect(new Set(ids).size).toBe(ids.length);
+ moveLayer(document, exposure, 1);
+ expect(document.scene.getState().layers[1].id).toBe(exposure);
+ expect(
+ findLayer(document.scene.getState().layers, mask)?.children.map(
+ (layer) => layer.id,
+ ),
+ ).toEqual([vignette]);
+ document.history.undo();
+ expect(
+ findLayer(document.scene.getState().layers, mask)?.children[0].id,
+ ).toBe(exposure);
+ const unchanged = document.scene.getState();
+ expect(() =>
+ addLayer(document, createLayer("vignette"), { inside: exposure }),
+ ).toThrow("two levels");
+ expect(() => moveLayer(document, mask, 0, exposure)).toThrow("itself");
+ expect(() => moveLayer(document, exposure, 0, "base")).toThrow("image");
+ expect(
+ layerDrop(document.scene.getState(), {
+ id: exposure,
+ target: "base",
+ position: "inside",
+ }),
+ ).toBeUndefined();
+ expect(() => moveLayer(document, exposure, 0)).toThrow("position");
+ expect(() =>
+ setLayerMask(document, mask, {
+ kind: "linear",
+ start: [0, 0],
+ end: [0, 0],
+ }),
+ ).toThrow("distinct");
+ expect(() => setExposure(document, exposure, NaN)).toThrow("Exposure");
+ expect(() => deleteLayer(document, "base")).toThrow("unavailable");
+ expect(document.scene.getState()).toBe(unchanged);
+ const added = addLayer(document, createLayer("vignette"), {
+ above: exposure,
+ });
+ expect(
+ findLayer(document.scene.getState().layers, mask)?.children.map(
+ (layer) => layer.id,
+ ),
+ ).toEqual([exposure, added, vignette]);
+ const top = addLayer(document, createLayer("vignette"));
+ expect(document.scene.getState().layers.at(-1)?.id).toBe(top);
+ expect(() =>
+ addLayer(document, createLayer("vignette"), { above: "missing" }),
+ ).toThrow("unavailable");
+ document.history.undo();
+ document.history.undo();
+ expect(document.scene.getState()).toBe(unchanged);
+ document.selectLayer(exposure);
+ deleteLayer(document, mask);
+ expect(document.selection.getState().layerId).toBe("base");
+ expect(
+ findLayer(document.scene.getState().layers, exposure),
+ ).toBeUndefined();
+ document.history.undo();
+ expect(findLayer(document.scene.getState().layers, exposure)).toBeDefined();
+ expect(renderer.outputImage().format).toBe("rgba16float");
+ } finally {
+ renderer.dispose();
+ workspace.dispose();
+ gpu.dispose();
+ }
+});
diff --git a/tests/loaders.test.ts b/tests/loaders.test.ts
index bc1a244..298a75a 100644
--- a/tests/loaders.test.ts
+++ b/tests/loaders.test.ts
@@ -1,4 +1,5 @@
import { expect, test } from "bun:test";
+import { createLayer, createMask } from "@/app/editor/layers";
import { createCameraRawXmpLoader } from "@/app/loaders/camera-raw-xmp";
import { createLoaderRegistry, type FileLoader } from "@/app/loaders/registry";
import { createWorkspace } from "@/app/workspace";
@@ -7,6 +8,8 @@ import { canDecode } from "@/core/image/decode";
import { imageFrame } from "@/core/image/frame";
import { setAdjustments } from "@/features/adjustments/edits";
import { defaultAdjustments } from "@/features/adjustments/model";
+import { addLayer } from "@/features/layers/edits";
+import { defaultGradient } from "@/features/layers/gradient";
import { defaultCurve } from "@/features/tone-curves/curve";
function settings(attributes: string, name = "photo.xmp") {
@@ -32,9 +35,17 @@ test("file batches preserve ordering, group imports, recover from failures, and
if (file.name === "broken.png") throw new Error("Decode failed");
return createDocument({
frame: imageFrame([32, 32]),
- source: file.name,
- adjustments: { ...defaultAdjustments },
- toneCurve: defaultCurve,
+ layers: [
+ {
+ kind: "image",
+ name: "Photo",
+ children: [],
+ id: "base",
+ source: file.name,
+ adjustments: { ...defaultAdjustments },
+ toneCurve: defaultCurve,
+ },
+ ],
});
}),
};
@@ -70,17 +81,17 @@ test("file batches preserve ordering, group imports, recover from failures, and
vibrance: 30,
saturation: -10,
};
- expect(document.scene.getState().adjustments).toEqual(imported);
+ expect(document.scene.getState().layers[0].adjustments).toEqual(imported);
await registry.openFiles([
settings('crs:Exposure2012="3"'),
settings('crs:Exposure2012="-1"'),
]);
- expect(document.scene.getState().adjustments).toEqual({
+ expect(document.scene.getState().layers[0].adjustments).toEqual({
...imported,
exposure: -1,
});
document.history.undo();
- expect(document.scene.getState().adjustments.exposure).toBe(3);
+ expect(document.scene.getState().layers[0].adjustments.exposure).toBe(3);
document.history.redo();
document.history.begin();
setAdjustments(document, { contrast: 20 });
@@ -94,21 +105,43 @@ test("file batches preserve ordering, group imports, recover from failures, and
undoCount: 5,
redoCount: 0,
});
- expect(document.scene.getState().adjustments).toMatchObject({
+ expect(document.scene.getState().layers[0].adjustments).toMatchObject({
highlights: 0,
shadows: 0,
whites: 0,
blacks: 0,
});
document.history.undo();
- expect(document.scene.getState().adjustments).toEqual({
+ expect(document.scene.getState().layers[0].adjustments).toEqual({
...imported,
exposure: -1,
contrast: 30,
});
document.history.undo();
- expect(document.scene.getState().adjustments.contrast).toBe(-20);
+ expect(document.scene.getState().layers[0].adjustments.contrast).toBe(
+ -20,
+ );
}
+ const document = workspace.getDocument();
+ const maskId = addLayer(document, createMask(defaultGradient([32, 32])));
+ addLayer(document, createLayer("details"), { inside: maskId });
+ const beforeDetails = document.scene.getState();
+ await xmp.load(settings('crs:Exposure2012="0.5" crs:Clarity2012="35"'));
+ expect(document.scene.getState().layers[2]).toMatchObject({
+ kind: "details",
+ details: { clarity: 35 },
+ });
+ expect(document.scene.getState().layers[0].adjustments.exposure).toBe(0.5);
+ expect(document.scene.getState().layers[1]).toBe(beforeDetails.layers[1]);
+ document.history.undo();
+ expect(document.scene.getState()).toEqual(beforeDetails);
+ document.history.redo();
+ await xmp.load(settings('crs:Clarity2012="0"'));
+ expect(document.scene.getState().layers).toHaveLength(3);
+ expect(document.scene.getState().layers[2]).toMatchObject({
+ details: { clarity: 0 },
+ });
+ expect(document.scene.getState().layers[1]).toBe(beforeDetails.layers[1]);
await Promise.all([
registry.openFiles([exposure, new File([], "first.png")]),
registry.openFiles([
@@ -117,7 +150,9 @@ test("file batches preserve ordering, group imports, recover from failures, and
]),
]);
expect(workspace.state.getState().file).toBe("second.png");
- expect(workspace.getDocument().scene.getState().adjustments).toEqual({
+ expect(
+ workspace.getDocument().scene.getState().layers[0].adjustments,
+ ).toEqual({
...defaultAdjustments,
contrast: 20,
});
@@ -129,14 +164,16 @@ test("file batches preserve ordering, group imports, recover from failures, and
});
await registry.openFiles([exposure, photo]);
const recovered = workspace.getDocument();
- expect(recovered.scene.getState().adjustments.exposure).toBe(1.25);
+ expect(recovered.scene.getState().layers[0].adjustments.exposure).toBe(
+ 1.25,
+ );
await expect(
registry.openFiles([settings('crs:Exposure2012="99"')]),
).rejects.toThrow("Invalid adjustment");
await registry.openFiles([
settings('crs:Contrast2012="10" crs:Exposure2012="NaN"'),
]);
- expect(recovered.scene.getState().adjustments).toEqual({
+ expect(recovered.scene.getState().layers[0].adjustments).toEqual({
...defaultAdjustments,
exposure: 1.25,
contrast: 10,
@@ -151,9 +188,9 @@ test("file batches preserve ordering, group imports, recover from failures, and
text.resolve(await exposure.text());
await pending;
expect(workspace.getDocument()).not.toBe(recovered);
- expect(workspace.getDocument().scene.getState().adjustments).toEqual(
- defaultAdjustments,
- );
+ expect(
+ workspace.getDocument().scene.getState().layers[0].adjustments,
+ ).toEqual(defaultAdjustments);
} finally {
workspace.dispose();
}
diff --git a/tests/render-graph.test.ts b/tests/render-graph.test.ts
index a86caba..43ed212 100644
--- a/tests/render-graph.test.ts
+++ b/tests/render-graph.test.ts
@@ -110,6 +110,13 @@ test("a shared branch renders once and reuses effects, buffers, and temporary st
);
expect(graph.render([small])[0].size).toEqual([4, 4]);
expect(graph.inspect().textures).toHaveLength(1);
+ // Removing a composition retires its cached effect so its name can be reused.
+ graph.release("shared");
+ const replacement = merge(
+ { source, base: source },
+ node("shared", shader.replace("weights[0]", "1.0 - weights[0]"), options),
+ );
+ expect(() => graph.render([replacement])).not.toThrow();
graph.dispose();
expect(() => saved.color.view).toThrow("destroyed");
expect(() => image.color.view).not.toThrow();
diff --git a/tests/renderer.test.ts b/tests/renderer.test.ts
index f8682d2..d44c5ff 100644
--- a/tests/renderer.test.ts
+++ b/tests/renderer.test.ts
@@ -6,6 +6,7 @@ import {
init,
target,
} from "vgpu/mock";
+import { createLayer } from "@/app/editor/layers";
import { createEditorRenderer as createRenderer } from "@/app/editor/renderer";
import { createDocument, createResources } from "@/core/document";
import { createImageSource } from "@/core/image";
@@ -18,7 +19,7 @@ import {
} from "@/core/renderer";
import { setAdjustments } from "@/features/adjustments/edits";
import { defaultAdjustments } from "@/features/adjustments/model";
-import { unsharpMask } from "@/features/adjustments/unsharp-mask";
+import { unsharpMask } from "@/features/details/unsharp-mask";
import { defaultCurve } from "@/features/tone-curves/curve";
import { setToneCurve } from "@/features/tone-curves/edits";
import { setWhiteBalance } from "@/features/white-balance/edits";
@@ -58,11 +59,19 @@ test("RAW edits coalesce, recover from failure, and retain an exporting source a
const id = resources.add(new File([], "photo.nef"), source);
const document = createDocument(
{
- source: id,
frame: imageFrame(image.size),
- adjustments: { ...defaultAdjustments },
- toneCurve: defaultCurve,
- whiteBalance: asShot,
+ layers: [
+ {
+ kind: "image",
+ name: "Photo",
+ children: [],
+ id: "base",
+ source: id,
+ adjustments: { ...defaultAdjustments },
+ toneCurve: defaultCurve,
+ whiteBalance: asShot,
+ },
+ ],
},
resources,
);
@@ -87,7 +96,9 @@ test("RAW edits coalesce, recover from failure, and retain an exporting source a
expect(notify).toHaveBeenCalledTimes(2);
expect(outputs).toHaveLength(2);
document.history.undo();
- expect(document.scene.getState().whiteBalance?.temperature).toBe(3000);
+ expect(document.scene.getState().layers[0].whiteBalance?.temperature).toBe(
+ 3000,
+ );
const failed = preview.update(document.scene.getState());
requests[1].reject(Error("Decode failure"));
await expect(failed).rejects.toThrow("Decode failure");
@@ -180,15 +191,25 @@ test("rendering follows grouped edits and undo, reuses pipelines, and releases o
const canvas = Object.assign(target(gpu, { size: [64, 32] }), { dpr: 2 });
const document = createDocument({
frame: imageFrame([32, 16]),
- source: "photo",
- adjustments: { ...defaultAdjustments },
- toneCurve: defaultCurve,
+ layers: [
+ {
+ kind: "image",
+ name: "Photo",
+ children: [],
+ id: "base",
+ source: "photo",
+ adjustments: { ...defaultAdjustments },
+ toneCurve: defaultCurve,
+ },
+ ],
});
const resource = createImageSource(source);
const renderer = createRenderer(gpu, resource);
const notify = mock(() => {});
const detach = renderer.subscribe(notify);
- const unsubscribe = document.scene.subscribe(renderer.update);
+ const unsubscribe = document.scene.subscribe((scene) =>
+ renderer.update(scene),
+ );
const display = createDisplay(gpu);
const draw = () =>
frame(gpu, (frame) =>
@@ -201,13 +222,13 @@ test("rendering follows grouped edits and undo, reuses pipelines, and releases o
await expect(
renderer.update({
...document.scene.getState(),
- get adjustments(): never {
+ get layers(): never {
throw Error("Render failure");
},
}),
).rejects.toThrow("Render failure");
renderer.update(document.scene.getState());
- const adjusted = renderer.inputImage();
+ const adjusted = renderer.outputImage();
expect(adjusted.size).toEqual(source.size);
expect(adjusted.format).toBe(source.format);
expect(renderer.outputImage()).toBe(adjusted);
@@ -223,7 +244,6 @@ test("rendering follows grouped edits and undo, reuses pipelines, and releases o
const curved = renderer.outputImage();
expect(curved).not.toBe(adjusted);
expect(curved.size).toEqual(source.size);
- expect(renderer.inputImage()).toBe(adjusted);
expect(document.history.status.getState()).toEqual({
undoCount: 1,
redoCount: 0,
@@ -238,24 +258,63 @@ test("rendering follows grouped edits and undo, reuses pipelines, and releases o
detachLate();
document.history.undo();
expect(renderer.outputImage()).toBe(adjusted);
- expect(document.scene.getState().adjustments.exposure).toBe(0);
+ expect(document.scene.getState().layers[0].adjustments.exposure).toBe(0);
document.history.redo();
- expect(renderer.inspect().passes).toEqual(["adjustments", "curves"]);
+ expect(renderer.inspect().passes).toEqual([
+ "layer/base/adjustments",
+ "layer/base/curves",
+ ]);
document.history.begin();
setToneCurve(document);
expect(renderer.outputImage()).toBe(adjusted);
document.history.cancel();
- expect(renderer.inspect().passes).toEqual(["adjustments", "curves"]);
+ expect(renderer.inspect().passes).toEqual([
+ "layer/base/adjustments",
+ "layer/base/curves",
+ ]);
draw();
expect(calls.createRenderPipeline).toBe(pipelines);
expect(notify).toHaveBeenCalledTimes(8);
expect(late).toHaveBeenCalledTimes(1);
detach();
- setAdjustments(document, {
- exposure: -1,
- clarity: 50,
- sharpening: 100,
- sharpenRadius: 2,
+ const beforeInput = document.scene.getState();
+ const base = beforeInput.layers[0];
+ document.edit({
+ ...beforeInput,
+ layers: [
+ {
+ ...base,
+ children: [
+ { ...createLayer("exposure"), id: "exposure" },
+ ...base.children,
+ ],
+ },
+ ],
+ });
+ await renderer.update(document.scene.getState(), "base");
+ expect(renderer.inputImage("base")).toBeDefined();
+ expect(renderer.inputImage("base")).not.toBe(renderer.outputImage());
+ expect(renderer.inputImage("exposure")).toBeUndefined();
+ expect(renderer.inspect().passes).toEqual([
+ "layer/exposure/exposure",
+ "layer/base/adjustments",
+ "layer/base/curves",
+ ]);
+ document.edit(beforeInput);
+ expect(renderer.inputImage("base")).toBeUndefined();
+ setAdjustments(document, { exposure: -1 });
+ const scene = document.scene.getState();
+ const [image, ...effects] = scene.layers;
+ document.edit({
+ ...scene,
+ layers: [
+ image,
+ {
+ ...createLayer("details"),
+ details: { clarity: 50, sharpening: 100, sharpenRadius: 2 },
+ },
+ ...effects,
+ ],
});
expect(notify).toHaveBeenCalledTimes(8);
document.edit({
@@ -266,12 +325,9 @@ test("rendering follows grouped edits and undo, reuses pipelines, and releases o
angle: 10,
},
});
- const croppedInput = renderer.inputImage();
const croppedOutput = renderer.outputImage();
expect(croppedOutput.size).toEqual([16, 8]);
- expect(croppedInput.size).toEqual([16, 8]);
renderer.dispose();
- expect(() => croppedInput.color.view).toThrow("destroyed");
expect(() => croppedOutput.color.view).toThrow("destroyed");
expect(() => adjusted.color.view).toThrow("destroyed");
expect(() => curved.color.view).toThrow("destroyed");
diff --git a/tests/rendering-benchmark.ts b/tests/rendering-benchmark.ts
index 0df63e3..e78ecde 100644
--- a/tests/rendering-benchmark.ts
+++ b/tests/rendering-benchmark.ts
@@ -1,10 +1,11 @@
import { effect, frame, init, target, timer } from "vgpu";
import { encodeImage } from "@/app/editor/export/export-image";
import { createEditorRenderer } from "@/app/editor/renderer";
-import type { Scene } from "@/core/document";
+import type { Gradient, ProcessingLayer, Scene } from "@/core/document";
import { createImageSource } from "@/core/image";
import { imageFrame } from "@/core/image/frame";
import { defaultAdjustments } from "@/features/adjustments/model";
+import { createHistogram } from "@/features/histogram/histogram";
import { defaultCurve } from "@/features/tone-curves/curve";
export type Workload =
@@ -12,7 +13,11 @@ export type Workload =
| "color-mixer"
| "vignette"
| "detail"
- | "pipeline";
+ | "pipeline"
+ | "pipeline-input"
+ | "masked-exposure"
+ | "radial-exposure"
+ | "layer-stack";
function summarize(values: number[]) {
const sorted = values.toSorted((a, b) => a - b);
@@ -52,37 +57,108 @@ export async function benchmarkRendering(
clock?.onResults((results) => {
measurements.push(results);
});
- const combined = workload === "pipeline";
+ const inputId = workload === "pipeline-input" ? "benchmark-image" : undefined;
+ const histogram = inputId ? createHistogram(gpu) : undefined;
+ const combined = workload === "pipeline" || workload === "pipeline-input";
const detail = combined || workload === "detail";
- const scene: Scene = {
- source: "benchmark",
- frame: imageFrame(size),
- adjustments: {
- ...defaultAdjustments,
- exposure: 0.25,
- contrast: 10,
- clarity: detail ? 50 : 0,
- sharpening: detail ? 75 : 0,
- },
- toneCurve: combined
- ? [
- { x: 0, y: 0 },
- { x: 0.5, y: 0.6 },
- { x: 1, y: 1 },
- ]
- : defaultCurve,
- vignette:
- combined || workload === "vignette"
- ? { intensity: 80, softness: 60 }
- : undefined,
- colorMixer:
- combined || workload === "color-mixer"
+ const effects: ProcessingLayer[] = [];
+ const common = { visible: true, opacity: 1, children: [] };
+ if (detail) {
+ effects.push({
+ ...common,
+ id: "benchmark-details",
+ name: "Details",
+ kind: "details",
+ details: { clarity: 50, sharpening: 75, sharpenRadius: 1 },
+ });
+ }
+ if (combined || workload === "color-mixer") {
+ effects.push({
+ ...common,
+ id: "benchmark-mixer",
+ name: "Color Mixer",
+ kind: "color-mixer",
+ colorMixer: {
+ hue: new Array<number>(8).fill(20),
+ saturation: new Array<number>(8).fill(25),
+ luminance: new Array<number>(8).fill(10),
+ },
+ });
+ }
+ if (
+ workload === "masked-exposure" ||
+ workload === "radial-exposure" ||
+ workload === "layer-stack"
+ ) {
+ const mask: Gradient =
+ workload === "radial-exposure"
? {
- hue: new Array<number>(8).fill(20),
- saturation: new Array<number>(8).fill(25),
- luminance: new Array<number>(8).fill(10),
+ kind: "radial",
+ center: [size[0] / 2, size[1] / 2],
+ radius: [size[0] * 0.3, size[1] * 0.35],
+ angle: 20,
+ feather: 0.5,
}
- : undefined,
+ : {
+ kind: "linear",
+ start: [0, size[1] * 0.2],
+ end: [0, size[1] * 0.8],
+ };
+ effects.push({
+ ...common,
+ id: "benchmark-gradient",
+ name: "Gradient",
+ kind: "mask",
+ operation: "add",
+ adjustments: defaultAdjustments,
+ toneCurve: defaultCurve,
+ opacity: 0.75,
+ mask,
+ children: [
+ {
+ ...common,
+ id: "benchmark-exposure",
+ name: "Exposure",
+ kind: "exposure",
+ exposure: 1,
+ },
+ ],
+ });
+ }
+ if (combined || workload === "vignette" || workload === "layer-stack") {
+ effects.push({
+ ...common,
+ id: "benchmark-vignette",
+ name: "Vignette",
+ kind: "vignette",
+ opacity: workload === "layer-stack" ? 0.6 : 1,
+ vignette: { intensity: 80, softness: 60 },
+ });
+ }
+ const scene: Scene = {
+ frame: imageFrame(size),
+ layers: [
+ {
+ kind: "image",
+ id: "benchmark-image",
+ name: "Benchmark",
+ source: "benchmark",
+ children: [],
+ adjustments: {
+ ...defaultAdjustments,
+ exposure: 0.25,
+ contrast: 10,
+ },
+ toneCurve: combined
+ ? [
+ { x: 0, y: 0 },
+ { x: 0.5, y: 0.6 },
+ { x: 1, y: 1 },
+ ]
+ : defaultCurve,
+ },
+ ...effects,
+ ],
};
const setupStart = performance.now();
let renderer = createEditorRenderer(gpu, source);
@@ -94,10 +170,16 @@ export async function benchmarkRendering(
const nodes: Record<string, number[]> = {};
for (let i = 0; i < warmup + samples; i++) {
const start = performance.now();
- await renderer.update(scene);
+ await renderer.update(scene, inputId);
+ const inspected = inputId && renderer.inputImage(inputId);
+ if (inputId && !inspected) {
+ throw Error("Missing benchmark curve input.");
+ }
+ const reading = inspected && histogram?.read(inspected, true, 1);
const encoded = performance.now();
await gpu.gpu.queue.onSubmittedWorkDone();
const end = performance.now();
+ await reading;
await gpu.settled();
const spans = measurements.pop();
if (errors.length) {
@@ -141,7 +223,7 @@ export async function benchmarkRendering(
frame(gpu, (f) => f.pass(input, fill));
await gpu.gpu.queue.onSubmittedWorkDone();
const start = performance.now();
- await renderer.update(scene);
+ await renderer.update(scene, inputId);
await gpu.gpu.queue.onSubmittedWorkDone();
await gpu.settled();
const firstRenderMs = performance.now() - start;
@@ -189,6 +271,7 @@ export async function benchmarkRendering(
image: [...new Uint8Array(await blob.arrayBuffer())],
};
} finally {
+ histogram?.dispose();
renderer.dispose();
source.dispose();
clock?.dispose();
diff --git a/tests/rendering.bench.ts b/tests/rendering.bench.ts
index 3306bce..7c81569 100644
--- a/tests/rendering.bench.ts
+++ b/tests/rendering.bench.ts
@@ -10,6 +10,10 @@ for (const workload of [
"vignette",
"detail",
"pipeline",
+ "pipeline-input",
+ "masked-exposure",
+ "radial-exposure",
+ "layer-stack",
] as const) {
test(`rendering ${workload}`, async ({ page, browser }, info) => {
await page.goto("/tests/gpu.html");
diff --git a/tests/vignette.e2e.ts b/tests/vignette.e2e.ts
index 47e4315..85895f1 100644
--- a/tests/vignette.e2e.ts
+++ b/tests/vignette.e2e.ts
@@ -12,11 +12,17 @@ test("vignette darkens a white image's edges, softens, undoes and disables", asy
'<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128"><rect width="128" height="128" fill="white"/></svg>',
),
});
+ await page.getByRole("button", { name: "Add effect", exact: true }).click();
+ await page
+ .locator("[popover]:popover-open")
+ .getByRole("button", { name: "Vignette", exact: true })
+ .click();
const intensity = page.getByRole("textbox", {
name: "Intensity",
exact: true,
});
- await expect(intensity).toHaveValue("0");
+ await intensity.fill("0");
+ await intensity.press("Enter");
const exportBytes = () =>
page.evaluate(async () => [
...new Uint8Array(