Skip to content

Free open-source image editor for the browser

Render on scene changes

Rodrigo7dceb460f971
diff --git a/src/app/editor/sidebar/export-button.tsx b/src/app/editor/export/export-button.tsx
similarity index 87%
rename from src/app/editor/sidebar/export-button.tsx
rename to src/app/editor/export/export-button.tsx
index 1dde7c0..fb9a5d0 100644
--- a/src/app/editor/sidebar/export-button.tsx
+++ b/src/app/editor/export/export-button.tsx
@@ -1,8 +1,8 @@
import { useRef } from "react";
import Button from "@/components/ui/button";
-import ExportSettings from "./export-settings";
+import { ExportSettings } from "./export-settings";
-export default function ExportButton() {
+export function ExportButton() {
const dialog = useRef<HTMLDialogElement>(null);
return (
<section className="shrink-0 p-4">
diff --git a/src/app/export-image.ts b/src/app/editor/export/export-image.ts
similarity index 91%
rename from src/app/export-image.ts
rename to src/app/editor/export/export-image.ts
index d0e5bef..29049c4 100644
--- a/src/app/export-image.ts
+++ b/src/app/editor/export/export-image.ts
@@ -32,8 +32,10 @@ export async function exportImage(
const output = surface(gpu, canvas, { size: [width, height], dpr: 1 });
const renderer = createRenderer(gpu, source.image);
try {
- renderer.attachCanvas(output, { zoom: 1, pan: [0, 0], percent: 100 });
- frame(gpu, (frame) => renderer.render(frame, scene));
+ renderer.update(scene);
+ frame(gpu, (frame) =>
+ renderer.draw(frame, output, { zoom: 1, pan: [0, 0] }),
+ );
const blob = await canvas.convertToBlob({
type: `image/${options.format}`,
quality: options.format === "jpeg" ? options.quality / 100 : undefined,
diff --git a/src/app/editor/sidebar/export-settings.tsx b/src/app/editor/export/export-settings.tsx
similarity index 96%
rename from src/app/editor/sidebar/export-settings.tsx
rename to src/app/editor/export/export-settings.tsx
index 368d013..83a3ce6 100644
--- a/src/app/editor/sidebar/export-settings.tsx
+++ b/src/app/editor/export/export-settings.tsx
@@ -1,6 +1,6 @@
import { useRef, useState } from "react";
import { useGpu } from "vgpu-react";
-import { exportImage } from "@/app/export-image";
+import { exportImage } from "@/app/editor/export/export-image";
import Button from "@/components/ui/button";
import { Slider } from "@/components/ui/slider";
@@ -9,7 +9,7 @@ const formats = [
{ value: "jpeg", description: "Smaller files" },
] as const;
-export default function ExportSettings({ onClose }: { onClose: () => void }) {
+export function ExportSettings({ onClose }: { onClose: () => void }) {
const gpu = useGpu();
const [format, setFormat] = useState<"png" | "jpeg">("png");
const [quality, setQuality] = useState(90);
diff --git a/src/app/editor/index.tsx b/src/app/editor/index.tsx
index 979819f..157b7ae 100644
--- a/src/app/editor/index.tsx
+++ b/src/app/editor/index.tsx
@@ -4,26 +4,32 @@ import ResizablePanel from "@/components/ui/resizable-panel";
import Spinner from "@/components/ui/spinner";
import { usePanZoom } from "@/hooks/use-pan-zoom";
import type { Target } from "@/lib/decode";
-import CanvasRenderer from "./renderer";
+import { CanvasRenderer } from "./renderer";
import { RendererProvider } from "./renderer/provider";
import { Sidebar } from "./sidebar";
type WorkspaceProps = { image: Target };
-function Workspace({ image }: WorkspaceProps) {
+function ImageCanvas({ image }: WorkspaceProps) {
const { ref, view, handlers } = usePanZoom(image.size);
+ return (
+ <div
+ className="grid min-h-0 min-w-0 flex-1 cursor-grab touch-none place-items-center active:cursor-grabbing"
+ ref={ref}
+ {...handlers}
+ >
+ <Canvas className="size-full min-h-0">
+ <CanvasRenderer view={view} />
+ </Canvas>
+ </div>
+ );
+}
+
+function Workspace({ image }: WorkspaceProps) {
return (
<RendererProvider source={image}>
- <div
- className="grid min-h-0 min-w-0 flex-1 cursor-grab touch-none place-items-center active:cursor-grabbing"
- ref={ref}
- {...handlers}
- >
- <Canvas className="size-full min-h-0">
- <CanvasRenderer view={view} />
- </Canvas>
- </div>
+ <ImageCanvas image={image} />
<Sidebar />
</RendererProvider>
);
diff --git a/src/app/editor/renderer/index.tsx b/src/app/editor/renderer/index.tsx
index 777f3b1..bdcc7e2 100644
--- a/src/app/editor/renderer/index.tsx
+++ b/src/app/editor/renderer/index.tsx
@@ -1,16 +1,25 @@
import { useEffect } from "react";
-import { useCanvas } from "vgpu-react";
+import { useCanvas, useFrame } from "vgpu-react";
import type { View } from "@/hooks/use-pan-zoom";
import { useRenderer } from "./provider";
type CanvasRendererProps = { view: View };
-export default function CanvasRenderer({ view }: CanvasRendererProps) {
+export function CanvasRenderer({ view }: CanvasRendererProps) {
const renderer = useRenderer();
const canvas = useCanvas();
- useEffect(
- () => renderer.attachCanvas(canvas, view),
- [renderer, canvas, view],
- );
+ const draw = useFrame((frame) => renderer.draw(frame, canvas, view));
+ useEffect(() => {
+ const unsubscribe = renderer.subscribe(draw);
+ const observer = new ResizeObserver(draw);
+ if (canvas.canvas instanceof HTMLCanvasElement) {
+ observer.observe(canvas.canvas);
+ }
+ return () => {
+ unsubscribe();
+ observer.disconnect();
+ };
+ }, [renderer, canvas, draw]);
+ useEffect(() => draw(), [draw, view]);
return null;
}
diff --git a/src/app/editor/renderer/provider.tsx b/src/app/editor/renderer/provider.tsx
index 7a122a1..aac8648 100644
--- a/src/app/editor/renderer/provider.tsx
+++ b/src/app/editor/renderer/provider.tsx
@@ -6,8 +6,8 @@ import {
useMemo,
} from "react";
import type { Target } from "vgpu";
-import { useFrameLoop, useGpu } from "vgpu-react";
-import { useScene } from "@/app/scene";
+import { useGpu } from "vgpu-react";
+import { type Scene, useScene } from "@/app/scene";
import { createRenderer } from "./renderer";
const RendererContext = createContext<ReturnType<typeof createRenderer> | null>(
@@ -27,12 +27,19 @@ type RendererProviderProps = { source: Target; children: ReactNode };
export function RendererProvider({ source, children }: RendererProviderProps) {
const gpu = useGpu();
const renderer = useMemo(() => createRenderer(gpu, source), [gpu, source]);
- useEffect(() => () => renderer.dispose(), [renderer]);
- useFrameLoop((frame) => {
- const scene = useScene.getState();
- if (scene.source?.image === source) {
- renderer.render(frame, scene);
- }
- });
+ useEffect(() => {
+ const render = (scene: Scene) => {
+ if (scene.source?.image !== source) {
+ return;
+ }
+ renderer.update(scene);
+ };
+ const unsubscribe = useScene.subscribe(render);
+ render(useScene.getState());
+ return () => {
+ unsubscribe();
+ renderer.dispose();
+ };
+ }, [renderer, source]);
return <RendererContext value={renderer}>{children}</RendererContext>;
}
diff --git a/src/app/editor/renderer/renderer.ts b/src/app/editor/renderer/renderer.ts
index f43272f..b6cd7e5 100644
--- a/src/app/editor/renderer/renderer.ts
+++ b/src/app/editor/renderer/renderer.ts
@@ -1,6 +1,7 @@
import {
effect,
type Frame,
+ frame,
type Gpu,
sampler,
type Target,
@@ -25,41 +26,53 @@ export function createRenderer(gpu: Gpu, source: Target) {
},
});
- const canvases = new Set<{ canvas: Target & { dpr: number }; view: View }>();
+ const listeners = new Set<() => void>();
+ let rendered = false;
let output = adjusted;
return {
inputImage: () => adjusted,
outputImage: () => output,
- attachCanvas(canvas: Target & { dpr: number }, view: View) {
- const output = { canvas, view };
- canvases.add(output);
+ subscribe(listener: () => void) {
+ listeners.add(listener);
+ if (rendered) {
+ listener();
+ }
return () => {
- canvases.delete(output);
+ listeners.delete(listener);
};
},
- render(frame: Frame, scene: Scene) {
- frame.pass(
- adjusted,
- adjust.set({ source: source.color, adjustments: scene.adjustments }),
- );
- output = toneCurves.render(frame, scene.curve);
- for (const { canvas, view } of canvases) {
+ update(scene: Scene) {
+ frame(gpu, (frame) => {
frame.pass(
- canvas,
- display.set({
- source: output.color,
- params: {
- size: canvas.size,
- sourceSize: output.size,
- pan: view.pan.map((p) => p * canvas.dpr),
- zoom: view.zoom,
- },
- }),
+ adjusted,
+ adjust.set({ source: source.color, adjustments: scene.adjustments }),
);
+ output = toneCurves.render(frame, scene.curve);
+ });
+ rendered = true;
+ for (const listener of listeners) {
+ listener();
}
},
+ draw(frame: Frame, canvas: Target & { dpr: number }, view: View) {
+ if (!rendered) {
+ return;
+ }
+ frame.pass(
+ canvas,
+ display.set({
+ source: output.color,
+ params: {
+ size: canvas.size,
+ sourceSize: output.size,
+ pan: view.pan.map((p) => p * canvas.dpr),
+ zoom: view.zoom,
+ },
+ }),
+ );
+ },
dispose() {
- canvases.clear();
+ listeners.clear();
adjusted.color.dispose();
toneCurves.dispose();
},
diff --git a/src/app/editor/sidebar/adjustment-controls.tsx b/src/app/editor/sidebar/adjustment-controls.tsx
index df3033c..8a027ff 100644
--- a/src/app/editor/sidebar/adjustment-controls.tsx
+++ b/src/app/editor/sidebar/adjustment-controls.tsx
@@ -1,4 +1,10 @@
-import { adjustmentLimits, defaultAdjustments, useScene } from "@/app/scene";
+import type { ComponentProps } from "react";
+import {
+ type Adjustments,
+ adjustmentLimits,
+ defaultAdjustments,
+ useScene,
+} from "@/app/scene";
import { Slider } from "@/components/ui/slider";
const stops = {
@@ -13,63 +19,44 @@ const stops = {
],
};
-export default function AdjustmentControls() {
- const value = useScene((scene) => scene.adjustments);
+type AdjustmentSliderProps = Pick<
+ ComponentProps<typeof Slider>,
+ "label" | "step" | "stops"
+> & {
+ name: keyof Adjustments;
+};
+
+function AdjustmentSlider({ name, ...props }: AdjustmentSliderProps) {
+ const value = useScene((scene) => scene.adjustments[name]);
const onChange = useScene((scene) => scene.setAdjustments);
+ return (
+ <Slider
+ {...props}
+ value={value}
+ onChange={(value) => onChange({ [name]: value })}
+ defaultValue={defaultAdjustments[name]}
+ min={-adjustmentLimits[name]}
+ max={adjustmentLimits[name]}
+ />
+ );
+}
+
+export default function AdjustmentControls() {
return (
<section className="flex flex-col gap-3 p-4 shadow-ridge">
- <Slider
- defaultValue={defaultAdjustments.exposure}
- label="Exposure"
- max={adjustmentLimits.exposure}
- min={-adjustmentLimits.exposure}
- onChange={(exposure) => onChange({ exposure })}
- step={0.01}
- value={value.exposure}
- />
- <Slider
- defaultValue={defaultAdjustments.temp}
- label="Temp"
- max={adjustmentLimits.temp}
- min={-adjustmentLimits.temp}
- onChange={(temp) => onChange({ temp })}
- stops={stops.temp}
- value={value.temp}
- />
- <Slider
- defaultValue={defaultAdjustments.tint}
- label="Tint"
- max={adjustmentLimits.tint}
- min={-adjustmentLimits.tint}
- onChange={(tint) => onChange({ tint })}
- stops={stops.tint}
- value={value.tint}
- />
- <Slider
- defaultValue={defaultAdjustments.contrast}
- label="Contrast"
- max={adjustmentLimits.contrast}
- min={-adjustmentLimits.contrast}
- onChange={(contrast) => onChange({ contrast })}
- value={value.contrast}
- />
- <Slider
- defaultValue={defaultAdjustments.vibrance}
+ <AdjustmentSlider name="exposure" label="Exposure" step={0.01} />
+ <AdjustmentSlider name="temp" label="Temp" stops={stops.temp} />
+ <AdjustmentSlider name="tint" label="Tint" stops={stops.tint} />
+ <AdjustmentSlider name="contrast" label="Contrast" />
+ <AdjustmentSlider
+ name="vibrance"
label="Vibrance"
- max={adjustmentLimits.vibrance}
- min={-adjustmentLimits.vibrance}
- onChange={(vibrance) => onChange({ vibrance })}
stops={stops.saturation}
- value={value.vibrance}
/>
- <Slider
- defaultValue={defaultAdjustments.saturation}
+ <AdjustmentSlider
+ name="saturation"
label="Saturation"
- max={adjustmentLimits.saturation}
- min={-adjustmentLimits.saturation}
- onChange={(saturation) => onChange({ saturation })}
stops={stops.saturation}
- value={value.saturation}
/>
</section>
);
diff --git a/src/app/editor/sidebar/index.tsx b/src/app/editor/sidebar/index.tsx
index 277aa7b..1a9570d 100644
--- a/src/app/editor/sidebar/index.tsx
+++ b/src/app/editor/sidebar/index.tsx
@@ -1,5 +1,6 @@
import { useEffect, useMemo } from "react";
import { useGpu } from "vgpu-react";
+import { ExportButton } from "@/app/editor/export/export-button";
import { useRenderer } from "@/app/editor/renderer/provider";
import { useScene } from "@/app/scene";
import ResizablePanel from "@/components/ui/resizable-panel";
@@ -7,7 +8,6 @@ import { Histogram } from "@/features/histogram";
import { createHistogram } from "@/features/histogram/histogram";
import { ToneCurves } from "@/features/tone-curves/tone-curves";
import AdjustmentControls from "./adjustment-controls";
-import ExportButton from "./export-button";
const histogramColors = ["#f25445", "#6bd175", "#5c8ffa"] as const;
const curveHistogramColors = ["#a3a3a3"] as const;
@@ -25,6 +25,7 @@ function ToneCurvesPanel({
<Histogram
histogram={histogram}
image={renderer.inputImage}
+ subscribe={renderer.subscribe}
colors={curveHistogramColors}
working
fillOpacity={0.65}
@@ -48,6 +49,7 @@ export function Sidebar() {
<Histogram
histogram={histogram}
image={renderer.outputImage}
+ subscribe={renderer.subscribe}
colors={histogramColors}
fillOpacity={0.2}
className="h-30 w-full"
diff --git a/src/app/scene/controls.ts b/src/app/scene/controls.ts
index 764e53a..e45dced 100644
--- a/src/app/scene/controls.ts
+++ b/src/app/scene/controls.ts
@@ -1,6 +1,9 @@
import { useEffect, useMemo } from "react";
import { useGpu } from "vgpu-react";
-import { type ExportOptions, exportImage } from "@/app/export-image";
+import {
+ type ExportOptions,
+ exportImage,
+} from "@/app/editor/export/export-image";
import { useScene } from ".";
function getState() {
diff --git a/src/features/histogram/histogram.ts b/src/features/histogram/histogram.ts
index b13b04a..e81ff1e 100644
--- a/src/features/histogram/histogram.ts
+++ b/src/features/histogram/histogram.ts
@@ -1,4 +1,4 @@
-import { compute, frameLoop, type Gpu, type Target } from "vgpu";
+import { compute, type Gpu, type Target } from "vgpu";
import shader from "./histogram.wgsl";
export function createHistogram(gpu: Gpu) {
@@ -46,21 +46,29 @@ export function createHistogram(gpu: Gpu) {
});
svg.append(plot);
let pending = false;
- const loop = frameLoop(gpu, async () => {
+ let requested = false;
+ async function update() {
+ requested = true;
if (pending) {
return;
}
pending = true;
try {
- const values = await read(image(), working, colors.length);
- curves.forEach(({ polygon, polyline }, channel) => {
- const points = Array.from(
- values.subarray(channel * 256, (channel + 1) * 256),
- (y, x) => `${x},${y.toFixed(1)}`,
- ).join(" ");
- polygon.setAttribute("points", `0,100 ${points} 255,100`);
- polyline.setAttribute("points", points);
- });
+ do {
+ requested = false;
+ const values = await read(image(), working, colors.length);
+ if (!plot.isConnected) {
+ return;
+ }
+ curves.forEach(({ polygon, polyline }, channel) => {
+ const points = Array.from(
+ values.subarray(channel * 256, (channel + 1) * 256),
+ (y, x) => `${x},${y.toFixed(1)}`,
+ ).join(" ");
+ polygon.setAttribute("points", `0,100 ${points} 255,100`);
+ polyline.setAttribute("points", points);
+ });
+ } while (requested);
} catch (error) {
if (plot.isConnected) {
console.error(error);
@@ -68,10 +76,10 @@ export function createHistogram(gpu: Gpu) {
} finally {
pending = false;
}
- });
- return () => {
- loop.stop();
- plot.remove();
+ }
+ return {
+ update,
+ dispose: () => plot.remove(),
};
},
dispose() {
diff --git a/src/features/histogram/index.tsx b/src/features/histogram/index.tsx
index b697e2d..01288d8 100644
--- a/src/features/histogram/index.tsx
+++ b/src/features/histogram/index.tsx
@@ -5,6 +5,7 @@ import type { createHistogram } from "./histogram";
type Props = ComponentProps<"svg"> & {
histogram: ReturnType<typeof createHistogram>;
image: () => Target;
+ subscribe: (listener: () => void) => () => void;
colors: readonly [string] | readonly [string, string, string];
working?: boolean;
};
@@ -12,6 +13,7 @@ type Props = ComponentProps<"svg"> & {
export function Histogram({
histogram,
image,
+ subscribe,
colors,
working,
...props
@@ -19,10 +21,15 @@ export function Histogram({
const attach = useCallback(
(svg: SVGSVGElement | null) => {
if (svg) {
- return histogram.attach(svg, image, colors, working);
+ const plot = histogram.attach(svg, image, colors, working);
+ const unsubscribe = subscribe(plot.update);
+ return () => {
+ unsubscribe();
+ plot.dispose();
+ };
}
},
- [histogram, image, colors, working],
+ [histogram, image, subscribe, colors, working],
);
return (
<svg
diff --git a/src/hooks/use-pan-zoom.ts b/src/hooks/use-pan-zoom.ts
index d6bb3e4..932856d 100644
--- a/src/hooks/use-pan-zoom.ts
+++ b/src/hooks/use-pan-zoom.ts
@@ -8,10 +8,9 @@ import {
type Size = readonly [number, number, ...unknown[]];
type Point = readonly [number, number];
-/** `percent` is image px per screen px × 100: 100 is real size. */
-export type View = { zoom: number; pan: Point; percent: number };
+export type View = { zoom: number; pan: Point };
-const fit: View = { zoom: 1, pan: [0, 0], percent: 0 };
+const fit: View = { zoom: 1, pan: [0, 0] };
const maxZoom = 8;
function measureGesture(points: Iterable<Point>) {
@@ -50,7 +49,6 @@ function clamp(view: View, content: Size, viewport: Size): View {
return {
zoom: view.zoom,
pan: [axis(0), axis(1)],
- percent: scale * devicePixelRatio * 100,
};
}
diff --git a/tests/histogram.e2e.ts b/tests/histogram.e2e.ts
index 4d301ac..f780a69 100644
--- a/tests/histogram.e2e.ts
+++ b/tests/histogram.e2e.ts
@@ -1,6 +1,6 @@
import { expect, test } from "@playwright/test";
-test("loading an image renders the RGB histogram", async ({ page }) => {
+test("the RGB histogram follows image edits and resets", async ({ page }) => {
await page.goto("/");
await page.waitForFunction(() => window.openlight);
await page.evaluate(() =>
@@ -21,4 +21,14 @@ test("loading an image renders the RGB histogram", async ({ page }) => {
for (const curve of await curves.all()) {
await expect(curve).toBeVisible();
}
+ const original = await curves.first().getAttribute("points");
+ if (!original) throw new Error("Missing histogram points.");
+ await page.evaluate(() => {
+ for (let i = 1; i <= 120; i++) {
+ window.openlight.setAdjustments({ exposure: i / 120 });
+ }
+ });
+ await expect(curves.first()).not.toHaveAttribute("points", original);
+ await page.evaluate(() => window.openlight.setAdjustments({ exposure: 0 }));
+ await expect(curves.first()).toHaveAttribute("points", original);
});