Skip to content

Free open-source image editor for the browser

Align scene names

Rodrigof5d12c858555
diff --git a/bun.lock b/bun.lock
index b28f3d0..2bc8476 100644
--- a/bun.lock
+++ b/bun.lock
@@ -21,6 +21,7 @@
"devDependencies": {
"@biomejs/biome": "2.5.11",
"@playwright/test": "^1.62.1",
+ "@types/node": "^26.4.1",
"@types/react": "^19.2.18",
"@types/react-dom": "^19.2.5",
"@vitejs/plugin-react": "^6.1.1",
diff --git a/package.json b/package.json
index 71503ab..f80d94c 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,7 @@
"devDependencies": {
"@biomejs/biome": "2.5.11",
"@playwright/test": "^1.62.1",
+ "@types/node": "^26.4.1",
"@types/react": "^19.2.18",
"@types/react-dom": "^19.2.5",
"@vitejs/plugin-react": "^6.1.1",
diff --git a/src/app/editor/renderer/renderer.ts b/src/app/editor/renderer/renderer.ts
index b6cd7e5..22390f0 100644
--- a/src/app/editor/renderer/renderer.ts
+++ b/src/app/editor/renderer/renderer.ts
@@ -47,7 +47,7 @@ export function createRenderer(gpu: Gpu, source: Target) {
adjusted,
adjust.set({ source: source.color, adjustments: scene.adjustments }),
);
- output = toneCurves.render(frame, scene.curve);
+ output = toneCurves.render(frame, scene.toneCurve);
});
rendered = true;
for (const listener of listeners) {
diff --git a/src/app/editor/sidebar/adjustment-controls.tsx b/src/app/editor/sidebar/adjustment-controls.tsx
index 8a027ff..c826eab 100644
--- a/src/app/editor/sidebar/adjustment-controls.tsx
+++ b/src/app/editor/sidebar/adjustment-controls.tsx
@@ -8,8 +8,8 @@ import {
import { Slider } from "@/components/ui/slider";
const stops = {
- temp: ["#4a6fc3", "#c3b84a"],
- tint: ["#5ab34a", "#b34ab3"],
+ incrementalTemperature: ["#4a6fc3", "#c3b84a"],
+ incrementalTint: ["#5ab34a", "#b34ab3"],
saturation: [
"#7b7d85",
"#868686 50%",
@@ -45,8 +45,16 @@ export default function AdjustmentControls() {
return (
<section className="flex flex-col gap-3 p-4 shadow-ridge">
<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="incrementalTemperature"
+ label="Temp"
+ stops={stops.incrementalTemperature}
+ />
+ <AdjustmentSlider
+ name="incrementalTint"
+ label="Tint"
+ stops={stops.incrementalTint}
+ />
<AdjustmentSlider name="contrast" label="Contrast" />
<AdjustmentSlider
name="vibrance"
diff --git a/src/app/editor/sidebar/index.tsx b/src/app/editor/sidebar/index.tsx
index 1a9570d..1372fc0 100644
--- a/src/app/editor/sidebar/index.tsx
+++ b/src/app/editor/sidebar/index.tsx
@@ -18,10 +18,10 @@ function ToneCurvesPanel({
histogram: ReturnType<typeof createHistogram>;
}) {
const renderer = useRenderer();
- const curve = useScene((scene) => scene.curve);
- const setCurve = useScene((scene) => scene.setCurve);
+ const toneCurve = useScene((scene) => scene.toneCurve);
+ const setToneCurve = useScene((scene) => scene.setToneCurve);
return (
- <ToneCurves points={curve} onChange={setCurve}>
+ <ToneCurves points={toneCurve} onChange={setToneCurve}>
<Histogram
histogram={histogram}
image={renderer.inputImage}
diff --git a/src/app/scene/controls.ts b/src/app/scene/controls.ts
index e45dced..290353f 100644
--- a/src/app/scene/controls.ts
+++ b/src/app/scene/controls.ts
@@ -11,7 +11,7 @@ function getState() {
return {
file: scene.source?.file.name,
adjustments: { ...scene.adjustments },
- curve: scene.curve.map((point) => ({ ...point })),
+ toneCurve: scene.toneCurve.map((point) => ({ ...point })),
};
}
@@ -27,7 +27,7 @@ export function useControls() {
() => ({
loadImage: (file: File) => useScene.getState().loadImage(gpu, file),
setAdjustments: useScene.getState().setAdjustments,
- setCurve: useScene.getState().setCurve,
+ setToneCurve: useScene.getState().setToneCurve,
exportImage: (options?: ExportOptions) => exportImage(gpu, options),
getState,
}),
diff --git a/src/app/scene/index.ts b/src/app/scene/index.ts
index d483620..1e1f873 100644
--- a/src/app/scene/index.ts
+++ b/src/app/scene/index.ts
@@ -1,8 +1,8 @@
import type { Gpu, Target } from "vgpu";
import { create } from "zustand";
import {
- type Curve,
defaultCurve,
+ type ToneCurve,
validateCurve,
} from "@/features/tone-curves/curve";
import decode from "@/lib/decode";
@@ -10,8 +10,8 @@ import decode from "@/lib/decode";
/** Non-destructive edits: exposure in stops, the rest -100..100. */
export type Adjustments = {
exposure: number;
- temp: number;
- tint: number;
+ incrementalTemperature: number;
+ incrementalTint: number;
contrast: number;
vibrance: number;
saturation: number;
@@ -19,8 +19,8 @@ export type Adjustments = {
export const defaultAdjustments: Adjustments = {
exposure: 0,
- temp: 0,
- tint: 0,
+ incrementalTemperature: 0,
+ incrementalTint: 0,
contrast: 0,
vibrance: 0,
saturation: 0,
@@ -28,25 +28,29 @@ export const defaultAdjustments: Adjustments = {
export const adjustmentLimits: Adjustments = {
exposure: 5,
- temp: 100,
- tint: 100,
+ incrementalTemperature: 100,
+ incrementalTint: 100,
contrast: 100,
vibrance: 100,
saturation: 100,
};
export type Source = { file: File; image?: Target; error?: string };
-export type Scene = { source?: Source; adjustments: Adjustments; curve: Curve };
+export type Scene = {
+ source?: Source;
+ adjustments: Adjustments;
+ toneCurve: ToneCurve;
+};
type SceneStore = Scene & {
loadImage: (gpu: Gpu, file: File) => Promise<void>;
setAdjustments: (change: Partial<Adjustments>) => void;
/** Ordered points in 0..1; endpoints follow the lower-left and upper-right edges. Omit to reset. */
- setCurve: (curve?: Curve) => void;
+ setToneCurve: (toneCurve?: ToneCurve) => void;
};
export const useScene = create<SceneStore>((set, get) => ({
adjustments: { ...defaultAdjustments },
- curve: defaultCurve,
+ toneCurve: defaultCurve,
loadImage: async (gpu, file) => {
if (!(file instanceof File)) {
throw new Error("loadImage requires a File.");
@@ -56,7 +60,7 @@ export const useScene = create<SceneStore>((set, get) => ({
set({
source,
adjustments: { ...defaultAdjustments },
- curve: defaultCurve,
+ toneCurve: defaultCurve,
});
try {
const image = await decode(gpu, file);
@@ -78,11 +82,11 @@ export const useScene = create<SceneStore>((set, get) => ({
}
set({ adjustments: { ...adjustments, ...change } });
},
- setCurve: (curve = defaultCurve) => {
+ setToneCurve: (toneCurve = defaultCurve) => {
if (!get().source) {
- throw new Error("Load an image before changing the curve.");
+ throw new Error("Load an image before changing the tone curve.");
}
- validateCurve(curve);
- set({ curve: curve.map((point) => ({ ...point })) });
+ validateCurve(toneCurve);
+ set({ toneCurve: toneCurve.map((point) => ({ ...point })) });
},
}));
diff --git a/src/features/tone-curves/curve.ts b/src/features/tone-curves/curve.ts
index 6c0a3f4..8e28e63 100644
--- a/src/features/tone-curves/curve.ts
+++ b/src/features/tone-curves/curve.ts
@@ -1,16 +1,16 @@
import { clamp, interpolatePchip } from "@/lib/math";
export type CurvePoint = { readonly x: number; readonly y: number };
-export type Curve = readonly CurvePoint[];
+export type ToneCurve = readonly CurvePoint[];
-export const defaultCurve: Curve = [
+export const defaultCurve: ToneCurve = [
{ x: 0, y: 0 },
{ x: 1, y: 1 },
];
const gap = 1 / 1024;
-export function validateCurve(points: Curve) {
+export function validateCurve(points: ToneCurve) {
if (!Array.isArray(points) || points.length < 2) {
throw new Error("A curve needs at least two points.");
}
@@ -44,10 +44,10 @@ export function validateCurve(points: Curve) {
}
export function moveCurvePoint(
- points: Curve,
+ points: ToneCurve,
index: number,
point: CurvePoint,
-): Curve {
+): ToneCurve {
if (!points[index]) {
return points;
}
@@ -73,7 +73,7 @@ export function moveCurvePoint(
return points.with(index, { x, y });
}
-export function removeCurvePoint(points: Curve, index: number): Curve {
+export function removeCurvePoint(points: ToneCurve, index: number): ToneCurve {
if (index <= 0 || index >= points.length - 1) {
return points;
}
@@ -81,14 +81,14 @@ export function removeCurvePoint(points: Curve, index: number): Curve {
}
/** Uniform samples over 0..1, including both endpoints; size must be at least two. */
-export function sampleCurve(points: Curve, size = 1024) {
+export function sampleCurve(points: ToneCurve, size = 1024) {
const evaluate = interpolatePchip(points);
return Float32Array.from({ length: size }, (_, i) =>
evaluate(i / (size - 1)),
);
}
-function midpoint(points: Curve): CurvePoint {
+function midpoint(points: ToneCurve): CurvePoint {
let widest = 0;
for (let i = 1; i < points.length - 1; i++) {
if (
@@ -103,7 +103,7 @@ function midpoint(points: Curve): CurvePoint {
}
/** Without a position, insert on the curve in its widest interval. */
-export function insertCurvePoint(points: Curve, point = midpoint(points)) {
+export function insertCurvePoint(points: ToneCurve, point = midpoint(points)) {
const index = points.findIndex((next) => next.x > point.x);
if (
index <= 0 ||
diff --git a/src/features/tone-curves/graph.tsx b/src/features/tone-curves/graph.tsx
index e34e541..d51e409 100644
--- a/src/features/tone-curves/graph.tsx
+++ b/src/features/tone-curves/graph.tsx
@@ -6,12 +6,12 @@ import {
} from "react";
import { clamp } from "@/lib/math";
import {
- type Curve,
type CurvePoint,
insertCurvePoint,
moveCurvePoint,
removeCurvePoint,
sampleCurve,
+ type ToneCurve,
} from "./curve";
function gridLines(spacing: number) {
@@ -29,7 +29,10 @@ function position(event: MouseEvent<SVGSVGElement>): CurvePoint {
};
}
-type GraphProps = { points: Curve; onChange: (points: Curve) => void };
+type GraphProps = {
+ points: ToneCurve;
+ onChange: (points: ToneCurve) => void;
+};
export function Graph({ points, onChange }: GraphProps) {
const [selected, select] = useState<number | null>(null);
diff --git a/src/features/tone-curves/pass.ts b/src/features/tone-curves/pass.ts
index 24a16ca..0df3d00 100644
--- a/src/features/tone-curves/pass.ts
+++ b/src/features/tone-curves/pass.ts
@@ -1,5 +1,5 @@
import { effect, type Frame, type Gpu, type Target, target } from "vgpu";
-import { type Curve, sampleCurve } from "./curve";
+import { sampleCurve, type ToneCurve } from "./curve";
import shader from "./curves.wgsl";
const curveSize = 1024;
@@ -12,7 +12,7 @@ export function createToneCurves(gpu: Gpu, source: Target) {
});
const apply = effect(gpu, shader, { set: { source: source.color, curve } });
return {
- render(frame: Frame, points: Curve) {
+ render(frame: Frame, points: ToneCurve) {
if (points.every((point) => point.x === point.y)) {
return source;
}
diff --git a/src/features/tone-curves/tone-curves.tsx b/src/features/tone-curves/tone-curves.tsx
index 42464ba..2497d8e 100644
--- a/src/features/tone-curves/tone-curves.tsx
+++ b/src/features/tone-curves/tone-curves.tsx
@@ -1,10 +1,10 @@
import type { ReactNode } from "react";
-import { type Curve, defaultCurve } from "./curve";
+import { defaultCurve, type ToneCurve } from "./curve";
import { Graph } from "./graph";
type ToneCurvesProps = {
- points: Curve;
- onChange: (points: Curve) => void;
+ points: ToneCurve;
+ onChange: (points: ToneCurve) => void;
children?: ReactNode;
};
diff --git a/src/lib/adjustments/adjustments.wgsl b/src/lib/adjustments/adjustments.wgsl
index 473b9d5..dc60f77 100644
--- a/src/lib/adjustments/adjustments.wgsl
+++ b/src/lib/adjustments/adjustments.wgsl
@@ -1,7 +1,7 @@
struct Adjustments {
exposure: f32,
- temp: f32,
- tint: f32,
+ incrementalTemperature: f32,
+ incrementalTint: f32,
contrast: f32,
vibrance: f32,
saturation: f32,
@@ -60,7 +60,7 @@ fn fs_main(@location(0) uv: vec2f) -> @location(0) vec4f {
let input = textureSample(source, sourceSampler, uv);
var color = input.rgb;
color = adjustExposure(color, adjustments.exposure);
- color = adjustWhiteBalance(color, adjustments.temp / 100.0, adjustments.tint / 100.0);
+ color = adjustWhiteBalance(color, adjustments.incrementalTemperature / 100.0, adjustments.incrementalTint / 100.0);
color = adjustContrast(color, 1.0 + adjustments.contrast / 100.0);
color = adjustVibrance(color, adjustments.vibrance / 100.0);
color = adjustSaturation(color, 1.0 + adjustments.saturation / 100.0);
diff --git a/tests/curves.e2e.ts b/tests/curves.e2e.ts
index 1c9187e..5b7a79a 100644
--- a/tests/curves.e2e.ts
+++ b/tests/curves.e2e.ts
@@ -41,7 +41,7 @@ test("a master curve maps colors beyond its white endpoint to white", async ({
);
await expect.poll(() => centerPixel(page)).toEqual([48, 80, 128, 255]);
await page.evaluate(() =>
- window.openlight.setCurve([
+ window.openlight.setToneCurve([
{ x: 0, y: 0 },
{ x: 0.1, y: 1 },
]),
@@ -63,18 +63,18 @@ test("curve commands reject invalid edits, reset, and start fresh for another im
{ type: "image/svg+xml" },
);
await window.openlight.loadImage(image);
- const initial = window.openlight.getState().curve;
+ const initial = window.openlight.getState().toneCurve;
const points = [
{ x: 0, y: 0 },
{ x: 0.5, y: 0.75 },
{ x: 1, y: 1 },
];
- window.openlight.setCurve(points);
+ window.openlight.setToneCurve(points);
points[1].y = 0.25;
- const edited = window.openlight.getState().curve;
+ const edited = window.openlight.getState().toneCurve;
const snapshot = window.openlight.getState();
- snapshot.curve[1].y = 0;
- const afterSnapshotChange = window.openlight.getState().curve;
+ snapshot.toneCurve[1].y = 0;
+ const afterSnapshotChange = window.openlight.getState().toneCurve;
const rejected = [
[],
[{ x: 0, y: 0 }],
@@ -109,16 +109,16 @@ test("curve commands reject invalid edits, reset, and start fresh for another im
],
].map((curve) => {
try {
- window.openlight.setCurve(curve);
+ window.openlight.setToneCurve(curve);
return false;
} catch (error) {
return error instanceof Error && error.message.length > 0;
}
});
- const afterRejected = window.openlight.getState().curve;
- window.openlight.setCurve();
- const reset = window.openlight.getState().curve;
- window.openlight.setCurve(edited);
+ const afterRejected = window.openlight.getState().toneCurve;
+ window.openlight.setToneCurve();
+ const reset = window.openlight.getState().toneCurve;
+ window.openlight.setToneCurve(edited);
await window.openlight.loadImage(
new File(
[
@@ -135,7 +135,7 @@ test("curve commands reject invalid edits, reset, and start fresh for another im
rejected,
afterRejected,
reset,
- reloaded: window.openlight.getState().curve,
+ reloaded: window.openlight.getState().toneCurve,
file: window.openlight.getState().file,
};
});
@@ -188,11 +188,11 @@ test("curves render after adjustments and resetting restores the preview", async
{ x: 0.5, y: 0.75 },
{ x: 1, y: 1 },
];
- await page.evaluate((curve) => window.openlight.setCurve(curve), points);
+ await page.evaluate((curve) => window.openlight.setToneCurve(curve), points);
await expect
.poll(async () => (await centerPixel(page))[0])
.toBeCloseTo(192, -1);
- await page.evaluate(() => window.openlight.setCurve());
+ await page.evaluate(() => window.openlight.setToneCurve());
await expect
.poll(() => page.locator("canvas").screenshot())
.toEqual(original);
@@ -200,12 +200,12 @@ test("curves render after adjustments and resetting restores the preview", async
await expect.poll(async () => (await centerPixel(page))[0]).toBeLessThan(120);
const adjusted = await centerPixel(page);
const adjustedPreview = await page.locator("canvas").screenshot();
- await page.evaluate((curve) => window.openlight.setCurve(curve), points);
+ await page.evaluate((curve) => window.openlight.setToneCurve(curve), points);
const expected = interpolatePchip(points)(adjusted[0] / 255) * 255;
await expect
.poll(async () => Math.abs((await centerPixel(page))[0] - expected))
.toBeLessThan(2);
- await page.evaluate(() => window.openlight.setCurve());
+ await page.evaluate(() => window.openlight.setToneCurve());
await expect
.poll(() => page.locator("canvas").screenshot())
.toEqual(adjustedPreview);
@@ -271,7 +271,7 @@ test("the curve panel edits points over a combined input histogram", async ({
);
await page.mouse.up();
const edited = await page.evaluate(
- () => window.openlight.getState().curve[1],
+ () => window.openlight.getState().toneCurve[1],
);
expect(edited.x).toBeCloseTo(0.5, 2);
expect(edited.y).toBeCloseTo(0.75, 2);
@@ -283,7 +283,7 @@ test("the curve panel edits points over a combined input histogram", async ({
.toBeGreaterThan(185);
await graph.press("Shift+ArrowDown");
expect(
- (await page.evaluate(() => window.openlight.getState().curve[1])).y,
+ (await page.evaluate(() => window.openlight.getState().toneCurve[1])).y,
).toBeCloseTo(edited.y - 0.01, 5);
await graph.press("Delete");
await expect(graph.locator("circle")).toHaveCount(2);
@@ -292,14 +292,14 @@ test("the curve panel edits points over a combined input histogram", async ({
await expect(graph.locator("circle")).toHaveCount(3);
await graph.press("ArrowUp");
expect(
- (await page.evaluate(() => window.openlight.getState().curve[1])).y,
+ (await page.evaluate(() => window.openlight.getState().toneCurve[1])).y,
).toBeCloseTo(0.501, 5);
await graph.dblclick({
position: { x: bounds.width / 2, y: bounds.height * 0.499 },
});
await expect(graph.locator("circle")).toHaveCount(2);
await page.evaluate(() =>
- window.openlight.setCurve([
+ window.openlight.setToneCurve([
{ x: 0, y: 0 },
{ x: 0.3, y: 0.4 },
{ x: 0.7, y: 0.6 },
@@ -317,7 +317,7 @@ test("the curve panel edits points over a combined input histogram", async ({
});
await page.mouse.up();
const constrained = await page.evaluate(
- () => window.openlight.getState().curve,
+ () => window.openlight.getState().toneCurve,
);
expect(constrained[1].x).toBeLessThan(constrained[2].x);
expect(constrained[1].y).toBe(1);
@@ -325,12 +325,14 @@ test("the curve panel edits points over a combined input histogram", async ({
bounds.x + bounds.width / 2,
bounds.y + bounds.height / 2,
);
- expect(await page.evaluate(() => window.openlight.getState().curve)).toEqual(
- constrained,
- );
+ expect(
+ await page.evaluate(() => window.openlight.getState().toneCurve),
+ ).toEqual(constrained);
await page.getByRole("button", { name: "Reset curve" }).click();
await expect(graph.locator("circle")).toHaveCount(2);
- expect(await page.evaluate(() => window.openlight.getState().curve)).toEqual([
+ expect(
+ await page.evaluate(() => window.openlight.getState().toneCurve),
+ ).toEqual([
{ x: 0, y: 0 },
{ x: 1, y: 1 },
]);
@@ -396,7 +398,7 @@ test("endpoints follow the edges, remap black and white, and reset on double-cli
await page.mouse.move(vertical.x, vertical.y, { steps: 5 });
await page.mouse.up();
const moved = await page.evaluate(
- (index) => window.openlight.getState().curve[index],
+ (index) => window.openlight.getState().toneCurve[index],
example.index,
);
expect(moved.x).toBeCloseTo(example.vertical.x, 2);
@@ -419,7 +421,7 @@ test("endpoints follow the edges, remap black and white, and reset on double-cli
await expect(graph.locator("circle")).toHaveCount(2);
expect(
await page.evaluate(
- (index) => window.openlight.getState().curve[index],
+ (index) => window.openlight.getState().toneCurve[index],
example.index,
),
).toEqual(example.start);
@@ -428,7 +430,7 @@ test("endpoints follow the edges, remap black and white, and reset on double-cli
await page.mouse.move(horizontal.x, horizontal.y, { steps: 5 });
await page.mouse.up();
const shifted = await page.evaluate(
- (index) => window.openlight.getState().curve[index],
+ (index) => window.openlight.getState().toneCurve[index],
example.index,
);
expect(shifted.x).toBeCloseTo(example.horizontal.x, 2);
@@ -440,7 +442,7 @@ test("endpoints follow the edges, remap black and white, and reset on double-cli
},
});
expect(
- await page.evaluate(() => window.openlight.getState().curve),
+ await page.evaluate(() => window.openlight.getState().toneCurve),
).toEqual([
{ x: 0, y: 0 },
{ x: 1, y: 1 },
diff --git a/tests/export.e2e.ts b/tests/export.e2e.ts
index 3b72625..e64b527 100644
--- a/tests/export.e2e.ts
+++ b/tests/export.e2e.ts
@@ -37,7 +37,7 @@ test("exports full-resolution PNGs with current edits through the API and button
expect(original).toEqual([128, 128, 128, 255]);
await page.evaluate(() => {
window.openlight.setAdjustments({ exposure: 1 });
- window.openlight.setCurve([
+ window.openlight.setToneCurve([
{ x: 0, y: 0 },
{ x: 0.5, y: 0.75 },
{ x: 1, y: 1 },
diff --git a/tsconfig.json b/tsconfig.json
index bfb046b..bdaa721 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,6 +2,7 @@
"compilerOptions": {
"target": "ES2023",
"lib": ["ES2023", "DOM"],
+ "types": ["node"],
"module": "ESNext",
"moduleResolution": "bundler",
"jsx": "react-jsx",