Skip to content

The truly free, open-source, local-first, cross-platform CapCut replacement. Scriptable through a JSON-RPC API & MCP.

A second pass over every look, and fourteen more from CapCut's own shelves

Jareer6591b8578dbf
diff --git a/engine/crates/concat-effects/packages/concat.bronze/effect.toml b/engine/crates/concat-effects/packages/concat.bronze/effect.toml
index 1668ed41..70d1d28b 100644
--- a/engine/crates/concat-effects/packages/concat.bronze/effect.toml
+++ b/engine/crates/concat-effects/packages/concat.bronze/effect.toml
@@ -3,9 +3,9 @@ id = "concat.bronze"
name = "Bronze"
kind = "filter"
category = "Retro"
-order = 31
+order = 42
intensity = "tone"
-description = "Sepia that keeps its contrast, so it reads as old film rather than a brown wash."
+description = "Sepia that keeps its contrast and its highlights, so it reads as old film rather than a brown wash."
[[param]]
key = "tone"
@@ -26,7 +26,7 @@ step = 1
unit = "%"
[ffmpeg]
-chain = "hue=s={fixed(1 - tone / 100 * 0.9, 3)},colorbalance=rm={fixed(tone / 100 * 0.12, 3)}:gm={fixed(tone / 100 * 0.04, 3)}:bm={fixed(0 - tone / 100 * 0.12, 3)},eq=contrast={fixed(1 + contrast / 100 * 0.3, 3)}"
+chain = "hue=s={fixed(1 - tone / 100 * 0.9, 3)},colorbalance=rm={fixed(tone / 100 * 0.12, 3)}:gm={fixed(tone / 100 * 0.04, 3)}:bm={fixed(0 - tone / 100 * 0.12, 3)}:rh={fixed(tone / 100 * 0.04, 3)}:bh={fixed(0 - tone / 100 * 0.04, 3)},eq=contrast={fixed(1 + contrast / 100 * 0.3, 3)}"
[wgsl]
entry = "effect.wgsl"
diff --git a/engine/crates/concat-effects/packages/concat.bronze/effect.wgsl b/engine/crates/concat-effects/packages/concat.bronze/effect.wgsl
index 1896cd93..7243fc0d 100644
--- a/engine/crates/concat-effects/packages/concat.bronze/effect.wgsl
+++ b/engine/crates/concat-effects/packages/concat.bronze/effect.wgsl
@@ -1,11 +1,12 @@
struct Params { tone: f32, contrast: f32 }
-// Nearly grey, then bronze through the middle, then the curve back.
+// Nearly grey, bronze through the middle and a little into the light, the curve back.
fn effect(uv: vec2<f32>) -> vec4<f32> {
let c = sample(uv);
let tone = params.tone / 100.0;
var out = saturation(c.rgb, 1.0 - tone * 0.9);
out = tint_midtones(out, vec3<f32>(0.12, 0.04, -0.12), tone);
- out = contrast(out, 1.0 + params.contrast / 100.0 * 0.3);
+ out = split_tone(out, vec3<f32>(0.0), vec3<f32>(0.04, 0.01, -0.04), tone);
+ out = s_curve(out, params.contrast / 100.0 * 0.6);
return vec4<f32>(clamp01(out), c.a);
}
diff --git a/engine/crates/concat-effects/packages/concat.bronze/fixtures.toml b/engine/crates/concat-effects/packages/concat.bronze/fixtures.toml
index ac8e552b..4df76722 100644
--- a/engine/crates/concat-effects/packages/concat.bronze/fixtures.toml
+++ b/engine/crates/concat-effects/packages/concat.bronze/fixtures.toml
@@ -1,13 +1,13 @@
[[case]]
name = "default"
-chain = "hue=s=0.280,colorbalance=rm=0.096:gm=0.032:bm=-0.096,eq=contrast=1.090"
+chain = "hue=s=0.280,colorbalance=rm=0.096:gm=0.032:bm=-0.096:rh=0.032:bh=-0.032,eq=contrast=1.090"
[[case]]
name = "minimum"
at = "min"
-chain = "hue=s=1.000,colorbalance=rm=0.000:gm=0.000:bm=0.000,eq=contrast=1.000"
+chain = "hue=s=1.000,colorbalance=rm=0.000:gm=0.000:bm=0.000:rh=0.000:bh=0.000,eq=contrast=1.000"
[[case]]
name = "maximum"
at = "max"
-chain = "hue=s=0.100,colorbalance=rm=0.120:gm=0.040:bm=-0.120,eq=contrast=1.300"
+chain = "hue=s=0.100,colorbalance=rm=0.120:gm=0.040:bm=-0.120:rh=0.040:bh=-0.040,eq=contrast=1.300"
diff --git a/engine/crates/concat-effects/packages/concat.clean/effect.toml b/engine/crates/concat-effects/packages/concat.clean/effect.toml
index 00b2eb83..fd750fbe 100644
--- a/engine/crates/concat-effects/packages/concat.clean/effect.toml
+++ b/engine/crates/concat-effects/packages/concat.clean/effect.toml
@@ -5,7 +5,7 @@ kind = "filter"
category = "Everyday"
order = 12
intensity = "amount"
-description = "Barely there: neutral balance, a little contrast, colour left honest. What a talking head wants."
+description = "Barely there: neutral, a gentle curve, a touch more colour, and the reds calmed so a face reads even. What a talking head wants."
[[param]]
key = "amount"
@@ -17,7 +17,7 @@ step = 1
unit = "%"
[ffmpeg]
-chain = "eq=contrast={fixed(1 + amount / 100 * 0.16, 3)}:saturation={fixed(1 + amount / 100 * 0.12, 3)}"
+chain = "eq=contrast={fixed(1 + amount / 100 * 0.14, 3)}:saturation={fixed(1 + amount / 100 * 0.1, 3)},selectivecolor=reds='0 {fixed(0 - amount / 100 * 0.06, 3)} 0 0'"
[wgsl]
entry = "effect.wgsl"
diff --git a/engine/crates/concat-effects/packages/concat.clean/effect.wgsl b/engine/crates/concat-effects/packages/concat.clean/effect.wgsl
index 14d3c1e4..a92a6eba 100644
--- a/engine/crates/concat-effects/packages/concat.clean/effect.wgsl
+++ b/engine/crates/concat-effects/packages/concat.clean/effect.wgsl
@@ -1,10 +1,11 @@
struct Params { amount: f32 }
-// The quiet one: a gentle curve and a touch more colour.
+// The quiet one: a gentle curve, a touch of colour, reds eased on skin.
fn effect(uv: vec2<f32>) -> vec4<f32> {
let c = sample(uv);
let amount = params.amount / 100.0;
- var out = s_curve(c.rgb, amount * 0.35);
- out = saturation(out, 1.0 + amount * 0.12);
+ var out = s_curve(c.rgb, amount * 0.3);
+ out = saturation(out, 1.0 + amount * 0.1);
+ out = hsl_band(out, 10.0, 40.0, 0.0, 1.0 - amount * 0.12, 1.0);
return vec4<f32>(clamp01(out), c.a);
}
diff --git a/engine/crates/concat-effects/packages/concat.clean/fixtures.toml b/engine/crates/concat-effects/packages/concat.clean/fixtures.toml
index dc28130c..c7e04fc7 100644
--- a/engine/crates/concat-effects/packages/concat.clean/fixtures.toml
+++ b/engine/crates/concat-effects/packages/concat.clean/fixtures.toml
@@ -1,13 +1,13 @@
[[case]]
name = "default"
-chain = "eq=contrast=1.080:saturation=1.060"
+chain = "eq=contrast=1.070:saturation=1.050,selectivecolor=reds='0 -0.030 0 0'"
[[case]]
name = "minimum"
at = "min"
-chain = "eq=contrast=1.000:saturation=1.000"
+chain = "eq=contrast=1.000:saturation=1.000,selectivecolor=reds='0 0.000 0 0'"
[[case]]
name = "maximum"
at = "max"
-chain = "eq=contrast=1.160:saturation=1.120"
+chain = "eq=contrast=1.140:saturation=1.100,selectivecolor=reds='0 -0.060 0 0'"
diff --git a/engine/crates/concat-effects/packages/concat.cloudless-sky/effect.toml b/engine/crates/concat-effects/packages/concat.cloudless-sky/effect.toml
index 17ebeafc..3e71f607 100644
--- a/engine/crates/concat-effects/packages/concat.cloudless-sky/effect.toml
+++ b/engine/crates/concat-effects/packages/concat.cloudless-sky/effect.toml
@@ -5,7 +5,7 @@ kind = "filter"
category = "Everyday"
order = 15
intensity = "sky"
-description = "Blues deeper and richer, greens cooled, everything else left alone. Travel footage."
+description = "Skies deeper and bluer, foliage cooler and calmer, the rest of the picture and every face untouched. Travel footage."
[[param]]
key = "sky"
@@ -26,7 +26,7 @@ step = 1
unit = "%"
[ffmpeg]
-chain = "selectivecolor=blues='{fixed(sky / 100 * 0.4, 3)} 0 {fixed(0 - sky / 100 * 0.3, 3)} {fixed(sky / 100 * 0.15, 3)}':greens='{fixed(greens / 100 * 0.2, 3)} 0 {fixed(0 - greens / 100 * 0.2, 3)} 0',eq=saturation={fixed(1 + sky / 100 * 0.1, 3)}"
+chain = "selectivecolor=blues='{fixed(sky / 100 * 0.35, 3)} 0 {fixed(0 - sky / 100 * 0.25, 3)} {fixed(sky / 100 * 0.12, 3)}':cyans='{fixed(sky / 100 * 0.2, 3)} 0 {fixed(0 - sky / 100 * 0.15, 3)} 0':greens='{fixed(greens / 100 * 0.25, 3)} 0 {fixed(0 - greens / 100 * 0.25, 3)} 0'"
[wgsl]
entry = "effect.wgsl"
diff --git a/engine/crates/concat-effects/packages/concat.cloudless-sky/effect.wgsl b/engine/crates/concat-effects/packages/concat.cloudless-sky/effect.wgsl
index b719a33f..05cdb56f 100644
--- a/engine/crates/concat-effects/packages/concat.cloudless-sky/effect.wgsl
+++ b/engine/crates/concat-effects/packages/concat.cloudless-sky/effect.wgsl
@@ -1,11 +1,13 @@
struct Params { sky: f32, greens: f32 }
-// Two hue bands, each treated on its own and the rest untouched.
+// Two bands, each turned and weighted on its own; skin is in neither.
fn effect(uv: vec2<f32>) -> vec4<f32> {
let c = sample(uv);
- let blue = hue_mask(c.rgb, 215.0, 70.0) * params.sky / 100.0;
- let green = hue_mask(c.rgb, 110.0, 70.0) * params.greens / 100.0;
- var out = mix(c.rgb, saturation(c.rgb, 1.6) * 0.9, blue);
- out = mix(out, saturation(out, 0.85) + vec3<f32>(-0.03, 0.0, 0.05), green);
+ let sky = params.sky / 100.0;
+ let greens = params.greens / 100.0;
+ // Sky: toward azure, richer, a shade darker so it reads deep not bright.
+ var out = hsl_band(c.rgb, 210.0, 70.0, -6.0 * sky, 1.0 + sky * 0.55, 1.0 - sky * 0.08);
+ // Foliage: toward teal, quieter.
+ out = hsl_band(out, 105.0, 60.0, 12.0 * greens, 1.0 - greens * 0.2, 1.0);
return vec4<f32>(clamp01(out), c.a);
}
diff --git a/engine/crates/concat-effects/packages/concat.cloudless-sky/fixtures.toml b/engine/crates/concat-effects/packages/concat.cloudless-sky/fixtures.toml
index af3db743..d5399735 100644
--- a/engine/crates/concat-effects/packages/concat.cloudless-sky/fixtures.toml
+++ b/engine/crates/concat-effects/packages/concat.cloudless-sky/fixtures.toml
@@ -1,13 +1,13 @@
[[case]]
name = "default"
-chain = "selectivecolor=blues='0.240 0 -0.180 0.090':greens='0.080 0 -0.080 0',eq=saturation=1.060"
+chain = "selectivecolor=blues='0.210 0 -0.150 0.072':cyans='0.120 0 -0.090 0':greens='0.100 0 -0.100 0'"
[[case]]
name = "minimum"
at = "min"
-chain = "selectivecolor=blues='0.000 0 0.000 0.000':greens='0.000 0 0.000 0',eq=saturation=1.000"
+chain = "selectivecolor=blues='0.000 0 0.000 0.000':cyans='0.000 0 0.000 0':greens='0.000 0 0.000 0'"
[[case]]
name = "maximum"
at = "max"
-chain = "selectivecolor=blues='0.400 0 -0.300 0.150':greens='0.200 0 -0.200 0',eq=saturation=1.100"
+chain = "selectivecolor=blues='0.350 0 -0.250 0.120':cyans='0.200 0 -0.150 0':greens='0.250 0 -0.250 0'"
diff --git a/engine/crates/concat-effects/packages/concat.contrast-pop/effect.wgsl b/engine/crates/concat-effects/packages/concat.contrast-pop/effect.wgsl
index 35210fc9..664ce226 100644
--- a/engine/crates/concat-effects/packages/concat.contrast-pop/effect.wgsl
+++ b/engine/crates/concat-effects/packages/concat.contrast-pop/effect.wgsl
@@ -1,7 +1,11 @@
struct Params { contrast: f32 }
+// Contrast about middle grey, with the ends rolled off by a film curve
+// rather than clipped, so a pop never crushes a face into the floor.
fn effect(uv: vec2<f32>) -> vec4<f32> {
let c = sample(uv);
- let out = (c.rgb - vec3<f32>(0.5)) * params.contrast + vec3<f32>(0.5);
- return vec4<f32>(clamp(out, vec3<f32>(0.0), vec3<f32>(1.0)), c.a);
+ let amount = params.contrast - 1.0;
+ var out = contrast(c.rgb, 1.0 + amount * 0.7);
+ out = film_curve(out, amount * 0.5, amount * 0.5);
+ return vec4<f32>(clamp01(out), c.a);
}
diff --git a/engine/crates/concat-effects/packages/concat.cool-blue/effect.toml b/engine/crates/concat-effects/packages/concat.cool-blue/effect.toml
index b1a0ffc7..c756ba8f 100644
--- a/engine/crates/concat-effects/packages/concat.cool-blue/effect.toml
+++ b/engine/crates/concat-effects/packages/concat.cool-blue/effect.toml
@@ -3,9 +3,9 @@ id = "concat.cool-blue"
name = "Cool Blue"
kind = "filter"
category = "Cinematic"
-order = 21
+order = 32
intensity = "chill"
-description = "Blue in the shadows and midtones, the highlights left neutral, contrast up. Cities at dusk."
+description = "Blue in the shadows and midtones, highlights and skin left neutral, contrast up. Cities at dusk."
[[param]]
key = "chill"
@@ -26,7 +26,7 @@ step = 1
unit = "%"
[ffmpeg]
-chain = "colorbalance=bs={fixed(chill / 100 * 0.25, 3)}:rs={fixed(0 - chill / 100 * 0.08, 3)}:bm={fixed(chill / 100 * 0.12, 3)},eq=contrast={fixed(1 + contrast / 100 * 0.4, 3)}"
+chain = "colorbalance=bs={fixed(chill / 100 * 0.25, 3)}:rs={fixed(0 - chill / 100 * 0.08, 3)}:bm={fixed(chill / 100 * 0.1, 3)},eq=contrast={fixed(1 + contrast / 100 * 0.35, 3)}"
[wgsl]
entry = "effect.wgsl"
diff --git a/engine/crates/concat-effects/packages/concat.cool-blue/effect.wgsl b/engine/crates/concat-effects/packages/concat.cool-blue/effect.wgsl
index 0ab7a47e..e3ba3e40 100644
--- a/engine/crates/concat-effects/packages/concat.cool-blue/effect.wgsl
+++ b/engine/crates/concat-effects/packages/concat.cool-blue/effect.wgsl
@@ -1,11 +1,11 @@
struct Params { chill: f32, contrast: f32 }
-// The three-way version of Cool: blue where it is dark, not everywhere.
+// Blue where it is dark, not on faces, and a curve.
fn effect(uv: vec2<f32>) -> vec4<f32> {
let c = sample(uv);
- let chill = params.chill / 100.0;
+ let chill = params.chill / 100.0 * (1.0 - skin_mask(c.rgb) * 0.7);
var out = split_tone(c.rgb, vec3<f32>(-0.08, 0.0, 0.25), vec3<f32>(0.0), chill);
- out = tint_midtones(out, vec3<f32>(0.0, 0.0, 0.12), chill);
- out = contrast(out, 1.0 + params.contrast / 100.0 * 0.4);
+ out = tint_midtones(out, vec3<f32>(0.0, 0.0, 0.1), chill);
+ out = s_curve(out, params.contrast / 100.0 * 0.7);
return vec4<f32>(clamp01(out), c.a);
}
diff --git a/engine/crates/concat-effects/packages/concat.cool-blue/fixtures.toml b/engine/crates/concat-effects/packages/concat.cool-blue/fixtures.toml
index fac2084b..1f7e180a 100644
--- a/engine/crates/concat-effects/packages/concat.cool-blue/fixtures.toml
+++ b/engine/crates/concat-effects/packages/concat.cool-blue/fixtures.toml
@@ -1,6 +1,6 @@
[[case]]
name = "default"
-chain = "colorbalance=bs=0.150:rs=-0.048:bm=0.072,eq=contrast=1.120"
+chain = "colorbalance=bs=0.150:rs=-0.048:bm=0.060,eq=contrast=1.105"
[[case]]
name = "minimum"
@@ -10,4 +10,4 @@ chain = "colorbalance=bs=0.000:rs=0.000:bm=0.000,eq=contrast=1.000"
[[case]]
name = "maximum"
at = "max"
-chain = "colorbalance=bs=0.250:rs=-0.080:bm=0.120,eq=contrast=1.400"
+chain = "colorbalance=bs=0.250:rs=-0.080:bm=0.100,eq=contrast=1.350"
diff --git a/engine/crates/concat-effects/packages/concat.cool/effect.toml b/engine/crates/concat-effects/packages/concat.cool/effect.toml
index ee6aca35..d387a97d 100644
--- a/engine/crates/concat-effects/packages/concat.cool/effect.toml
+++ b/engine/crates/concat-effects/packages/concat.cool/effect.toml
@@ -18,7 +18,7 @@ step = 50
unit = "K"
[ffmpeg]
-chain = "colortemperature=temperature={round(temperature)}"
+chain = "colortemperature=temperature={round(temperature)}:pl=1"
[wgsl]
entry = "effect.wgsl"
diff --git a/engine/crates/concat-effects/packages/concat.cool/effect.wgsl b/engine/crates/concat-effects/packages/concat.cool/effect.wgsl
index 5b9577d6..ef620824 100644
--- a/engine/crates/concat-effects/packages/concat.cool/effect.wgsl
+++ b/engine/crates/concat-effects/packages/concat.cool/effect.wgsl
@@ -1,8 +1,6 @@
struct Params { temperature: f32 }
-// Colour temperature as a white balance shift: the picture as if it were
-// lit at `temperature` kelvin while the camera was set for daylight.
-
+// White balance toward shade, brightness held.
fn effect(uv: vec2<f32>) -> vec4<f32> {
let c = sample(uv);
return vec4<f32>(clamp01(white_balance(c.rgb, params.temperature)), c.a);
diff --git a/engine/crates/concat-effects/packages/concat.cool/fixtures.toml b/engine/crates/concat-effects/packages/concat.cool/fixtures.toml
index 306f7065..ce30ac4a 100644
--- a/engine/crates/concat-effects/packages/concat.cool/fixtures.toml
+++ b/engine/crates/concat-effects/packages/concat.cool/fixtures.toml
@@ -1,13 +1,13 @@
[[case]]
name = "default"
-chain = "colortemperature=temperature=8500"
+chain = "colortemperature=temperature=8500:pl=1"
[[case]]
name = "minimum"
at = "min"
-chain = "colortemperature=temperature=7000"
+chain = "colortemperature=temperature=7000:pl=1"
[[case]]
name = "maximum"
at = "max"
-chain = "colortemperature=temperature=11000"
+chain = "colortemperature=temperature=11000:pl=1"
diff --git a/engine/crates/concat-effects/packages/concat.daydream/effect.toml b/engine/crates/concat-effects/packages/concat.daydream/effect.toml
new file mode 100644
index 00000000..b3871749
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.daydream/effect.toml
@@ -0,0 +1,32 @@
+[effect]
+id = "concat.daydream"
+name = "Daydream"
+kind = "filter"
+category = "Cinematic"
+order = 35
+intensity = "haze"
+description = "Soft cinema: blacks lifted, the light blooming warm, shadows a touch cool, skin kept. The look of a story told in a window seat."
+
+[[param]]
+key = "haze"
+label = "Haze"
+min = 0
+max = 100
+default = 50
+step = 1
+unit = "%"
+
+[[param]]
+key = "warmth"
+label = "Warmth"
+min = 0
+max = 100
+default = 50
+step = 1
+unit = "%"
+
+[ffmpeg]
+chain = "curves=all='0/{fixed(haze / 100 * 0.08, 3)} 1/{fixed(1 - haze / 100 * 0.03, 3)}',eq=contrast={fixed(1 - haze / 100 * 0.12, 3)},colorbalance=rh={fixed(warmth / 100 * 0.08, 3)}:bh={fixed(0 - warmth / 100 * 0.05, 3)}:bs={fixed(warmth / 100 * 0.04, 3)},split[dreama{index}][dreamb{index}];[dreamb{index}]gblur=sigma=14[dreamg{index}];[dreama{index}][dreamg{index}]blend=all_mode=screen:all_opacity={fixed(haze / 100 * 0.3, 3)}"
+
+[wgsl]
+entry = "effect.wgsl"
diff --git a/engine/crates/concat-effects/packages/concat.daydream/effect.wgsl b/engine/crates/concat-effects/packages/concat.daydream/effect.wgsl
new file mode 100644
index 00000000..caf20c8e
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.daydream/effect.wgsl
@@ -0,0 +1,14 @@
+struct Params { haze: f32, warmth: f32 }
+
+// A matte, warm light blooming wide, a cool floor, skin untouched by the tone.
+fn effect(uv: vec2<f32>) -> vec4<f32> {
+ let c = sample(uv);
+ let haze = params.haze / 100.0;
+ let w = params.warmth / 100.0;
+ let keep = 1.0 - skin_mask(c.rgb) * 0.6;
+ var out = matte(c.rgb, haze * 0.08, 1.0 - haze * 0.03);
+ out = contrast(out, 1.0 - haze * 0.12);
+ out = split_tone(out, vec3<f32>(0.0, 0.0, 0.04), vec3<f32>(0.08, 0.02, -0.05), w * keep);
+ out = halation(uv, out, 0.55, 14.0, vec3<f32>(1.0, 0.9, 0.75), haze * 0.5);
+ return vec4<f32>(clamp01(out), c.a);
+}
diff --git a/engine/crates/concat-effects/packages/concat.daydream/fixtures.toml b/engine/crates/concat-effects/packages/concat.daydream/fixtures.toml
new file mode 100644
index 00000000..cdf2598e
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.daydream/fixtures.toml
@@ -0,0 +1,13 @@
+[[case]]
+name = "default"
+chain = "curves=all='0/0.040 1/0.985',eq=contrast=0.940,colorbalance=rh=0.040:bh=-0.025:bs=0.020,split[dreama0][dreamb0];[dreamb0]gblur=sigma=14[dreamg0];[dreama0][dreamg0]blend=all_mode=screen:all_opacity=0.150"
+
+[[case]]
+name = "minimum"
+at = "min"
+chain = "curves=all='0/0.000 1/1.000',eq=contrast=1.000,colorbalance=rh=0.000:bh=0.000:bs=0.000,split[dreama0][dreamb0];[dreamb0]gblur=sigma=14[dreamg0];[dreama0][dreamg0]blend=all_mode=screen:all_opacity=0.000"
+
+[[case]]
+name = "maximum"
+at = "max"
+chain = "curves=all='0/0.080 1/0.970',eq=contrast=0.880,colorbalance=rh=0.080:bh=-0.050:bs=0.040,split[dreama0][dreamb0];[dreamb0]gblur=sigma=14[dreamg0];[dreama0][dreamg0]blend=all_mode=screen:all_opacity=0.300"
diff --git a/engine/crates/concat-effects/packages/concat.digicam/effect.toml b/engine/crates/concat-effects/packages/concat.digicam/effect.toml
new file mode 100644
index 00000000..33b9bb4c
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.digicam/effect.toml
@@ -0,0 +1,32 @@
+[effect]
+id = "concat.digicam"
+name = "Digicam"
+kind = "filter"
+category = "Retro"
+order = 45
+intensity = "flash"
+description = "The 2000s point-and-shoot: hard flash, whites blown, colour up, a cool cyan cast, over-sharpened with the sensor's noise."
+
+[[param]]
+key = "flash"
+label = "Flash"
+min = 0
+max = 100
+default = 60
+step = 1
+unit = "%"
+
+[[param]]
+key = "noise"
+label = "Noise"
+min = 0
+max = 100
+default = 40
+step = 1
+unit = "%"
+
+[ffmpeg]
+chain = "curves=all='0/0 0.6/{fixed(0.6 + flash / 100 * 0.15, 3)} 0.85/{fixed(0.85 + flash / 100 * 0.13, 3)} 1/1',eq=saturation={fixed(1 + flash / 100 * 0.3, 3)}:contrast={fixed(1 + flash / 100 * 0.15, 3)},colorbalance=bh={fixed(flash / 100 * 0.06, 3)}:gh={fixed(flash / 100 * 0.04, 3)},unsharp=5:5:{fixed(0.8 + flash / 100 * 0.8, 2)},noise=alls={round(noise / 100 * 22)}:allf=t"
+
+[wgsl]
+entry = "effect.wgsl"
diff --git a/engine/crates/concat-effects/packages/concat.digicam/effect.wgsl b/engine/crates/concat-effects/packages/concat.digicam/effect.wgsl
new file mode 100644
index 00000000..1f1c76ae
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.digicam/effect.wgsl
@@ -0,0 +1,14 @@
+struct Params { flash: f32, noise: f32 }
+
+// The brights pushed to clipping, colour up, cyan in the whites, a hard unsharp, noise.
+fn effect(uv: vec2<f32>) -> vec4<f32> {
+ let c = sample(uv);
+ let f = params.flash / 100.0;
+ var out = c.rgb + highlights(c.rgb) * f * 0.35;
+ out = saturation(out, 1.0 + f * 0.3);
+ out = contrast(out, 1.0 + f * 0.15);
+ out = split_tone(out, vec3<f32>(0.0), vec3<f32>(-0.02, 0.04, 0.06), f);
+ out = out + (c.rgb - soften(uv, 2.0)) * (0.8 + f * 0.8);
+ out = out + grain_at(uv, params.noise / 100.0 * 0.14);
+ return vec4<f32>(clamp01(out), c.a);
+}
diff --git a/engine/crates/concat-effects/packages/concat.digicam/fixtures.toml b/engine/crates/concat-effects/packages/concat.digicam/fixtures.toml
new file mode 100644
index 00000000..09377854
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.digicam/fixtures.toml
@@ -0,0 +1,13 @@
+[[case]]
+name = "default"
+chain = "curves=all='0/0 0.6/0.690 0.85/0.928 1/1',eq=saturation=1.180:contrast=1.090,colorbalance=bh=0.036:gh=0.024,unsharp=5:5:1.28,noise=alls=9:allf=t"
+
+[[case]]
+name = "minimum"
+at = "min"
+chain = "curves=all='0/0 0.6/0.600 0.85/0.850 1/1',eq=saturation=1.000:contrast=1.000,colorbalance=bh=0.000:gh=0.000,unsharp=5:5:0.80,noise=alls=0:allf=t"
+
+[[case]]
+name = "maximum"
+at = "max"
+chain = "curves=all='0/0 0.6/0.750 0.85/0.980 1/1',eq=saturation=1.300:contrast=1.150,colorbalance=bh=0.060:gh=0.040,unsharp=5:5:1.60,noise=alls=22:allf=t"
diff --git a/engine/crates/concat-effects/packages/concat.fair/effect.toml b/engine/crates/concat-effects/packages/concat.fair/effect.toml
new file mode 100644
index 00000000..5f88e236
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.fair/effect.toml
@@ -0,0 +1,32 @@
+[effect]
+id = "concat.fair"
+name = "Fair"
+kind = "filter"
+category = "Portrait"
+order = 21
+intensity = "brighten"
+description = "Faces brightened and evened: skin lifted, reds calmed, the balance neutral, the rest of the frame left where it was."
+
+[[param]]
+key = "brighten"
+label = "Brighten"
+min = 0
+max = 100
+default = 50
+step = 1
+unit = "%"
+
+[[param]]
+key = "even"
+label = "Even"
+min = 0
+max = 100
+default = 50
+step = 1
+unit = "%"
+
+[ffmpeg]
+chain = "selectivecolor=reds='0 {fixed(0 - even / 100 * 0.1, 3)} 0 {fixed(0 - brighten / 100 * 0.15, 3)}':yellows='0 0 {fixed(0 - even / 100 * 0.05, 3)} {fixed(0 - brighten / 100 * 0.1, 3)}',curves=all='0/0 0.5/{fixed(0.5 + brighten / 100 * 0.03, 3)} 1/1'"
+
+[wgsl]
+entry = "effect.wgsl"
diff --git a/engine/crates/concat-effects/packages/concat.fair/effect.wgsl b/engine/crates/concat-effects/packages/concat.fair/effect.wgsl
new file mode 100644
index 00000000..9bc854d3
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.fair/effect.wgsl
@@ -0,0 +1,11 @@
+struct Params { brighten: f32, even: f32 }
+
+// The skin band alone: lifted, its reds eased, a touch less saturated.
+fn effect(uv: vec2<f32>) -> vec4<f32> {
+ let c = sample(uv);
+ let b = params.brighten / 100.0;
+ let e = params.even / 100.0;
+ var out = hsl_band(c.rgb, 20.0, 45.0, 4.0 * e, 1.0 - e * 0.15, 1.0 + b * 0.18);
+ out = lift_gamma_gain(out, vec3<f32>(0.0), vec3<f32>(1.0 + b * 0.08), vec3<f32>(1.0));
+ return vec4<f32>(clamp01(out), c.a);
+}
diff --git a/engine/crates/concat-effects/packages/concat.fair/fixtures.toml b/engine/crates/concat-effects/packages/concat.fair/fixtures.toml
new file mode 100644
index 00000000..70ae03e5
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.fair/fixtures.toml
@@ -0,0 +1,13 @@
+[[case]]
+name = "default"
+chain = "selectivecolor=reds='0 -0.050 0 -0.075':yellows='0 0 -0.025 -0.050',curves=all='0/0 0.5/0.515 1/1'"
+
+[[case]]
+name = "minimum"
+at = "min"
+chain = "selectivecolor=reds='0 0.000 0 0.000':yellows='0 0 0.000 0.000',curves=all='0/0 0.5/0.500 1/1'"
+
+[[case]]
+name = "maximum"
+at = "max"
+chain = "selectivecolor=reds='0 -0.100 0 -0.150':yellows='0 0 -0.050 -0.100',curves=all='0/0 0.5/0.530 1/1'"
diff --git a/engine/crates/concat-effects/packages/concat.falling-dust/effect.toml b/engine/crates/concat-effects/packages/concat.falling-dust/effect.toml
index 3dd93f29..fa39f5c3 100644
--- a/engine/crates/concat-effects/packages/concat.falling-dust/effect.toml
+++ b/engine/crates/concat-effects/packages/concat.falling-dust/effect.toml
@@ -3,7 +3,7 @@ id = "concat.falling-dust"
name = "Falling Dust"
kind = "filter"
category = "Retro"
-order = 34
+order = 46
intensity = "dust"
description = "A warm fade with dust drifting down through it and a light leak in one corner. The CPU shows the fade and a whisper of noise."
diff --git a/engine/crates/concat-effects/packages/concat.falling-dust/effect.wgsl b/engine/crates/concat-effects/packages/concat.falling-dust/effect.wgsl
index 0bd518f5..91b14485 100644
--- a/engine/crates/concat-effects/packages/concat.falling-dust/effect.wgsl
+++ b/engine/crates/concat-effects/packages/concat.falling-dust/effect.wgsl
@@ -20,13 +20,10 @@ fn effect(uv: vec2<f32>) -> vec4<f32> {
let c = sample(uv);
let leak = params.leak / 100.0;
let dust = params.dust / 100.0;
- // The warm fade, then the leak: a wash from the top-right corner,
- // screened over, the colour of light through a gap in the camera.
- var out = fade(c.rgb, 0.04) * 0.97;
+ var out = matte(c.rgb, 0.04, 0.97);
out = split_tone(out, vec3<f32>(0.0), vec3<f32>(0.12, 0.03, -0.08), leak);
let wash = (1.0 - smoothstep(0.0, 0.9, distance(uv, vec2<f32>(1.05, -0.1)))) * leak * 0.55;
out = vec3<f32>(1.0) - (vec3<f32>(1.0) - out) * (vec3<f32>(1.0) - vec3<f32>(1.0, 0.72, 0.4) * wash);
- // The motes, a couple of dozen of them, brightest where the leak is.
var glow = 0.0;
for (var k: i32 = 0; k < 28; k++) {
glow += mote(uv, f32(k));
diff --git a/engine/crates/concat-effects/packages/concat.film/effect.toml b/engine/crates/concat-effects/packages/concat.film/effect.toml
index 53c83fc8..b843ae00 100644
--- a/engine/crates/concat-effects/packages/concat.film/effect.toml
+++ b/engine/crates/concat-effects/packages/concat.film/effect.toml
@@ -3,9 +3,9 @@ id = "concat.film"
name = "Film"
kind = "filter"
category = "Cinematic"
-order = 24
+order = 34
intensity = "grain"
-description = "A film curve with a soft toe and shoulder, a little warmth, and grain that moves."
+description = "A film curve with a real toe and shoulder, warm halation around the lights, and grain that moves. Print stock, not a filter."
[[param]]
key = "grain"
@@ -26,7 +26,7 @@ step = 1
unit = "%"
[ffmpeg]
-chain = "curves=all='0/0.03 0.25/0.22 0.75/0.8 1/0.97',colorbalance=rm={fixed(warmth / 100 * 0.06, 3)}:bm={fixed(0 - warmth / 100 * 0.06, 3)},noise=alls={round(grain / 100 * 30)}:allf=t"
+chain = "curves=all='0/0.03 0.25/0.22 0.75/0.8 1/0.97',colorbalance=rm={fixed(warmth / 100 * 0.06, 3)}:bm={fixed(0 - warmth / 100 * 0.06, 3)},split[filma{index}][filmb{index}];[filmb{index}]gblur=sigma=8[filmg{index}];[filma{index}][filmg{index}]blend=all_mode=screen:all_opacity={fixed(0.12 + warmth / 100 * 0.08, 3)},noise=alls={round(grain / 100 * 30)}:allf=t"
[wgsl]
entry = "effect.wgsl"
diff --git a/engine/crates/concat-effects/packages/concat.film/effect.wgsl b/engine/crates/concat-effects/packages/concat.film/effect.wgsl
index 8e469ca8..b2bf3e14 100644
--- a/engine/crates/concat-effects/packages/concat.film/effect.wgsl
+++ b/engine/crates/concat-effects/packages/concat.film/effect.wgsl
@@ -1,10 +1,12 @@
struct Params { grain: f32, warmth: f32 }
-// Toe and shoulder, a warm middle, and the grain on top.
+// Toe and shoulder, a warm middle, halation on the lights, grain on top.
fn effect(uv: vec2<f32>) -> vec4<f32> {
let c = sample(uv);
- var out = s_curve(fade(c.rgb, 0.03), 0.35) * 0.985;
- out = tint_midtones(out, vec3<f32>(0.06, 0.0, -0.06), params.warmth / 100.0);
+ let w = params.warmth / 100.0;
+ var out = matte(film_curve(c.rgb, 0.6, 0.6), 0.03, 0.97);
+ out = tint_midtones(out, vec3<f32>(0.06, 0.0, -0.06), w);
+ out = halation(uv, out, 0.7, 8.0, vec3<f32>(1.0, 0.6, 0.3), 0.15 + w * 0.1);
out = out + grain_at(uv, params.grain / 100.0 * 0.12);
return vec4<f32>(clamp01(out), c.a);
}
diff --git a/engine/crates/concat-effects/packages/concat.film/fixtures.toml b/engine/crates/concat-effects/packages/concat.film/fixtures.toml
index 3625729f..35ef662b 100644
--- a/engine/crates/concat-effects/packages/concat.film/fixtures.toml
+++ b/engine/crates/concat-effects/packages/concat.film/fixtures.toml
@@ -1,13 +1,13 @@
[[case]]
name = "default"
-chain = "curves=all='0/0.03 0.25/0.22 0.75/0.8 1/0.97',colorbalance=rm=0.030:bm=-0.030,noise=alls=12:allf=t"
+chain = "curves=all='0/0.03 0.25/0.22 0.75/0.8 1/0.97',colorbalance=rm=0.030:bm=-0.030,split[filma0][filmb0];[filmb0]gblur=sigma=8[filmg0];[filma0][filmg0]blend=all_mode=screen:all_opacity=0.160,noise=alls=12:allf=t"
[[case]]
name = "minimum"
at = "min"
-chain = "curves=all='0/0.03 0.25/0.22 0.75/0.8 1/0.97',colorbalance=rm=0.000:bm=0.000,noise=alls=0:allf=t"
+chain = "curves=all='0/0.03 0.25/0.22 0.75/0.8 1/0.97',colorbalance=rm=0.000:bm=0.000,split[filma0][filmb0];[filmb0]gblur=sigma=8[filmg0];[filma0][filmg0]blend=all_mode=screen:all_opacity=0.120,noise=alls=0:allf=t"
[[case]]
name = "maximum"
at = "max"
-chain = "curves=all='0/0.03 0.25/0.22 0.75/0.8 1/0.97',colorbalance=rm=0.060:bm=-0.060,noise=alls=30:allf=t"
+chain = "curves=all='0/0.03 0.25/0.22 0.75/0.8 1/0.97',colorbalance=rm=0.060:bm=-0.060,split[filma0][filmb0];[filmb0]gblur=sigma=8[filmg0];[filma0][filmg0]blend=all_mode=screen:all_opacity=0.200,noise=alls=30:allf=t"
diff --git a/engine/crates/concat-effects/packages/concat.fresh/effect.toml b/engine/crates/concat-effects/packages/concat.fresh/effect.toml
index c20f124d..287ff907 100644
--- a/engine/crates/concat-effects/packages/concat.fresh/effect.toml
+++ b/engine/crates/concat-effects/packages/concat.fresh/effect.toml
@@ -5,7 +5,7 @@ kind = "filter"
category = "Everyday"
order = 10
intensity = "pop"
-description = "Brighter and richer, with a breath of mint in the highlights: daylight footage made to pop."
+description = "Daylight footage made to pop: midtones lifted, colour brought up where it is muted, a breath of mint in the brightest whites, skin left alone."
[[param]]
key = "pop"
@@ -26,7 +26,7 @@ step = 1
unit = "%"
[ffmpeg]
-chain = "eq=brightness={fixed(brightness / 100 * 0.12, 3)}:saturation={fixed(1 + pop / 100 * 0.5, 3)},colorbalance=gh={fixed(pop / 100 * 0.08, 3)}:bh={fixed(pop / 100 * 0.04, 3)}"
+chain = "curves=all='0/0 0.5/{fixed(0.5 + brightness / 100 * 0.08, 3)} 1/1',vibrance=intensity={fixed(pop / 100 * 0.9, 3)},colorbalance=gh={fixed(pop / 100 * 0.05, 3)}:bh={fixed(pop / 100 * 0.03, 3)}"
[wgsl]
entry = "effect.wgsl"
diff --git a/engine/crates/concat-effects/packages/concat.fresh/effect.wgsl b/engine/crates/concat-effects/packages/concat.fresh/effect.wgsl
index 87b7cdac..8320cd74 100644
--- a/engine/crates/concat-effects/packages/concat.fresh/effect.wgsl
+++ b/engine/crates/concat-effects/packages/concat.fresh/effect.wgsl
@@ -1,11 +1,12 @@
struct Params { pop: f32, brightness: f32 }
-// Brighter, richer, a mint cast in the highlights.
+// Midtones up, vibrance rather than saturation so skin does not go orange,
+// and a mint cast only in the whites.
fn effect(uv: vec2<f32>) -> vec4<f32> {
let c = sample(uv);
let pop = params.pop / 100.0;
- var out = c.rgb + vec3<f32>(params.brightness / 100.0 * 0.12);
- out = saturation(out, 1.0 + pop * 0.5);
- out = split_tone(out, vec3<f32>(0.0), vec3<f32>(0.0, 0.08, 0.04), pop);
+ var out = lift_gamma_gain(c.rgb, vec3<f32>(0.0), vec3<f32>(1.0 + params.brightness / 100.0 * 0.25), vec3<f32>(1.0));
+ out = vibrance(out, pop * 0.9);
+ out = split_tone(out, vec3<f32>(0.0), vec3<f32>(0.0, 0.05, 0.03), pop);
return vec4<f32>(clamp01(out), c.a);
}
diff --git a/engine/crates/concat-effects/packages/concat.fresh/fixtures.toml b/engine/crates/concat-effects/packages/concat.fresh/fixtures.toml
index 44d3c888..b18d13fc 100644
--- a/engine/crates/concat-effects/packages/concat.fresh/fixtures.toml
+++ b/engine/crates/concat-effects/packages/concat.fresh/fixtures.toml
@@ -1,13 +1,13 @@
[[case]]
name = "default"
-chain = "eq=brightness=0.048:saturation=1.250,colorbalance=gh=0.040:bh=0.020"
+chain = "curves=all='0/0 0.5/0.532 1/1',vibrance=intensity=0.450,colorbalance=gh=0.025:bh=0.015"
[[case]]
name = "minimum"
at = "min"
-chain = "eq=brightness=0.000:saturation=1.000,colorbalance=gh=0.000:bh=0.000"
+chain = "curves=all='0/0 0.5/0.500 1/1',vibrance=intensity=0.000,colorbalance=gh=0.000:bh=0.000"
[[case]]
name = "maximum"
at = "max"
-chain = "eq=brightness=0.120:saturation=1.500,colorbalance=gh=0.080:bh=0.040"
+chain = "curves=all='0/0 0.5/0.580 1/1',vibrance=intensity=0.900,colorbalance=gh=0.050:bh=0.030"
diff --git a/engine/crates/concat-effects/packages/concat.golden-hour/effect.toml b/engine/crates/concat-effects/packages/concat.golden-hour/effect.toml
index 55faf4bd..82e1849d 100644
--- a/engine/crates/concat-effects/packages/concat.golden-hour/effect.toml
+++ b/engine/crates/concat-effects/packages/concat.golden-hour/effect.toml
@@ -5,7 +5,7 @@ kind = "filter"
category = "Everyday"
order = 14
intensity = "glow"
-description = "Late-afternoon light: warm balance, orange in the highlights, a whisper of magenta in the shadows, blacks lifted."
+description = "Late light: a warm balance that keeps its brightness, orange in the highlights, a whisper of magenta in the shadows, blacks lifted a touch."
[[param]]
key = "glow"
@@ -26,7 +26,7 @@ step = 50
unit = "K"
[ffmpeg]
-chain = "colortemperature=temperature={round(warmth)},colorbalance=rh={fixed(glow / 100 * 0.15, 3)}:gh={fixed(glow / 100 * 0.05, 3)}:rs={fixed(glow / 100 * 0.06, 3)}:bs={fixed(glow / 100 * 0.04, 3)},curves=all='0/{fixed(glow / 100 * 0.04, 3)} 1/1'"
+chain = "colortemperature=temperature={round(warmth)}:pl=1,colorbalance=rh={fixed(glow / 100 * 0.14, 3)}:gh={fixed(glow / 100 * 0.05, 3)}:rs={fixed(glow / 100 * 0.05, 3)}:bs={fixed(glow / 100 * 0.04, 3)},curves=all='0/{fixed(glow / 100 * 0.04, 3)} 1/1'"
[wgsl]
entry = "effect.wgsl"
diff --git a/engine/crates/concat-effects/packages/concat.golden-hour/effect.wgsl b/engine/crates/concat-effects/packages/concat.golden-hour/effect.wgsl
index 574906ef..e4906315 100644
--- a/engine/crates/concat-effects/packages/concat.golden-hour/effect.wgsl
+++ b/engine/crates/concat-effects/packages/concat.golden-hour/effect.wgsl
@@ -1,11 +1,11 @@
struct Params { glow: f32, warmth: f32 }
-// White balance toward candlelight, then the split tone the hour has.
+// Balance toward candlelight without darkening, then the hour's split tone.
fn effect(uv: vec2<f32>) -> vec4<f32> {
let c = sample(uv);
let glow = params.glow / 100.0;
var out = white_balance(c.rgb, params.warmth);
- out = split_tone(out, vec3<f32>(0.06, 0.0, 0.04), vec3<f32>(0.15, 0.05, 0.0), glow);
- out = fade(out, glow * 0.04);
+ out = split_tone(out, vec3<f32>(0.05, 0.0, 0.04), vec3<f32>(0.14, 0.05, 0.0), glow);
+ out = matte(out, glow * 0.04, 1.0);
return vec4<f32>(clamp01(out), c.a);
}
diff --git a/engine/crates/concat-effects/packages/concat.golden-hour/fixtures.toml b/engine/crates/concat-effects/packages/concat.golden-hour/fixtures.toml
index ee465dec..4091680a 100644
--- a/engine/crates/concat-effects/packages/concat.golden-hour/fixtures.toml
+++ b/engine/crates/concat-effects/packages/concat.golden-hour/fixtures.toml
@@ -1,13 +1,13 @@
[[case]]
name = "default"
-chain = "colortemperature=temperature=4600,colorbalance=rh=0.075:gh=0.025:rs=0.030:bs=0.020,curves=all='0/0.020 1/1'"
+chain = "colortemperature=temperature=4600:pl=1,colorbalance=rh=0.070:gh=0.025:rs=0.025:bs=0.020,curves=all='0/0.020 1/1'"
[[case]]
name = "minimum"
at = "min"
-chain = "colortemperature=temperature=3500,colorbalance=rh=0.000:gh=0.000:rs=0.000:bs=0.000,curves=all='0/0.000 1/1'"
+chain = "colortemperature=temperature=3500:pl=1,colorbalance=rh=0.000:gh=0.000:rs=0.000:bs=0.000,curves=all='0/0.000 1/1'"
[[case]]
name = "maximum"
at = "max"
-chain = "colortemperature=temperature=6500,colorbalance=rh=0.150:gh=0.050:rs=0.060:bs=0.040,curves=all='0/0.040 1/1'"
+chain = "colortemperature=temperature=6500:pl=1,colorbalance=rh=0.140:gh=0.050:rs=0.050:bs=0.040,curves=all='0/0.040 1/1'"
diff --git a/engine/crates/concat-effects/packages/concat.ivory/effect.toml b/engine/crates/concat-effects/packages/concat.ivory/effect.toml
new file mode 100644
index 00000000..4a2905a3
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.ivory/effect.toml
@@ -0,0 +1,32 @@
+[effect]
+id = "concat.ivory"
+name = "Ivory"
+kind = "filter"
+category = "Everyday"
+order = 18
+intensity = "matte"
+description = "Milk's warm twin: the same soft matte with cream in the whites and a little gold in the middle. Interiors and morning light."
+
+[[param]]
+key = "matte"
+label = "Matte"
+min = 0
+max = 100
+default = 60
+step = 1
+unit = "%"
+
+[[param]]
+key = "warmth"
+label = "Warmth"
+min = 0
+max = 100
+default = 50
+step = 1
+unit = "%"
+
+[ffmpeg]
+chain = "curves=all='0/{fixed(matte / 100 * 0.12, 3)} 0.5/{fixed(0.5 + matte / 100 * 0.06, 3)} 1/{fixed(1 - matte / 100 * 0.04, 3)}',eq=saturation={fixed(1 - matte / 100 * 0.18, 3)},colorbalance=rh={fixed(warmth / 100 * 0.08, 3)}:gh={fixed(warmth / 100 * 0.03, 3)}:bh={fixed(0 - warmth / 100 * 0.06, 3)}:rm={fixed(warmth / 100 * 0.04, 3)}:bm={fixed(0 - warmth / 100 * 0.04, 3)}"
+
+[wgsl]
+entry = "effect.wgsl"
diff --git a/engine/crates/concat-effects/packages/concat.ivory/effect.wgsl b/engine/crates/concat-effects/packages/concat.ivory/effect.wgsl
new file mode 100644
index 00000000..1cb755b7
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.ivory/effect.wgsl
@@ -0,0 +1,14 @@
+struct Params { matte: f32, warmth: f32 }
+
+// The matte, then cream in the light and a little gold through the middle.
+fn effect(uv: vec2<f32>) -> vec4<f32> {
+ let c = sample(uv);
+ let m = params.matte / 100.0;
+ let w = params.warmth / 100.0;
+ var out = lift_gamma_gain(c.rgb, vec3<f32>(0.0), vec3<f32>(1.0 + m * 0.18), vec3<f32>(1.0));
+ out = matte(out, m * 0.12, 1.0 - m * 0.04);
+ out = saturation(out, 1.0 - m * 0.18);
+ out = split_tone(out, vec3<f32>(0.0), vec3<f32>(0.08, 0.03, -0.06), w);
+ out = tint_midtones(out, vec3<f32>(0.04, 0.0, -0.04), w);
+ return vec4<f32>(clamp01(out), c.a);
+}
diff --git a/engine/crates/concat-effects/packages/concat.ivory/fixtures.toml b/engine/crates/concat-effects/packages/concat.ivory/fixtures.toml
new file mode 100644
index 00000000..62839511
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.ivory/fixtures.toml
@@ -0,0 +1,13 @@
+[[case]]
+name = "default"
+chain = "curves=all='0/0.072 0.5/0.536 1/0.976',eq=saturation=0.892,colorbalance=rh=0.040:gh=0.015:bh=-0.030:rm=0.020:bm=-0.020"
+
+[[case]]
+name = "minimum"
+at = "min"
+chain = "curves=all='0/0.000 0.5/0.500 1/1.000',eq=saturation=1.000,colorbalance=rh=0.000:gh=0.000:bh=0.000:rm=0.000:bm=0.000"
+
+[[case]]
+name = "maximum"
+at = "max"
+chain = "curves=all='0/0.120 0.5/0.560 1/0.960',eq=saturation=0.820,colorbalance=rh=0.080:gh=0.030:bh=-0.060:rm=0.040:bm=-0.040"
diff --git a/engine/crates/concat-effects/packages/concat.lagoon/effect.toml b/engine/crates/concat-effects/packages/concat.lagoon/effect.toml
new file mode 100644
index 00000000..845054bf
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.lagoon/effect.toml
@@ -0,0 +1,32 @@
+[effect]
+id = "concat.lagoon"
+name = "Lagoon"
+kind = "filter"
+category = "Everyday"
+order = 16
+intensity = "water"
+description = "Water and sky turned aquamarine and brightened, sand and skin left warm and clean. The beach-day look creators reach for first."
+
+[[param]]
+key = "water"
+label = "Water"
+min = 0
+max = 100
+default = 60
+step = 1
+unit = "%"
+
+[[param]]
+key = "brightness"
+label = "Brightness"
+min = 0
+max = 100
+default = 40
+step = 1
+unit = "%"
+
+[ffmpeg]
+chain = "selectivecolor=blues='{fixed(water / 100 * 0.3, 3)} {fixed(0 - water / 100 * 0.2, 3)} 0 {fixed(0 - water / 100 * 0.15, 3)}':cyans='{fixed(water / 100 * 0.35, 3)} {fixed(0 - water / 100 * 0.1, 3)} 0 {fixed(0 - water / 100 * 0.1, 3)}',curves=all='0/0 0.5/{fixed(0.5 + brightness / 100 * 0.06, 3)} 1/1',eq=saturation={fixed(1 + water / 100 * 0.12, 3)}"
+
+[wgsl]
+entry = "effect.wgsl"
diff --git a/engine/crates/concat-effects/packages/concat.lagoon/effect.wgsl b/engine/crates/concat-effects/packages/concat.lagoon/effect.wgsl
new file mode 100644
index 00000000..5750c824
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.lagoon/effect.wgsl
@@ -0,0 +1,12 @@
+struct Params { water: f32, brightness: f32 }
+
+// Blues turned toward cyan and lifted, cyans richer, everything a touch brighter.
+fn effect(uv: vec2<f32>) -> vec4<f32> {
+ let c = sample(uv);
+ let water = params.water / 100.0;
+ var out = lift_gamma_gain(c.rgb, vec3<f32>(0.0), vec3<f32>(1.0 + params.brightness / 100.0 * 0.2), vec3<f32>(1.0));
+ out = hsl_band(out, 225.0, 60.0, -25.0 * water, 1.0 + water * 0.4, 1.0 + water * 0.12);
+ out = hsl_band(out, 185.0, 50.0, 0.0, 1.0 + water * 0.5, 1.0 + water * 0.08);
+ out = saturation(out, 1.0 + water * 0.06);
+ return vec4<f32>(clamp01(out), c.a);
+}
diff --git a/engine/crates/concat-effects/packages/concat.lagoon/fixtures.toml b/engine/crates/concat-effects/packages/concat.lagoon/fixtures.toml
new file mode 100644
index 00000000..6fe3b822
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.lagoon/fixtures.toml
@@ -0,0 +1,13 @@
+[[case]]
+name = "default"
+chain = "selectivecolor=blues='0.180 -0.120 0 -0.090':cyans='0.210 -0.060 0 -0.060',curves=all='0/0 0.5/0.524 1/1',eq=saturation=1.072"
+
+[[case]]
+name = "minimum"
+at = "min"
+chain = "selectivecolor=blues='0.000 0.000 0 0.000':cyans='0.000 0.000 0 0.000',curves=all='0/0 0.5/0.500 1/1',eq=saturation=1.000"
+
+[[case]]
+name = "maximum"
+at = "max"
+chain = "selectivecolor=blues='0.300 -0.200 0 -0.150':cyans='0.350 -0.100 0 -0.100',curves=all='0/0 0.5/0.560 1/1',eq=saturation=1.120"
diff --git a/engine/crates/concat-effects/packages/concat.marquee/effect.toml b/engine/crates/concat-effects/packages/concat.marquee/effect.toml
new file mode 100644
index 00000000..d4a326f2
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.marquee/effect.toml
@@ -0,0 +1,32 @@
+[effect]
+id = "concat.marquee"
+name = "Marquee"
+kind = "filter"
+category = "Stylised"
+order = 52
+intensity = "lights"
+description = "Night city: the lights and signs made vivid and blooming, blacks kept deep and cool, faces left clean. Made for the strip."
+
+[[param]]
+key = "lights"
+label = "Lights"
+min = 0
+max = 100
+default = 60
+step = 1
+unit = "%"
+
+[[param]]
+key = "depth"
+label = "Depth"
+min = 0
+max = 100
+default = 40
+step = 1
+unit = "%"
+
+[ffmpeg]
+chain = "curves=all='0/0 0.2/{fixed(0.2 - depth / 100 * 0.08, 3)} 1/1',colorbalance=bs={fixed(depth / 100 * 0.1, 3)},eq=saturation={fixed(1 + lights / 100 * 0.35, 3)},split[marqa{index}][marqb{index}];[marqb{index}]gblur=sigma=8[marqg{index}];[marqa{index}][marqg{index}]blend=all_mode=screen:all_opacity={fixed(lights / 100 * 0.3, 3)}"
+
+[wgsl]
+entry = "effect.wgsl"
diff --git a/engine/crates/concat-effects/packages/concat.marquee/effect.wgsl b/engine/crates/concat-effects/packages/concat.marquee/effect.wgsl
new file mode 100644
index 00000000..7db8ffd4
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.marquee/effect.wgsl
@@ -0,0 +1,14 @@
+struct Params { lights: f32, depth: f32 }
+
+// Deep cool blacks, then the bright saturated things only: richer and blooming.
+fn effect(uv: vec2<f32>) -> vec4<f32> {
+ let c = sample(uv);
+ let l = params.lights / 100.0;
+ let d = params.depth / 100.0;
+ var out = film_curve(c.rgb, d * 0.8, 0.0);
+ out = split_tone(out, vec3<f32>(0.0, 0.0, 0.1), vec3<f32>(0.0), d);
+ let lit = highlights(c.rgb) * smoothstep(0.15, 0.5, chroma_of(c.rgb)) * (1.0 - skin_mask(c.rgb));
+ out = mix(out, saturation(out, 1.6), lit * l);
+ out = halation(uv, out, 0.7, 8.0, vec3<f32>(1.0), l * 0.5);
+ return vec4<f32>(clamp01(out), c.a);
+}
diff --git a/engine/crates/concat-effects/packages/concat.marquee/fixtures.toml b/engine/crates/concat-effects/packages/concat.marquee/fixtures.toml
new file mode 100644
index 00000000..466eafd9
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.marquee/fixtures.toml
@@ -0,0 +1,13 @@
+[[case]]
+name = "default"
+chain = "curves=all='0/0 0.2/0.168 1/1',colorbalance=bs=0.040,eq=saturation=1.210,split[marqa0][marqb0];[marqb0]gblur=sigma=8[marqg0];[marqa0][marqg0]blend=all_mode=screen:all_opacity=0.180"
+
+[[case]]
+name = "minimum"
+at = "min"
+chain = "curves=all='0/0 0.2/0.200 1/1',colorbalance=bs=0.000,eq=saturation=1.000,split[marqa0][marqb0];[marqb0]gblur=sigma=8[marqg0];[marqa0][marqg0]blend=all_mode=screen:all_opacity=0.000"
+
+[[case]]
+name = "maximum"
+at = "max"
+chain = "curves=all='0/0 0.2/0.120 1/1',colorbalance=bs=0.100,eq=saturation=1.350,split[marqa0][marqb0];[marqb0]gblur=sigma=8[marqg0];[marqa0][marqg0]blend=all_mode=screen:all_opacity=0.300"
diff --git a/engine/crates/concat-effects/packages/concat.matcha/effect.toml b/engine/crates/concat-effects/packages/concat.matcha/effect.toml
new file mode 100644
index 00000000..b14d10ba
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.matcha/effect.toml
@@ -0,0 +1,23 @@
+[effect]
+id = "concat.matcha"
+name = "Matcha"
+kind = "filter"
+category = "Stylised"
+order = 53
+intensity = "amount"
+description = "Soft green through the midtones and whites, colour muted, a light matte. The trend look, gentle enough for a face."
+
+[[param]]
+key = "amount"
+label = "Amount"
+min = 0
+max = 100
+default = 60
+step = 1
+unit = "%"
+
+[ffmpeg]
+chain = "curves=all='0/{fixed(amount / 100 * 0.06, 3)} 1/{fixed(1 - amount / 100 * 0.03, 3)}',eq=saturation={fixed(1 - amount / 100 * 0.25, 3)},colorbalance=gm={fixed(amount / 100 * 0.08, 3)}:rm={fixed(0 - amount / 100 * 0.03, 3)}:gh={fixed(amount / 100 * 0.06, 3)}:bh={fixed(0 - amount / 100 * 0.03, 3)}"
+
+[wgsl]
+entry = "effect.wgsl"
diff --git a/engine/crates/concat-effects/packages/concat.matcha/effect.wgsl b/engine/crates/concat-effects/packages/concat.matcha/effect.wgsl
new file mode 100644
index 00000000..94e4183f
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.matcha/effect.wgsl
@@ -0,0 +1,13 @@
+struct Params { amount: f32 }
+
+// Green in the middle and the light, colour down, a light matte; skin held.
+fn effect(uv: vec2<f32>) -> vec4<f32> {
+ let c = sample(uv);
+ let a = params.amount / 100.0;
+ let keep = 1.0 - skin_mask(c.rgb) * 0.5;
+ var out = matte(c.rgb, a * 0.06, 1.0 - a * 0.03);
+ out = saturation(out, 1.0 - a * 0.25);
+ out = tint_midtones(out, vec3<f32>(-0.03, 0.08, 0.0), a * keep);
+ out = split_tone(out, vec3<f32>(0.0), vec3<f32>(0.0, 0.06, -0.03), a);
+ return vec4<f32>(clamp01(out), c.a);
+}
diff --git a/engine/crates/concat-effects/packages/concat.matcha/fixtures.toml b/engine/crates/concat-effects/packages/concat.matcha/fixtures.toml
new file mode 100644
index 00000000..f2d8d646
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.matcha/fixtures.toml
@@ -0,0 +1,13 @@
+[[case]]
+name = "default"
+chain = "curves=all='0/0.036 1/0.982',eq=saturation=0.850,colorbalance=gm=0.048:rm=-0.018:gh=0.036:bh=-0.018"
+
+[[case]]
+name = "minimum"
+at = "min"
+chain = "curves=all='0/0.000 1/1.000',eq=saturation=1.000,colorbalance=gm=0.000:rm=0.000:gh=0.000:bh=0.000"
+
+[[case]]
+name = "maximum"
+at = "max"
+chain = "curves=all='0/0.060 1/0.970',eq=saturation=0.750,colorbalance=gm=0.080:rm=-0.030:gh=0.060:bh=-0.030"
diff --git a/engine/crates/concat-effects/packages/concat.midnight/effect.toml b/engine/crates/concat-effects/packages/concat.midnight/effect.toml
new file mode 100644
index 00000000..5e430f5e
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.midnight/effect.toml
@@ -0,0 +1,32 @@
+[effect]
+id = "concat.midnight"
+name = "Midnight"
+kind = "filter"
+category = "Cinematic"
+order = 37
+intensity = "depth"
+description = "Deep blacks, a cool cast over everything but the lamps, colour low, a little grain. Late-night desk and monologue footage."
+
+[[param]]
+key = "depth"
+label = "Depth"
+min = 0
+max = 100
+default = 60
+step = 1
+unit = "%"
+
+[[param]]
+key = "grain"
+label = "Grain"
+min = 0
+max = 100
+default = 25
+step = 1
+unit = "%"
+
+[ffmpeg]
+chain = "curves=all='0/0 0.2/{fixed(0.2 - depth / 100 * 0.1, 3)} 1/1',eq=saturation={fixed(1 - depth / 100 * 0.35, 3)},colorbalance=bs={fixed(depth / 100 * 0.12, 3)}:bm={fixed(depth / 100 * 0.08, 3)}:rs={fixed(0 - depth / 100 * 0.05, 3)},noise=alls={round(grain / 100 * 20)}:allf=t"
+
+[wgsl]
+entry = "effect.wgsl"
diff --git a/engine/crates/concat-effects/packages/concat.midnight/effect.wgsl b/engine/crates/concat-effects/packages/concat.midnight/effect.wgsl
new file mode 100644
index 00000000..e1279d74
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.midnight/effect.wgsl
@@ -0,0 +1,13 @@
+struct Params { depth: f32, grain: f32 }
+
+// A hard toe, colour down, blue in the dark and the middle, the lights left.
+fn effect(uv: vec2<f32>) -> vec4<f32> {
+ let c = sample(uv);
+ let d = params.depth / 100.0;
+ var out = film_curve(c.rgb, d, 0.0);
+ out = saturation(out, 1.0 - d * 0.35);
+ out = split_tone(out, vec3<f32>(-0.05, 0.0, 0.12), vec3<f32>(0.0), d);
+ out = tint_midtones(out, vec3<f32>(0.0, 0.0, 0.08), d);
+ out = out + grain_at(uv, params.grain / 100.0 * 0.1);
+ return vec4<f32>(clamp01(out), c.a);
+}
diff --git a/engine/crates/concat-effects/packages/concat.midnight/fixtures.toml b/engine/crates/concat-effects/packages/concat.midnight/fixtures.toml
new file mode 100644
index 00000000..e8ec38c7
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.midnight/fixtures.toml
@@ -0,0 +1,13 @@
+[[case]]
+name = "default"
+chain = "curves=all='0/0 0.2/0.140 1/1',eq=saturation=0.790,colorbalance=bs=0.072:bm=0.048:rs=-0.030,noise=alls=5:allf=t"
+
+[[case]]
+name = "minimum"
+at = "min"
+chain = "curves=all='0/0 0.2/0.200 1/1',eq=saturation=1.000,colorbalance=bs=0.000:bm=0.000:rs=0.000,noise=alls=0:allf=t"
+
+[[case]]
+name = "maximum"
+at = "max"
+chain = "curves=all='0/0 0.2/0.100 1/1',eq=saturation=0.650,colorbalance=bs=0.120:bm=0.080:rs=-0.050,noise=alls=20:allf=t"
diff --git a/engine/crates/concat-effects/packages/concat.milk/effect.toml b/engine/crates/concat-effects/packages/concat.milk/effect.toml
new file mode 100644
index 00000000..e9442c69
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.milk/effect.toml
@@ -0,0 +1,32 @@
+[effect]
+id = "concat.milk"
+name = "Milk"
+kind = "filter"
+category = "Everyday"
+order = 17
+intensity = "matte"
+description = "Bright and matte: whites soft and cool, blacks lifted well off the floor, colour quiet. The clean minimal look of a white room."
+
+[[param]]
+key = "matte"
+label = "Matte"
+min = 0
+max = 100
+default = 60
+step = 1
+unit = "%"
+
+[[param]]
+key = "cool"
+label = "Cool"
+min = 0
+max = 100
+default = 40
+step = 1
+unit = "%"
+
+[ffmpeg]
+chain = "curves=all='0/{fixed(matte / 100 * 0.14, 3)} 0.5/{fixed(0.5 + matte / 100 * 0.08, 3)} 1/{fixed(1 - matte / 100 * 0.05, 3)}',eq=saturation={fixed(1 - matte / 100 * 0.25, 3)},colorbalance=bh={fixed(cool / 100 * 0.06, 3)}:rh={fixed(0 - cool / 100 * 0.03, 3)}"
+
+[wgsl]
+entry = "effect.wgsl"
diff --git a/engine/crates/concat-effects/packages/concat.milk/effect.wgsl b/engine/crates/concat-effects/packages/concat.milk/effect.wgsl
new file mode 100644
index 00000000..091548b7
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.milk/effect.wgsl
@@ -0,0 +1,12 @@
+struct Params { matte: f32, cool: f32 }
+
+// A high matte with a lifted middle, colour pulled back, cool whites.
+fn effect(uv: vec2<f32>) -> vec4<f32> {
+ let c = sample(uv);
+ let m = params.matte / 100.0;
+ var out = lift_gamma_gain(c.rgb, vec3<f32>(0.0), vec3<f32>(1.0 + m * 0.25), vec3<f32>(1.0));
+ out = matte(out, m * 0.14, 1.0 - m * 0.05);
+ out = saturation(out, 1.0 - m * 0.25);
+ out = split_tone(out, vec3<f32>(0.0), vec3<f32>(-0.03, 0.0, 0.06), params.cool / 100.0);
+ return vec4<f32>(clamp01(out), c.a);
+}
diff --git a/engine/crates/concat-effects/packages/concat.milk/fixtures.toml b/engine/crates/concat-effects/packages/concat.milk/fixtures.toml
new file mode 100644
index 00000000..ad8091ee
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.milk/fixtures.toml
@@ -0,0 +1,13 @@
+[[case]]
+name = "default"
+chain = "curves=all='0/0.084 0.5/0.548 1/0.970',eq=saturation=0.850,colorbalance=bh=0.024:rh=-0.012"
+
+[[case]]
+name = "minimum"
+at = "min"
+chain = "curves=all='0/0.000 0.5/0.500 1/1.000',eq=saturation=1.000,colorbalance=bh=0.000:rh=0.000"
+
+[[case]]
+name = "maximum"
+at = "max"
+chain = "curves=all='0/0.140 0.5/0.580 1/0.950',eq=saturation=0.750,colorbalance=bh=0.060:rh=-0.030"
diff --git a/engine/crates/concat-effects/packages/concat.mono/effect.toml b/engine/crates/concat-effects/packages/concat.mono/effect.toml
index 4d8015b5..c03f20f2 100644
--- a/engine/crates/concat-effects/packages/concat.mono/effect.toml
+++ b/engine/crates/concat-effects/packages/concat.mono/effect.toml
@@ -3,9 +3,9 @@ id = "concat.mono"
name = "Mono"
kind = "filter"
category = "Retro"
-order = 32
+order = 43
intensity = "contrast"
-description = "Black and white through a coloured filter: red darkens skies and lightens skin, green does the reverse."
+description = "Black and white through a coloured filter: red darkens skies and lightens skin, green does the reverse. A little grain if you want it."
[[param]]
key = "colour"
@@ -25,13 +25,22 @@ default = 40
step = 1
unit = "%"
+[[param]]
+key = "grain"
+label = "Grain"
+min = 0
+max = 100
+default = 0
+step = 1
+unit = "%"
+
[ffmpeg]
let = [
"r = 0.3 + 0.35 * colour / 100",
"b = 0.11 - 0.05 * colour / 100",
"g = 1 - r - b",
]
-chain = "colorchannelmixer=rr={fixed(r, 3)}:rg={fixed(g, 3)}:rb={fixed(b, 3)}:gr={fixed(r, 3)}:gg={fixed(g, 3)}:gb={fixed(b, 3)}:br={fixed(r, 3)}:bg={fixed(g, 3)}:bb={fixed(b, 3)},eq=contrast={fixed(1 + contrast / 100 * 0.4, 3)}"
+chain = "colorchannelmixer=rr={fixed(r, 3)}:rg={fixed(g, 3)}:rb={fixed(b, 3)}:gr={fixed(r, 3)}:gg={fixed(g, 3)}:gb={fixed(b, 3)}:br={fixed(r, 3)}:bg={fixed(g, 3)}:bb={fixed(b, 3)},eq=contrast={fixed(1 + contrast / 100 * 0.4, 3)},noise=alls={round(grain / 100 * 25)}:allf=t"
[wgsl]
entry = "effect.wgsl"
diff --git a/engine/crates/concat-effects/packages/concat.mono/effect.wgsl b/engine/crates/concat-effects/packages/concat.mono/effect.wgsl
index d795d410..e905e79b 100644
--- a/engine/crates/concat-effects/packages/concat.mono/effect.wgsl
+++ b/engine/crates/concat-effects/packages/concat.mono/effect.wgsl
@@ -1,4 +1,4 @@
-struct Params { colour: f32, contrast: f32 }
+struct Params { colour: f32, contrast: f32, grain: f32 }
// The channel weights slide from a green filter to a red one.
fn effect(uv: vec2<f32>) -> vec4<f32> {
@@ -7,6 +7,7 @@ fn effect(uv: vec2<f32>) -> vec4<f32> {
let r = 0.3 + 0.35 * f;
let b = 0.11 - 0.05 * f;
var out = mono(c.rgb, vec3<f32>(r, 1.0 - r - b, b));
- out = contrast(out, 1.0 + params.contrast / 100.0 * 0.4);
+ out = s_curve(out, params.contrast / 100.0 * 0.8);
+ out = out + grain_at(uv, params.grain / 100.0 * 0.1);
return vec4<f32>(clamp01(out), c.a);
}
diff --git a/engine/crates/concat-effects/packages/concat.mono/fixtures.toml b/engine/crates/concat-effects/packages/concat.mono/fixtures.toml
index 86d3f1e7..bccf0c64 100644
--- a/engine/crates/concat-effects/packages/concat.mono/fixtures.toml
+++ b/engine/crates/concat-effects/packages/concat.mono/fixtures.toml
@@ -1,13 +1,13 @@
[[case]]
name = "default"
-chain = "colorchannelmixer=rr=0.440:rg=0.470:rb=0.090:gr=0.440:gg=0.470:gb=0.090:br=0.440:bg=0.470:bb=0.090,eq=contrast=1.160"
+chain = "colorchannelmixer=rr=0.440:rg=0.470:rb=0.090:gr=0.440:gg=0.470:gb=0.090:br=0.440:bg=0.470:bb=0.090,eq=contrast=1.160,noise=alls=0:allf=t"
[[case]]
name = "minimum"
at = "min"
-chain = "colorchannelmixer=rr=-0.050:rg=0.890:rb=0.160:gr=-0.050:gg=0.890:gb=0.160:br=-0.050:bg=0.890:bb=0.160,eq=contrast=1.000"
+chain = "colorchannelmixer=rr=-0.050:rg=0.890:rb=0.160:gr=-0.050:gg=0.890:gb=0.160:br=-0.050:bg=0.890:bb=0.160,eq=contrast=1.000,noise=alls=0:allf=t"
[[case]]
name = "maximum"
at = "max"
-chain = "colorchannelmixer=rr=0.650:rg=0.290:rb=0.060:gr=0.650:gg=0.290:gb=0.060:br=0.650:bg=0.290:bb=0.060,eq=contrast=1.400"
+chain = "colorchannelmixer=rr=0.650:rg=0.290:rb=0.060:gr=0.650:gg=0.290:gb=0.060:br=0.650:bg=0.290:bb=0.060,eq=contrast=1.400,noise=alls=25:allf=t"
diff --git a/engine/crates/concat-effects/packages/concat.moody/effect.toml b/engine/crates/concat-effects/packages/concat.moody/effect.toml
index a9930925..c47ebb5d 100644
--- a/engine/crates/concat-effects/packages/concat.moody/effect.toml
+++ b/engine/crates/concat-effects/packages/concat.moody/effect.toml
@@ -3,9 +3,9 @@ id = "concat.moody"
name = "Moody"
kind = "filter"
category = "Cinematic"
-order = 20
+order = 31
intensity = "depth"
-description = "Crushed shadows, bronze midtones, colour pulled back, the corners closing in."
+description = "Blacks crushed by a film toe, colour drained, bronze through the middle, cool in the shadows, the corners closing in."
[[param]]
key = "depth"
@@ -26,7 +26,7 @@ step = 1
unit = "%"
[ffmpeg]
-chain = "eq=contrast={fixed(1 + depth / 100 * 0.35, 3)}:saturation={fixed(1 - depth / 100 * 0.4, 3)}:brightness={fixed(0 - depth / 100 * 0.06, 3)},colorbalance=rm={fixed(warmth / 100 * 0.1, 3)}:gm={fixed(warmth / 100 * 0.03, 3)}:bm={fixed(0 - warmth / 100 * 0.08, 3)},vignette=a={fixed(depth / 100 * 0.9, 3)}"
+chain = "curves=all='0/0 0.15/{fixed(0.15 - depth / 100 * 0.07, 3)} 0.5/{fixed(0.5 - depth / 100 * 0.05, 3)} 1/1',eq=saturation={fixed(1 - depth / 100 * 0.4, 3)},colorbalance=rm={fixed(warmth / 100 * 0.1, 3)}:gm={fixed(warmth / 100 * 0.03, 3)}:bm={fixed(0 - warmth / 100 * 0.08, 3)}:bs={fixed(depth / 100 * 0.06, 3)},vignette=a={fixed(depth / 100 * 0.9, 3)}"
[wgsl]
entry = "effect.wgsl"
diff --git a/engine/crates/concat-effects/packages/concat.moody/effect.wgsl b/engine/crates/concat-effects/packages/concat.moody/effect.wgsl
index 9619aeb9..e9547750 100644
--- a/engine/crates/concat-effects/packages/concat.moody/effect.wgsl
+++ b/engine/crates/concat-effects/packages/concat.moody/effect.wgsl
@@ -1,13 +1,13 @@
struct Params { depth: f32, warmth: f32 }
-// Darker, harder, drained, and bronze through the middle.
+// A toe, drained colour, bronze in the middle, a cool floor, and the corners.
fn effect(uv: vec2<f32>) -> vec4<f32> {
let c = sample(uv);
let depth = params.depth / 100.0;
- var out = c.rgb - vec3<f32>(depth * 0.06);
- out = contrast(out, 1.0 + depth * 0.35);
+ var out = film_curve(c.rgb, depth * 0.9, 0.0) * (1.0 - depth * 0.06);
out = saturation(out, 1.0 - depth * 0.4);
out = tint_midtones(out, vec3<f32>(0.1, 0.03, -0.08), params.warmth / 100.0);
+ out = split_tone(out, vec3<f32>(0.0, 0.0, 0.06), vec3<f32>(0.0), depth);
out = vignette(out, uv, depth * 0.7);
return vec4<f32>(clamp01(out), c.a);
}
diff --git a/engine/crates/concat-effects/packages/concat.moody/fixtures.toml b/engine/crates/concat-effects/packages/concat.moody/fixtures.toml
index 50b41f6d..f5d87e56 100644
--- a/engine/crates/concat-effects/packages/concat.moody/fixtures.toml
+++ b/engine/crates/concat-effects/packages/concat.moody/fixtures.toml
@@ -1,13 +1,13 @@
[[case]]
name = "default"
-chain = "eq=contrast=1.210:saturation=0.760:brightness=-0.036,colorbalance=rm=0.050:gm=0.015:bm=-0.040,vignette=a=0.540"
+chain = "curves=all='0/0 0.15/0.108 0.5/0.470 1/1',eq=saturation=0.760,colorbalance=rm=0.050:gm=0.015:bm=-0.040:bs=0.036,vignette=a=0.540"
[[case]]
name = "minimum"
at = "min"
-chain = "eq=contrast=1.000:saturation=1.000:brightness=0.000,colorbalance=rm=0.000:gm=0.000:bm=0.000,vignette=a=0.000"
+chain = "curves=all='0/0 0.15/0.150 0.5/0.500 1/1',eq=saturation=1.000,colorbalance=rm=0.000:gm=0.000:bm=0.000:bs=0.000,vignette=a=0.000"
[[case]]
name = "maximum"
at = "max"
-chain = "eq=contrast=1.350:saturation=0.600:brightness=-0.060,colorbalance=rm=0.100:gm=0.030:bm=-0.080,vignette=a=0.900"
+chain = "curves=all='0/0 0.15/0.080 0.5/0.450 1/1',eq=saturation=0.600,colorbalance=rm=0.100:gm=0.030:bm=-0.080:bs=0.060,vignette=a=0.900"
diff --git a/engine/crates/concat-effects/packages/concat.neon/effect.toml b/engine/crates/concat-effects/packages/concat.neon/effect.toml
index bb2d2370..ee7aac7e 100644
--- a/engine/crates/concat-effects/packages/concat.neon/effect.toml
+++ b/engine/crates/concat-effects/packages/concat.neon/effect.toml
@@ -3,9 +3,9 @@ id = "concat.neon"
name = "Neon"
kind = "filter"
category = "Stylised"
-order = 40
+order = 51
intensity = "glow"
-description = "Magenta in the shadows, cyan in the highlights, hard contrast and colour turned up. Night streets and signage."
+description = "Magenta in the shadows, cyan in the highlights, hard contrast, colour turned up, and the lights themselves blooming. Night streets and signage."
[[param]]
key = "glow"
@@ -26,7 +26,7 @@ step = 1
unit = "%"
[ffmpeg]
-chain = "colorbalance=rs={fixed(glow / 100 * 0.18, 3)}:gs={fixed(0 - glow / 100 * 0.1, 3)}:bs={fixed(glow / 100 * 0.18, 3)}:rh={fixed(0 - glow / 100 * 0.1, 3)}:gh={fixed(glow / 100 * 0.1, 3)}:bh={fixed(glow / 100 * 0.15, 3)},eq=contrast={fixed(1 + punch / 100 * 0.5, 3)}:saturation={fixed(1 + punch / 100 * 0.6, 3)}"
+chain = "colorbalance=rs={fixed(glow / 100 * 0.18, 3)}:gs={fixed(0 - glow / 100 * 0.1, 3)}:bs={fixed(glow / 100 * 0.18, 3)}:rh={fixed(0 - glow / 100 * 0.1, 3)}:gh={fixed(glow / 100 * 0.1, 3)}:bh={fixed(glow / 100 * 0.15, 3)},eq=contrast={fixed(1 + punch / 100 * 0.5, 3)}:saturation={fixed(1 + punch / 100 * 0.6, 3)},split[neona{index}][neonb{index}];[neonb{index}]gblur=sigma=10[neong{index}];[neona{index}][neong{index}]blend=all_mode=screen:all_opacity={fixed(glow / 100 * 0.25, 3)}"
[wgsl]
entry = "effect.wgsl"
diff --git a/engine/crates/concat-effects/packages/concat.neon/effect.wgsl b/engine/crates/concat-effects/packages/concat.neon/effect.wgsl
index 2f0dffbb..2da04bea 100644
--- a/engine/crates/concat-effects/packages/concat.neon/effect.wgsl
+++ b/engine/crates/concat-effects/packages/concat.neon/effect.wgsl
@@ -1,11 +1,13 @@
struct Params { glow: f32, punch: f32 }
-// The same split tone as a film grade, with the two ends swapped for signage.
+// The split tone with the ends swapped for signage, and the signs blooming.
fn effect(uv: vec2<f32>) -> vec4<f32> {
let c = sample(uv);
+ let g = params.glow / 100.0;
let punch = params.punch / 100.0;
- var out = split_tone(c.rgb, vec3<f32>(0.18, -0.1, 0.18), vec3<f32>(-0.1, 0.1, 0.15), params.glow / 100.0);
+ var out = split_tone(c.rgb, vec3<f32>(0.18, -0.1, 0.18), vec3<f32>(-0.1, 0.1, 0.15), g);
out = contrast(out, 1.0 + punch * 0.5);
out = saturation(out, 1.0 + punch * 0.6);
+ out = halation(uv, out, 0.75, 10.0, vec3<f32>(1.0, 1.0, 1.0), g * 0.4);
return vec4<f32>(clamp01(out), c.a);
}
diff --git a/engine/crates/concat-effects/packages/concat.neon/fixtures.toml b/engine/crates/concat-effects/packages/concat.neon/fixtures.toml
index 90c77c5a..545db876 100644
--- a/engine/crates/concat-effects/packages/concat.neon/fixtures.toml
+++ b/engine/crates/concat-effects/packages/concat.neon/fixtures.toml
@@ -1,13 +1,13 @@
[[case]]
name = "default"
-chain = "colorbalance=rs=0.108:gs=-0.060:bs=0.108:rh=-0.060:gh=0.060:bh=0.090,eq=contrast=1.250:saturation=1.300"
+chain = "colorbalance=rs=0.108:gs=-0.060:bs=0.108:rh=-0.060:gh=0.060:bh=0.090,eq=contrast=1.250:saturation=1.300,split[neona0][neonb0];[neonb0]gblur=sigma=10[neong0];[neona0][neong0]blend=all_mode=screen:all_opacity=0.150"
[[case]]
name = "minimum"
at = "min"
-chain = "colorbalance=rs=0.000:gs=0.000:bs=0.000:rh=0.000:gh=0.000:bh=0.000,eq=contrast=1.000:saturation=1.000"
+chain = "colorbalance=rs=0.000:gs=0.000:bs=0.000:rh=0.000:gh=0.000:bh=0.000,eq=contrast=1.000:saturation=1.000,split[neona0][neonb0];[neonb0]gblur=sigma=10[neong0];[neona0][neong0]blend=all_mode=screen:all_opacity=0.000"
[[case]]
name = "maximum"
at = "max"
-chain = "colorbalance=rs=0.180:gs=-0.100:bs=0.180:rh=-0.100:gh=0.100:bh=0.150,eq=contrast=1.500:saturation=1.600"
+chain = "colorbalance=rs=0.180:gs=-0.100:bs=0.180:rh=-0.100:gh=0.100:bh=0.150,eq=contrast=1.500:saturation=1.600,split[neona0][neonb0];[neonb0]gblur=sigma=10[neong0];[neona0][neong0]blend=all_mode=screen:all_opacity=0.250"
diff --git a/engine/crates/concat-effects/packages/concat.night/effect.toml b/engine/crates/concat-effects/packages/concat.night/effect.toml
index 2f77a7a2..5b5e9c57 100644
--- a/engine/crates/concat-effects/packages/concat.night/effect.toml
+++ b/engine/crates/concat-effects/packages/concat.night/effect.toml
@@ -3,9 +3,9 @@ id = "concat.night"
name = "Night"
kind = "filter"
category = "Cinematic"
-order = 23
+order = 33
intensity = "lift"
-description = "Low light opened up: shadows lifted, the darks softened so the noise does not come up with them, the blue kept."
+description = "Low light opened up: shadows lifted with the noise softened before it rises, whites held, the blue of the night kept."
[[param]]
key = "lift"
@@ -26,7 +26,7 @@ step = 1
unit = "%"
[ffmpeg]
-chain = "curves=all='0/{fixed(lift / 100 * 0.06, 3)} 0.25/{fixed(0.25 + lift / 100 * 0.15, 3)} 0.5/{fixed(0.5 + lift / 100 * 0.1, 3)} 1/1',hqdn3d={fixed(clarity / 100 * 6, 2)}"
+chain = "curves=all='0/{fixed(lift / 100 * 0.05, 3)} 0.25/{fixed(0.25 + lift / 100 * 0.15, 3)} 0.5/{fixed(0.5 + lift / 100 * 0.1, 3)} 1/1',hqdn3d={fixed(clarity / 100 * 6, 2)}"
[wgsl]
entry = "effect.wgsl"
diff --git a/engine/crates/concat-effects/packages/concat.night/effect.wgsl b/engine/crates/concat-effects/packages/concat.night/effect.wgsl
index bd739b9a..0de4aa61 100644
--- a/engine/crates/concat-effects/packages/concat.night/effect.wgsl
+++ b/engine/crates/concat-effects/packages/concat.night/effect.wgsl
@@ -6,6 +6,6 @@ fn effect(uv: vec2<f32>) -> vec4<f32> {
let lift = params.lift / 100.0;
let soft = soften(uv, 3.0);
let base = mix(c.rgb, soft, shadows(c.rgb) * params.clarity / 100.0);
- let out = lift_gamma_gain(base, vec3<f32>(lift * 0.06), vec3<f32>(1.0 + lift * 0.45), vec3<f32>(1.0));
+ let out = lift_gamma_gain(base, vec3<f32>(lift * 0.05), vec3<f32>(1.0 + lift * 0.45), vec3<f32>(1.0));
return vec4<f32>(clamp01(out), c.a);
}
diff --git a/engine/crates/concat-effects/packages/concat.night/fixtures.toml b/engine/crates/concat-effects/packages/concat.night/fixtures.toml
index 1ed1ecc8..8bbda245 100644
--- a/engine/crates/concat-effects/packages/concat.night/fixtures.toml
+++ b/engine/crates/concat-effects/packages/concat.night/fixtures.toml
@@ -1,6 +1,6 @@
[[case]]
name = "default"
-chain = "curves=all='0/0.036 0.25/0.340 0.5/0.560 1/1',hqdn3d=2.40"
+chain = "curves=all='0/0.030 0.25/0.340 0.5/0.560 1/1',hqdn3d=2.40"
[[case]]
name = "minimum"
@@ -10,4 +10,4 @@ chain = "curves=all='0/0.000 0.25/0.250 0.5/0.500 1/1',hqdn3d=0.00"
[[case]]
name = "maximum"
at = "max"
-chain = "curves=all='0/0.060 0.25/0.400 0.5/0.600 1/1',hqdn3d=6.00"
+chain = "curves=all='0/0.050 0.25/0.400 0.5/0.600 1/1',hqdn3d=6.00"
diff --git a/engine/crates/concat-effects/packages/concat.peach/effect.toml b/engine/crates/concat-effects/packages/concat.peach/effect.toml
new file mode 100644
index 00000000..5543a025
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.peach/effect.toml
@@ -0,0 +1,32 @@
+[effect]
+id = "concat.peach"
+name = "Peach"
+kind = "filter"
+category = "Portrait"
+order = 20
+intensity = "glow"
+description = "Skin warmed toward peach and softened, shadows lifted so lines ease, contrast low. Portraits and talking heads; it is meant to run at half strength."
+
+[[param]]
+key = "glow"
+label = "Glow"
+min = 0
+max = 100
+default = 50
+step = 1
+unit = "%"
+
+[[param]]
+key = "softness"
+label = "Softness"
+min = 0
+max = 100
+default = 40
+step = 1
+unit = "%"
+
+[ffmpeg]
+chain = "selectivecolor=reds='0 {fixed(0 - glow / 100 * 0.08, 3)} {fixed(glow / 100 * 0.1, 3)} {fixed(0 - glow / 100 * 0.1, 3)}':yellows='0 {fixed(glow / 100 * 0.05, 3)} 0 {fixed(0 - glow / 100 * 0.06, 3)}',curves=all='0/{fixed(glow / 100 * 0.06, 3)} 1/1',eq=contrast={fixed(1 - glow / 100 * 0.1, 3)},colorbalance=rh={fixed(glow / 100 * 0.05, 3)}:gh={fixed(glow / 100 * 0.02, 3)},split[peacha{index}][peachb{index}];[peachb{index}]gblur=sigma=6[peachg{index}];[peacha{index}][peachg{index}]blend=all_mode=screen:all_opacity={fixed(softness / 100 * 0.25, 3)}"
+
+[wgsl]
+entry = "effect.wgsl"
diff --git a/engine/crates/concat-effects/packages/concat.peach/effect.wgsl b/engine/crates/concat-effects/packages/concat.peach/effect.wgsl
new file mode 100644
index 00000000..558c6db7
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.peach/effect.wgsl
@@ -0,0 +1,15 @@
+struct Params { glow: f32, softness: f32 }
+
+// Skin turned a few degrees toward peach and lifted, softened only where
+// it is skin, then a light matte and a warm highlight.
+fn effect(uv: vec2<f32>) -> vec4<f32> {
+ let c = sample(uv);
+ let glow = params.glow / 100.0;
+ let skin = skin_mask(c.rgb);
+ var out = mix(c.rgb, soften(uv, 4.0), skin * params.softness / 100.0 * 0.7);
+ out = hsl_band(out, 20.0, 45.0, 6.0 * glow, 1.0 + glow * 0.1, 1.0 + glow * 0.1);
+ out = matte(out, glow * 0.06, 1.0);
+ out = contrast(out, 1.0 - glow * 0.1);
+ out = split_tone(out, vec3<f32>(0.0), vec3<f32>(0.05, 0.02, 0.0), glow);
+ return vec4<f32>(clamp01(out), c.a);
+}
diff --git a/engine/crates/concat-effects/packages/concat.peach/fixtures.toml b/engine/crates/concat-effects/packages/concat.peach/fixtures.toml
new file mode 100644
index 00000000..c3adc497
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.peach/fixtures.toml
@@ -0,0 +1,13 @@
+[[case]]
+name = "default"
+chain = "selectivecolor=reds='0 -0.040 0.050 -0.050':yellows='0 0.025 0 -0.030',curves=all='0/0.030 1/1',eq=contrast=0.950,colorbalance=rh=0.025:gh=0.010,split[peacha0][peachb0];[peachb0]gblur=sigma=6[peachg0];[peacha0][peachg0]blend=all_mode=screen:all_opacity=0.100"
+
+[[case]]
+name = "minimum"
+at = "min"
+chain = "selectivecolor=reds='0 0.000 0.000 0.000':yellows='0 0.000 0 0.000',curves=all='0/0.000 1/1',eq=contrast=1.000,colorbalance=rh=0.000:gh=0.000,split[peacha0][peachb0];[peachb0]gblur=sigma=6[peachg0];[peacha0][peachg0]blend=all_mode=screen:all_opacity=0.000"
+
+[[case]]
+name = "maximum"
+at = "max"
+chain = "selectivecolor=reds='0 -0.080 0.100 -0.100':yellows='0 0.050 0 -0.060',curves=all='0/0.060 1/1',eq=contrast=0.900,colorbalance=rh=0.050:gh=0.020,split[peacha0][peachb0];[peachb0]gblur=sigma=6[peachg0];[peacha0][peachg0]blend=all_mode=screen:all_opacity=0.250"
diff --git a/engine/crates/concat-effects/packages/concat.pink-fuzz/effect.toml b/engine/crates/concat-effects/packages/concat.pink-fuzz/effect.toml
index 6c59b959..97368364 100644
--- a/engine/crates/concat-effects/packages/concat.pink-fuzz/effect.toml
+++ b/engine/crates/concat-effects/packages/concat.pink-fuzz/effect.toml
@@ -3,7 +3,7 @@ id = "concat.pink-fuzz"
name = "Pink Fuzz"
kind = "filter"
category = "Stylised"
-order = 42
+order = 50
intensity = "haze"
description = "Low contrast, pink and lavender in the light, and a soft bloom over it all. The dreamy one."
diff --git a/engine/crates/concat-effects/packages/concat.pink-fuzz/effect.wgsl b/engine/crates/concat-effects/packages/concat.pink-fuzz/effect.wgsl
index d304a533..0c886555 100644
--- a/engine/crates/concat-effects/packages/concat.pink-fuzz/effect.wgsl
+++ b/engine/crates/concat-effects/packages/concat.pink-fuzz/effect.wgsl
@@ -1,15 +1,13 @@
struct Params { haze: f32, blush: f32 }
-// A fade, less contrast, the blush in the brights, and a bloom screened over.
+// A matte, less contrast, the blush in the brights, a pink bloom screened over.
fn effect(uv: vec2<f32>) -> vec4<f32> {
let c = sample(uv);
let haze = params.haze / 100.0;
- var out = fade(c.rgb, haze * 0.1);
+ var out = matte(c.rgb, haze * 0.1, 1.0);
out = contrast(out, 1.0 - haze * 0.2);
out = saturation(out, 1.0 - haze * 0.15);
out = split_tone(out, vec3<f32>(0.0), vec3<f32>(0.1, -0.04, 0.08), params.blush / 100.0);
- let bloom = soften(uv, 10.0);
- let screen = vec3<f32>(1.0) - (vec3<f32>(1.0) - out) * (vec3<f32>(1.0) - bloom);
- out = mix(out, screen, haze * 0.35);
+ out = halation(uv, out, 0.5, 12.0, vec3<f32>(1.0, 0.85, 0.95), haze * 0.55);
return vec4<f32>(clamp01(out), c.a);
}
diff --git a/engine/crates/concat-effects/packages/concat.polaroid/effect.toml b/engine/crates/concat-effects/packages/concat.polaroid/effect.toml
new file mode 100644
index 00000000..3c208f2a
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.polaroid/effect.toml
@@ -0,0 +1,32 @@
+[effect]
+id = "concat.polaroid"
+name = "Polaroid"
+kind = "filter"
+category = "Retro"
+order = 41
+intensity = "fade"
+description = "The instant print: a cream matte, warm highlights, cyan creeping into the shadows, a little softness in the corners."
+
+[[param]]
+key = "fade"
+label = "Fade"
+min = 0
+max = 100
+default = 60
+step = 1
+unit = "%"
+
+[[param]]
+key = "warmth"
+label = "Warmth"
+min = 0
+max = 100
+default = 50
+step = 1
+unit = "%"
+
+[ffmpeg]
+chain = "curves=all='0/{fixed(fade / 100 * 0.1, 3)} 1/{fixed(1 - fade / 100 * 0.05, 3)}',eq=contrast={fixed(1 - fade / 100 * 0.1, 3)}:saturation={fixed(1 - fade / 100 * 0.15, 3)},colorbalance=rh={fixed(warmth / 100 * 0.1, 3)}:gh={fixed(warmth / 100 * 0.05, 3)}:bh={fixed(0 - warmth / 100 * 0.06, 3)}:gs={fixed(fade / 100 * 0.05, 3)}:bs={fixed(fade / 100 * 0.08, 3)}:rs={fixed(0 - fade / 100 * 0.06, 3)},vignette=a={fixed(fade / 100 * 0.35, 3)}"
+
+[wgsl]
+entry = "effect.wgsl"
diff --git a/engine/crates/concat-effects/packages/concat.polaroid/effect.wgsl b/engine/crates/concat-effects/packages/concat.polaroid/effect.wgsl
new file mode 100644
index 00000000..dfc9b94a
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.polaroid/effect.wgsl
@@ -0,0 +1,15 @@
+struct Params { fade: f32, warmth: f32 }
+
+// A cream matte, warm light, cyan in the dark, soft corners.
+fn effect(uv: vec2<f32>) -> vec4<f32> {
+ let c = sample(uv);
+ let f = params.fade / 100.0;
+ let w = params.warmth / 100.0;
+ var out = matte(c.rgb, f * 0.1, 1.0 - f * 0.05);
+ out = contrast(out, 1.0 - f * 0.1);
+ out = saturation(out, 1.0 - f * 0.15);
+ out = split_tone(out, vec3<f32>(-0.06, 0.05, 0.08) * f, vec3<f32>(0.1, 0.05, -0.06) * w, 1.0);
+ out = mix(out, soften(uv, 3.0), smoothstep(0.5, 1.0, distance(uv, vec2<f32>(0.5)) * 1.4142) * f * 0.6);
+ out = vignette(out, uv, f * 0.3);
+ return vec4<f32>(clamp01(out), c.a);
+}
diff --git a/engine/crates/concat-effects/packages/concat.polaroid/fixtures.toml b/engine/crates/concat-effects/packages/concat.polaroid/fixtures.toml
new file mode 100644
index 00000000..6bf60bbc
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.polaroid/fixtures.toml
@@ -0,0 +1,13 @@
+[[case]]
+name = "default"
+chain = "curves=all='0/0.060 1/0.970',eq=contrast=0.940:saturation=0.910,colorbalance=rh=0.050:gh=0.025:bh=-0.030:gs=0.030:bs=0.048:rs=-0.036,vignette=a=0.210"
+
+[[case]]
+name = "minimum"
+at = "min"
+chain = "curves=all='0/0.000 1/1.000',eq=contrast=1.000:saturation=1.000,colorbalance=rh=0.000:gh=0.000:bh=0.000:gs=0.000:bs=0.000:rs=0.000,vignette=a=0.000"
+
+[[case]]
+name = "maximum"
+at = "max"
+chain = "curves=all='0/0.100 1/0.950',eq=contrast=0.900:saturation=0.850,colorbalance=rh=0.100:gh=0.050:bh=-0.060:gs=0.050:bs=0.080:rs=-0.060,vignette=a=0.350"
diff --git a/engine/crates/concat-effects/packages/concat.rain/effect.toml b/engine/crates/concat-effects/packages/concat.rain/effect.toml
new file mode 100644
index 00000000..75693a71
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.rain/effect.toml
@@ -0,0 +1,32 @@
+[effect]
+id = "concat.rain"
+name = "Rain"
+kind = "filter"
+category = "Cinematic"
+order = 38
+intensity = "haze"
+description = "Cool, hazy and drained, with the wet reflections lifted and blooming. Street-level walks at the end of the day."
+
+[[param]]
+key = "haze"
+label = "Haze"
+min = 0
+max = 100
+default = 60
+step = 1
+unit = "%"
+
+[[param]]
+key = "chill"
+label = "Chill"
+min = 0
+max = 100
+default = 50
+step = 1
+unit = "%"
+
+[ffmpeg]
+chain = "curves=all='0/{fixed(haze / 100 * 0.08, 3)} 1/{fixed(1 - haze / 100 * 0.02, 3)}',eq=saturation={fixed(1 - haze / 100 * 0.4, 3)}:contrast={fixed(1 - haze / 100 * 0.08, 3)},colorbalance=bs={fixed(chill / 100 * 0.1, 3)}:bm={fixed(chill / 100 * 0.06, 3)},split[raina{index}][rainb{index}];[rainb{index}]gblur=sigma=12[raing{index}];[raina{index}][raing{index}]blend=all_mode=screen:all_opacity={fixed(haze / 100 * 0.25, 3)}"
+
+[wgsl]
+entry = "effect.wgsl"
diff --git a/engine/crates/concat-effects/packages/concat.rain/effect.wgsl b/engine/crates/concat-effects/packages/concat.rain/effect.wgsl
new file mode 100644
index 00000000..b0f85193
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.rain/effect.wgsl
@@ -0,0 +1,15 @@
+struct Params { haze: f32, chill: f32 }
+
+// A matte, colour drained, cool through the dark, the brights blooming.
+fn effect(uv: vec2<f32>) -> vec4<f32> {
+ let c = sample(uv);
+ let h = params.haze / 100.0;
+ let ch = params.chill / 100.0;
+ var out = matte(c.rgb, h * 0.08, 1.0 - h * 0.02);
+ out = saturation(out, 1.0 - h * 0.4);
+ out = contrast(out, 1.0 - h * 0.08);
+ out = split_tone(out, vec3<f32>(0.0, 0.0, 0.1), vec3<f32>(0.0), ch);
+ out = tint_midtones(out, vec3<f32>(0.0, 0.0, 0.06), ch);
+ out = halation(uv, out, 0.65, 12.0, vec3<f32>(0.85, 0.92, 1.0), h * 0.45);
+ return vec4<f32>(clamp01(out), c.a);
+}
diff --git a/engine/crates/concat-effects/packages/concat.rain/fixtures.toml b/engine/crates/concat-effects/packages/concat.rain/fixtures.toml
new file mode 100644
index 00000000..c85142c2
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.rain/fixtures.toml
@@ -0,0 +1,13 @@
+[[case]]
+name = "default"
+chain = "curves=all='0/0.048 1/0.988',eq=saturation=0.760:contrast=0.952,colorbalance=bs=0.050:bm=0.030,split[raina0][rainb0];[rainb0]gblur=sigma=12[raing0];[raina0][raing0]blend=all_mode=screen:all_opacity=0.150"
+
+[[case]]
+name = "minimum"
+at = "min"
+chain = "curves=all='0/0.000 1/1.000',eq=saturation=1.000:contrast=1.000,colorbalance=bs=0.000:bm=0.000,split[raina0][rainb0];[rainb0]gblur=sigma=12[raing0];[raina0][raing0]blend=all_mode=screen:all_opacity=0.000"
+
+[[case]]
+name = "maximum"
+at = "max"
+chain = "curves=all='0/0.080 1/0.980',eq=saturation=0.600:contrast=0.920,colorbalance=bs=0.100:bm=0.060,split[raina0][rainb0];[rainb0]gblur=sigma=12[raing0];[raina0][raing0]blend=all_mode=screen:all_opacity=0.250"
diff --git a/engine/crates/concat-effects/packages/concat.retro-cartoon/effect.toml b/engine/crates/concat-effects/packages/concat.retro-cartoon/effect.toml
index 78efe89a..ca6367f4 100644
--- a/engine/crates/concat-effects/packages/concat.retro-cartoon/effect.toml
+++ b/engine/crates/concat-effects/packages/concat.retro-cartoon/effect.toml
@@ -3,7 +3,7 @@ id = "concat.retro-cartoon"
name = "Retro Cartoon"
kind = "filter"
category = "Stylised"
-order = 43
+order = 55
intensity = "ink"
description = "Flat bands of colour with inked edges, like a printed comic."
diff --git a/engine/crates/concat-effects/packages/concat.sage/effect.toml b/engine/crates/concat-effects/packages/concat.sage/effect.toml
new file mode 100644
index 00000000..1265adcc
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.sage/effect.toml
@@ -0,0 +1,23 @@
+[effect]
+id = "concat.sage"
+name = "Sage"
+kind = "filter"
+category = "Cinematic"
+order = 36
+intensity = "amount"
+description = "Muted and green-teal through the midtones, a gentle film curve, warmth only where a face is. The quiet grade of an indie film."
+
+[[param]]
+key = "amount"
+label = "Amount"
+min = 0
+max = 100
+default = 60
+step = 1
+unit = "%"
+
+[ffmpeg]
+chain = "eq=saturation={fixed(1 - amount / 100 * 0.3, 3)},colorbalance=gm={fixed(amount / 100 * 0.06, 3)}:bm={fixed(amount / 100 * 0.04, 3)}:rm={fixed(0 - amount / 100 * 0.04, 3)},curves=all='0/0.02 0.5/0.48 1/0.98'"
+
+[wgsl]
+entry = "effect.wgsl"
diff --git a/engine/crates/concat-effects/packages/concat.sage/effect.wgsl b/engine/crates/concat-effects/packages/concat.sage/effect.wgsl
new file mode 100644
index 00000000..573fe2c9
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.sage/effect.wgsl
@@ -0,0 +1,12 @@
+struct Params { amount: f32 }
+
+// Colour down, the middle turned green-teal except on skin, a soft curve.
+fn effect(uv: vec2<f32>) -> vec4<f32> {
+ let c = sample(uv);
+ let a = params.amount / 100.0;
+ let keep = 1.0 - skin_mask(c.rgb) * 0.8;
+ var out = saturation(c.rgb, 1.0 - a * 0.3);
+ out = tint_midtones(out, vec3<f32>(-0.04, 0.06, 0.04), a * keep);
+ out = matte(film_curve(out, 0.3 * a, 0.3 * a), 0.02 * a, 1.0 - 0.02 * a);
+ return vec4<f32>(clamp01(out), c.a);
+}
diff --git a/engine/crates/concat-effects/packages/concat.sage/fixtures.toml b/engine/crates/concat-effects/packages/concat.sage/fixtures.toml
new file mode 100644
index 00000000..bc1fcfa8
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.sage/fixtures.toml
@@ -0,0 +1,13 @@
+[[case]]
+name = "default"
+chain = "eq=saturation=0.820,colorbalance=gm=0.036:bm=0.024:rm=-0.024,curves=all='0/0.02 0.5/0.48 1/0.98'"
+
+[[case]]
+name = "minimum"
+at = "min"
+chain = "eq=saturation=1.000,colorbalance=gm=0.000:bm=0.000:rm=0.000,curves=all='0/0.02 0.5/0.48 1/0.98'"
+
+[[case]]
+name = "maximum"
+at = "max"
+chain = "eq=saturation=0.700,colorbalance=gm=0.060:bm=0.040:rm=-0.040,curves=all='0/0.02 0.5/0.48 1/0.98'"
diff --git a/engine/crates/concat-effects/packages/concat.soft-light/effect.toml b/engine/crates/concat-effects/packages/concat.soft-light/effect.toml
index 0d647b53..7b2ee784 100644
--- a/engine/crates/concat-effects/packages/concat.soft-light/effect.toml
+++ b/engine/crates/concat-effects/packages/concat.soft-light/effect.toml
@@ -5,7 +5,7 @@ kind = "filter"
category = "Everyday"
order = 13
intensity = "lift"
-description = "Lifted blacks, low contrast, cream in the highlights: airy and flattering."
+description = "A matte: blacks lifted, whites eased down, contrast low, and a soft bloom in the light with cream in it. Airy and flattering."
[[param]]
key = "lift"
@@ -26,7 +26,7 @@ step = 1
unit = "%"
[ffmpeg]
-chain = "curves=all='0/{fixed(lift / 100 * 0.12, 3)} 1/1',eq=contrast={fixed(1 - lift / 100 * 0.2, 3)}:saturation={fixed(1 - lift / 100 * 0.15, 3)},colorbalance=rh={fixed(warmth / 100 * 0.08, 3)}:bh={fixed(0 - warmth / 100 * 0.06, 3)}"
+chain = "curves=all='0/{fixed(lift / 100 * 0.1, 3)} 1/{fixed(1 - lift / 100 * 0.04, 3)}',eq=contrast={fixed(1 - lift / 100 * 0.18, 3)}:saturation={fixed(1 - lift / 100 * 0.12, 3)},colorbalance=rh={fixed(warmth / 100 * 0.07, 3)}:bh={fixed(0 - warmth / 100 * 0.06, 3)},split[softa{index}][softb{index}];[softb{index}]gblur=sigma=10[softg{index}];[softa{index}][softg{index}]blend=all_mode=screen:all_opacity={fixed(lift / 100 * 0.2, 3)}"
[wgsl]
entry = "effect.wgsl"
diff --git a/engine/crates/concat-effects/packages/concat.soft-light/effect.wgsl b/engine/crates/concat-effects/packages/concat.soft-light/effect.wgsl
index a02947b9..a517fff9 100644
--- a/engine/crates/concat-effects/packages/concat.soft-light/effect.wgsl
+++ b/engine/crates/concat-effects/packages/concat.soft-light/effect.wgsl
@@ -1,12 +1,13 @@
struct Params { lift: f32, warmth: f32 }
-// A fade, less contrast, less colour, and cream in the brights.
+// Matte, less contrast, less colour, cream in the brights, a bloom over them.
fn effect(uv: vec2<f32>) -> vec4<f32> {
let c = sample(uv);
let lift = params.lift / 100.0;
- var out = fade(c.rgb, lift * 0.12);
- out = contrast(out, 1.0 - lift * 0.2);
- out = saturation(out, 1.0 - lift * 0.15);
- out = split_tone(out, vec3<f32>(0.0), vec3<f32>(0.08, 0.02, -0.06), params.warmth / 100.0);
+ var out = matte(c.rgb, lift * 0.1, 1.0 - lift * 0.04);
+ out = contrast(out, 1.0 - lift * 0.18);
+ out = saturation(out, 1.0 - lift * 0.12);
+ out = split_tone(out, vec3<f32>(0.0), vec3<f32>(0.07, 0.02, -0.06), params.warmth / 100.0);
+ out = halation(uv, out, 0.6, 10.0, vec3<f32>(1.0, 0.97, 0.9), lift * 0.35);
return vec4<f32>(clamp01(out), c.a);
}
diff --git a/engine/crates/concat-effects/packages/concat.soft-light/fixtures.toml b/engine/crates/concat-effects/packages/concat.soft-light/fixtures.toml
index 170929a8..bdc91369 100644
--- a/engine/crates/concat-effects/packages/concat.soft-light/fixtures.toml
+++ b/engine/crates/concat-effects/packages/concat.soft-light/fixtures.toml
@@ -1,13 +1,13 @@
[[case]]
name = "default"
-chain = "curves=all='0/0.060 1/1',eq=contrast=0.900:saturation=0.925,colorbalance=rh=0.032:bh=-0.024"
+chain = "curves=all='0/0.050 1/0.980',eq=contrast=0.910:saturation=0.940,colorbalance=rh=0.028:bh=-0.024,split[softa0][softb0];[softb0]gblur=sigma=10[softg0];[softa0][softg0]blend=all_mode=screen:all_opacity=0.100"
[[case]]
name = "minimum"
at = "min"
-chain = "curves=all='0/0.000 1/1',eq=contrast=1.000:saturation=1.000,colorbalance=rh=0.000:bh=0.000"
+chain = "curves=all='0/0.000 1/1.000',eq=contrast=1.000:saturation=1.000,colorbalance=rh=0.000:bh=0.000,split[softa0][softb0];[softb0]gblur=sigma=10[softg0];[softa0][softg0]blend=all_mode=screen:all_opacity=0.000"
[[case]]
name = "maximum"
at = "max"
-chain = "curves=all='0/0.120 1/1',eq=contrast=0.800:saturation=0.850,colorbalance=rh=0.080:bh=-0.060"
+chain = "curves=all='0/0.100 1/0.960',eq=contrast=0.820:saturation=0.880,colorbalance=rh=0.070:bh=-0.060,split[softa0][softb0];[softb0]gblur=sigma=10[softg0];[softa0][softg0]blend=all_mode=screen:all_opacity=0.200"
diff --git a/engine/crates/concat-effects/packages/concat.spooky/effect.toml b/engine/crates/concat-effects/packages/concat.spooky/effect.toml
index 8dd591b0..ab452c87 100644
--- a/engine/crates/concat-effects/packages/concat.spooky/effect.toml
+++ b/engine/crates/concat-effects/packages/concat.spooky/effect.toml
@@ -3,9 +3,9 @@ id = "concat.spooky"
name = "Spooky"
kind = "filter"
category = "Stylised"
-order = 41
+order = 54
intensity = "dread"
-description = "Drained colour, a green-cyan cast, crushed blacks and a heavy vignette. For the season."
+description = "Drained colour, a green-cyan cast, a hard toe, and a heavy vignette. For the season."
[[param]]
key = "dread"
@@ -17,7 +17,7 @@ step = 1
unit = "%"
[ffmpeg]
-chain = "eq=saturation={fixed(1 - dread / 100 * 0.6, 3)}:contrast={fixed(1 + dread / 100 * 0.4, 3)}:brightness={fixed(0 - dread / 100 * 0.08, 3)},colorbalance=rm={fixed(0 - dread / 100 * 0.08, 3)}:gm={fixed(dread / 100 * 0.1, 3)}:bm={fixed(dread / 100 * 0.06, 3)},vignette=a={fixed(dread / 100 * 1.1, 3)}"
+chain = "eq=saturation={fixed(1 - dread / 100 * 0.6, 3)}:contrast={fixed(1 + dread / 100 * 0.3, 3)},curves=all='0/0 0.2/{fixed(0.2 - dread / 100 * 0.1, 3)} 1/1',colorbalance=rm={fixed(0 - dread / 100 * 0.08, 3)}:gm={fixed(dread / 100 * 0.1, 3)}:bm={fixed(dread / 100 * 0.06, 3)},vignette=a={fixed(dread / 100 * 1.1, 3)}"
[wgsl]
entry = "effect.wgsl"
diff --git a/engine/crates/concat-effects/packages/concat.spooky/effect.wgsl b/engine/crates/concat-effects/packages/concat.spooky/effect.wgsl
index c7dafbb3..20d0bc75 100644
--- a/engine/crates/concat-effects/packages/concat.spooky/effect.wgsl
+++ b/engine/crates/concat-effects/packages/concat.spooky/effect.wgsl
@@ -1,12 +1,12 @@
struct Params { dread: f32 }
-// Less colour, more contrast, darker, sickly green, and the walls close in.
+// Less colour, a toe, sickly green through the middle, and the walls close in.
fn effect(uv: vec2<f32>) -> vec4<f32> {
let c = sample(uv);
let dread = params.dread / 100.0;
- var out = c.rgb - vec3<f32>(dread * 0.08);
- out = saturation(out, 1.0 - dread * 0.6);
- out = contrast(out, 1.0 + dread * 0.4);
+ var out = saturation(c.rgb, 1.0 - dread * 0.6);
+ out = film_curve(out, dread, 0.0);
+ out = contrast(out, 1.0 + dread * 0.2);
out = tint_midtones(out, vec3<f32>(-0.08, 0.1, 0.06), dread);
out = vignette(out, uv, dread * 0.85);
return vec4<f32>(clamp01(out), c.a);
diff --git a/engine/crates/concat-effects/packages/concat.spooky/fixtures.toml b/engine/crates/concat-effects/packages/concat.spooky/fixtures.toml
index fe417c69..0f38d259 100644
--- a/engine/crates/concat-effects/packages/concat.spooky/fixtures.toml
+++ b/engine/crates/concat-effects/packages/concat.spooky/fixtures.toml
@@ -1,13 +1,13 @@
[[case]]
name = "default"
-chain = "eq=saturation=0.640:contrast=1.240:brightness=-0.048,colorbalance=rm=-0.048:gm=0.060:bm=0.036,vignette=a=0.660"
+chain = "eq=saturation=0.640:contrast=1.180,curves=all='0/0 0.2/0.140 1/1',colorbalance=rm=-0.048:gm=0.060:bm=0.036,vignette=a=0.660"
[[case]]
name = "minimum"
at = "min"
-chain = "eq=saturation=1.000:contrast=1.000:brightness=0.000,colorbalance=rm=0.000:gm=0.000:bm=0.000,vignette=a=0.000"
+chain = "eq=saturation=1.000:contrast=1.000,curves=all='0/0 0.2/0.200 1/1',colorbalance=rm=0.000:gm=0.000:bm=0.000,vignette=a=0.000"
[[case]]
name = "maximum"
at = "max"
-chain = "eq=saturation=0.400:contrast=1.400:brightness=-0.080,colorbalance=rm=-0.080:gm=0.100:bm=0.060,vignette=a=1.100"
+chain = "eq=saturation=0.400:contrast=1.300,curves=all='0/0 0.2/0.100 1/1',colorbalance=rm=-0.080:gm=0.100:bm=0.060,vignette=a=1.100"
diff --git a/engine/crates/concat-effects/packages/concat.teal-orange/effect.toml b/engine/crates/concat-effects/packages/concat.teal-orange/effect.toml
index bfa18439..0bf3ff76 100644
--- a/engine/crates/concat-effects/packages/concat.teal-orange/effect.toml
+++ b/engine/crates/concat-effects/packages/concat.teal-orange/effect.toml
@@ -3,9 +3,9 @@ id = "concat.teal-orange"
name = "Teal & Orange"
kind = "filter"
category = "Cinematic"
-order = 22
+order = 30
intensity = "amount"
-description = "Teal in the shadows, orange in the highlights, skin left as skin: the blockbuster grade."
+description = "Teal in the shadows, orange in the highlights, skin held as skin, a film curve over it. The blockbuster grade, and the most requested look there is."
[[param]]
key = "amount"
@@ -35,7 +35,7 @@ step = 1
unit = "%"
[ffmpeg]
-chain = "colorbalance=rs={fixed(0 - amount / 100 * 0.12, 3)}:gs={fixed(amount / 100 * 0.04, 3)}:bs={fixed(amount / 100 * 0.16, 3)}:rh={fixed(amount / 100 * 0.16, 3)}:gh={fixed(amount / 100 * 0.04, 3)}:bh={fixed(0 - amount / 100 * 0.12, 3)},eq=contrast={fixed(1 + contrast / 100 * 0.4, 3)}"
+chain = "colorbalance=rs={fixed(0 - amount / 100 * 0.12, 3)}:gs={fixed(amount / 100 * 0.04, 3)}:bs={fixed(amount / 100 * 0.16, 3)}:rh={fixed(amount / 100 * 0.16, 3)}:gh={fixed(amount / 100 * 0.04, 3)}:bh={fixed(0 - amount / 100 * 0.12, 3)},eq=contrast={fixed(1 + contrast / 100 * 0.35, 3)}"
[wgsl]
entry = "effect.wgsl"
diff --git a/engine/crates/concat-effects/packages/concat.teal-orange/effect.wgsl b/engine/crates/concat-effects/packages/concat.teal-orange/effect.wgsl
index a700679d..c3b5289a 100644
--- a/engine/crates/concat-effects/packages/concat.teal-orange/effect.wgsl
+++ b/engine/crates/concat-effects/packages/concat.teal-orange/effect.wgsl
@@ -1,10 +1,10 @@
struct Params { amount: f32, contrast: f32, skin: f32 }
-// The split tone, held back where the pixel is skin, then the curve.
+// The split tone held back on skin, then a film curve rather than a hard one.
fn effect(uv: vec2<f32>) -> vec4<f32> {
let c = sample(uv);
let keep = 1.0 - skin_mask(c.rgb) * params.skin / 100.0;
var out = split_tone(c.rgb, vec3<f32>(-0.12, 0.04, 0.16), vec3<f32>(0.16, 0.04, -0.12), params.amount / 100.0 * keep);
- out = s_curve(out, params.contrast / 100.0 * 0.8);
+ out = film_curve(out, params.contrast / 100.0 * 0.6, params.contrast / 100.0 * 0.5);
return vec4<f32>(clamp01(out), c.a);
}
diff --git a/engine/crates/concat-effects/packages/concat.teal-orange/fixtures.toml b/engine/crates/concat-effects/packages/concat.teal-orange/fixtures.toml
index 7125d0d2..d0c536c6 100644
--- a/engine/crates/concat-effects/packages/concat.teal-orange/fixtures.toml
+++ b/engine/crates/concat-effects/packages/concat.teal-orange/fixtures.toml
@@ -1,6 +1,6 @@
[[case]]
name = "default"
-chain = "colorbalance=rs=-0.084:gs=0.028:bs=0.112:rh=0.112:gh=0.028:bh=-0.084,eq=contrast=1.100"
+chain = "colorbalance=rs=-0.084:gs=0.028:bs=0.112:rh=0.112:gh=0.028:bh=-0.084,eq=contrast=1.087"
[[case]]
name = "minimum"
@@ -10,4 +10,4 @@ chain = "colorbalance=rs=0.000:gs=0.000:bs=0.000:rh=0.000:gh=0.000:bh=0.000,eq=c
[[case]]
name = "maximum"
at = "max"
-chain = "colorbalance=rs=-0.120:gs=0.040:bs=0.160:rh=0.160:gh=0.040:bh=-0.120,eq=contrast=1.400"
+chain = "colorbalance=rs=-0.120:gs=0.040:bs=0.160:rh=0.160:gh=0.040:bh=-0.120,eq=contrast=1.350"
diff --git a/engine/crates/concat-effects/packages/concat.umber/effect.toml b/engine/crates/concat-effects/packages/concat.umber/effect.toml
new file mode 100644
index 00000000..46d11977
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.umber/effect.toml
@@ -0,0 +1,32 @@
+[effect]
+id = "concat.umber"
+name = "Umber"
+kind = "filter"
+category = "Everyday"
+order = 19
+intensity = "warmth"
+description = "The café look: warm brown through the middle, greens muted to olive, contrast eased. Cosy, and kind to wood and skin alike."
+
+[[param]]
+key = "warmth"
+label = "Warmth"
+min = 0
+max = 100
+default = 60
+step = 1
+unit = "%"
+
+[[param]]
+key = "soften"
+label = "Soften"
+min = 0
+max = 100
+default = 40
+step = 1
+unit = "%"
+
+[ffmpeg]
+chain = "colorbalance=rm={fixed(warmth / 100 * 0.1, 3)}:gm={fixed(warmth / 100 * 0.03, 3)}:bm={fixed(0 - warmth / 100 * 0.1, 3)}:rs={fixed(warmth / 100 * 0.04, 3)}:bs={fixed(0 - warmth / 100 * 0.04, 3)},selectivecolor=greens='0 {fixed(warmth / 100 * 0.1, 3)} {fixed(warmth / 100 * 0.2, 3)} {fixed(warmth / 100 * 0.1, 3)}',eq=contrast={fixed(1 - soften / 100 * 0.12, 3)},curves=all='0/{fixed(soften / 100 * 0.05, 3)} 1/1'"
+
+[wgsl]
+entry = "effect.wgsl"
diff --git a/engine/crates/concat-effects/packages/concat.umber/effect.wgsl b/engine/crates/concat-effects/packages/concat.umber/effect.wgsl
new file mode 100644
index 00000000..00924831
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.umber/effect.wgsl
@@ -0,0 +1,14 @@
+struct Params { warmth: f32, soften: f32 }
+
+// Brown through the midtones and shadows, greens to olive, a soft matte.
+fn effect(uv: vec2<f32>) -> vec4<f32> {
+ let c = sample(uv);
+ let w = params.warmth / 100.0;
+ let s = params.soften / 100.0;
+ var out = tint_midtones(c.rgb, vec3<f32>(0.1, 0.03, -0.1), w);
+ out = split_tone(out, vec3<f32>(0.04, 0.0, -0.04), vec3<f32>(0.0), w);
+ out = hsl_band(out, 110.0, 60.0, -20.0 * w, 1.0 - w * 0.3, 1.0 - w * 0.08);
+ out = contrast(out, 1.0 - s * 0.12);
+ out = matte(out, s * 0.05, 1.0);
+ return vec4<f32>(clamp01(out), c.a);
+}
diff --git a/engine/crates/concat-effects/packages/concat.umber/fixtures.toml b/engine/crates/concat-effects/packages/concat.umber/fixtures.toml
new file mode 100644
index 00000000..60d4f9b4
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.umber/fixtures.toml
@@ -0,0 +1,13 @@
+[[case]]
+name = "default"
+chain = "colorbalance=rm=0.060:gm=0.018:bm=-0.060:rs=0.024:bs=-0.024,selectivecolor=greens='0 0.060 0.120 0.060',eq=contrast=0.952,curves=all='0/0.020 1/1'"
+
+[[case]]
+name = "minimum"
+at = "min"
+chain = "colorbalance=rm=0.000:gm=0.000:bm=0.000:rs=0.000:bs=0.000,selectivecolor=greens='0 0.000 0.000 0.000',eq=contrast=1.000,curves=all='0/0.000 1/1'"
+
+[[case]]
+name = "maximum"
+at = "max"
+chain = "colorbalance=rm=0.100:gm=0.030:bm=-0.100:rs=0.040:bs=-0.040,selectivecolor=greens='0 0.100 0.200 0.100',eq=contrast=0.880,curves=all='0/0.050 1/1'"
diff --git a/engine/crates/concat-effects/packages/concat.vhs/effect.toml b/engine/crates/concat-effects/packages/concat.vhs/effect.toml
index 6f644750..cdb6d851 100644
--- a/engine/crates/concat-effects/packages/concat.vhs/effect.toml
+++ b/engine/crates/concat-effects/packages/concat.vhs/effect.toml
@@ -3,9 +3,9 @@ id = "concat.vhs"
name = "VHS"
kind = "filter"
category = "Retro"
-order = 33
+order = 44
intensity = "bleed"
-description = "Colour bleeding sideways, scan lines, softness, tape noise and too much saturation."
+description = "Colour bleeding sideways, scan lines, softness, tape noise and too much saturation, with the slight vertical smear of a worn head."
[[param]]
key = "bleed"
diff --git a/engine/crates/concat-effects/packages/concat.vhs/effect.wgsl b/engine/crates/concat-effects/packages/concat.vhs/effect.wgsl
index c3465b37..d344ce7e 100644
--- a/engine/crates/concat-effects/packages/concat.vhs/effect.wgsl
+++ b/engine/crates/concat-effects/packages/concat.vhs/effect.wgsl
@@ -1,13 +1,16 @@
struct Params { bleed: f32, lines: f32 }
-// Red and blue sampled off to either side, then the tape's own marks.
+// Red and blue sampled off to either side, a smear downward, then the tape's marks.
fn effect(uv: vec2<f32>) -> vec4<f32> {
let bleed = params.bleed / 100.0;
let lines = params.lines / 100.0;
- let off = vec2<f32>(texel().x * bleed * 3.0, 0.0);
+ let t = texel();
+ let off = vec2<f32>(t.x * bleed * 3.0, 0.0);
let c = sample(uv);
var out = vec3<f32>(sample(uv - off).r, c.g, sample(uv + off).b);
- out = mix(out, soften(uv, 2.0), bleed * 0.4);
+ let smear = (sample(uv - vec2<f32>(0.0, t.y)).rgb + sample(uv - vec2<f32>(0.0, 2.0 * t.y)).rgb) * 0.5;
+ out = mix(out, smear, bleed * 0.25);
+ out = mix(out, soften(uv, 2.0), bleed * 0.3);
out = saturation(out, 1.3);
let row = fract(uv.y * frame.size.y / 3.0);
out = out * (1.0 - lines * 0.25 * step(0.5, row));
diff --git a/engine/crates/concat-effects/packages/concat.vibrance/effect.wgsl b/engine/crates/concat-effects/packages/concat.vibrance/effect.wgsl
index 7abdba85..c48449ef 100644
--- a/engine/crates/concat-effects/packages/concat.vibrance/effect.wgsl
+++ b/engine/crates/concat-effects/packages/concat.vibrance/effect.wgsl
@@ -1,12 +1,10 @@
struct Params { amount: f32 }
-// Saturates the dull colours more than the vivid ones.
+// Saturates the dull colours more than the vivid ones, and skin less
+// than either: a face should be the last thing a vibrance boost reaches.
fn effect(uv: vec2<f32>) -> vec4<f32> {
let c = sample(uv);
- let l = luma(c.rgb);
- let mx = max(max(c.r, c.g), c.b);
- let mn = min(min(c.r, c.g), c.b);
- let sat = mx - mn;
- let boost = params.amount * (1.0 - sat);
- return vec4<f32>(clamp(mix(vec3<f32>(l), c.rgb, 1.0 + boost), vec3<f32>(0.0), vec3<f32>(1.0)), c.a);
+ let boosted = vibrance(c.rgb, params.amount);
+ let out = mix(boosted, c.rgb, skin_mask(c.rgb) * 0.6);
+ return vec4<f32>(clamp01(out), c.a);
}
diff --git a/engine/crates/concat-effects/packages/concat.vintage/effect.toml b/engine/crates/concat-effects/packages/concat.vintage/effect.toml
index af03c583..d9eb2f8c 100644
--- a/engine/crates/concat-effects/packages/concat.vintage/effect.toml
+++ b/engine/crates/concat-effects/packages/concat.vintage/effect.toml
@@ -3,9 +3,9 @@ id = "concat.vintage"
name = "Vintage"
kind = "filter"
category = "Retro"
-order = 30
+order = 40
intensity = "age"
-description = "Faded blacks, muted colour, a drift toward yellow-green, a soft vignette: a seventies print."
+description = "A seventies print: matte blacks and whites, colour faded, greens gone to yellow, a soft vignette."
[[param]]
key = "age"
@@ -26,7 +26,7 @@ step = 1
unit = "%"
[ffmpeg]
-chain = "curves=all='0/{fixed(age / 100 * 0.12, 3)} 1/{fixed(1 - age / 100 * 0.06, 3)}',eq=saturation={fixed(1 - age / 100 * 0.35, 3)}:contrast={fixed(1 - age / 100 * 0.12, 3)},colorbalance=rm={fixed(tint / 100 * 0.06, 3)}:gm={fixed(tint / 100 * 0.06, 3)}:bm={fixed(0 - tint / 100 * 0.1, 3)},vignette=a={fixed(age / 100 * 0.5, 3)}"
+chain = "curves=all='0/{fixed(age / 100 * 0.12, 3)} 1/{fixed(1 - age / 100 * 0.06, 3)}',eq=saturation={fixed(1 - age / 100 * 0.35, 3)}:contrast={fixed(1 - age / 100 * 0.1, 3)},selectivecolor=greens='0 0 {fixed(tint / 100 * 0.4, 3)} 0':cyans='0 0 {fixed(tint / 100 * 0.2, 3)} 0',colorbalance=rm={fixed(tint / 100 * 0.05, 3)}:bm={fixed(0 - tint / 100 * 0.08, 3)},vignette=a={fixed(age / 100 * 0.5, 3)}"
[wgsl]
entry = "effect.wgsl"
diff --git a/engine/crates/concat-effects/packages/concat.vintage/effect.wgsl b/engine/crates/concat-effects/packages/concat.vintage/effect.wgsl
index 5deeefc7..0df96b42 100644
--- a/engine/crates/concat-effects/packages/concat.vintage/effect.wgsl
+++ b/engine/crates/concat-effects/packages/concat.vintage/effect.wgsl
@@ -1,13 +1,15 @@
struct Params { age: f32, tint: f32 }
-// A fade at both ends, less colour, the print's yellow-green, the corners.
+// A matte at both ends, colour faded, greens turned to yellow, warm middle.
fn effect(uv: vec2<f32>) -> vec4<f32> {
let c = sample(uv);
let age = params.age / 100.0;
- var out = fade(c.rgb, age * 0.12) * (1.0 - age * 0.06);
+ let t = params.tint / 100.0;
+ var out = matte(c.rgb, age * 0.12, 1.0 - age * 0.06);
out = saturation(out, 1.0 - age * 0.35);
- out = contrast(out, 1.0 - age * 0.12);
- out = tint_midtones(out, vec3<f32>(0.06, 0.06, -0.1), params.tint / 100.0);
+ out = contrast(out, 1.0 - age * 0.1);
+ out = hsl_band(out, 120.0, 70.0, -35.0 * t, 1.0 - t * 0.1, 1.0);
+ out = tint_midtones(out, vec3<f32>(0.05, 0.03, -0.08), t);
out = vignette(out, uv, age * 0.4);
return vec4<f32>(clamp01(out), c.a);
}
diff --git a/engine/crates/concat-effects/packages/concat.vintage/fixtures.toml b/engine/crates/concat-effects/packages/concat.vintage/fixtures.toml
index 0e0403bd..84110f01 100644
--- a/engine/crates/concat-effects/packages/concat.vintage/fixtures.toml
+++ b/engine/crates/concat-effects/packages/concat.vintage/fixtures.toml
@@ -1,13 +1,13 @@
[[case]]
name = "default"
-chain = "curves=all='0/0.072 1/0.964',eq=saturation=0.790:contrast=0.928,colorbalance=rm=0.030:gm=0.030:bm=-0.050,vignette=a=0.300"
+chain = "curves=all='0/0.072 1/0.964',eq=saturation=0.790:contrast=0.940,selectivecolor=greens='0 0 0.200 0':cyans='0 0 0.100 0',colorbalance=rm=0.025:bm=-0.040,vignette=a=0.300"
[[case]]
name = "minimum"
at = "min"
-chain = "curves=all='0/0.000 1/1.000',eq=saturation=1.000:contrast=1.000,colorbalance=rm=0.000:gm=0.000:bm=0.000,vignette=a=0.000"
+chain = "curves=all='0/0.000 1/1.000',eq=saturation=1.000:contrast=1.000,selectivecolor=greens='0 0 0.000 0':cyans='0 0 0.000 0',colorbalance=rm=0.000:bm=0.000,vignette=a=0.000"
[[case]]
name = "maximum"
at = "max"
-chain = "curves=all='0/0.120 1/0.940',eq=saturation=0.650:contrast=0.880,colorbalance=rm=0.060:gm=0.060:bm=-0.100,vignette=a=0.500"
+chain = "curves=all='0/0.120 1/0.940',eq=saturation=0.650:contrast=0.900,selectivecolor=greens='0 0 0.400 0':cyans='0 0 0.200 0',colorbalance=rm=0.050:bm=-0.080,vignette=a=0.500"
diff --git a/engine/crates/concat-effects/packages/concat.vivid/effect.toml b/engine/crates/concat-effects/packages/concat.vivid/effect.toml
index 9b68cc6c..ec302c82 100644
--- a/engine/crates/concat-effects/packages/concat.vivid/effect.toml
+++ b/engine/crates/concat-effects/packages/concat.vivid/effect.toml
@@ -5,7 +5,7 @@ kind = "filter"
category = "Everyday"
order = 11
intensity = "colour"
-description = "Contrast that bites and colour that sings, sharpened a touch: the look that reads as a better camera."
+description = "Colour that sings and contrast that bites, with a little edge: the look that reads as a better camera. Skin is held back from the boost."
[[param]]
key = "colour"
@@ -26,7 +26,7 @@ step = 1
unit = "%"
[ffmpeg]
-chain = "eq=contrast={fixed(1 + punch / 100 * 0.5, 3)},vibrance=intensity={fixed(colour / 100 * 1.5, 3)},unsharp=5:5:{fixed(punch / 100 * 0.6, 3)}"
+chain = "eq=contrast={fixed(1 + punch / 100 * 0.35, 3)},vibrance=intensity={fixed(colour / 100 * 1.4, 3)},unsharp=5:5:{fixed(punch / 100 * 0.7, 3)}"
[wgsl]
entry = "effect.wgsl"
diff --git a/engine/crates/concat-effects/packages/concat.vivid/effect.wgsl b/engine/crates/concat-effects/packages/concat.vivid/effect.wgsl
index ee781510..03748ed7 100644
--- a/engine/crates/concat-effects/packages/concat.vivid/effect.wgsl
+++ b/engine/crates/concat-effects/packages/concat.vivid/effect.wgsl
@@ -1,15 +1,12 @@
struct Params { colour: f32, punch: f32 }
-// An S-curve, vibrance that spares skin, and a little edge.
+// An S-curve, vibrance that leaves skin be, and the picture minus its blur.
fn effect(uv: vec2<f32>) -> vec4<f32> {
let c = sample(uv);
let punch = params.punch / 100.0;
- var out = s_curve(c.rgb, punch * 0.8);
- out = vibrance(out, params.colour / 100.0 * 1.5);
- // Unsharp: the picture minus its blur, added back.
- let t = texel();
- let blur = (sample(uv + vec2<f32>(t.x, 0.0)).rgb + sample(uv - vec2<f32>(t.x, 0.0)).rgb
- + sample(uv + vec2<f32>(0.0, t.y)).rgb + sample(uv - vec2<f32>(0.0, t.y)).rgb) * 0.25;
- out = out + (c.rgb - blur) * punch * 0.6;
+ let keep = 1.0 - skin_mask(c.rgb) * 0.6;
+ var out = s_curve(c.rgb, punch * 0.7);
+ out = mix(out, vibrance(out, params.colour / 100.0 * 1.4), keep);
+ out = out + (c.rgb - soften(uv, 2.0)) * punch * 0.7;
return vec4<f32>(clamp01(out), c.a);
}
diff --git a/engine/crates/concat-effects/packages/concat.vivid/fixtures.toml b/engine/crates/concat-effects/packages/concat.vivid/fixtures.toml
index 0897d60e..8cddd7d2 100644
--- a/engine/crates/concat-effects/packages/concat.vivid/fixtures.toml
+++ b/engine/crates/concat-effects/packages/concat.vivid/fixtures.toml
@@ -1,6 +1,6 @@
[[case]]
name = "default"
-chain = "eq=contrast=1.250,vibrance=intensity=0.900,unsharp=5:5:0.300"
+chain = "eq=contrast=1.175,vibrance=intensity=0.840,unsharp=5:5:0.350"
[[case]]
name = "minimum"
@@ -10,4 +10,4 @@ chain = "eq=contrast=1.000,vibrance=intensity=0.000,unsharp=5:5:0.000"
[[case]]
name = "maximum"
at = "max"
-chain = "eq=contrast=1.500,vibrance=intensity=1.500,unsharp=5:5:0.600"
+chain = "eq=contrast=1.350,vibrance=intensity=1.400,unsharp=5:5:0.700"
diff --git a/engine/crates/concat-effects/packages/concat.warm/effect.toml b/engine/crates/concat-effects/packages/concat.warm/effect.toml
index 4167ebe7..5f6ab1db 100644
--- a/engine/crates/concat-effects/packages/concat.warm/effect.toml
+++ b/engine/crates/concat-effects/packages/concat.warm/effect.toml
@@ -18,7 +18,7 @@ step = 50
unit = "K"
[ffmpeg]
-chain = "colortemperature=temperature={round(temperature)}"
+chain = "colortemperature=temperature={round(temperature)}:pl=1"
[wgsl]
entry = "effect.wgsl"
diff --git a/engine/crates/concat-effects/packages/concat.warm/effect.wgsl b/engine/crates/concat-effects/packages/concat.warm/effect.wgsl
index 5b9577d6..0d0b9ecb 100644
--- a/engine/crates/concat-effects/packages/concat.warm/effect.wgsl
+++ b/engine/crates/concat-effects/packages/concat.warm/effect.wgsl
@@ -1,8 +1,6 @@
struct Params { temperature: f32 }
-// Colour temperature as a white balance shift: the picture as if it were
-// lit at `temperature` kelvin while the camera was set for daylight.
-
+// White balance toward candlelight, brightness held.
fn effect(uv: vec2<f32>) -> vec4<f32> {
let c = sample(uv);
return vec4<f32>(clamp01(white_balance(c.rgb, params.temperature)), c.a);
diff --git a/engine/crates/concat-effects/packages/concat.warm/fixtures.toml b/engine/crates/concat-effects/packages/concat.warm/fixtures.toml
index 70fca5a0..81757f03 100644
--- a/engine/crates/concat-effects/packages/concat.warm/fixtures.toml
+++ b/engine/crates/concat-effects/packages/concat.warm/fixtures.toml
@@ -1,13 +1,13 @@
[[case]]
name = "default"
-chain = "colortemperature=temperature=4600"
+chain = "colortemperature=temperature=4600:pl=1"
[[case]]
name = "minimum"
at = "min"
-chain = "colortemperature=temperature=3000"
+chain = "colortemperature=temperature=3000:pl=1"
[[case]]
name = "maximum"
at = "max"
-chain = "colortemperature=temperature=6000"
+chain = "colortemperature=temperature=6000:pl=1"
diff --git a/engine/crates/concat-effects/src/lib.rs b/engine/crates/concat-effects/src/lib.rs
index 68953fd8..afc9a84a 100644
--- a/engine/crates/concat-effects/src/lib.rs
+++ b/engine/crates/concat-effects/src/lib.rs
@@ -82,7 +82,7 @@ mod tests {
fn a_filter_mixes_by_its_intensity_and_an_effect_does_not() {
let catalogue = Catalogue::builtin();
let full = catalogue.video_chain(&[applied("concat.warm", &[])]);
- assert_eq!(full, "colortemperature=temperature=4600");
+ assert_eq!(full, "colortemperature=temperature=4600:pl=1");
let half = catalogue.video_chain(&[
applied("concat.sepia", &[]),
applied("concat.warm", &[("intensity", 50.0)]),
@@ -90,7 +90,7 @@ mod tests {
assert!(half.starts_with("colorchannelmixer"), "{half}");
assert!(
half.ends_with(
- "split[m1a][m1b];[m1b]colortemperature=temperature=4600[m1c];\
+ "split[m1a][m1b];[m1b]colortemperature=temperature=4600:pl=1[m1c];\
[m1a][m1c]blend=all_mode=normal:all_opacity=0.500"
),
"{half}"
diff --git a/engine/crates/concat-effects/src/shader.rs b/engine/crates/concat-effects/src/shader.rs
index 5dd26c54..24cfcff5 100644
--- a/engine/crates/concat-effects/src/shader.rs
+++ b/engine/crates/concat-effects/src/shader.rs
@@ -79,9 +79,11 @@ fn hash(p: vec2<f32>, seed: f32) -> f32 {
// Every look is a few of these in different amounts, so they live here,
// once, rather than in each package. Each has an FFmpeg twin a manifest's
// chain can reach for: `saturation` is eq=saturation, `contrast` is
-// eq=contrast, `fade` and `s_curve` are curves, `split_tone` and
-// `tint_midtones` are colorbalance, `white_balance` is colortemperature,
-// `vignette` is vignette, `mono` is colorchannelmixer.
+// eq=contrast, `fade`, `matte`, `s_curve` and `film_curve` are curves,
+// `split_tone` and `tint_midtones` are colorbalance, `white_balance` is
+// colortemperature, `vignette`
+// is vignette, `mono` is colorchannelmixer, `hsl_band` is selectivecolor,
+// `halation` is a split, gblur and screen blend.
/// Everything held to the displayable range.
fn clamp01(rgb: vec3<f32>) -> vec3<f32> {
@@ -176,7 +178,8 @@ fn kelvin(k: f32) -> vec3<f32> {
/// White balance: the picture as if lit at `k` kelvin while the camera
/// was set for daylight. 6500 is as shot.
fn white_balance(rgb: vec3<f32>, k: f32) -> vec3<f32> {
- return rgb * (kelvin(k) / kelvin(6500.0));
+ let tint = kelvin(k) / kelvin(6500.0);
+ return rgb * (tint / max(luma(tint), 0.001));
}
/// A vignette: the corners darkened by `amount` from a clear middle.
@@ -192,6 +195,72 @@ fn mono(rgb: vec3<f32>, weights: vec3<f32>) -> vec3<f32> {
return vec3<f32>(dot(rgb, w));
}
+/// A matte: the blacks lifted to `black` and the whites pulled down to
+/// `white`, the range between them kept in proportion. The print look
+/// every faded, milky and instant-camera grade is built on; (0, 1) is as
+/// shot. FFmpeg: curves with those two end points.
+fn matte(rgb: vec3<f32>, black: f32, white: f32) -> vec3<f32> {
+ return rgb * (white - black) + vec3<f32>(black);
+}
+
+/// A film curve: a toe that rolls the shadows into black by `toe` and a
+/// shoulder that rolls the highlights into white by `shoulder`, both
+/// `0..1`, the midtones left on the line. Unlike a contrast, it never
+/// clips: it compresses the ends the way a negative does.
+fn film_curve(rgb: vec3<f32>, toe: f32, shoulder: f32) -> vec3<f32> {
+ let c = clamp01(rgb);
+ let t = mix(c, c * c, vec3<f32>(toe) * (vec3<f32>(1.0) - c));
+ return mix(t, vec3<f32>(1.0) - (vec3<f32>(1.0) - t) * (vec3<f32>(1.0) - t), vec3<f32>(shoulder) * t);
+}
+
+/// Every hue turned by `degrees`, brightness held: a rotation in the
+/// YIQ plane, the same for every pixel.
+fn hue_rotate(rgb: vec3<f32>, degrees: f32) -> vec3<f32> {
+ let a = radians(degrees);
+ let y = luma(rgb);
+ let i = dot(rgb, vec3<f32>(0.596, -0.274, -0.322));
+ let q = dot(rgb, vec3<f32>(0.211, -0.523, 0.312));
+ let i2 = i * cos(a) - q * sin(a);
+ let q2 = i * sin(a) + q * cos(a);
+ return vec3<f32>(
+ y + 0.956 * i2 + 0.621 * q2,
+ y - 0.272 * i2 - 0.647 * q2,
+ y - 1.106 * i2 + 1.703 * q2,
+ );
+}
+
+/// One band of hues adjusted and the rest untouched: the band `width`
+/// degrees around `centre` has its hue turned by `turn` degrees, its
+/// saturation scaled by `sat` and its brightness by `lum`, weighted by
+/// `hue_mask` so the edges of the band blend. What a grading panel's HSL
+/// sliders do, and what keeps a sky change off a face. FFmpeg:
+/// selectivecolor on the nearest of its six ranges.
+fn hsl_band(rgb: vec3<f32>, centre: f32, width: f32, turn: f32, sat: f32, lum: f32) -> vec3<f32> {
+ let w = hue_mask(rgb, centre, width);
+ var out = hue_rotate(rgb, turn);
+ out = saturation(out, sat);
+ out = out * lum;
+ return mix(rgb, out, w);
+}
+
+/// Halation: the brights above `threshold` gathered from `radius` pixels
+/// around, tinted, and screened back over the picture by `amount`. The
+/// glow around a lamp on film, and the bloom every soft look leans on.
+/// FFmpeg: a split, a gblur and a screen blend.
+fn halation(uv: vec2<f32>, rgb: vec3<f32>, threshold: f32, radius: f32, tint: vec3<f32>, amount: f32) -> vec3<f32> {
+ let t = texel() * radius * 0.5;
+ var sum = vec3<f32>(0.0);
+ for (var y: i32 = -2; y <= 2; y++) {
+ for (var x: i32 = -2; x <= 2; x++) {
+ let s = sample(uv + vec2<f32>(f32(x), f32(y)) * t).rgb;
+ let bright = smoothstep(threshold, 1.0, luma(s));
+ sum += s * bright;
+ }
+ }
+ let glow = clamp01(sum / 25.0 * tint * amount);
+ return vec3<f32>(1.0) - (vec3<f32>(1.0) - rgb) * (vec3<f32>(1.0) - glow);
+}
+
// ── targeting and texture: the taps a look takes around a pixel, and the
// bands of colour it singles out. FFmpeg twins: `hue_mask` is
// selectivecolor, `soften` is gblur, `grain_at` is noise, `edge_at` is
diff --git a/engine/crates/concat/locales/en.json b/engine/crates/concat/locales/en.json
index fe5953dc..6cfa463a 100644
--- a/engine/crates/concat/locales/en.json
+++ b/engine/crates/concat/locales/en.json
@@ -5,12 +5,14 @@
"1 stroke": "1 stroke",
"A brighter, lighter, closer voice. Pitch at 0 follows the amount.": "A brighter, lighter, closer voice. Pitch at 0 follows the amount.",
"A concert hall: long, even reflections.": "A concert hall: long, even reflections.",
- "A film curve with a soft toe and shoulder, a little warmth, and grain that moves.": "A film curve with a soft toe and shoulder, a little warmth, and grain that moves.",
+ "A film curve with a real toe and shoulder, warm halation around the lights, and grain that moves. Print stock, not a filter.": "A film curve with a real toe and shoulder, warm halation around the lights, and grain that moves. Print stock, not a filter.",
"A flat, boxy blur.": "A flat, boxy blur.",
"A handheld jitter.": "A handheld jitter.",
"A horizontal streak, as if the camera panned.": "A horizontal streak, as if the camera panned.",
"A layer treats everything under it for as long as it runs. Trim it on the timeline to change what it covers.": "A layer treats everything under it for as long as it runs. Trim it on the timeline to change what it covers.",
+ "A matte: blacks lifted, whites eased down, contrast low, and a soft bloom in the light with cream in it. Airy and flattering.": "A matte: blacks lifted, whites eased down, contrast low, and a soft bloom in the light with cream in it. Airy and flattering.",
"A metallic, modulated voice.": "A metallic, modulated voice.",
+ "A seventies print: matte blacks and whites, colour faded, greens gone to yellow, a soft vignette.": "A seventies print: matte blacks and whites, colour faded, greens gone to yellow, a soft vignette.",
"A small old speaker: no top end, and a grain to the sound.": "A small old speaker: no top end, and a grain to the sound.",
"A small speaker on a long wave: narrow band, a little crunch.": "A small speaker on a long wave: narrow band, a little crunch.",
"A soft bloom around the bright parts of the picture.": "A soft bloom around the bright parts of the picture.",
@@ -49,20 +51,20 @@
"Auto removal": "Auto removal",
"Auto removal keeps what the model finds and drops the rest: a person, or the one thing the picture is of. Custom removal starts from the same mask and takes corrections painted on the monitor: the smart brush keeps the whole thing it touches and the smart eraser removes it, the plain ones do exactly what you paint; Apply ends the painting. Chroma key drops one colour instead; similarity is how far from the colour still counts, softness feathers the edge.": "Auto removal keeps what the model finds and drops the rest: a person, or the one thing the picture is of. Custom removal starts from the same mask and takes corrections painted on the monitor: the smart brush keeps the whole thing it touches and the smart eraser removes it, the plain ones do exactly what you paint; Apply ends the painting. Chroma key drops one colour instead; similarity is how far from the colour still counts, softness feathers the edge.",
"Balanced": "Balanced",
- "Barely there: neutral balance, a little contrast, colour left honest. What a talking head wants.": "Barely there: neutral balance, a little contrast, colour left honest. What a talking head wants.",
+ "Barely there: neutral, a gentle curve, a touch more colour, and the reds calmed so a face reads even. What a talking head wants.": "Barely there: neutral, a gentle curve, a touch more colour, and the reds calmed so a face reads even. What a talking head wants.",
"Basic": "Basic",
"Bass": "Bass",
"Big square pixels.": "Big square pixels.",
"Bits": "Bits",
"Black & White": "Black & White",
- "Black and white through a coloured filter: red darkens skies and lightens skin, green does the reverse.": "Black and white through a coloured filter: red darkens skies and lightens skin, green does the reverse.",
+ "Black and white through a coloured filter: red darkens skies and lightens skin, green does the reverse. A little grain if you want it.": "Black and white through a coloured filter: red darkens skies and lightens skin, green does the reverse. A little grain if you want it.",
"Blacks": "Blacks",
+ "Blacks crushed by a film toe, colour drained, bronze through the middle, cool in the shadows, the corners closing in.": "Blacks crushed by a film toe, colour drained, bronze through the middle, cool in the shadows, the corners closing in.",
"Bleed": "Bleed",
"Blend": "Blend",
"Blue": "Blue",
- "Blue in the shadows and midtones, the highlights left neutral, contrast up. Cities at dusk.": "Blue in the shadows and midtones, the highlights left neutral, contrast up. Cities at dusk.",
+ "Blue in the shadows and midtones, highlights and skin left neutral, contrast up. Cities at dusk.": "Blue in the shadows and midtones, highlights and skin left neutral, contrast up. Cities at dusk.",
"Blue Screen": "Blue Screen",
- "Blues deeper and richer, greens cooled, everything else left alone. Travel footage.": "Blues deeper and richer, greens cooled, everything else left alone. Travel footage.",
"Blur": "Blur",
"Blush": "Blush",
"Body": "Body",
@@ -71,7 +73,8 @@
"Bounce": "Bounce",
"Box Blur": "Box Blur",
"Bright": "Bright",
- "Brighter and richer, with a breath of mint in the highlights: daylight footage made to pop.": "Brighter and richer, with a breath of mint in the highlights: daylight footage made to pop.",
+ "Bright and matte: whites soft and cool, blacks lifted well off the floor, colour quiet. The clean minimal look of a white room.": "Bright and matte: whites soft and cool, blacks lifted well off the floor, colour quiet. The clean minimal look of a white room.",
+ "Brighten": "Brighten",
"Brightness": "Brightness",
"Brings the clip to a broadcast level without riding the fader.": "Brings the clip to a broadcast level without riding the fader.",
"Brings the whole clip to one loudness, the way broadcast and the platforms expect.": "Brings the whole clip to one loudness, the way broadcast and the platforms expect.",
@@ -111,8 +114,9 @@
"Cloudless Sky": "Cloudless Sky",
"Color": "Color",
"Colour": "Colour",
- "Colour bleeding sideways, scan lines, softness, tape noise and too much saturation.": "Colour bleeding sideways, scan lines, softness, tape noise and too much saturation.",
+ "Colour bleeding sideways, scan lines, softness, tape noise and too much saturation, with the slight vertical smear of a worn head.": "Colour bleeding sideways, scan lines, softness, tape noise and too much saturation, with the slight vertical smear of a worn head.",
"Colour filter": "Colour filter",
+ "Colour that sings and contrast that bites, with a little edge: the look that reads as a better camera. Skin is held back from the boost.": "Colour that sings and contrast that bites, with a little edge: the look that reads as a better camera. Skin is held back from the boost.",
"Combo": "Combo",
"Concat {0}": "Concat {0}",
"Content": "Content",
@@ -120,9 +124,9 @@
"Contents": "Contents",
"Contrast": "Contrast",
"Contrast Pop": "Contrast Pop",
- "Contrast that bites and colour that sings, sharpened a touch: the look that reads as a better camera.": "Contrast that bites and colour that sings, sharpened a touch: the look that reads as a better camera.",
"Cool": "Cool",
"Cool Blue": "Cool Blue",
+ "Cool, hazy and drained, with the wet reflections lifted and blooming. Street-level walks at the end of the day.": "Cool, hazy and drained, with the wet reflections lifted and blooming. Street-level walks at the end of the day.",
"Copied": "Copied",
"Copy": "Copy",
"Copy system information": "Copy system information",
@@ -133,7 +137,6 @@
"Creating…": "Creating…",
"Crisper edges.": "Crisper edges.",
"Crop": "Crop",
- "Crushed shadows, bronze midtones, colour pulled back, the corners closing in.": "Crushed shadows, bronze midtones, colour pulled back, the corners closing in.",
"Curve": "Curve",
"Custom": "Custom",
"Custom removal": "Custom removal",
@@ -142,8 +145,11 @@
"Dark": "Dark",
"Darken": "Darken",
"Darkened corners that draw the eye to the middle.": "Darkened corners that draw the eye to the middle.",
+ "Daydream": "Daydream",
+ "Daylight footage made to pop: midtones lifted, colour brought up where it is muted, a breath of mint in the brightest whites, skin left alone.": "Daylight footage made to pop: midtones lifted, colour brought up where it is muted, a breath of mint in the brightest whites, skin left alone.",
"Decay": "Decay",
"Deep": "Deep",
+ "Deep blacks, a cool cast over everything but the lamps, colour low, a little grain. Late-night desk and monologue footage.": "Deep blacks, a cool cast over everything but the lamps, colour low, a little grain. Late-night desk and monologue footage.",
"Deeper shadows, brighter highlights.": "Deeper shadows, brighter highlights.",
"Default title": "Default title",
"Delay": "Delay",
@@ -155,6 +161,7 @@
"Destination": "Destination",
"Detach audio": "Detach audio",
"DETAILS": "DETAILS",
+ "Digicam": "Digicam",
"Distort": "Distort",
"Distorted": "Distorted",
"Download": "Download",
@@ -162,7 +169,7 @@
"Download a transcriber model in Settings › Transcriber first.": "Download a transcriber model in Settings › Transcriber first.",
"Download a voice model in Settings › Speech first": "Download a voice model in Settings › Speech first",
"Download a voice model in Settings › Speech first.": "Download a voice model in Settings › Speech first.",
- "Drained colour, a green-cyan cast, crushed blacks and a heavy vignette. For the season.": "Drained colour, a green-cyan cast, crushed blacks and a heavy vignette. For the season.",
+ "Drained colour, a green-cyan cast, a hard toe, and a heavy vignette. For the season.": "Drained colour, a green-cyan cast, a hard toe, and a heavy vignette. For the season.",
"Dread": "Dread",
"Drift": "Drift",
"Drive": "Drive",
@@ -184,6 +191,7 @@
"Enhance Voice": "Enhance Voice",
"Enhance voice": "Enhance voice",
"Eraser": "Eraser",
+ "Even": "Even",
"Every colour becomes its opposite.": "Every colour becomes its opposite.",
"Everyday": "Everyday",
"Everything on this machine. Transcription and speech run against models you download here, and nothing about a project leaves the device.": "Everything on this machine. Transcription and speech run against models you download here, and nothing about a project leaves the device.",
@@ -197,11 +205,12 @@
"Export…": "Export…",
"Exposure": "Exposure",
"Exposure is in stops; the rest is a signed percent of the picture as shot, and zero everywhere is the picture as shot. Double-click a label to put it back; the diamond keys the knob at the playhead.": "Exposure is in stops; the rest is a signed percent of the picture as shot, and zero everywhere is the picture as shot. Double-click a label to put it back; the diamond keys the knob at the playhead.",
+ "Faces brightened and evened: skin lifted, reds calmed, the balance neutral, the rest of the frame left where it was.": "Faces brightened and evened: skin lifted, reds calmed, the balance neutral, the rest of the frame left where it was.",
"Fade": "Fade",
"Fade in": "Fade in",
"Fade out": "Fade out",
- "Faded blacks, muted colour, a drift toward yellow-green, a soft vignette: a seventies print.": "Faded blacks, muted colour, a drift toward yellow-green, a soft vignette: a seventies print.",
"Fades": "Fades",
+ "Fair": "Fair",
"Falling Dust": "Falling Dust",
"Faster": "Faster",
"Favourites": "Favourites",
@@ -218,6 +227,7 @@
"Finalising file": "Finalising file",
"Finding the subject… {0}%": "Finding the subject… {0}%",
"Fisheye": "Fisheye",
+ "Flash": "Flash",
"Flash In": "Flash In",
"Flash Out": "Flash Out",
"Flat bands of colour with inked edges, like a printed comic.": "Flat bands of colour with inked edges, like a printed comic.",
@@ -276,6 +286,7 @@
"Invert": "Invert",
"Italian": "Italian",
"Italic": "Italic",
+ "Ivory": "Ivory",
"Japanese": "Japanese",
"Jump Cut": "Jump Cut",
"just now": "just now",
@@ -284,9 +295,10 @@
"Keeps the picture left of a soft vertical edge and lets the rest through.": "Keeps the picture left of a soft vertical edge and lets the rest through.",
"Keys the blue out, leaving the picture over whatever is beneath.": "Keys the blue out, leaving the picture over whatever is beneath.",
"Keys the green out, leaving the picture over whatever is beneath.": "Keys the green out, leaving the picture over whatever is beneath.",
+ "Lagoon": "Lagoon",
"Language": "Language",
"Large": "Large",
- "Late-afternoon light: warm balance, orange in the highlights, a whisper of magenta in the shadows, blacks lifted.": "Late-afternoon light: warm balance, orange in the highlights, a whisper of magenta in the shadows, blacks lifted.",
+ "Late light: a warm balance that keeps its brightness, orange in the highlights, a whisper of magenta in the shadows, blacks lifted a touch.": "Late light: a warm balance that keeps its brightness, orange in the highlights, a whisper of magenta in the shadows, blacks lifted a touch.",
"Layer": "Layer",
"Layout": "Layout",
"Left": "Left",
@@ -295,12 +307,12 @@
"Levels": "Levels",
"Library": "Library",
"Lift": "Lift",
- "Lifted blacks, low contrast, cream in the highlights: airy and flattering.": "Lifted blacks, low contrast, cream in the highlights: airy and flattering.",
"Lifts speech out of the mix: a little presence, a little control.": "Lifts speech out of the mix: a little presence, a little control.",
"Light": "Light",
"Light leak": "Light leak",
"Lighten": "Lighten",
"Lightness": "Lightness",
+ "Lights": "Lights",
"Line height": "Line height",
"Lines": "Lines",
"Lo-fi": "Lo-fi",
@@ -309,19 +321,25 @@
"Lock track": "Lock track",
"Lock {0}": "Lock {0}",
"Low contrast, pink and lavender in the light, and a soft bloom over it all. The dreamy one.": "Low contrast, pink and lavender in the light, and a soft bloom over it all. The dreamy one.",
- "Low light opened up: shadows lifted, the darks softened so the noise does not come up with them, the blue kept.": "Low light opened up: shadows lifted, the darks softened so the noise does not come up with them, the blue kept.",
+ "Low light opened up: shadows lifted with the noise softened before it rises, whites held, the blue of the night kept.": "Low light opened up: shadows lifted with the noise softened before it rises, whites held, the blue of the night kept.",
"Lower and fuller.": "Lower and fuller.",
"Lower third": "Lower third",
"LUT": "LUT",
- "Magenta in the shadows, cyan in the highlights, hard contrast and colour turned up. Night streets and signage.": "Magenta in the shadows, cyan in the highlights, hard contrast and colour turned up. Night streets and signage.",
+ "Magenta in the shadows, cyan in the highlights, hard contrast, colour turned up, and the lights themselves blooming. Night streets and signage.": "Magenta in the shadows, cyan in the highlights, hard contrast, colour turned up, and the lights themselves blooming. Night streets and signage.",
"male": "male",
+ "Marquee": "Marquee",
"Mask": "Mask",
"Mask: Circle": "Mask: Circle",
"Mask: Linear": "Mask: Linear",
"Mask: Rectangle": "Mask: Rectangle",
"Master": "Master",
+ "Matcha": "Matcha",
+ "Matte": "Matte",
"Media": "Media",
"Medium": "Medium",
+ "Midnight": "Midnight",
+ "Milk": "Milk",
+ "Milk's warm twin: the same soft matte with cream in the whites and a little gold in the middle. Interiors and morning light.": "Milk's warm twin: the same soft matte with cream in the whites and a little gold in the middle. Interiors and morning light.",
"Minimal": "Minimal",
"Mirror": "Mirror",
"Mixing audio": "Mixing audio",
@@ -342,6 +360,7 @@
"Multiply": "Multiply",
"Mute": "Mute",
"Mute {0}": "Mute {0}",
+ "Muted and green-teal through the midtones, a gentle film curve, warmth only where a face is. The quiet grade of an indie film.": "Muted and green-teal through the midtones, a gentle film curve, warmth only where a face is. The quiet grade of an indie film.",
"My templates": "My templates",
"Name": "Name",
"Natural": "Natural",
@@ -349,6 +368,7 @@
"New project": "New project",
"Next frame": "Next frame",
"Night": "Night",
+ "Night city: the lights and signs made vivid and blooming, blacks kept deep and cool, faces left clean. Made for the strip.": "Night city: the lights and signs made vivid and blooming, blacks kept deep and cool, faces left clean. Made for the strip.",
"No effect on this clip yet. Pick one from the Library's Effects page.": "No effect on this clip yet. Pick one from the Library's Effects page.",
"No templates yet. Mark media as slots, then save this project as a template.": "No templates yet. Mark media as slots, then save this project as a template.",
"No voice to read with": "No voice to read with",
@@ -384,6 +404,7 @@
"Pace": "Pace",
"Paste": "Paste",
"Pause": "Pause",
+ "Peach": "Peach",
"Person": "Person",
"Pick an effect or filter from the library": "Pick an effect or filter from the library",
"Pink Fuzz": "Pink Fuzz",
@@ -393,7 +414,9 @@
"Plate": "Plate",
"Plate colour": "Plate colour",
"Play": "Play",
+ "Polaroid": "Polaroid",
"Pop": "Pop",
+ "Portrait": "Portrait",
"Portuguese": "Portuguese",
"Position": "Position",
"Position X": "Position X",
@@ -416,6 +439,7 @@
"Quarter": "Quarter",
"Radio": "Radio",
"Radius": "Radius",
+ "Rain": "Rain",
"Ramp in": "Ramp in",
"Ramp out": "Ramp out",
"Ramps": "Ramps",
@@ -447,6 +471,7 @@
"Rotation": "Rotation",
"Row height for {0}": "Row height for {0}",
"Runs locally": "Runs locally",
+ "Sage": "Sage",
"Saturation": "Saturation",
"Save": "Save",
"Save as template…": "Save as template…",
@@ -469,7 +494,7 @@
"SemiBold": "SemiBold",
"Semitones": "Semitones",
"Sepia": "Sepia",
- "Sepia that keeps its contrast, so it reads as old film rather than a brown wash.": "Sepia that keeps its contrast, so it reads as old film rather than a brown wash.",
+ "Sepia that keeps its contrast and its highlights, so it reads as old film rather than a brown wash.": "Sepia that keeps its contrast and its highlights, so it reads as old film rather than a brown wash.",
"Settings": "Settings",
"Settings…": "Settings…",
"Shadows": "Shadows",
@@ -485,6 +510,8 @@
"Silent": "Silent",
"Similarity": "Similarity",
"Size": "Size",
+ "Skies deeper and bluer, foliage cooler and calmer, the rest of the picture and every face untouched. Travel footage.": "Skies deeper and bluer, foliage cooler and calmer, the rest of the picture and every face untouched. Travel footage.",
+ "Skin warmed toward peach and softened, shadows lifted so lines ease, contrast low. Portraits and talking heads; it is meant to run at half strength.": "Skin warmed toward peach and softened, shadows lifted so lines ease, contrast low. Portraits and talking heads; it is meant to run at half strength.",
"Sky": "Sky",
"Slide Down": "Slide Down",
"Slide Left": "Slide Left",
@@ -496,7 +523,10 @@
"Smart brush: {0}": "Smart brush: {0}",
"Smart eraser": "Smart eraser",
"Snap to edges": "Snap to edges",
+ "Soft cinema: blacks lifted, the light blooming warm, shadows a touch cool, skin kept. The look of a story told in a window seat.": "Soft cinema: blacks lifted, the light blooming warm, shadows a touch cool, skin kept. The look of a story told in a window seat.",
+ "Soft green through the midtones and whites, colour muted, a light matte. The trend look, gentle enough for a face.": "Soft green through the midtones and whites, colour muted, a light matte. The trend look, gentle enough for a face.",
"Soft Light": "Soft Light",
+ "Soften": "Soften",
"Softness": "Softness",
"Soon": "Soon",
"Sound": "Sound",
@@ -522,17 +552,20 @@
"Takes the room's hiss and hum out from under the voice.": "Takes the room's hiss and hum out from under the voice.",
"Target": "Target",
"Teal & Orange": "Teal & Orange",
- "Teal in the shadows, orange in the highlights, skin left as skin: the blockbuster grade.": "Teal in the shadows, orange in the highlights, skin left as skin: the blockbuster grade.",
+ "Teal in the shadows, orange in the highlights, skin held as skin, a film curve over it. The blockbuster grade, and the most requested look there is.": "Teal in the shadows, orange in the highlights, skin held as skin, a film curve over it. The blockbuster grade, and the most requested look there is.",
"Telephone": "Telephone",
"Temperature": "Temperature",
"Templates": "Templates",
"Text": "Text",
"Text to speech": "Text to speech",
"Text to speech…": "Text to speech…",
+ "The 2000s point-and-shoot: hard flash, whites blown, colour up, a cool cyan cast, over-sharpened with the sensor's noise.": "The 2000s point-and-shoot: hard flash, whites blown, colour up, a cool cyan cast, over-sharpened with the sensor's noise.",
"The bulge of a very wide lens.": "The bulge of a very wide lens.",
+ "The café look: warm brown through the middle, greens muted to olive, contrast eased. Cosy, and kind to wood and skin alike.": "The café look: warm brown through the middle, greens muted to olive, contrast eased. Cosy, and kind to wood and skin alike.",
"The chain runs top to bottom — reorder it with the chevrons. The eye bypasses one link without losing the values you dialled into it.": "The chain runs top to bottom — reorder it with the chevrons. The eye bypasses one link without losing the values you dialled into it.",
"The clip is no longer on the timeline": "The clip is no longer on the timeline",
"The early reflections of a room.": "The early reflections of a room.",
+ "The instant print: a cream matte, warm highlights, cyan creeping into the shadows, a little softness in the corners.": "The instant print: a cream matte, warm highlights, cyan creeping into the shadows, a little softness in the corners.",
"The left half, reflected onto the right.": "The left half, reflected onto the right.",
"The manual colour panel every picture clip carries: exposure, tone, balance, sharpness and edge.": "The manual colour panel every picture clip carries: exposure, tone, balance, sharpness and edge.",
"The narrow band of a phone line.": "The narrow band of a phone line.",
@@ -561,6 +594,7 @@
"Treatments": "Treatments",
"Treble": "Treble",
"Type the narration to read aloud…": "Type the narration to read aloud…",
+ "Umber": "Umber",
"Undo": "Undo",
"Unlock {0}": "Unlock {0}",
"Unmute {0}": "Unmute {0}",
@@ -582,6 +616,8 @@
"Volume": "Volume",
"Warm": "Warm",
"Warmth": "Warmth",
+ "Water": "Water",
+ "Water and sky turned aquamarine and brightened, sand and skin left warm and clean. The beach-day look creators reach for first.": "Water and sky turned aquamarine and brightened, sand and skin left warm and clean. The beach-day look creators reach for first.",
"Where should the project folder go?": "Where should the project folder go?",
"Whites": "Whites",
"Width": "Width",
diff --git a/engine/crates/concat/ui/assets/effect-previews/bronze.jpg b/engine/crates/concat/ui/assets/effect-previews/bronze.jpg
index b562cb41..117922b1 100644
Binary files a/engine/crates/concat/ui/assets/effect-previews/bronze.jpg and b/engine/crates/concat/ui/assets/effect-previews/bronze.jpg differ
diff --git a/engine/crates/concat/ui/assets/effect-previews/clean.jpg b/engine/crates/concat/ui/assets/effect-previews/clean.jpg
index 9f8c95ae..37c771c4 100644
Binary files a/engine/crates/concat/ui/assets/effect-previews/clean.jpg and b/engine/crates/concat/ui/assets/effect-previews/clean.jpg differ
diff --git a/engine/crates/concat/ui/assets/effect-previews/cloudless-sky.jpg b/engine/crates/concat/ui/assets/effect-previews/cloudless-sky.jpg
index bbe61a99..f3e100d5 100644
Binary files a/engine/crates/concat/ui/assets/effect-previews/cloudless-sky.jpg and b/engine/crates/concat/ui/assets/effect-previews/cloudless-sky.jpg differ
diff --git a/engine/crates/concat/ui/assets/effect-previews/contrast-pop.jpg b/engine/crates/concat/ui/assets/effect-previews/contrast-pop.jpg
index ab8093b6..c5d46098 100644
Binary files a/engine/crates/concat/ui/assets/effect-previews/contrast-pop.jpg and b/engine/crates/concat/ui/assets/effect-previews/contrast-pop.jpg differ
diff --git a/engine/crates/concat/ui/assets/effect-previews/cool-blue.jpg b/engine/crates/concat/ui/assets/effect-previews/cool-blue.jpg
index 4fbe8591..60e70837 100644
Binary files a/engine/crates/concat/ui/assets/effect-previews/cool-blue.jpg and b/engine/crates/concat/ui/assets/effect-previews/cool-blue.jpg differ
diff --git a/engine/crates/concat/ui/assets/effect-previews/cool.jpg b/engine/crates/concat/ui/assets/effect-previews/cool.jpg
index 8955fddf..cf780417 100644
Binary files a/engine/crates/concat/ui/assets/effect-previews/cool.jpg and b/engine/crates/concat/ui/assets/effect-previews/cool.jpg differ
diff --git a/engine/crates/concat/ui/assets/effect-previews/daydream.jpg b/engine/crates/concat/ui/assets/effect-previews/daydream.jpg
new file mode 100644
index 00000000..16ab04c9
Binary files /dev/null and b/engine/crates/concat/ui/assets/effect-previews/daydream.jpg differ
diff --git a/engine/crates/concat/ui/assets/effect-previews/digicam.jpg b/engine/crates/concat/ui/assets/effect-previews/digicam.jpg
new file mode 100644
index 00000000..96b59b16
Binary files /dev/null and b/engine/crates/concat/ui/assets/effect-previews/digicam.jpg differ
diff --git a/engine/crates/concat/ui/assets/effect-previews/fair.jpg b/engine/crates/concat/ui/assets/effect-previews/fair.jpg
new file mode 100644
index 00000000..df5ec1e5
Binary files /dev/null and b/engine/crates/concat/ui/assets/effect-previews/fair.jpg differ
diff --git a/engine/crates/concat/ui/assets/effect-previews/film.jpg b/engine/crates/concat/ui/assets/effect-previews/film.jpg
index df86712e..0e1b4360 100644
Binary files a/engine/crates/concat/ui/assets/effect-previews/film.jpg and b/engine/crates/concat/ui/assets/effect-previews/film.jpg differ
diff --git a/engine/crates/concat/ui/assets/effect-previews/fresh.jpg b/engine/crates/concat/ui/assets/effect-previews/fresh.jpg
index 72562de6..57249abd 100644
Binary files a/engine/crates/concat/ui/assets/effect-previews/fresh.jpg and b/engine/crates/concat/ui/assets/effect-previews/fresh.jpg differ
diff --git a/engine/crates/concat/ui/assets/effect-previews/golden-hour.jpg b/engine/crates/concat/ui/assets/effect-previews/golden-hour.jpg
index 2c632d6e..90852126 100644
Binary files a/engine/crates/concat/ui/assets/effect-previews/golden-hour.jpg and b/engine/crates/concat/ui/assets/effect-previews/golden-hour.jpg differ
diff --git a/engine/crates/concat/ui/assets/effect-previews/ivory.jpg b/engine/crates/concat/ui/assets/effect-previews/ivory.jpg
new file mode 100644
index 00000000..3da55b6e
Binary files /dev/null and b/engine/crates/concat/ui/assets/effect-previews/ivory.jpg differ
diff --git a/engine/crates/concat/ui/assets/effect-previews/lagoon.jpg b/engine/crates/concat/ui/assets/effect-previews/lagoon.jpg
new file mode 100644
index 00000000..cd0d4f02
Binary files /dev/null and b/engine/crates/concat/ui/assets/effect-previews/lagoon.jpg differ
diff --git a/engine/crates/concat/ui/assets/effect-previews/marquee.jpg b/engine/crates/concat/ui/assets/effect-previews/marquee.jpg
new file mode 100644
index 00000000..68fcbb4e
Binary files /dev/null and b/engine/crates/concat/ui/assets/effect-previews/marquee.jpg differ
diff --git a/engine/crates/concat/ui/assets/effect-previews/matcha.jpg b/engine/crates/concat/ui/assets/effect-previews/matcha.jpg
new file mode 100644
index 00000000..8f033ce3
Binary files /dev/null and b/engine/crates/concat/ui/assets/effect-previews/matcha.jpg differ
diff --git a/engine/crates/concat/ui/assets/effect-previews/midnight.jpg b/engine/crates/concat/ui/assets/effect-previews/midnight.jpg
new file mode 100644
index 00000000..c91a7e5b
Binary files /dev/null and b/engine/crates/concat/ui/assets/effect-previews/midnight.jpg differ
diff --git a/engine/crates/concat/ui/assets/effect-previews/milk.jpg b/engine/crates/concat/ui/assets/effect-previews/milk.jpg
new file mode 100644
index 00000000..b1dc85a8
Binary files /dev/null and b/engine/crates/concat/ui/assets/effect-previews/milk.jpg differ
diff --git a/engine/crates/concat/ui/assets/effect-previews/moody.jpg b/engine/crates/concat/ui/assets/effect-previews/moody.jpg
index 2f26a5ac..087dbbe4 100644
Binary files a/engine/crates/concat/ui/assets/effect-previews/moody.jpg and b/engine/crates/concat/ui/assets/effect-previews/moody.jpg differ
diff --git a/engine/crates/concat/ui/assets/effect-previews/neon.jpg b/engine/crates/concat/ui/assets/effect-previews/neon.jpg
index fd784332..f0668677 100644
Binary files a/engine/crates/concat/ui/assets/effect-previews/neon.jpg and b/engine/crates/concat/ui/assets/effect-previews/neon.jpg differ
diff --git a/engine/crates/concat/ui/assets/effect-previews/night.jpg b/engine/crates/concat/ui/assets/effect-previews/night.jpg
index cef197af..7a7c66ca 100644
Binary files a/engine/crates/concat/ui/assets/effect-previews/night.jpg and b/engine/crates/concat/ui/assets/effect-previews/night.jpg differ
diff --git a/engine/crates/concat/ui/assets/effect-previews/peach.jpg b/engine/crates/concat/ui/assets/effect-previews/peach.jpg
new file mode 100644
index 00000000..8eafbf89
Binary files /dev/null and b/engine/crates/concat/ui/assets/effect-previews/peach.jpg differ
diff --git a/engine/crates/concat/ui/assets/effect-previews/polaroid.jpg b/engine/crates/concat/ui/assets/effect-previews/polaroid.jpg
new file mode 100644
index 00000000..8a9f323b
Binary files /dev/null and b/engine/crates/concat/ui/assets/effect-previews/polaroid.jpg differ
diff --git a/engine/crates/concat/ui/assets/effect-previews/rain.jpg b/engine/crates/concat/ui/assets/effect-previews/rain.jpg
new file mode 100644
index 00000000..c7d3b03c
Binary files /dev/null and b/engine/crates/concat/ui/assets/effect-previews/rain.jpg differ
diff --git a/engine/crates/concat/ui/assets/effect-previews/sage.jpg b/engine/crates/concat/ui/assets/effect-previews/sage.jpg
new file mode 100644
index 00000000..edd4b86d
Binary files /dev/null and b/engine/crates/concat/ui/assets/effect-previews/sage.jpg differ
diff --git a/engine/crates/concat/ui/assets/effect-previews/soft-light.jpg b/engine/crates/concat/ui/assets/effect-previews/soft-light.jpg
index 736d69a6..9bfb8b72 100644
Binary files a/engine/crates/concat/ui/assets/effect-previews/soft-light.jpg and b/engine/crates/concat/ui/assets/effect-previews/soft-light.jpg differ
diff --git a/engine/crates/concat/ui/assets/effect-previews/spooky.jpg b/engine/crates/concat/ui/assets/effect-previews/spooky.jpg
index fbd09430..b2671fe1 100644
Binary files a/engine/crates/concat/ui/assets/effect-previews/spooky.jpg and b/engine/crates/concat/ui/assets/effect-previews/spooky.jpg differ
diff --git a/engine/crates/concat/ui/assets/effect-previews/teal-orange.jpg b/engine/crates/concat/ui/assets/effect-previews/teal-orange.jpg
index 5b2dd644..4ff5cf77 100644
Binary files a/engine/crates/concat/ui/assets/effect-previews/teal-orange.jpg and b/engine/crates/concat/ui/assets/effect-previews/teal-orange.jpg differ
diff --git a/engine/crates/concat/ui/assets/effect-previews/umber.jpg b/engine/crates/concat/ui/assets/effect-previews/umber.jpg
new file mode 100644
index 00000000..681011a8
Binary files /dev/null and b/engine/crates/concat/ui/assets/effect-previews/umber.jpg differ
diff --git a/engine/crates/concat/ui/assets/effect-previews/vibrance.jpg b/engine/crates/concat/ui/assets/effect-previews/vibrance.jpg
index d3baf791..21ab1a06 100644
Binary files a/engine/crates/concat/ui/assets/effect-previews/vibrance.jpg and b/engine/crates/concat/ui/assets/effect-previews/vibrance.jpg differ
diff --git a/engine/crates/concat/ui/assets/effect-previews/vintage.jpg b/engine/crates/concat/ui/assets/effect-previews/vintage.jpg
index c27bb292..f333762a 100644
Binary files a/engine/crates/concat/ui/assets/effect-previews/vintage.jpg and b/engine/crates/concat/ui/assets/effect-previews/vintage.jpg differ
diff --git a/engine/crates/concat/ui/assets/effect-previews/vivid.jpg b/engine/crates/concat/ui/assets/effect-previews/vivid.jpg
index 2556708d..f84a3900 100644
Binary files a/engine/crates/concat/ui/assets/effect-previews/vivid.jpg and b/engine/crates/concat/ui/assets/effect-previews/vivid.jpg differ
diff --git a/engine/crates/concat/ui/assets/effect-previews/warm.jpg b/engine/crates/concat/ui/assets/effect-previews/warm.jpg
index 957990ac..5735597f 100644
Binary files a/engine/crates/concat/ui/assets/effect-previews/warm.jpg and b/engine/crates/concat/ui/assets/effect-previews/warm.jpg differ
diff --git a/engine/crates/concat/ui/workspace/media-pane.slint b/engine/crates/concat/ui/workspace/media-pane.slint
index 1bf2768a..c8fdc880 100644
--- a/engine/crates/concat/ui/workspace/media-pane.slint
+++ b/engine/crates/concat/ui/workspace/media-pane.slint
@@ -1360,6 +1360,20 @@ export component MediaPane inherits Rectangle {
if (id == "concat.pink-fuzz") { return @image-url("../assets/effect-previews/pink-fuzz.jpg"); }
if (id == "concat.retro-cartoon") { return @image-url("../assets/effect-previews/retro-cartoon.jpg"); }
if (id == "concat.falling-dust") { return @image-url("../assets/effect-previews/falling-dust.jpg"); }
+ if (id == "concat.lagoon") { return @image-url("../assets/effect-previews/lagoon.jpg"); }
+ if (id == "concat.milk") { return @image-url("../assets/effect-previews/milk.jpg"); }
+ if (id == "concat.ivory") { return @image-url("../assets/effect-previews/ivory.jpg"); }
+ if (id == "concat.umber") { return @image-url("../assets/effect-previews/umber.jpg"); }
+ if (id == "concat.peach") { return @image-url("../assets/effect-previews/peach.jpg"); }
+ if (id == "concat.fair") { return @image-url("../assets/effect-previews/fair.jpg"); }
+ if (id == "concat.daydream") { return @image-url("../assets/effect-previews/daydream.jpg"); }
+ if (id == "concat.sage") { return @image-url("../assets/effect-previews/sage.jpg"); }
+ if (id == "concat.midnight") { return @image-url("../assets/effect-previews/midnight.jpg"); }
+ if (id == "concat.rain") { return @image-url("../assets/effect-previews/rain.jpg"); }
+ if (id == "concat.polaroid") { return @image-url("../assets/effect-previews/polaroid.jpg"); }
+ if (id == "concat.digicam") { return @image-url("../assets/effect-previews/digicam.jpg"); }
+ if (id == "concat.marquee") { return @image-url("../assets/effect-previews/marquee.jpg"); }
+ if (id == "concat.matcha") { return @image-url("../assets/effect-previews/matcha.jpg"); }
return root.no-art;
}
/// The category column. In-out, because it is dragged.