Skip to content

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

feat(effects): every effect card drawn by the package's own shader on the GPU

Jareer51265283e6f1
diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md
index 97c1efc7..8464e5fe 100644
--- a/THIRD_PARTY_NOTICES.md
+++ b/THIRD_PARTY_NOTICES.md
@@ -169,9 +169,9 @@ of it.
## Effect preview photograph
-The effect catalogue thumbnails are rendered from a photograph by
-Vitaly Gariev on Unsplash (https://unsplash.com/@silverkblack), used
-under the Unsplash License. The source still lives at
-`assets/effect-preview-source.jpg`; the tiles are each effect's real FFmpeg
-chain (`concat-export`'s `chains.rs`) run over it, and are embedded from
-`src/crates/concat/ui/assets/effect-previews/`.
+The effect catalogue cards are drawn from a photograph by Vitaly Gariev on
+Unsplash (https://unsplash.com/@silverkblack), used under the Unsplash
+License. The still lives at `src/crates/concat-host/assets/card-still.jpg`
+and is embedded in the app; each card is the effect's own shader run over
+it on the GPU when the app first needs the card (`concat-host`'s
+`cards.rs`).
diff --git a/src/Cargo.lock b/src/Cargo.lock
index 3b3ac788..7bfc039b 100644
--- a/src/Cargo.lock
+++ b/src/Cargo.lock
@@ -1145,7 +1145,6 @@ dependencies = [
"image",
"log",
"opener",
- "png 0.17.16",
"pollster",
"rfd",
"serde",
@@ -1192,8 +1191,8 @@ dependencies = [
"concat-api",
"concat-core",
"concat-effects",
+ "concat-host",
"concat-media",
- "concat-project",
"concat-render",
"concat-server",
"serde_json",
@@ -1233,6 +1232,7 @@ name = "concat-host"
version = "0.2.4"
dependencies = [
"concat-core",
+ "concat-effects",
"concat-export",
"concat-media",
"concat-project",
diff --git a/src/crates/concat-cli/Cargo.toml b/src/crates/concat-cli/Cargo.toml
index 8e07b729..6990243e 100644
--- a/src/crates/concat-cli/Cargo.toml
+++ b/src/crates/concat-cli/Cargo.toml
@@ -20,10 +20,10 @@ concat-render.workspace = true
concat-api.workspace = true
concat-server.workspace = true
serde_json.workspace = true
-# `preview` renders one effect at its defaults: the catalogue for the
-# chain, the document model for the applied entry it takes.
+# `preview` draws one effect's card, as the window does; `check` loads
+# packages and runs their probes.
concat-effects.workspace = true
-concat-project.workspace = true
+concat-host.workspace = true
clap.workspace = true
[features]
diff --git a/src/crates/concat-cli/src/main.rs b/src/crates/concat-cli/src/main.rs
index c0ce6923..933b327c 100644
--- a/src/crates/concat-cli/src/main.rs
+++ b/src/crates/concat-cli/src/main.rs
@@ -9,8 +9,8 @@
//! first transport: JSON-RPC requests in, responses and events out, one per
//! line, so a script in any language edits and exports a project; `serve`
//! is the same API on a socket, for callers that are other processes.
-//! `preview` is how the window's effect cards get their pictures: one still
-//! through one package at its defaults. `check` is what an author runs on
+//! `preview` draws one effect's card the way the window draws the
+//! catalogue's: a still through the package's own shader on the GPU. `check` is what an author runs on
//! an effect package before sharing it: the same load the window does, its
//! fixtures, and its probes on the GPU, with every fault named.
@@ -24,9 +24,7 @@ use clap::{Parser, Subcommand};
use concat_api::rpc::{Call, Message};
use concat_core::time::{FrameRate, Rational};
use concat_core::timeline::{Clip, MediaRef, Timeline, Track, TrackKind};
-use concat_media::{
- DecodeOptions, Decoder, EncodeOptions, Encoder, FrameSink, FrameSource, ReaderPool,
-};
+use concat_media::{EncodeOptions, Encoder, FrameSink, ReaderPool};
use concat_render::{Compositor, WgpuCompositor, plan_frame};
#[derive(Parser)]
@@ -92,9 +90,10 @@ enum Command {
roots: Vec<PathBuf>,
},
- /// Run one picture through an effect at its defaults and write the
- /// result as a JPEG - how the effect cards' previews are made:
- /// `concat-cli preview assets/effect-preview-source.jpg out.jpg --effect concat.emboss`.
+ /// Draw one effect's card - a still through the package's own shader
+ /// on the GPU, at its defaults or its manifest's `[card]` settings,
+ /// the way the window draws the catalogue's - and write it as a JPEG:
+ /// `concat-cli preview still.jpg out.jpg --effect concat.emboss`.
Preview {
/// A still, or the first frame of a video.
input: PathBuf,
@@ -103,12 +102,12 @@ enum Command {
/// The package's catalogue id or alias, e.g. `concat.emboss`.
#[arg(long)]
effect: String,
- /// Output width in pixels; the picture is scaled before the effect
+ /// Card width in pixels; the picture is scaled before the effect
/// runs, so pixel-sized effects look as they will on the card.
- #[arg(long, default_value_t = 320)]
+ #[arg(long, default_value_t = concat_host::cards::WIDTH)]
width: u32,
- /// Output height in pixels.
- #[arg(long, default_value_t = 180)]
+ /// Card height in pixels.
+ #[arg(long, default_value_t = concat_host::cards::HEIGHT)]
height: u32,
},
@@ -254,11 +253,11 @@ fn serve(
/// is known to use.
const DEFAULT_JSON: &str = "127.0.0.1:7420";
-/// One frame of `input`, scaled to the card's size, through `effect` at its
-/// defaults, as a JPEG at `output`.
+/// `effect`'s card drawn from `input`, scaled to `width` by `height`, as
+/// a JPEG at `output`.
fn preview(
- input: &PathBuf,
- output: &PathBuf,
+ input: &Path,
+ output: &Path,
effect: &str,
width: u32,
height: u32,
@@ -267,20 +266,13 @@ fn preview(
let package = catalogue
.get(effect)
.ok_or_else(|| format!("no package answers to {effect}"))?;
- let applied = concat_project::model::AppliedFilter::new(package.manifest.effect.id.clone());
- // The CPU chain: what a machine without a GPU renders, and what every
- // package has whether or not it also carries a shader.
- let chain = catalogue.video_chain(&[applied]);
- if chain.is_empty() {
- return Err(format!("{effect} has no FFmpeg chain to preview").into());
- }
- let mut decoder = Decoder::open(input, &DecodeOptions::default().scaled_to(width, height))?;
- let frame = decoder
- .next_frame()?
- .ok_or_else(|| format!("{} holds no picture", input.display()))?;
- let treated = concat_media::treat(&frame, &chain)?;
- std::fs::write(output, concat_media::jpeg(&treated, 3)?)?;
- println!("{effect}: {chain}\n -> {}", output.display());
+ let card = concat_host::cards::Card::of(catalogue, package, Path::new(""))
+ .ok_or_else(|| format!("{effect} draws no picture to make a card of"))?;
+ let compositor =
+ WgpuCompositor::new().ok_or("no GPU or software renderer is available to draw with")?;
+ let mut painter = concat_host::cards::Painter::new(compositor, input, width, height)?;
+ painter.draw_to(&card, output)?;
+ println!("{} -> {}", package.id(), output.display());
Ok(())
}
diff --git a/src/crates/concat-effects/examples/previews.rs b/src/crates/concat-effects/examples/previews.rs
deleted file mode 100644
index cc48adbc..00000000
--- a/src/crates/concat-effects/examples/previews.rs
+++ /dev/null
@@ -1,137 +0,0 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
-// SPDX-FileCopyrightText: 2026 Jareer and Concat contributors
-
-//! Renders every look's preview still: the package's own FFmpeg chain at
-//! its defaults, run over one reference picture, so the card in the Library
-//! shows the real look and not a guess at it.
-//!
-//! ```text
-//! cargo run -p concat-effects --example previews -- <still> <out dir> [id...]
-//! ```
-//!
-//! With no ids, every filter, effect, and transition package is rendered;
-//! the file is named after the id without its namespace, `concat.golden-hour` as `golden-hour.jpg`.
-//! Needs `ffmpeg` on the path.
-
-use std::path::PathBuf;
-use std::process::Command;
-
-use concat_effects::{At, Catalogue, Kind, Package};
-
-fn transition_xfade(package: &Package) -> &str {
- if let Some(xfade) = package.transition_xfade() {
- return xfade;
- }
- let id = package.id();
- let name = id.rsplit('.').next().unwrap_or(id);
- match name {
- "cube" => "slideleft",
- "linear-wipe" => "wipeleft",
- "rgb-split-wipe" => "wipeleft",
- "shape-wipe" => "circleopen",
- "slide" => "slideleft",
- "push" => "slideleft",
- "spin" => "radial",
- "swirl" => "radial",
- "glitch-transition" => "pixelize",
- _ => "fade",
- }
-}
-
-fn main() {
- let mut args = std::env::args().skip(1);
- let (Some(still), Some(out)) = (args.next(), args.next()) else {
- eprintln!("usage: previews <still> <out dir> [id...]");
- std::process::exit(2);
- };
- let only: Vec<String> = args.collect();
- let out = PathBuf::from(out);
- std::fs::create_dir_all(&out).expect("out dir");
-
- let mut failed = 0;
- let kinds = [Kind::Filter, Kind::Effect, Kind::Transition];
- for package in kinds
- .into_iter()
- .flat_map(|k| Catalogue::builtin().of_kind(k))
- {
- let id = package.id();
- if !only.is_empty() && !only.iter().any(|want| want == id) {
- continue;
- }
- let name = id.rsplit('.').next().unwrap_or(id);
- let target = out.join(format!("{name}.jpg"));
-
- let status = if package.kind() == Kind::Transition {
- let xfade = transition_xfade(package);
- let filter = format!(
- "[0:v]hue=h=180[v2];[0:v][v2]xfade=transition={xfade}:duration=1:offset=0[out]"
- );
- Command::new("ffmpeg")
- .args([
- "-y",
- "-loglevel",
- "error",
- "-loop",
- "1",
- "-t",
- "1",
- "-i",
- &still,
- "-filter_complex",
- &filter,
- "-map",
- "[out]",
- "-ss",
- "0.5",
- "-vframes",
- "1",
- "-q:v",
- "3",
- ])
- .arg(&target)
- .status()
- } else {
- let chain = match package.ffmpeg_fragment(&package.params_at(At::Default), 0) {
- Ok(Some(chain)) => chain,
- Ok(None) => {
- eprintln!("{id}: no ffmpeg chain, skipped");
- continue;
- }
- Err(error) => {
- eprintln!("{id}: {error}");
- failed += 1;
- continue;
- }
- };
- Command::new("ffmpeg")
- .args([
- "-y",
- "-loglevel",
- "error",
- "-i",
- &still,
- "-vf",
- &chain,
- "-q:v",
- "3",
- ])
- .arg(&target)
- .status()
- };
-
- match status {
- Ok(status) if status.success() => println!("{id} -> {}", target.display()),
- Ok(status) => {
- eprintln!("{id}: ffmpeg exited with {status}");
- failed += 1;
- }
- Err(error) => {
- eprintln!("{id}: could not run ffmpeg: {error}");
- failed += 1;
- }
- }
- }
- if failed > 0 {
- std::process::exit(1);
- }
-}
diff --git a/src/crates/concat-effects/packages/concat.adjust/effect.toml b/src/crates/concat-effects/packages/concat.adjust/effect.toml
index 904709f8..3b392781 100644
--- a/src/crates/concat-effects/packages/concat.adjust/effect.toml
+++ b/src/crates/concat-effects/packages/concat.adjust/effect.toml
@@ -150,3 +150,7 @@ unit = "%"
[wgsl]
entry = "effect.wgsl"
space = "display"
+
+# At its defaults the panel changes nothing; the card shows it at work.
+[card]
+params = { contrast = 30, saturation = 30 }
diff --git a/src/crates/concat-effects/packages/concat.blue-screen/effect.toml b/src/crates/concat-effects/packages/concat.blue-screen/effect.toml
index de36836d..9c879842 100644
--- a/src/crates/concat-effects/packages/concat.blue-screen/effect.toml
+++ b/src/crates/concat-effects/packages/concat.blue-screen/effect.toml
@@ -30,3 +30,10 @@ chain = "chromakey=color=0x0000FF:similarity={fixed(similarity / 100, 3)}:blend=
[wgsl]
entry = "effect.wgsl"
+
+# The reference picture has no screen; the card stands it before a
+# broadcast one, which the key takes out from a similarity of about 40 -
+# its default, 25, keys only a purer colour.
+[card]
+screen = "#0047bb"
+params = { similarity = 42 }
diff --git a/src/crates/concat-effects/packages/concat.cloudless-sky/effect.toml b/src/crates/concat-effects/packages/concat.cloudless-sky/effect.toml
index 687ad02e..54216144 100644
--- a/src/crates/concat-effects/packages/concat.cloudless-sky/effect.toml
+++ b/src/crates/concat-effects/packages/concat.cloudless-sky/effect.toml
@@ -30,3 +30,8 @@ unit = "%"
[wgsl]
entry = "effect.wgsl"
space = "display"
+
+# The reference picture has no sky; the card pushes both bands so the
+# blue wall and the green jumper show the look.
+[card]
+params = { sky = 100, greens = 100 }
diff --git a/src/crates/concat-effects/packages/concat.dust/effect.toml b/src/crates/concat-effects/packages/concat.dust/effect.toml
index acae7507..2b4bf4c8 100644
--- a/src/crates/concat-effects/packages/concat.dust/effect.toml
+++ b/src/crates/concat-effects/packages/concat.dust/effect.toml
@@ -21,3 +21,7 @@ chain = "noise=alls={round(amount / 100 * 15)}:allf=t+u,eq=contrast={fixed(1 - a
[wgsl]
entry = "effect.wgsl"
+
+# A card is small; it shows the dust at its thickest.
+[card]
+params = { amount = 100 }
diff --git a/src/crates/concat-effects/packages/concat.exposure/effect.toml b/src/crates/concat-effects/packages/concat.exposure/effect.toml
index 0cfea71f..f59f6e9d 100644
--- a/src/crates/concat-effects/packages/concat.exposure/effect.toml
+++ b/src/crates/concat-effects/packages/concat.exposure/effect.toml
@@ -21,3 +21,7 @@ animate = true
[wgsl]
entry = "effect.wgsl"
+
+# At its default the picture is as shot; the card shows a stop up.
+[card]
+params = { stops = 1 }
diff --git a/src/crates/concat-effects/packages/concat.film-burn/effect.toml b/src/crates/concat-effects/packages/concat.film-burn/effect.toml
index 89d9b095..c989bf05 100644
--- a/src/crates/concat-effects/packages/concat.film-burn/effect.toml
+++ b/src/crates/concat-effects/packages/concat.film-burn/effect.toml
@@ -21,3 +21,7 @@ unit = "%"
entry = "effect.wgsl"
xfade = "fadewhite"
fallback = "cross-fade"
+
+# By the usual point of the cut the flash has burned the frame white.
+[card]
+progress = 0.15
diff --git a/src/crates/concat-effects/packages/concat.green-screen/effect.toml b/src/crates/concat-effects/packages/concat.green-screen/effect.toml
index 2e207421..d709b2e8 100644
--- a/src/crates/concat-effects/packages/concat.green-screen/effect.toml
+++ b/src/crates/concat-effects/packages/concat.green-screen/effect.toml
@@ -30,3 +30,10 @@ chain = "chromakey=color=0x00FF00:similarity={fixed(similarity / 100, 3)}:blend=
[wgsl]
entry = "effect.wgsl"
+
+# The reference picture has no screen; the card stands it before a
+# broadcast one, which the key takes out from a similarity of about 40 -
+# its default, 25, keys only a purer colour.
+[card]
+screen = "#00b140"
+params = { similarity = 42 }
diff --git a/src/crates/concat-effects/packages/concat.halation/effect.toml b/src/crates/concat-effects/packages/concat.halation/effect.toml
index 1e3fd484..b594b36f 100644
--- a/src/crates/concat-effects/packages/concat.halation/effect.toml
+++ b/src/crates/concat-effects/packages/concat.halation/effect.toml
@@ -34,3 +34,8 @@ chain = "split[hla{index}][hlb{index}];[hlb{index}]gblur=sigma={r},colorbalance=
[wgsl]
entry = "effect.wgsl"
+
+# The reference picture has few highlights; the card shows the glow at
+# its strongest.
+[card]
+params = { amount = 100 }
diff --git a/src/crates/concat-effects/packages/concat.light-leak-flash/effect.toml b/src/crates/concat-effects/packages/concat.light-leak-flash/effect.toml
index 1db19694..25ffb181 100644
--- a/src/crates/concat-effects/packages/concat.light-leak-flash/effect.toml
+++ b/src/crates/concat-effects/packages/concat.light-leak-flash/effect.toml
@@ -21,3 +21,7 @@ unit = "%"
entry = "effect.wgsl"
xfade = "fadewhite"
fallback = "cross-fade"
+
+# By the usual point of the cut the flash has burned the frame white.
+[card]
+progress = 0.15
diff --git a/src/crates/concat-effects/packages/concat.shape-wipe/effect.toml b/src/crates/concat-effects/packages/concat.shape-wipe/effect.toml
index 8417553f..bf8e0a15 100644
--- a/src/crates/concat-effects/packages/concat.shape-wipe/effect.toml
+++ b/src/crates/concat-effects/packages/concat.shape-wipe/effect.toml
@@ -30,3 +30,7 @@ unit = "%"
[transition]
entry = "effect.wgsl"
fallback = "cross-fade"
+
+# The shape has barely opened at the usual point of the cut.
+[card]
+progress = 0.55
diff --git a/src/crates/concat-effects/packages/concat.snow/effect.toml b/src/crates/concat-effects/packages/concat.snow/effect.toml
index d96885ce..9fea7693 100644
--- a/src/crates/concat-effects/packages/concat.snow/effect.toml
+++ b/src/crates/concat-effects/packages/concat.snow/effect.toml
@@ -29,3 +29,7 @@ chain = "noise=alls={round(density / 100 * 30)}:allf=t,eq=brightness={fixed(dens
[wgsl]
entry = "effect.wgsl"
+
+# A card is small; it shows the snow at its thickest.
+[card]
+params = { density = 100 }
diff --git a/src/crates/concat-effects/packages/concat.sparkle/effect.toml b/src/crates/concat-effects/packages/concat.sparkle/effect.toml
index 2e01d34b..25c9d3dc 100644
--- a/src/crates/concat-effects/packages/concat.sparkle/effect.toml
+++ b/src/crates/concat-effects/packages/concat.sparkle/effect.toml
@@ -33,3 +33,8 @@ chain = "split[spka{index}][spkb{index}];[spkb{index}]gblur=sigma=8[spkg{index}]
[wgsl]
entry = "effect.wgsl"
+
+# The reference picture's brightest wall sits just under the default
+# threshold; the card lowers it so the glints show.
+[card]
+params = { threshold = 55 }
diff --git a/src/crates/concat-effects/src/lib.rs b/src/crates/concat-effects/src/lib.rs
index 27100209..deed0356 100644
--- a/src/crates/concat-effects/src/lib.rs
+++ b/src/crates/concat-effects/src/lib.rs
@@ -37,7 +37,7 @@ mod builtins {
}
pub use catalogue::{At, Catalogue, Fixture, Package, Probe, package_folders, package_stamp};
-pub use manifest::{FORMAT, Kind, Manifest, Param, ParamType, Space};
+pub use manifest::{CardSettings, FORMAT, Kind, Manifest, Param, ParamType, Space};
pub use shader::{Contract, Shader, TransitionShader};
/// Why a package could not be loaded.
diff --git a/src/crates/concat-effects/src/manifest.rs b/src/crates/concat-effects/src/manifest.rs
index dc331b45..32b15080 100644
--- a/src/crates/concat-effects/src/manifest.rs
+++ b/src/crates/concat-effects/src/manifest.rs
@@ -57,6 +57,45 @@ pub struct Manifest {
/// `lut()`, and a chain names its file as `{lut}`.
#[serde(default)]
pub lut: Option<LutTable>,
+ /// What the package's card in the catalogue shows, where its defaults
+ /// alone would show little.
+ #[serde(default)]
+ pub card: Option<CardSettings>,
+}
+
+/// The `[card]` table. A card is the reference picture through the package
+/// at its defaults, a little way into a clip; this is for a package whose
+/// defaults show little there - an exposure of nothing, a key with no
+/// screen to key, a flash that has burned the cut white.
+#[derive(Deserialize, Clone, PartialEq, Debug, Default)]
+#[serde(deny_unknown_fields)]
+pub struct CardSettings {
+ /// Knob values set over the defaults, within each knob's range; a
+ /// filter's `intensity` among them, a point's as `<key>.x`, `<key>.y`.
+ #[serde(default)]
+ pub params: std::collections::BTreeMap<String, f64>,
+ /// Seconds into the clip the card shows, for an effect or a look.
+ #[serde(default)]
+ pub moment: Option<f64>,
+ /// How far through the cut the card shows, `0..=1`, for a transition.
+ #[serde(default)]
+ pub progress: Option<f64>,
+ /// For a key: the reference picture stands before a screen of this
+ /// colour, `#rrggbb`, for the key to take out.
+ #[serde(default)]
+ pub screen: Option<String>,
+}
+
+impl CardSettings {
+ /// The screen's colour as bytes, when it names one that parses.
+ pub fn screen_rgb(&self) -> Option<[u8; 3]> {
+ let hex = self.screen.as_deref()?.strip_prefix('#')?;
+ if hex.len() != 6 || !hex.chars().all(|c| c.is_ascii_hexdigit()) {
+ return None;
+ }
+ let byte = |at: usize| u8::from_str_radix(&hex[at..at + 2], 16).ok();
+ Some([byte(0)?, byte(2)?, byte(4)?])
+ }
}
/// The `[lut]` table: a `.cube` file beside the manifest.
@@ -459,6 +498,9 @@ impl Manifest {
}
}
}
+ if let Some(card) = &self.card {
+ self.validate_card(card)?;
+ }
if let Some(intensity) = &self.effect.intensity
&& !self.params.iter().any(|param| &param.key == intensity)
{
@@ -528,6 +570,70 @@ impl Manifest {
self.format >= SCENE_LINEAR
}
+ /// A `[card]` table sets only knobs the package has, within their
+ /// ranges, and places the card by what kind of package it is.
+ fn validate_card(&self, card: &CardSettings) -> Result<(), Error> {
+ if !self.effect.kind.is_visual() {
+ return Err(self.invalid("[card] is for a package that draws the picture"));
+ }
+ for (key, value) in &card.params {
+ let point = key
+ .split_once('.')
+ .filter(|(_, axis)| *axis == "x" || *axis == "y")
+ .and_then(|(name, _)| self.param(name))
+ .filter(|param| param.kind == ParamType::Point);
+ let range = match (self.param(key), point) {
+ (Some(param), _) => param.min..=param.max,
+ (None, Some(_)) => 0.0..=1.0,
+ (None, None) if key == "intensity" && self.effect.kind == Kind::Filter => {
+ 0.0..=100.0
+ }
+ (None, None) => {
+ return Err(
+ self.invalid(format!("[card] sets `{key}`, which is not a parameter"))
+ );
+ }
+ };
+ if !range.contains(value) {
+ return Err(self.invalid(format!(
+ "[card] sets `{key}` to {value}, outside {}..{}",
+ range.start(),
+ range.end()
+ )));
+ }
+ }
+ let transition = self.effect.kind == Kind::Transition;
+ if let Some(progress) = card.progress {
+ if !transition {
+ return Err(self.invalid(
+ "[card] progress places a transition's card; an effect's is placed by moment",
+ ));
+ }
+ if !(0.0..=1.0).contains(&progress) {
+ return Err(self.invalid("[card] progress is outside 0..1"));
+ }
+ }
+ if let Some(moment) = card.moment {
+ if transition {
+ return Err(self.invalid(
+ "[card] moment places an effect's card; a transition's is placed by progress",
+ ));
+ }
+ if !(0.0..=60.0).contains(&moment) {
+ return Err(self.invalid("[card] moment is outside 0..60 seconds"));
+ }
+ }
+ if card.screen.is_some() {
+ if transition {
+ return Err(self.invalid("[card] screen is for an effect, not a transition"));
+ }
+ if card.screen_rgb().is_none() {
+ return Err(self.invalid("[card] screen is not a `#rrggbb` colour"));
+ }
+ }
+ Ok(())
+ }
+
/// The declared parameter with this key.
pub fn param(&self, key: &str) -> Option<&Param> {
self.params.iter().find(|param| param.key == key)
@@ -638,6 +744,45 @@ mod tests {
rejects(&format!("format = \"1\"\n{GOOD}"), "format");
}
+ /// A card may set only the package's own knobs, in range, and is
+ /// placed by moment for an effect and by progress for a transition.
+ #[test]
+ fn a_card_table_is_checked_like_the_rest() {
+ let with = |card: &str| format!("{GOOD}\n [card]\n {card}\n");
+ let manifest = Manifest::parse(&with("params = { radius = 20 }\n moment = 2.5"))
+ .expect("parses");
+ let card = manifest.card.expect("a card");
+ assert_eq!(card.params.get("radius"), Some(&20.0));
+ assert_eq!(card.moment, Some(2.5));
+ rejects(&with("params = { sigma = 20 }"), "not a parameter");
+ rejects(&with("params = { radius = 99 }"), "outside 1..50");
+ rejects(&with("progress = 0.5"), "places a transition's card");
+ rejects(&with("moment = -1"), "outside 0..60");
+ rejects(&with("screen = \"green\""), "#rrggbb");
+ let keyed = Manifest::parse(&with("screen = \"#20c040\"")).expect("parses");
+ assert_eq!(
+ keyed.card.and_then(|card| card.screen_rgb()),
+ Some([0x20, 0xc0, 0x40])
+ );
+ let cut = format!("{GOOD_TRANSITION}\n [card]\n progress = 0.2\n");
+ assert_eq!(
+ Manifest::parse(&cut)
+ .expect("parses")
+ .card
+ .and_then(|c| c.progress),
+ Some(0.2)
+ );
+ rejects(
+ &cut.replace("progress = 0.2", "moment = 1"),
+ "placed by progress",
+ );
+ let sound = GOOD.replace("kind = \"effect\"", "kind = \"audio\"");
+ rejects(
+ &format!("{sound}\n [card]\n moment = 1\n"),
+ "draws the picture",
+ );
+ }
+
/// A shader may work in the display encoding from format 2, where the
/// host has one to hand it.
#[test]
diff --git a/src/crates/concat-host/Cargo.toml b/src/crates/concat-host/Cargo.toml
index bbf5ab8e..a15b10ba 100644
--- a/src/crates/concat-host/Cargo.toml
+++ b/src/crates/concat-host/Cargo.toml
@@ -16,6 +16,9 @@ concat-core.workspace = true
concat-media.workspace = true
concat-project.workspace = true
concat-export.workspace = true
+# The effect cards: every picture package drawn by its own shader; see
+# cards.rs.
+concat-effects.workspace = true
# Titles become pictures here; see titles.rs.
concat-text.workspace = true
# The cutout models and their masks; `infer` because the host is what
diff --git a/assets/effect-preview-source.jpg b/src/crates/concat-host/assets/card-still.jpg
similarity index 100%
rename from assets/effect-preview-source.jpg
rename to src/crates/concat-host/assets/card-still.jpg
diff --git a/src/crates/concat-host/src/cards.rs b/src/crates/concat-host/src/cards.rs
new file mode 100644
index 00000000..7754bcfd
--- /dev/null
+++ b/src/crates/concat-host/src/cards.rs
@@ -0,0 +1,631 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-FileCopyrightText: 2026 Jareer and Concat contributors
+
+//! Effect cards: every picture package's still, drawn by the package.
+//!
+//! A card is one reference picture through a package at its defaults,
+//! drawn by the same shader and the same compositor a clip's frames go
+//! through, so a card shows what the effect does and cannot drift from it.
+//! An effect or a look treats the picture; a text effect treats a title set
+//! over it; a transition cuts from the picture to a mirrored, hue-turned
+//! copy of it, partway through. A package with no shader - someone's own
+//! format 1 package - is drawn through its FFmpeg chain. Whatever a card
+//! leaves transparent - a mask, a key - shows a checkerboard. A package
+//! whose defaults show little on a card says what its card shows in its
+//! manifest's `[card]` table: knob values, the moment, the point of the
+//! cut, a screen behind the picture for a key to take out.
+//!
+//! Cards are drawn once and kept as JPEGs in a folder, each named after its
+//! package and a fingerprint of everything it was drawn from: the shader,
+//! the knobs' defaults, the table, and how cards are drawn. A package whose
+//! shader or defaults change has a new name and so a new card, and the old
+//! one is swept away ([`prune`]). The window reads what is there as it opens
+//! and draws the rest on a thread of its own ([`Painter`]).
+
+use std::collections::HashSet;
+use std::path::{Path, PathBuf};
+use std::sync::Arc;
+
+use concat_core::frame::Frame;
+use concat_core::shader::{RevealMap, ShaderPass, TransitionPass};
+use concat_core::time::Rational;
+use concat_effects::{At, Catalogue, Package};
+use concat_media::{DecodeOptions, Decoder, FrameSource};
+use concat_render::{Compositor, FramePlan, PlannedLayer, WgpuCompositor, detached_clip};
+
+/// A card's width in pixels: 16:9, and twice the widest a card is shown,
+/// for a high-density screen.
+pub const WIDTH: u32 = 480;
+
+/// A card's height in pixels.
+pub const HEIGHT: u32 = 270;
+
+/// The picture every card is drawn from: a person in a bright, colourful
+/// room, so a look has skin, saturated colour, shadow and highlight to
+/// work on.
+pub const STILL: &[u8] = include_bytes!("../assets/card-still.jpg");
+
+/// Bumped whenever the way a card is drawn changes - the still, the moment,
+/// the title, the size, the encoding - so every kept card is drawn again.
+const EDITION: u64 = 1;
+
+/// The instant a card shows, in seconds into its clip: late enough that a
+/// reveal is under way and a pulse is lit, early enough that a one-shot
+/// look has not finished.
+const MOMENT: f64 = 0.9;
+
+/// How far through its cut a transition's card shows: both pictures in
+/// view, the incoming one not yet past the middle.
+const CUT_AT: f32 = 0.4;
+
+/// The words a text effect's card sets over the still.
+const TITLE: &str = "Big Title";
+
+/// The quality cards are written at: FFmpeg's JPEG quantiser, 2 the best.
+const QUALITY: u8 = 3;
+
+/// What a card draws.
+#[derive(Clone, Debug)]
+enum Drawing {
+ /// The still through a pass, over a checkerboard; before a screen of
+ /// the colour given, for a key.
+ Picture {
+ pass: ShaderPass,
+ screen: Option<[u8; 3]>,
+ },
+ /// A title over the still, the pass on the title.
+ Title(ShaderPass),
+ /// A cut from the still to its turned copy.
+ Cut(TransitionPass),
+ /// The still through an FFmpeg chain.
+ Chain(String),
+}
+
+/// One package's card: where it is kept, and what it draws.
+#[derive(Clone, Debug)]
+pub struct Card {
+ /// The package's id.
+ pub id: String,
+ /// The JPEG the card is kept in; see [`Card::is_drawn`].
+ pub path: PathBuf,
+ drawing: Drawing,
+ /// Seconds into the clip the card shows.
+ moment: f64,
+}
+
+impl Card {
+ /// The card `package` has, kept under `dir`, or None for a package
+ /// with nothing to draw: a sound, or a package with neither a shader
+ /// nor a chain.
+ pub fn of(catalogue: &Catalogue, package: &Package, dir: &Path) -> Option<Card> {
+ if !package.kind().is_visual() {
+ return None;
+ }
+ let settings = package.manifest.card.clone().unwrap_or_default();
+ let mut set = package.params_at(At::Default);
+ set.extend(settings.params.clone());
+ let moment = settings.moment.unwrap_or(MOMENT);
+ let drawing = if package.transition().is_some() {
+ Drawing::Cut(catalogue.transition_pass(
+ package.id(),
+ &settings.params,
+ settings.progress.unwrap_or(f64::from(CUT_AT)),
+ )?)
+ } else if let Some(pass) = package.pass(&set, None) {
+ if package.category().eq_ignore_ascii_case("Text") {
+ Drawing::Title(pass)
+ } else {
+ Drawing::Picture {
+ pass,
+ screen: settings.screen_rgb(),
+ }
+ }
+ } else {
+ Drawing::Chain(package.ffmpeg_fragment(&set, 0).ok().flatten()?)
+ };
+ let name = format!(
+ "{}-{:016x}.jpg",
+ package.id(),
+ fingerprint(&drawing, moment)
+ );
+ Some(Card {
+ id: package.id().to_owned(),
+ path: dir.join(name),
+ drawing,
+ moment,
+ })
+ }
+
+ /// Whether the card is drawn and kept.
+ pub fn is_drawn(&self) -> bool {
+ self.path.is_file()
+ }
+}
+
+/// Every card the catalogue's picture packages have, kept under `dir`.
+pub fn cards(catalogue: &Catalogue, dir: &Path) -> Vec<Card> {
+ catalogue
+ .packages()
+ .filter_map(|package| Card::of(catalogue, package, dir))
+ .collect()
+}
+
+/// Removes every kept card under `dir` that is not one of `cards`: an
+/// older drawing of a package that has changed, or the card of one that
+/// is gone. Anything in the folder that is not named like a card is left.
+pub fn prune(dir: &Path, cards: &[Card]) {
+ let keep: HashSet<&Path> = cards.iter().map(|card| card.path.as_path()).collect();
+ let Ok(entries) = std::fs::read_dir(dir) else {
+ return;
+ };
+ for path in entries.filter_map(Result::ok).map(|entry| entry.path()) {
+ let named = path
+ .file_name()
+ .and_then(|name| name.to_str())
+ .and_then(|name| name.strip_suffix(".jpg"))
+ .and_then(|stem| stem.rsplit_once('-'))
+ .is_some_and(|(_, print)| {
+ print.len() == 16 && print.chars().all(|c| c.is_ascii_hexdigit())
+ });
+ if named && !keep.contains(path.as_path()) {
+ let _ = std::fs::remove_file(&path);
+ }
+ }
+}
+
+/// FNV-1a over everything a card is drawn from, so its name is the same on
+/// every run and every build: a kept card is found again, and a changed
+/// package is not mistaken for its old self.
+fn fingerprint(drawing: &Drawing, moment: f64) -> u64 {
+ let mut hash: u64 = 0xcbf2_9ce4_8422_2325;
+ let mut feed = |bytes: &[u8]| {
+ for byte in bytes {
+ hash ^= u64::from(*byte);
+ hash = hash.wrapping_mul(0x0000_0100_0000_01b3);
+ }
+ // A separator, so two fields cannot run into one another.
+ hash ^= 0xff;
+ hash = hash.wrapping_mul(0x0000_0100_0000_01b3);
+ };
+ feed(&EDITION.to_le_bytes());
+ feed(&WIDTH.to_le_bytes());
+ feed(&HEIGHT.to_le_bytes());
+ feed(&moment.to_le_bytes());
+ let pass = |feed: &mut dyn FnMut(&[u8]), pass: &ShaderPass| {
+ feed(pass.key.as_bytes());
+ feed(&pass.params);
+ feed(&pass.intensity.to_le_bytes());
+ feed(&pass.lut.as_ref().map_or(0, |lut| lut.id).to_le_bytes());
+ };
+ match drawing {
+ Drawing::Picture {
+ pass: drawn,
+ screen,
+ } => {
+ feed(b"picture");
+ feed(&screen.map_or([0; 4], |[r, g, b]| [1, r, g, b]));
+ pass(&mut feed, drawn);
+ }
+ Drawing::Title(drawn) => {
+ feed(b"title");
+ feed(TITLE.as_bytes());
+ pass(&mut feed, drawn);
+ }
+ Drawing::Cut(cut) => {
+ feed(b"cut");
+ feed(cut.key.as_bytes());
+ feed(&cut.params);
+ feed(&cut.progress.to_le_bytes());
+ feed(&cut.lut.as_ref().map_or(0, |lut| lut.id).to_le_bytes());
+ }
+ Drawing::Chain(chain) => {
+ feed(b"chain");
+ feed(chain.as_bytes());
+ }
+ }
+ hash
+}
+
+/// What draws cards: a compositor, and the pictures every card starts from,
+/// made once - the still at the card's size, its turned copy, the
+/// checkerboard, the title.
+pub struct Painter {
+ compositor: WgpuCompositor,
+ still: Arc<Frame>,
+ turned: Arc<Frame>,
+ checker: Arc<Frame>,
+ title: Option<(Arc<Frame>, Arc<RevealMap>)>,
+}
+
+impl Painter {
+ /// A painter on `compositor`, drawing from the picture at `still`
+ /// scaled to `width` by `height`.
+ pub fn new(
+ compositor: WgpuCompositor,
+ still: &Path,
+ width: u32,
+ height: u32,
+ ) -> Result<Painter, String> {
+ let mut decoder = Decoder::open(still, &DecodeOptions::default().scaled_to(width, height))
+ .map_err(|error| error.to_string())?;
+ let still = decoder
+ .next_frame()
+ .map_err(|error| error.to_string())?
+ .ok_or_else(|| format!("{} holds no picture", still.display()))?;
+ let turned = turned(&still);
+ let checker = checker(still.width(), still.height());
+ Ok(Painter {
+ compositor,
+ still: Arc::new(still),
+ turned: Arc::new(turned),
+ checker: Arc::new(checker),
+ title: None,
+ })
+ }
+
+ /// Draws `card` and writes it to its path, whole or not at all.
+ pub fn draw(&mut self, card: &Card) -> Result<(), String> {
+ let frame = self.frame(card)?;
+ write_card(&frame, &card.path)
+ }
+
+ /// Draws `card` and writes it to `path` instead of its own.
+ pub fn draw_to(&mut self, card: &Card, path: &Path) -> Result<(), String> {
+ let frame = self.frame(card)?;
+ write_card(&frame, path)
+ }
+
+ /// `card` drawn, as an opaque frame the still's size.
+ pub fn frame(&mut self, card: &Card) -> Result<Frame, String> {
+ let (width, height) = (self.still.width(), self.still.height());
+ let moment = Rational::approximate(card.moment).ok_or("the moment is not a time")?;
+ let frame = match &card.drawing {
+ Drawing::Picture { pass, screen } => {
+ let subject = match screen {
+ Some(colour) => Arc::new(screened(&self.still, *colour)),
+ None => Arc::clone(&self.still),
+ };
+ let ground = PlannedLayer::picture(detached_clip(), Arc::clone(&self.checker));
+ let mut picture = PlannedLayer::picture(detached_clip(), subject);
+ picture.track = 1;
+ picture.effects = vec![pass.clone()];
+ self.compositor.render(&FramePlan {
+ time: moment,
+ layers: vec![ground, picture],
+ ..FramePlan::empty(width, height)
+ })
+ }
+ Drawing::Title(pass) => {
+ let (title, reveal) = self.title(width, height)?;
+ let ground = PlannedLayer::picture(detached_clip(), Arc::clone(&self.still));
+ let mut words = PlannedLayer::picture(detached_clip(), title);
+ words.track = 1;
+ let mut pass = pass.clone();
+ pass.reveal_map = Some(reveal);
+ words.effects = vec![pass];
+ self.compositor.render(&FramePlan {
+ time: moment,
+ layers: vec![ground, words],
+ ..FramePlan::empty(width, height)
+ })
+ }
+ Drawing::Cut(cut) => self
+ .compositor
+ .combine(
+ width,
+ height,
+ card.moment as f32,
+ &self.still,
+ &self.turned,
+ cut,
+ )
+ .ok_or("the transition's shader would not run")?,
+ Drawing::Chain(chain) => {
+ concat_media::treat(&self.still, chain).map_err(|error| error.to_string())?
+ }
+ };
+ if self.compositor.lost() {
+ return Err("the GPU device was lost".to_owned());
+ }
+ Ok(frame)
+ }
+
+ /// The title a text effect's card treats, set once: white words with a
+ /// shadow, centred, over nothing, and the order its words reveal in.
+ fn title(&mut self, width: u32, height: u32) -> Result<(Arc<Frame>, Arc<RevealMap>), String> {
+ if let Some((frame, reveal)) = &self.title {
+ return Ok((Arc::clone(frame), Arc::clone(reveal)));
+ }
+ let style = concat_text::TitleStyle {
+ content: TITLE.to_owned(),
+ font_family: concat_text::BUNDLED_FAMILY.to_owned(),
+ font_size: 0.26,
+ font_weight: 800.0,
+ italic: false,
+ color: "#ffffff".to_owned(),
+ align: concat_text::Align::Center,
+ stroke_width: 0.0,
+ stroke_color: "#000000".to_owned(),
+ shadow: true,
+ background: String::new(),
+ background_radius: 0.0,
+ background_padding_x: 0.0,
+ background_padding_y: 0.0,
+ line_height: 1.1,
+ tracking: 0.0,
+ max_width: 0.0,
+ max_height: 0.0,
+ };
+ let fonts = concat_text::Fonts::new();
+ let rendered = concat_text::render_frame(&fonts, &style, width, height)
+ .map_err(|error| error.to_string())?;
+ let rects: Vec<(i32, i32, u32, u32)> = rendered
+ .words
+ .iter()
+ .map(|word| (word.x, word.y, word.width, word.height))
+ .collect();
+ let reveal = Arc::new(RevealMap::from_rects(width, height, &rects));
+ let frame = Arc::new(
+ Frame::from_rgba(rendered.width, rendered.height, rendered.rgba)
+ .ok_or("the title came back the wrong size")?,
+ );
+ self.title = Some((Arc::clone(&frame), Arc::clone(&reveal)));
+ Ok((frame, reveal))
+ }
+}
+
+/// The still a transition cuts to: mirrored, and every hue turned half way
+/// round, so the two pictures of a cut can be told apart anywhere on it.
+fn turned(still: &Frame) -> Frame {
+ let (width, height) = (still.width(), still.height());
+ let mut out = still.clone();
+ for y in 0..height {
+ for x in 0..width {
+ let [r, g, b, a] = still.pixel(width - 1 - x, y).unwrap_or([0, 0, 0, 255]);
+ let [r, g, b] = [r, g, b].map(|c| f32::from(c) / 255.0);
+ // Half a turn in YIQ: the two chroma axes negated, the
+ // brightness kept.
+ let luma = 0.299 * r + 0.587 * g + 0.114 * b;
+ let [r, g, b] = [2.0 * luma - r, 2.0 * luma - g, 2.0 * luma - b]
+ .map(|c| (c.clamp(0.0, 1.0) * 255.0).round() as u8);
+ out.set_pixel(x, y, [r, g, b, a]);
+ }
+ }
+ out
+}
+
+/// Draws `cards` on `compositor` - the window's device, else whatever
+/// adapter is to be had - handing their ids to `report` a few at a time as
+/// they land, so a shelf fills as it goes, and a last time with `done`. A
+/// card that fails is logged and skipped: its package shows no picture.
+pub fn draw_all(
+ dir: &Path,
+ cards: &[Card],
+ compositor: Option<WgpuCompositor>,
+ mut report: impl FnMut(Vec<String>, bool),
+) {
+ const BATCH: usize = 12;
+ let painter = compositor
+ .or_else(WgpuCompositor::new)
+ .ok_or_else(|| "no GPU or software renderer is available to draw with".to_owned())
+ .and_then(|compositor| Painter::new(compositor, &still_in(dir)?, WIDTH, HEIGHT));
+ let mut painter = match painter {
+ Ok(painter) => painter,
+ Err(error) => {
+ log::warn!("cards: {error}");
+ report(Vec::new(), true);
+ return;
+ }
+ };
+ let mut batch = Vec::new();
+ for card in cards {
+ match painter.draw(card) {
+ Ok(()) => batch.push(card.id.clone()),
+ Err(error) => log::warn!("card {}: {error}", card.id),
+ }
+ if batch.len() >= BATCH {
+ report(std::mem::take(&mut batch), false);
+ }
+ }
+ report(batch, true);
+}
+
+/// What shows through where a card is transparent: grey squares a
+/// twentieth of the height, the way every editor says "nothing here".
+fn checker(width: u32, height: u32) -> Frame {
+ let side = (height / 20).max(1);
+ let mut frame = Frame::transparent(width, height);
+ for y in 0..height {
+ for x in 0..width {
+ let light = ((x / side) + (y / side)).is_multiple_of(2);
+ let level = if light { 0x5a } else { 0x44 };
+ frame.set_pixel(x, y, [level, level, level, 255]);
+ }
+ }
+ frame
+}
+
+/// The still before a screen of `colour`: everything left of the person
+/// in the middle, and right of him, painted that colour, as a key's card
+/// needs something to take out.
+fn screened(still: &Frame, [r, g, b]: [u8; 3]) -> Frame {
+ let (width, height) = (still.width(), still.height());
+ let (left, right) = (width * 33 / 100, width * 80 / 100);
+ let mut out = still.clone();
+ for y in 0..height {
+ for x in (0..left).chain(right..width) {
+ out.set_pixel(x, y, [r, g, b, 255]);
+ }
+ }
+ out
+}
+
+/// `frame` written to `path` as a JPEG, through a file beside it that is
+/// renamed into place, so a reader never meets half a card.
+fn write_card(frame: &Frame, path: &Path) -> Result<(), String> {
+ let bytes = concat_media::jpeg(frame, QUALITY).map_err(|error| error.to_string())?;
+ if let Some(parent) = path.parent() {
+ std::fs::create_dir_all(parent).map_err(|error| error.to_string())?;
+ }
+ let part = path.with_extension("jpg.part");
+ std::fs::write(&part, bytes).map_err(|error| error.to_string())?;
+ std::fs::rename(&part, path).map_err(|error| error.to_string())
+}
+
+/// The still, written into `dir` for a decoder to read, and its path. It is
+/// rewritten when it differs, so a build with a new still draws from it.
+pub fn still_in(dir: &Path) -> Result<PathBuf, String> {
+ let path = dir.join("still.jpg");
+ if std::fs::read(&path).ok().as_deref() != Some(STILL) {
+ std::fs::create_dir_all(dir).map_err(|error| error.to_string())?;
+ std::fs::write(&path, STILL).map_err(|error| error.to_string())?;
+ }
+ Ok(path)
+}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+
+ fn scratch(name: &str) -> PathBuf {
+ let dir = std::env::temp_dir().join(format!("concat-cards-{}-{name}", std::process::id()));
+ let _ = std::fs::remove_dir_all(&dir);
+ std::fs::create_dir_all(&dir).expect("a scratch folder");
+ dir
+ }
+
+ /// Every picture package has a card and every sound has none, each
+ /// under a name of its own.
+ #[test]
+ fn every_picture_package_has_a_card_of_its_own() {
+ let catalogue = Catalogue::builtin();
+ let dir = Path::new("cards");
+ let cards = cards(catalogue, dir);
+ let pictures = catalogue
+ .packages()
+ .filter(|package| package.kind().is_visual())
+ .count();
+ assert_eq!(cards.len(), pictures);
+ let names: HashSet<&Path> = cards.iter().map(|card| card.path.as_path()).collect();
+ assert_eq!(names.len(), cards.len(), "two cards share a name");
+ for card in &cards {
+ let package = catalogue.get(&card.id).expect("a package");
+ assert!(package.kind().is_visual(), "{}", card.id);
+ assert!(card.path.starts_with(dir), "{}", card.path.display());
+ }
+ }
+
+ /// A card's name follows what it is drawn from: the same package gives
+ /// the same name, another shader or another default another.
+ #[test]
+ fn a_card_is_named_after_what_it_draws() {
+ let catalogue = Catalogue::builtin();
+ let dir = Path::new("cards");
+ let manifest = |default: f64| {
+ format!(
+ "format = 2\n[effect]\nid = \"a.gain\"\nname = \"Gain\"\nkind = \"effect\"\n\
+ [[param]]\nkey = \"gain\"\nlabel = \"Gain\"\nmax = 4\ndefault = {default}\n\
+ [wgsl]\nentry = \"effect.wgsl\"\n"
+ )
+ };
+ let shader = |k: f64| {
+ format!(
+ "struct Params {{ gain: f32 }}\nfn effect(uv: vec2<f32>) -> vec4<f32> {{ let c = sample(uv); return vec4<f32>(c.rgb * params.gain * {k:.1}, c.a); }}"
+ )
+ };
+ let card = |default: f64, k: f64| {
+ let package =
+ Package::from_sources(&manifest(default), None, Some(&shader(k))).expect("loads");
+ Card::of(catalogue, &package, dir).expect("a card").path
+ };
+ assert_eq!(card(2.0, 1.0), card(2.0, 1.0));
+ assert_ne!(card(2.0, 1.0), card(3.0, 1.0), "another default");
+ assert_ne!(card(2.0, 1.0), card(2.0, 2.0), "another shader");
+ assert!(
+ card(2.0, 1.0)
+ .to_string_lossy()
+ .starts_with(&*dir.join("a.gain-").to_string_lossy())
+ );
+ }
+
+ /// Pruning sweeps away a card no package draws any more and leaves the
+ /// cards that are current, the still and anything else in the folder.
+ #[test]
+ fn prune_sweeps_only_stale_cards() {
+ let dir = scratch("prune");
+ let catalogue = Catalogue::builtin();
+ let current: Vec<Card> = cards(catalogue, &dir).into_iter().take(2).collect();
+ for card in &current {
+ std::fs::write(&card.path, b"card").expect("write");
+ }
+ let stale = dir.join("concat.glow-0123456789abcdef.jpg");
+ let other = dir.join("notes.jpg");
+ let still = still_in(&dir).expect("the still");
+ std::fs::write(&stale, b"old").expect("write");
+ std::fs::write(&other, b"mine").expect("write");
+ prune(&dir, &current);
+ assert!(!stale.exists(), "a stale card");
+ assert!(other.exists() && still.exists(), "not cards");
+ assert!(current.iter().all(Card::is_drawn), "current cards");
+ let _ = std::fs::remove_dir_all(&dir);
+ }
+
+ /// Every card draws on the GPU, and every one shows its package at
+ /// work: the picture it was drawn from - the still, or the still
+ /// before its screen - comes out changed, where the FFmpeg-drawn cards
+ /// of old came out all but untouched for a mask, a key or a mirror. Set
+ /// `CONCAT_CARDS_DIR` to keep the cards for a look.
+ #[test]
+ fn every_card_draws_and_shows_its_package_at_work() {
+ let Some(compositor) = WgpuCompositor::new() else {
+ eprintln!("no usable GPU adapter; skipping");
+ return;
+ };
+ let dir = std::env::var_os("CONCAT_CARDS_DIR")
+ .map(PathBuf::from)
+ .unwrap_or_else(|| scratch("draw"));
+ let still = still_in(&dir).expect("the still");
+ let mut painter = Painter::new(compositor, &still, WIDTH, HEIGHT).expect("a painter");
+ let mut idle = Vec::new();
+ let mut failed = Vec::new();
+ let cards = cards(Catalogue::builtin(), &dir);
+ for card in &cards {
+ let frame = match painter.frame(card) {
+ Ok(frame) => frame,
+ Err(error) => {
+ failed.push(format!("{}: {error}", card.id));
+ continue;
+ }
+ };
+ assert_eq!((frame.width(), frame.height()), (WIDTH, HEIGHT));
+ let untreated = match &card.drawing {
+ Drawing::Picture {
+ screen: Some(colour),
+ ..
+ } => screened(&painter.still, *colour),
+ _ => (*painter.still).clone(),
+ };
+ let change = frame
+ .pixels()
+ .iter()
+ .zip(untreated.pixels())
+ .map(|(a, b)| f64::from(a.abs_diff(*b)))
+ .sum::<f64>()
+ / frame.pixels().len() as f64;
+ eprintln!("{:40} {change:6.2}", card.id);
+ if change < 0.02 {
+ idle.push(format!(
+ "{}: changes the still by {change:.2} a channel",
+ card.id
+ ));
+ }
+ write_card(&frame, &card.path).expect("writes");
+ assert!(card.is_drawn());
+ }
+ assert!(failed.is_empty(), "\n{}", failed.join("\n"));
+ assert!(idle.is_empty(), "\n{}", idle.join("\n"));
+ if std::env::var_os("CONCAT_CARDS_DIR").is_none() {
+ let _ = std::fs::remove_dir_all(&dir);
+ }
+ }
+}
diff --git a/src/crates/concat-host/src/lib.rs b/src/crates/concat-host/src/lib.rs
index 7ca9c5d9..e466ffd6 100644
--- a/src/crates/concat-host/src/lib.rs
+++ b/src/crates/concat-host/src/lib.rs
@@ -19,6 +19,7 @@
//! and cancels through flags, and the caller decides which thread it runs on.
pub mod brush;
+pub mod cards;
pub mod cutout;
pub mod dirs;
pub mod enhance;
diff --git a/src/crates/concat-host/src/preview.rs b/src/crates/concat-host/src/preview.rs
index 8f2d5f85..8ca23724 100644
--- a/src/crates/concat-host/src/preview.rs
+++ b/src/crates/concat-host/src/preview.rs
@@ -111,6 +111,15 @@ impl Monitor {
Some(gpu.trial_at(pass, side, timeout))
}
+ /// A compositor of its own on the window's device, for work off the
+ /// monitor's thread - the effect cards. None without a GPU here.
+ #[cfg(feature = "gpu")]
+ pub fn sibling(&self) -> Option<concat_render::WgpuCompositor> {
+ let gpu = self.gpu.as_ref()?;
+ let gpu = gpu.lock().unwrap_or_else(|poisoned| poisoned.into_inner());
+ Some(gpu.sibling())
+ }
+
/// Whether frames can be composited on the GPU.
pub fn has_gpu(&self) -> bool {
#[cfg(feature = "gpu")]
diff --git a/src/crates/concat-render/src/gpu.rs b/src/crates/concat-render/src/gpu.rs
index 28f3c422..f106dd01 100644
--- a/src/crates/concat-render/src/gpu.rs
+++ b/src/crates/concat-render/src/gpu.rs
@@ -512,6 +512,14 @@ impl WgpuCompositor {
Some(Self::with_device(device, queue))
}
+ /// A second compositor on this one's device, with pipelines, pools and
+ /// caches of its own: work on another thread - the effect cards -
+ /// shares the GPU's time with this one and nothing else, so it never
+ /// waits on this one's lock or evicts what this one keeps.
+ pub fn sibling(&self) -> Self {
+ Self::with_device(self.device.clone(), self.queue.clone())
+ }
+
/// Builds a compositor on a device the caller owns - the window's, so a
/// texture this draws is one the window can show.
pub fn with_device(device: wgpu::Device, queue: wgpu::Queue) -> Self {
diff --git a/src/crates/concat/Cargo.toml b/src/crates/concat/Cargo.toml
index ca51404b..a1f0e05f 100644
--- a/src/crates/concat/Cargo.toml
+++ b/src/crates/concat/Cargo.toml
@@ -90,9 +90,6 @@ slint = { version = "1.18", default-features = false, features = [
] }
[dependencies]
-# Writes the card still an imported look gets, rendered here from the
-# reference picture through the table.
-png = "0.17"
# The log facade. The window writes `log::warn!`; where that ends up is
# concat-host's logs.rs, opened by whichever entry point started this run.
log = "0.4"
diff --git a/src/crates/concat/locales/en.json b/src/crates/concat/locales/en.json
index 4aea4df5..b92d5385 100644
--- a/src/crates/concat/locales/en.json
+++ b/src/crates/concat/locales/en.json
@@ -129,6 +129,7 @@
"Bright": "Bright",
"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",
+ "Brighter or darker by stops of light, as the lens would make it, highlights kept.": "Brighter or darker by stops of light, as the lens would make it, highlights kept.",
"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.",
diff --git a/src/crates/concat/src/studio.rs b/src/crates/concat/src/studio.rs
index 3da25703..483f4f76 100644
--- a/src/crates/concat/src/studio.rs
+++ b/src/crates/concat/src/studio.rs
@@ -36,7 +36,7 @@ use concat_host::{
AnalyseRequest, Cutouts, EnhanceRequest, ProjectInfo, RegionRequest, Session, media, projects,
templates,
};
-use concat_media::{DecodeOptions, Decoder, FrameSource, Pyramid, jpeg};
+use concat_media::{Pyramid, jpeg};
use concat_project::commands::{ClipMove, ClipPatch, TrackFlag, TrimEdge};
use concat_project::model::{
self, AppliedFilter, Clip, Project, TextAlign, TextStyle, Timeline, Track, Transition,
@@ -807,11 +807,22 @@ pub struct Studio {
/// What the catalogue shelves were last built from; while nothing in
/// it changes the shelves are not rebuilt.
shelf_stamp: std::cell::RefCell<Option<ShelfStamp>>,
- /// The card stills of the user's own looks, by package id, loaded once
- /// from the package folder's `preview.png` and kept: the shelves are
- /// rebuilt on every publish and a picture read from disk each time
- /// would be the slowest thing in the window.
+ /// Every card still on the shelves, by package id, loaded once - an
+ /// author's own `preview.png`, else the card drawn for the package -
+ /// and kept: the shelves are rebuilt on every publish and a picture
+ /// read from disk each time would be the slowest thing in the window.
+ /// A card not drawn yet is kept as no picture until it arrives.
look_art: std::cell::RefCell<HashMap<String, slint::Image>>,
+ /// Where each picture package's card is kept, by package id; see
+ /// `concat_host::cards`. Planned whenever the catalogue loads.
+ card_paths: HashMap<String, std::path::PathBuf>,
+ /// How many cards have arrived since the window opened: part of the
+ /// shelf stamp, so a card that lands rebuilds the shelves.
+ cards_drawn: u64,
+ /// Whether cards are being drawn, and whether the catalogue changed
+ /// while they were, which makes for another round when this one ends.
+ cards_busy: bool,
+ cards_again: bool,
/// The watch on the user's effects folder: a poll every couple of
/// seconds of what is in it, cheaper than a file-system watcher and
/// one dependency fewer, at a cost nobody will notice.
@@ -932,6 +943,7 @@ fn shelves(
view: &LibraryView,
favourites: &[String],
look_art: &std::cell::RefCell<HashMap<String, slint::Image>>,
+ card_paths: &HashMap<String, std::path::PathBuf>,
) -> (Vec<SharedString>, Vec<CatalogueEntryData>) {
let mut groups: Vec<String> = Vec::new();
let mut entries = Vec::new();
@@ -980,21 +992,25 @@ fn shelves(
if !shown {
continue;
}
- // A user's look brings its own still, read once from its folder;
- // a built-in's is compiled into the window and looked up by id there.
- let art = match &package.folder {
- Some(folder) => look_art
- .borrow_mut()
- .entry(meta.id.clone())
- .or_insert_with(|| {
- // The author's own still, or the one rendered for them.
- slint::Image::load_from_path(&folder.join("preview.png"))
- .or_else(|_| slint::Image::load_from_path(&folder.join("preview.jpg")))
- .unwrap_or_default()
- })
- .clone(),
- None => slint::Image::default(),
- };
+ // An author's own still from the package's folder, else the card
+ // drawn for the package by its own shader; read once and kept.
+ let art = look_art
+ .borrow_mut()
+ .entry(meta.id.clone())
+ .or_insert_with(|| {
+ package
+ .folder
+ .as_deref()
+ .and_then(|folder| {
+ slint::Image::load_from_path(&folder.join("preview.png")).ok()
+ })
+ .or_else(|| {
+ let card = card_paths.get(&meta.id)?;
+ slint::Image::load_from_path(card).ok()
+ })
+ .unwrap_or_default()
+ })
+ .clone();
entries.push(CatalogueEntryData {
id: meta.id.as_str().into(),
name: name.into(),
@@ -1096,6 +1112,7 @@ fn key_field_of(property: model::KeyProperty) -> ClipField {
#[derive(PartialEq)]
struct ShelfStamp {
catalogue: usize,
+ cards: u64,
lang: String,
views: Vec<(String, i32, bool, String)>,
favourites: Vec<String>,
@@ -1104,9 +1121,6 @@ struct ShelfStamp {
/// The built-in colour package's id; see `adjust_rows` and `Studio::adjust_set`.
const ADJUST_ID: &str = "concat.adjust";
-/// The picture every look's card is rendered from.
-const REFERENCE_STILL: &[u8] = include_bytes!("../ui/assets/effect-previews/sharpen.jpg");
-
/// Makes a package folder under `dir` from the table at `path`, and
/// returns the package's id. The id is `user.` and the file's name slugged;
/// a second import of the same name replaces the first.
@@ -1129,7 +1143,7 @@ fn import_cube(dir: &std::path::Path, path: &std::path::Path) -> Result<String,
}
let id = format!("user.{slug}");
let text = std::fs::read_to_string(path).map_err(|error| error.to_string())?;
- let lut = concat_effects::cube::parse(&text)?;
+ concat_effects::cube::parse(&text)?;
let folder = dir.join(&id);
std::fs::create_dir_all(&folder).map_err(|error| error.to_string())?;
let name = stem.trim().to_owned();
@@ -1149,77 +1163,12 @@ fn import_cube(dir: &std::path::Path, path: &std::path::Path) -> Result<String,
)
.map_err(|error| error.to_string())?;
std::fs::write(folder.join("look.cube"), &text).map_err(|error| error.to_string())?;
- // The card still: the reference picture through the table, the same
- // arithmetic the GPU's sampler does. Read through Slint's decoder from
- // a copy on disk, since the bytes live in the binary.
- let reference = reference_still(dir)?;
- let image = slint::Image::load_from_path(&reference).map_err(|error| error.to_string())?;
- let Some(pixels) = image.to_rgba8() else {
- return Err("the reference picture would not decode".to_owned());
- };
- let (width, height) = (pixels.width(), pixels.height());
- let mut out = Vec::with_capacity((width * height * 4) as usize);
- for pixel in pixels.as_slice() {
- let rgb = lut.sample([
- f32::from(pixel.r) / 255.0,
- f32::from(pixel.g) / 255.0,
- f32::from(pixel.b) / 255.0,
- ]);
- for channel in rgb {
- out.push((channel.clamp(0.0, 1.0) * 255.0).round() as u8);
- }
- out.push(255);
- }
- let file =
- std::fs::File::create(folder.join("preview.png")).map_err(|error| error.to_string())?;
- let mut encoder = png::Encoder::new(std::io::BufWriter::new(file), width, height);
- encoder.set_color(png::ColorType::Rgba);
- encoder.set_depth(png::BitDepth::Eight);
- let mut writer = encoder.write_header().map_err(|error| error.to_string())?;
- writer
- .write_image_data(&out)
- .map_err(|error| error.to_string())?;
+ // A still an earlier import drew for this name: the card drawn from
+ // the package's own shader replaces it.
+ let _ = std::fs::remove_file(folder.join("preview.png"));
Ok(id)
}
-/// The reference picture every card is rendered from, as a file in the
-/// effects folder: the bytes live in the binary, and both Slint's decoder
-/// and FFmpeg's want a path.
-fn reference_still(dir: &std::path::Path) -> Result<std::path::PathBuf, String> {
- let reference = dir.join("reference.jpg");
- if !reference.is_file() {
- std::fs::create_dir_all(dir).map_err(|error| error.to_string())?;
- std::fs::write(&reference, REFERENCE_STILL).map_err(|error| error.to_string())?;
- }
- Ok(reference)
-}
-
-/// The card still for a package of the user's own that brought none: the
-/// reference picture through the package's own chain at its defaults,
-/// written beside its manifest as `preview.jpg`, the way the built-ins'
-/// cards were made. A package with a shader and no chain has no CPU
-/// rendering to be had here, so its card stays blank until its author
-/// puts a `preview.png` beside the manifest.
-fn render_card(
- dir: &std::path::Path,
- package: &concat_effects::Package,
- chain: &str,
-) -> Result<(), String> {
- let Some(folder) = package.folder.as_deref() else {
- return Ok(());
- };
- let reference = reference_still(dir)?;
- let mut decoder = Decoder::open(&reference, &DecodeOptions::default().scaled_to(320, 180))
- .map_err(|error| error.to_string())?;
- let frame = decoder
- .next_frame()
- .map_err(|error| error.to_string())?
- .ok_or_else(|| "the reference picture holds no frame".to_owned())?;
- let treated = concat_media::treat(&frame, chain).map_err(|error| error.to_string())?;
- let bytes = jpeg(&treated, 3).map_err(|error| error.to_string())?;
- std::fs::write(folder.join("preview.jpg"), bytes).map_err(|error| error.to_string())
-}
-
/// The ease a key put on at `at` inherits: that of whichever key it joins
/// behind, so laying a run of keys down does not alternate between shapes.
/// The first key on a parameter has nothing to inherit and gets the
@@ -1582,6 +1531,10 @@ impl Studio {
commit_timer: slint::Timer::default(),
shelf_stamp: std::cell::RefCell::new(None),
look_art: std::cell::RefCell::new(HashMap::new()),
+ card_paths: HashMap::new(),
+ cards_drawn: 0,
+ cards_busy: false,
+ cards_again: false,
packages_watch: slint::Timer::default(),
packages_seen: 0,
packages_pending: None,
@@ -5886,6 +5839,67 @@ impl Studio {
dirs.config.join("effects")
}
+ /// Where the effect cards are kept: drawn once, read on every launch.
+ pub fn cards_dir(dirs: &concat_host::dirs::AppDirs) -> std::path::PathBuf {
+ dirs.data.join("cards")
+ }
+
+ /// Plans every picture package's card against the catalogue as it
+ /// stands, sweeps away the cards no package draws any more, and draws
+ /// the missing ones on a thread of their own, on a compositor sharing
+ /// the monitor's device - or, while a round is drawing already, asks
+ /// for another when it ends.
+ fn plan_cards(&mut self) {
+ let dir = Self::cards_dir(&self.host.dirs);
+ let cards = concat_host::cards::cards(Catalogue::builtin(), &dir);
+ concat_host::cards::prune(&dir, &cards);
+ self.card_paths = cards
+ .iter()
+ .map(|card| (card.id.clone(), card.path.clone()))
+ .collect();
+ let missing: Vec<concat_host::cards::Card> =
+ cards.into_iter().filter(|card| !card.is_drawn()).collect();
+ if missing.is_empty() {
+ return;
+ }
+ if self.cards_busy {
+ self.cards_again = true;
+ return;
+ }
+ self.cards_busy = true;
+ let compositor = self.host.monitor.sibling();
+ let spawned = std::thread::Builder::new()
+ .name("concat cards".to_owned())
+ .spawn(move || {
+ concat_host::cards::draw_all(&dir, &missing, compositor, |ids, done| {
+ crate::host::on_ui(move |studio, _, _| studio.cards_arrived(ids, done));
+ });
+ });
+ if let Err(error) = spawned {
+ log::warn!("cards: {error}");
+ self.cards_busy = false;
+ }
+ }
+
+ /// Cards have landed: `ids` are read again the next time the shelves
+ /// are built. With `done` the round is over, and another is planned
+ /// when the catalogue changed while it drew.
+ fn cards_arrived(&mut self, ids: Vec<String>, done: bool) {
+ {
+ let mut art = self.look_art.borrow_mut();
+ for id in &ids {
+ art.remove(id);
+ }
+ }
+ self.cards_drawn += ids.len() as u64;
+ if done {
+ self.cards_busy = false;
+ if std::mem::take(&mut self.cards_again) {
+ self.plan_cards();
+ }
+ }
+ }
+
/// Rebuilds the catalogue from the built-ins and the packages in
/// `looks_dir`, and says in the window what would not load: the first
/// reason and how many more, with every reason in the log, so an
@@ -5915,29 +5929,9 @@ impl Studio {
for error in &errors {
log::warn!("package: {error}");
}
- // A card for every package of the user's own that has none and
- // can have one. A card that fails is a line in the log, not a
- // notice: the package itself loaded.
- let catalogue = Catalogue::builtin();
- for package in catalogue.packages() {
- let Some(folder) = package.folder.as_deref() else {
- continue;
- };
- if !package.kind().is_visual()
- || package.kind() == PackageKind::Transition
- || folder.join("preview.png").is_file()
- || folder.join("preview.jpg").is_file()
- {
- continue;
- }
- let chain = catalogue.video_chain(&[AppliedFilter::new(package.id().to_owned())]);
- if chain.is_empty() {
- continue;
- }
- if let Err(error) = render_card(&dir, package, &chain) {
- log::warn!("package {}: card: {error}", package.id());
- }
- }
+ // Every picture package's card: those drawn before are read as the
+ // shelves need them, the rest drawn on a thread of their own.
+ self.plan_cards();
// A changed shader means a changed card: the stills are read again.
self.look_art.borrow_mut().clear();
// The folder as the watch will next see it, cards included, so a
@@ -7447,6 +7441,7 @@ impl Studio {
let starred = &self.prefs.favourites;
let stamp = ShelfStamp {
catalogue: std::ptr::from_ref(Catalogue::builtin()) as usize,
+ cards: self.cards_drawn,
lang: i18n::current(),
views: self
.library
@@ -7463,20 +7458,40 @@ impl Studio {
favourites: starred.clone(),
};
if self.shelf_stamp.borrow().as_ref() != Some(&stamp) {
- let (groups, entries) =
- shelves(SHELF_KINDS[0], &self.library[0], starred, &self.look_art);
+ let (groups, entries) = shelves(
+ SHELF_KINDS[0],
+ &self.library[0],
+ starred,
+ &self.look_art,
+ &self.card_paths,
+ );
sync(&models.filter_groups, groups);
sync(&models.catalogue_filters, entries);
- let (groups, entries) =
- shelves(SHELF_KINDS[1], &self.library[1], starred, &self.look_art);
+ let (groups, entries) = shelves(
+ SHELF_KINDS[1],
+ &self.library[1],
+ starred,
+ &self.look_art,
+ &self.card_paths,
+ );
sync(&models.effect_groups, groups);
sync(&models.catalogue_effects, entries);
- let (groups, entries) =
- shelves(SHELF_KINDS[2], &self.library[2], starred, &self.look_art);
+ let (groups, entries) = shelves(
+ SHELF_KINDS[2],
+ &self.library[2],
+ starred,
+ &self.look_art,
+ &self.card_paths,
+ );
sync(&models.audio_groups, groups);
sync(&models.catalogue_audio, entries);
- let (groups, entries) =
- shelves(SHELF_KINDS[3], &self.library[3], starred, &self.look_art);
+ let (groups, entries) = shelves(
+ SHELF_KINDS[3],
+ &self.library[3],
+ starred,
+ &self.look_art,
+ &self.card_paths,
+ );
sync(&models.transition_groups, groups);
sync(&models.catalogue_transitions, entries);
*self.shelf_stamp.borrow_mut() = Some(stamp);
diff --git a/src/crates/concat/ui/assets/effect-previews/adjust.jpg b/src/crates/concat/ui/assets/effect-previews/adjust.jpg
deleted file mode 100644
index ad18fb3e..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/adjust.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/autumn.jpg b/src/crates/concat/ui/assets/effect-previews/autumn.jpg
deleted file mode 100644
index 20de26da..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/autumn.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/bass-shockwave.jpg b/src/crates/concat/ui/assets/effect-previews/bass-shockwave.jpg
deleted file mode 100644
index 14ceb333..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/bass-shockwave.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/black-white.jpg b/src/crates/concat/ui/assets/effect-previews/black-white.jpg
deleted file mode 100644
index 83c0922f..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/black-white.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/bleach-bypass.jpg b/src/crates/concat/ui/assets/effect-previews/bleach-bypass.jpg
deleted file mode 100644
index 3f4f0bc4..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/bleach-bypass.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/bloom-pulse.jpg b/src/crates/concat/ui/assets/effect-previews/bloom-pulse.jpg
deleted file mode 100644
index b8a1211f..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/bloom-pulse.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/blue-screen.jpg b/src/crates/concat/ui/assets/effect-previews/blue-screen.jpg
deleted file mode 100644
index 928b38c3..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/blue-screen.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/blur-dissolve.jpg b/src/crates/concat/ui/assets/effect-previews/blur-dissolve.jpg
deleted file mode 100644
index 09f9b9f9..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/blur-dissolve.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/bokeh.jpg b/src/crates/concat/ui/assets/effect-previews/bokeh.jpg
deleted file mode 100644
index 3f547bf6..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/bokeh.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/box-blur.jpg b/src/crates/concat/ui/assets/effect-previews/box-blur.jpg
deleted file mode 100644
index 5ea94b97..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/box-blur.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/bronze.jpg b/src/crates/concat/ui/assets/effect-previews/bronze.jpg
deleted file mode 100644
index a48b8294..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/bronze.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/bulge-pinch.jpg b/src/crates/concat/ui/assets/effect-previews/bulge-pinch.jpg
deleted file mode 100644
index b41745db..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/bulge-pinch.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/camcorder-90s.jpg b/src/crates/concat/ui/assets/effect-previews/camcorder-90s.jpg
deleted file mode 100644
index 136a28e8..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/camcorder-90s.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/camera-shake.jpg b/src/crates/concat/ui/assets/effect-previews/camera-shake.jpg
deleted file mode 100644
index a22daaf8..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/camera-shake.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/chromatic-aberration.jpg b/src/crates/concat/ui/assets/effect-previews/chromatic-aberration.jpg
deleted file mode 100644
index 743fc28a..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/chromatic-aberration.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/classic-chrome.jpg b/src/crates/concat/ui/assets/effect-previews/classic-chrome.jpg
deleted file mode 100644
index 75c400b5..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/classic-chrome.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/clean.jpg b/src/crates/concat/ui/assets/effect-previews/clean.jpg
deleted file mode 100644
index 7cd0d23d..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/clean.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/clock-wipe.jpg b/src/crates/concat/ui/assets/effect-previews/clock-wipe.jpg
deleted file mode 100644
index 903880e3..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/clock-wipe.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/cloudless-sky.jpg b/src/crates/concat/ui/assets/effect-previews/cloudless-sky.jpg
deleted file mode 100644
index 48359683..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/cloudless-sky.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/color-cycle.jpg b/src/crates/concat/ui/assets/effect-previews/color-cycle.jpg
deleted file mode 100644
index fc946d96..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/color-cycle.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/contrast-pop.jpg b/src/crates/concat/ui/assets/effect-previews/contrast-pop.jpg
deleted file mode 100644
index 1793487f..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/contrast-pop.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/cool-blue.jpg b/src/crates/concat/ui/assets/effect-previews/cool-blue.jpg
deleted file mode 100644
index 90e29c6c..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/cool-blue.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/cool.jpg b/src/crates/concat/ui/assets/effect-previews/cool.jpg
deleted file mode 100644
index 3cc6cb9d..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/cool.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/crosshatch.jpg b/src/crates/concat/ui/assets/effect-previews/crosshatch.jpg
deleted file mode 100644
index 0aa269a7..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/crosshatch.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/crt-scanlines.jpg b/src/crates/concat/ui/assets/effect-previews/crt-scanlines.jpg
deleted file mode 100644
index 1d1e5d04..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/crt-scanlines.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/cube.jpg b/src/crates/concat/ui/assets/effect-previews/cube.jpg
deleted file mode 100644
index b9772778..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/cube.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/cyberpunk.jpg b/src/crates/concat/ui/assets/effect-previews/cyberpunk.jpg
deleted file mode 100644
index 2182828b..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/cyberpunk.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/datamosh.jpg b/src/crates/concat/ui/assets/effect-previews/datamosh.jpg
deleted file mode 100644
index ec424a52..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/datamosh.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/daydream.jpg b/src/crates/concat/ui/assets/effect-previews/daydream.jpg
deleted file mode 100644
index e495ada7..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/daydream.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/delicious.jpg b/src/crates/concat/ui/assets/effect-previews/delicious.jpg
deleted file mode 100644
index 64609d5c..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/delicious.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/digicam.jpg b/src/crates/concat/ui/assets/effect-previews/digicam.jpg
deleted file mode 100644
index 7789303a..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/digicam.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/dissolve.jpg b/src/crates/concat/ui/assets/effect-previews/dissolve.jpg
deleted file mode 100644
index 0b81ca8e..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/dissolve.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/dreamy.jpg b/src/crates/concat/ui/assets/effect-previews/dreamy.jpg
deleted file mode 100644
index 7b6dedf4..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/dreamy.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/duotone.jpg b/src/crates/concat/ui/assets/effect-previews/duotone.jpg
deleted file mode 100644
index 0984ffff..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/duotone.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/dust.jpg b/src/crates/concat/ui/assets/effect-previews/dust.jpg
deleted file mode 100644
index 877de91a..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/dust.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/emboss.jpg b/src/crates/concat/ui/assets/effect-previews/emboss.jpg
deleted file mode 100644
index 75cf19b7..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/emboss.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/fair.jpg b/src/crates/concat/ui/assets/effect-previews/fair.jpg
deleted file mode 100644
index 63ac87ad..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/fair.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/falling-dust.jpg b/src/crates/concat/ui/assets/effect-previews/falling-dust.jpg
deleted file mode 100644
index 4299ce00..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/falling-dust.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/film-burn.jpg b/src/crates/concat/ui/assets/effect-previews/film-burn.jpg
deleted file mode 100644
index 9131cd3e..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/film-burn.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/film-grain.jpg b/src/crates/concat/ui/assets/effect-previews/film-grain.jpg
deleted file mode 100644
index 410cf442..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/film-grain.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/film-reel.jpg b/src/crates/concat/ui/assets/effect-previews/film-reel.jpg
deleted file mode 100644
index c8d544fe..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/film-reel.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/film.jpg b/src/crates/concat/ui/assets/effect-previews/film.jpg
deleted file mode 100644
index c397f36e..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/film.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/fisheye.jpg b/src/crates/concat/ui/assets/effect-previews/fisheye.jpg
deleted file mode 100644
index be8ffba3..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/fisheye.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/fog.jpg b/src/crates/concat/ui/assets/effect-previews/fog.jpg
deleted file mode 100644
index d291b5ef..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/fog.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/fresh.jpg b/src/crates/concat/ui/assets/effect-previews/fresh.jpg
deleted file mode 100644
index 33a49d4d..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/fresh.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/gaussian-blur.jpg b/src/crates/concat/ui/assets/effect-previews/gaussian-blur.jpg
deleted file mode 100644
index c8d90a6b..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/gaussian-blur.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/glitch-transition.jpg b/src/crates/concat/ui/assets/effect-previews/glitch-transition.jpg
deleted file mode 100644
index b76aa798..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/glitch-transition.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/glitch-warp.jpg b/src/crates/concat/ui/assets/effect-previews/glitch-warp.jpg
deleted file mode 100644
index a93e631d..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/glitch-warp.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/glow.jpg b/src/crates/concat/ui/assets/effect-previews/glow.jpg
deleted file mode 100644
index 856db6fa..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/glow.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/golden-hour.jpg b/src/crates/concat/ui/assets/effect-previews/golden-hour.jpg
deleted file mode 100644
index ad16c72e..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/golden-hour.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/green-screen.jpg b/src/crates/concat/ui/assets/effect-previews/green-screen.jpg
deleted file mode 100644
index 928b38c3..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/green-screen.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/halation.jpg b/src/crates/concat/ui/assets/effect-previews/halation.jpg
deleted file mode 100644
index c08fa253..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/halation.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/halftone.jpg b/src/crates/concat/ui/assets/effect-previews/halftone.jpg
deleted file mode 100644
index 4bdee9b7..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/halftone.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/high-contrast-mono.jpg b/src/crates/concat/ui/assets/effect-previews/high-contrast-mono.jpg
deleted file mode 100644
index f8a1df34..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/high-contrast-mono.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/hologram.jpg b/src/crates/concat/ui/assets/effect-previews/hologram.jpg
deleted file mode 100644
index a5c2458e..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/hologram.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/hue-shift.jpg b/src/crates/concat/ui/assets/effect-previews/hue-shift.jpg
deleted file mode 100644
index 08cecbe3..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/hue-shift.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/invert.jpg b/src/crates/concat/ui/assets/effect-previews/invert.jpg
deleted file mode 100644
index 2cb16855..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/invert.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/iris.jpg b/src/crates/concat/ui/assets/effect-previews/iris.jpg
deleted file mode 100644
index d83e8ccf..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/iris.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/ivory.jpg b/src/crates/concat/ui/assets/effect-previews/ivory.jpg
deleted file mode 100644
index ea849dfc..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/ivory.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/kaleidoscope.jpg b/src/crates/concat/ui/assets/effect-previews/kaleidoscope.jpg
deleted file mode 100644
index de07fe53..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/kaleidoscope.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/lagoon.jpg b/src/crates/concat/ui/assets/effect-previews/lagoon.jpg
deleted file mode 100644
index fcbf5d43..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/lagoon.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/landscape-pop.jpg b/src/crates/concat/ui/assets/effect-previews/landscape-pop.jpg
deleted file mode 100644
index 296de194..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/landscape-pop.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/laser-beams.jpg b/src/crates/concat/ui/assets/effect-previews/laser-beams.jpg
deleted file mode 100644
index f82643a1..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/laser-beams.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/lens-flare.jpg b/src/crates/concat/ui/assets/effect-previews/lens-flare.jpg
deleted file mode 100644
index 1f47330f..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/lens-flare.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/light-leak-flash.jpg b/src/crates/concat/ui/assets/effect-previews/light-leak-flash.jpg
deleted file mode 100644
index 88382a1d..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/light-leak-flash.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/light-leak-transition.jpg b/src/crates/concat/ui/assets/effect-previews/light-leak-transition.jpg
deleted file mode 100644
index 9131cd3e..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/light-leak-transition.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/light-leak.jpg b/src/crates/concat/ui/assets/effect-previews/light-leak.jpg
deleted file mode 100644
index d80d6012..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/light-leak.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/linear-wipe.jpg b/src/crates/concat/ui/assets/effect-previews/linear-wipe.jpg
deleted file mode 100644
index e51fd4df..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/linear-wipe.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/marquee.jpg b/src/crates/concat/ui/assets/effect-previews/marquee.jpg
deleted file mode 100644
index 78d72a9c..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/marquee.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/mask-circle.jpg b/src/crates/concat/ui/assets/effect-previews/mask-circle.jpg
deleted file mode 100644
index 67a55604..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/mask-circle.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/mask-linear.jpg b/src/crates/concat/ui/assets/effect-previews/mask-linear.jpg
deleted file mode 100644
index 67a55604..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/mask-linear.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/mask-rectangle.jpg b/src/crates/concat/ui/assets/effect-previews/mask-rectangle.jpg
deleted file mode 100644
index 67a55604..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/mask-rectangle.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/matcha.jpg b/src/crates/concat/ui/assets/effect-previews/matcha.jpg
deleted file mode 100644
index 9d6236dc..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/matcha.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/midnight.jpg b/src/crates/concat/ui/assets/effect-previews/midnight.jpg
deleted file mode 100644
index 973dc17a..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/midnight.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/milk.jpg b/src/crates/concat/ui/assets/effect-previews/milk.jpg
deleted file mode 100644
index 41aa10ce..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/milk.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/mirror-tile.jpg b/src/crates/concat/ui/assets/effect-previews/mirror-tile.jpg
deleted file mode 100644
index 4c5303fe..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/mirror-tile.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/mirror.jpg b/src/crates/concat/ui/assets/effect-previews/mirror.jpg
deleted file mode 100644
index ce1974fb..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/mirror.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/mono.jpg b/src/crates/concat/ui/assets/effect-previews/mono.jpg
deleted file mode 100644
index 9af3bf9c..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/mono.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/moody.jpg b/src/crates/concat/ui/assets/effect-previews/moody.jpg
deleted file mode 100644
index 14607830..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/moody.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/motion-blur.jpg b/src/crates/concat/ui/assets/effect-previews/motion-blur.jpg
deleted file mode 100644
index 52c87551..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/motion-blur.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/natural.jpg b/src/crates/concat/ui/assets/effect-previews/natural.jpg
deleted file mode 100644
index 306ce0df..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/natural.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/neon-edges.jpg b/src/crates/concat/ui/assets/effect-previews/neon-edges.jpg
deleted file mode 100644
index a77a2819..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/neon-edges.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/neon-glow.jpg b/src/crates/concat/ui/assets/effect-previews/neon-glow.jpg
deleted file mode 100644
index 29e19fc2..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/neon-glow.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/neon.jpg b/src/crates/concat/ui/assets/effect-previews/neon.jpg
deleted file mode 100644
index c039b0db..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/neon.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/night.jpg b/src/crates/concat/ui/assets/effect-previews/night.jpg
deleted file mode 100644
index 394de881..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/night.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/noir.jpg b/src/crates/concat/ui/assets/effect-previews/noir.jpg
deleted file mode 100644
index 3ddbabf4..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/noir.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/oil-paint.jpg b/src/crates/concat/ui/assets/effect-previews/oil-paint.jpg
deleted file mode 100644
index 00f6b4ef..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/oil-paint.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/peach.jpg b/src/crates/concat/ui/assets/effect-previews/peach.jpg
deleted file mode 100644
index 5c229be4..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/peach.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/pink-fuzz.jpg b/src/crates/concat/ui/assets/effect-previews/pink-fuzz.jpg
deleted file mode 100644
index 0d08dc8b..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/pink-fuzz.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/pixelate.jpg b/src/crates/concat/ui/assets/effect-previews/pixelate.jpg
deleted file mode 100644
index 723826cb..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/pixelate.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/polaroid.jpg b/src/crates/concat/ui/assets/effect-previews/polaroid.jpg
deleted file mode 100644
index 1c189641..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/polaroid.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/posterize.jpg b/src/crates/concat/ui/assets/effect-previews/posterize.jpg
deleted file mode 100644
index 8283947f..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/posterize.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/prism-dispersion.jpg b/src/crates/concat/ui/assets/effect-previews/prism-dispersion.jpg
deleted file mode 100644
index 10e7d778..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/prism-dispersion.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/push.jpg b/src/crates/concat/ui/assets/effect-previews/push.jpg
deleted file mode 100644
index b9772778..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/push.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/rain.jpg b/src/crates/concat/ui/assets/effect-previews/rain.jpg
deleted file mode 100644
index 00b80439..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/rain.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/retro-70s.jpg b/src/crates/concat/ui/assets/effect-previews/retro-70s.jpg
deleted file mode 100644
index 01ea1879..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/retro-70s.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/retro-cartoon.jpg b/src/crates/concat/ui/assets/effect-previews/retro-cartoon.jpg
deleted file mode 100644
index 5069259a..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/retro-cartoon.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/rgb-glitch.jpg b/src/crates/concat/ui/assets/effect-previews/rgb-glitch.jpg
deleted file mode 100644
index 010b84cc..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/rgb-glitch.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/rgb-split-wipe.jpg b/src/crates/concat/ui/assets/effect-previews/rgb-split-wipe.jpg
deleted file mode 100644
index e51fd4df..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/rgb-split-wipe.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/rgb-split.jpg b/src/crates/concat/ui/assets/effect-previews/rgb-split.jpg
deleted file mode 100644
index 24431043..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/rgb-split.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/ripple.jpg b/src/crates/concat/ui/assets/effect-previews/ripple.jpg
deleted file mode 100644
index e8839e27..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/ripple.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/rosy.jpg b/src/crates/concat/ui/assets/effect-previews/rosy.jpg
deleted file mode 100644
index 107d6380..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/rosy.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/sage.jpg b/src/crates/concat/ui/assets/effect-previews/sage.jpg
deleted file mode 100644
index 27c46d58..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/sage.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/scanlines.jpg b/src/crates/concat/ui/assets/effect-previews/scanlines.jpg
deleted file mode 100644
index 2e6a09e0..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/scanlines.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/sci-fi.jpg b/src/crates/concat/ui/assets/effect-previews/sci-fi.jpg
deleted file mode 100644
index bf2ac037..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/sci-fi.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/sepia.jpg b/src/crates/concat/ui/assets/effect-previews/sepia.jpg
deleted file mode 100644
index f23c75a3..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/sepia.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/shake.jpg b/src/crates/concat/ui/assets/effect-previews/shake.jpg
deleted file mode 100644
index efeab7c6..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/shake.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/shape-wipe.jpg b/src/crates/concat/ui/assets/effect-previews/shape-wipe.jpg
deleted file mode 100644
index d83e8ccf..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/shape-wipe.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/sharpen.jpg b/src/crates/concat/ui/assets/effect-previews/sharpen.jpg
deleted file mode 100644
index 58cc7af5..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/sharpen.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/silver.jpg b/src/crates/concat/ui/assets/effect-previews/silver.jpg
deleted file mode 100644
index 9e3edaf5..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/silver.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/sketch.jpg b/src/crates/concat/ui/assets/effect-previews/sketch.jpg
deleted file mode 100644
index 919ef590..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/sketch.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/slide.jpg b/src/crates/concat/ui/assets/effect-previews/slide.jpg
deleted file mode 100644
index b9772778..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/slide.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/snow.jpg b/src/crates/concat/ui/assets/effect-previews/snow.jpg
deleted file mode 100644
index 7a9caa88..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/snow.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/soft-light.jpg b/src/crates/concat/ui/assets/effect-previews/soft-light.jpg
deleted file mode 100644
index c3055625..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/soft-light.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/solarize.jpg b/src/crates/concat/ui/assets/effect-previews/solarize.jpg
deleted file mode 100644
index fde0ec6e..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/solarize.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/sparkle.jpg b/src/crates/concat/ui/assets/effect-previews/sparkle.jpg
deleted file mode 100644
index 2b32cdc0..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/sparkle.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/spin.jpg b/src/crates/concat/ui/assets/effect-previews/spin.jpg
deleted file mode 100644
index 903880e3..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/spin.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/spooky.jpg b/src/crates/concat/ui/assets/effect-previews/spooky.jpg
deleted file mode 100644
index 395c76ae..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/spooky.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/strobe-flash.jpg b/src/crates/concat/ui/assets/effect-previews/strobe-flash.jpg
deleted file mode 100644
index 6fe0c0bc..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/strobe-flash.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/super-8.jpg b/src/crates/concat/ui/assets/effect-previews/super-8.jpg
deleted file mode 100644
index cc71b789..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/super-8.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/swirl.jpg b/src/crates/concat/ui/assets/effect-previews/swirl.jpg
deleted file mode 100644
index 903880e3..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/swirl.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/teal-orange.jpg b/src/crates/concat/ui/assets/effect-previews/teal-orange.jpg
deleted file mode 100644
index 700e917e..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/teal-orange.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/threshold.jpg b/src/crates/concat/ui/assets/effect-previews/threshold.jpg
deleted file mode 100644
index a0f60722..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/threshold.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/tilt-shift.jpg b/src/crates/concat/ui/assets/effect-previews/tilt-shift.jpg
deleted file mode 100644
index 028f2ab1..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/tilt-shift.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/tropical.jpg b/src/crates/concat/ui/assets/effect-previews/tropical.jpg
deleted file mode 100644
index b322db9c..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/tropical.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/twirl.jpg b/src/crates/concat/ui/assets/effect-previews/twirl.jpg
deleted file mode 100644
index bdf49e77..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/twirl.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/umber.jpg b/src/crates/concat/ui/assets/effect-previews/umber.jpg
deleted file mode 100644
index 50ac9117..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/umber.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/vaporwave.jpg b/src/crates/concat/ui/assets/effect-previews/vaporwave.jpg
deleted file mode 100644
index bd39ca49..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/vaporwave.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/vhs.jpg b/src/crates/concat/ui/assets/effect-previews/vhs.jpg
deleted file mode 100644
index 09d38022..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/vhs.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/vibrance.jpg b/src/crates/concat/ui/assets/effect-previews/vibrance.jpg
deleted file mode 100644
index 1b40b812..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/vibrance.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/vignette.jpg b/src/crates/concat/ui/assets/effect-previews/vignette.jpg
deleted file mode 100644
index ca3de3c7..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/vignette.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/vintage.jpg b/src/crates/concat/ui/assets/effect-previews/vintage.jpg
deleted file mode 100644
index 767b61e6..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/vintage.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/vivid.jpg b/src/crates/concat/ui/assets/effect-previews/vivid.jpg
deleted file mode 100644
index 0a0882ad..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/vivid.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/vortex-swirl.jpg b/src/crates/concat/ui/assets/effect-previews/vortex-swirl.jpg
deleted file mode 100644
index 5f83f015..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/vortex-swirl.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/warm.jpg b/src/crates/concat/ui/assets/effect-previews/warm.jpg
deleted file mode 100644
index d09a7de5..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/warm.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/wave-warp.jpg b/src/crates/concat/ui/assets/effect-previews/wave-warp.jpg
deleted file mode 100644
index c0dc6f71..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/wave-warp.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/whip-pan.jpg b/src/crates/concat/ui/assets/effect-previews/whip-pan.jpg
deleted file mode 100644
index 7b3e14e0..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/whip-pan.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/winter-cool.jpg b/src/crates/concat/ui/assets/effect-previews/winter-cool.jpg
deleted file mode 100644
index 28fbbe31..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/winter-cool.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/zoom-blur-transition.jpg b/src/crates/concat/ui/assets/effect-previews/zoom-blur-transition.jpg
deleted file mode 100644
index bbc4b959..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/zoom-blur-transition.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/assets/effect-previews/zoom-transition.jpg b/src/crates/concat/ui/assets/effect-previews/zoom-transition.jpg
deleted file mode 100644
index b6862998..00000000
Binary files a/src/crates/concat/ui/assets/effect-previews/zoom-transition.jpg and /dev/null differ
diff --git a/src/crates/concat/ui/inspector/clip-inspector.slint b/src/crates/concat/ui/inspector/clip-inspector.slint
index 8ae9519d..565d3c8c 100644
--- a/src/crates/concat/ui/inspector/clip-inspector.slint
+++ b/src/crates/concat/ui/inspector/clip-inspector.slint
@@ -54,9 +54,9 @@ export struct CatalogueEntryData {
category: string,
group: int,
description: string,
- /// The card's still, when the package brings its own - a user's
- /// imported look does. Empty for a built-in, whose still the pane
- /// looks up by id.
+ /// The card's still: an author's own, else the one drawn by the
+ /// package's shader. Empty while that is still being drawn, and for a
+ /// sound.
art: image,
}
diff --git a/src/crates/concat/ui/workspace/media-pane.slint b/src/crates/concat/ui/workspace/media-pane.slint
index 2f5a3a93..70d99bc0 100644
--- a/src/crates/concat/ui/workspace/media-pane.slint
+++ b/src/crates/concat/ui/workspace/media-pane.slint
@@ -1178,9 +1178,8 @@ component PresetCard inherits Rectangle {
// A shelf of the effect catalogue, as Rust narrows it - searched, shelved
// and starred by the same `Library` view the inspector reads - with the
-// same auto-fill arithmetic as MediaGrid. The artwork is looked up by
-// id through `art`, since the pictures live here in the pane and the
-// entries come from the manifests.
+// same auto-fill arithmetic as MediaGrid. Each entry carries its card,
+// drawn by the package's own shader (concat_host::cards).
component ShelfGrid inherits Rectangle {
in property <[CatalogueEntryData]> entries;
/// The mark for an entry with no artwork; see CatalogueItemData.
@@ -1189,7 +1188,6 @@ component ShelfGrid inherits Rectangle {
/// source that leaves a layer clip, and empty leaves the page click-only.
in property <string> payload-kind;
- pure callback art(id: string) -> image;
callback applied(id: string, label: string);
/// See CatalogueCard: a shelf whose cards show before they add.
in property <bool> auditions;
@@ -1198,8 +1196,10 @@ component ShelfGrid inherits Rectangle {
property <length> gap: 8px;
property <length> min-card: 88px;
- property <bool> compact: root.entries.length > 0
- && root.art(root.entries[0].id).width == 0 && root.entries[0].art.width == 0;
+ /// Name-only cards, half the height: for a shelf whose entries have no
+ /// picture - sound. A picture shelf keeps its card shape while a card
+ /// is still being drawn, its glyph standing in.
+ in property <bool> compact;
property <int> cols: Math.max(1,
Math.floor((root.width + root.gap) / (root.min-card + root.gap)));
@@ -1219,7 +1219,7 @@ component ShelfGrid inherits Rectangle {
id: entry.id,
label: entry.name,
enabled: true,
- art: entry.art.width > 0 ? entry.art : root.art(entry.id),
+ art: entry.art,
glyph: root.glyph,
};
compact: root.compact;
@@ -1498,162 +1498,7 @@ export component MediaPane inherits Rectangle {
property <bool> audio-open: true;
/// The shelf the Effects page is reading from, in `Library`'s numbers.
property <int> effects-shelf: root.audio-shelf ? 2 : 1;
- /// Nothing, for an entry with no artwork: a picture of a sound would be
- /// a waveform, and every one of them would draw the same one.
- property <image> no-art;
-
- /// The rendered preview for an effect or a look: its real chain run
- /// over one source still. Looked up by the package id, since the
- /// entries come from the manifests and the pictures live here.
- pure function art-of(id: string) -> image {
- if (id == "concat.black-white") { return @image-url("../assets/effect-previews/black-white.jpg"); }
- if (id == "concat.sepia") { return @image-url("../assets/effect-previews/sepia.jpg"); }
- if (id == "concat.invert") { return @image-url("../assets/effect-previews/invert.jpg"); }
- if (id == "concat.sharpen") { return @image-url("../assets/effect-previews/sharpen.jpg"); }
- if (id == "concat.gaussian-blur") { return @image-url("../assets/effect-previews/gaussian-blur.jpg"); }
- if (id == "concat.box-blur") { return @image-url("../assets/effect-previews/box-blur.jpg"); }
- if (id == "concat.motion-blur") { return @image-url("../assets/effect-previews/motion-blur.jpg"); }
- if (id == "concat.warm") { return @image-url("../assets/effect-previews/warm.jpg"); }
- if (id == "concat.cool") { return @image-url("../assets/effect-previews/cool.jpg"); }
- if (id == "concat.vibrance") { return @image-url("../assets/effect-previews/vibrance.jpg"); }
- if (id == "concat.contrast-pop") { return @image-url("../assets/effect-previews/contrast-pop.jpg"); }
- if (id == "concat.vignette") { return @image-url("../assets/effect-previews/vignette.jpg"); }
- if (id == "concat.film-grain") { return @image-url("../assets/effect-previews/film-grain.jpg"); }
- if (id == "concat.glow") { return @image-url("../assets/effect-previews/glow.jpg"); }
- if (id == "concat.posterize") { return @image-url("../assets/effect-previews/posterize.jpg"); }
- if (id == "concat.pixelate") { return @image-url("../assets/effect-previews/pixelate.jpg"); }
- if (id == "concat.mirror") { return @image-url("../assets/effect-previews/mirror.jpg"); }
- if (id == "concat.fisheye") { return @image-url("../assets/effect-previews/fisheye.jpg"); }
- if (id == "concat.shake") { return @image-url("../assets/effect-previews/shake.jpg"); }
- // The looks, rendered by their own chains; see concat-effects' previews example.
- if (id == "concat.fresh") { return @image-url("../assets/effect-previews/fresh.jpg"); }
- if (id == "concat.vivid") { return @image-url("../assets/effect-previews/vivid.jpg"); }
- if (id == "concat.clean") { return @image-url("../assets/effect-previews/clean.jpg"); }
- if (id == "concat.soft-light") { return @image-url("../assets/effect-previews/soft-light.jpg"); }
- if (id == "concat.golden-hour") { return @image-url("../assets/effect-previews/golden-hour.jpg"); }
- if (id == "concat.moody") { return @image-url("../assets/effect-previews/moody.jpg"); }
- if (id == "concat.cool-blue") { return @image-url("../assets/effect-previews/cool-blue.jpg"); }
- if (id == "concat.vintage") { return @image-url("../assets/effect-previews/vintage.jpg"); }
- if (id == "concat.bronze") { return @image-url("../assets/effect-previews/bronze.jpg"); }
- if (id == "concat.mono") { return @image-url("../assets/effect-previews/mono.jpg"); }
- if (id == "concat.neon") { return @image-url("../assets/effect-previews/neon.jpg"); }
- if (id == "concat.spooky") { return @image-url("../assets/effect-previews/spooky.jpg"); }
- if (id == "concat.teal-orange") { return @image-url("../assets/effect-previews/teal-orange.jpg"); }
- if (id == "concat.cloudless-sky") { return @image-url("../assets/effect-previews/cloudless-sky.jpg"); }
- if (id == "concat.night") { return @image-url("../assets/effect-previews/night.jpg"); }
- if (id == "concat.film") { return @image-url("../assets/effect-previews/film.jpg"); }
- if (id == "concat.vhs") { return @image-url("../assets/effect-previews/vhs.jpg"); }
- 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"); }
- if (id == "concat.hue-shift") { return @image-url("../assets/effect-previews/hue-shift.jpg"); }
- if (id == "concat.threshold") { return @image-url("../assets/effect-previews/threshold.jpg"); }
- if (id == "concat.chromatic-aberration") { return @image-url("../assets/effect-previews/chromatic-aberration.jpg"); }
- if (id == "concat.emboss") { return @image-url("../assets/effect-previews/emboss.jpg"); }
- if (id == "concat.sketch") { return @image-url("../assets/effect-previews/sketch.jpg"); }
- if (id == "concat.solarize") { return @image-url("../assets/effect-previews/solarize.jpg"); }
- if (id == "concat.scanlines") { return @image-url("../assets/effect-previews/scanlines.jpg"); }
- if (id == "concat.hologram") { return @image-url("../assets/effect-previews/hologram.jpg"); }
- // New effects
- if (id == "concat.bloom-pulse") { return @image-url("../assets/effect-previews/bloom-pulse.jpg"); }
- if (id == "concat.blue-screen") { return @image-url("../assets/effect-previews/blue-screen.jpg"); }
- if (id == "concat.bokeh") { return @image-url("../assets/effect-previews/bokeh.jpg"); }
- if (id == "concat.bulge-pinch") { return @image-url("../assets/effect-previews/bulge-pinch.jpg"); }
- if (id == "concat.crosshatch") { return @image-url("../assets/effect-previews/crosshatch.jpg"); }
- if (id == "concat.datamosh") { return @image-url("../assets/effect-previews/datamosh.jpg"); }
- if (id == "concat.duotone") { return @image-url("../assets/effect-previews/duotone.jpg"); }
- if (id == "concat.dust") { return @image-url("../assets/effect-previews/dust.jpg"); }
- if (id == "concat.fog") { return @image-url("../assets/effect-previews/fog.jpg"); }
- if (id == "concat.green-screen") { return @image-url("../assets/effect-previews/green-screen.jpg"); }
- if (id == "concat.halftone") { return @image-url("../assets/effect-previews/halftone.jpg"); }
- if (id == "concat.kaleidoscope") { return @image-url("../assets/effect-previews/kaleidoscope.jpg"); }
- if (id == "concat.lens-flare") { return @image-url("../assets/effect-previews/lens-flare.jpg"); }
- if (id == "concat.light-leak") { return @image-url("../assets/effect-previews/light-leak.jpg"); }
- if (id == "concat.mask-circle") { return @image-url("../assets/effect-previews/mask-circle.jpg"); }
- if (id == "concat.mask-linear") { return @image-url("../assets/effect-previews/mask-linear.jpg"); }
- if (id == "concat.mask-rectangle") { return @image-url("../assets/effect-previews/mask-rectangle.jpg"); }
- if (id == "concat.neon-edges") { return @image-url("../assets/effect-previews/neon-edges.jpg"); }
- if (id == "concat.oil-paint") { return @image-url("../assets/effect-previews/oil-paint.jpg"); }
- if (id == "concat.rgb-split") { return @image-url("../assets/effect-previews/rgb-split.jpg"); }
- if (id == "concat.ripple") { return @image-url("../assets/effect-previews/ripple.jpg"); }
- if (id == "concat.snow") { return @image-url("../assets/effect-previews/snow.jpg"); }
- if (id == "concat.twirl") { return @image-url("../assets/effect-previews/twirl.jpg"); }
- // New filters
- if (id == "concat.adjust") { return @image-url("../assets/effect-previews/adjust.jpg"); }
- if (id == "concat.autumn") { return @image-url("../assets/effect-previews/autumn.jpg"); }
- if (id == "concat.bleach-bypass") { return @image-url("../assets/effect-previews/bleach-bypass.jpg"); }
- if (id == "concat.classic-chrome") { return @image-url("../assets/effect-previews/classic-chrome.jpg"); }
- if (id == "concat.cyberpunk") { return @image-url("../assets/effect-previews/cyberpunk.jpg"); }
- if (id == "concat.delicious") { return @image-url("../assets/effect-previews/delicious.jpg"); }
- if (id == "concat.dreamy") { return @image-url("../assets/effect-previews/dreamy.jpg"); }
- if (id == "concat.high-contrast-mono") { return @image-url("../assets/effect-previews/high-contrast-mono.jpg"); }
- if (id == "concat.landscape-pop") { return @image-url("../assets/effect-previews/landscape-pop.jpg"); }
- if (id == "concat.natural") { return @image-url("../assets/effect-previews/natural.jpg"); }
- if (id == "concat.noir") { return @image-url("../assets/effect-previews/noir.jpg"); }
- if (id == "concat.retro-70s") { return @image-url("../assets/effect-previews/retro-70s.jpg"); }
- if (id == "concat.rosy") { return @image-url("../assets/effect-previews/rosy.jpg"); }
- if (id == "concat.sci-fi") { return @image-url("../assets/effect-previews/sci-fi.jpg"); }
- if (id == "concat.silver") { return @image-url("../assets/effect-previews/silver.jpg"); }
- if (id == "concat.super-8") { return @image-url("../assets/effect-previews/super-8.jpg"); }
- if (id == "concat.tropical") { return @image-url("../assets/effect-previews/tropical.jpg"); }
- if (id == "concat.vaporwave") { return @image-url("../assets/effect-previews/vaporwave.jpg"); }
- if (id == "concat.winter-cool") { return @image-url("../assets/effect-previews/winter-cool.jpg"); }
- // Transitions
- if (id == "concat.blur-dissolve") { return @image-url("../assets/effect-previews/blur-dissolve.jpg"); }
- if (id == "concat.clock-wipe") { return @image-url("../assets/effect-previews/clock-wipe.jpg"); }
- if (id == "concat.cube") { return @image-url("../assets/effect-previews/cube.jpg"); }
- if (id == "concat.dissolve") { return @image-url("../assets/effect-previews/dissolve.jpg"); }
- if (id == "concat.film-burn") { return @image-url("../assets/effect-previews/film-burn.jpg"); }
- if (id == "concat.glitch-transition") { return @image-url("../assets/effect-previews/glitch-transition.jpg"); }
- if (id == "concat.iris") { return @image-url("../assets/effect-previews/iris.jpg"); }
- if (id == "concat.light-leak-transition") { return @image-url("../assets/effect-previews/light-leak-transition.jpg"); }
- if (id == "concat.linear-wipe") { return @image-url("../assets/effect-previews/linear-wipe.jpg"); }
- if (id == "concat.push") { return @image-url("../assets/effect-previews/push.jpg"); }
- if (id == "concat.rgb-split-wipe") { return @image-url("../assets/effect-previews/rgb-split-wipe.jpg"); }
- if (id == "concat.shape-wipe") { return @image-url("../assets/effect-previews/shape-wipe.jpg"); }
- if (id == "concat.slide") { return @image-url("../assets/effect-previews/slide.jpg"); }
- if (id == "concat.spin") { return @image-url("../assets/effect-previews/spin.jpg"); }
- if (id == "concat.swirl") { return @image-url("../assets/effect-previews/swirl.jpg"); }
- if (id == "concat.zoom-transition") { return @image-url("../assets/effect-previews/zoom-transition.jpg"); }
- // Modern Video Effects
- if (id == "concat.camera-shake") { return @image-url("../assets/effect-previews/camera-shake.jpg"); }
- if (id == "concat.rgb-glitch") { return @image-url("../assets/effect-previews/rgb-glitch.jpg"); }
- if (id == "concat.sparkle") { return @image-url("../assets/effect-previews/sparkle.jpg"); }
- if (id == "concat.tilt-shift") { return @image-url("../assets/effect-previews/tilt-shift.jpg"); }
- if (id == "concat.strobe-flash") { return @image-url("../assets/effect-previews/strobe-flash.jpg"); }
- if (id == "concat.crt-scanlines") { return @image-url("../assets/effect-previews/crt-scanlines.jpg"); }
- if (id == "concat.film-reel") { return @image-url("../assets/effect-previews/film-reel.jpg"); }
- if (id == "concat.camcorder-90s") { return @image-url("../assets/effect-previews/camcorder-90s.jpg"); }
- if (id == "concat.halation") { return @image-url("../assets/effect-previews/halation.jpg"); }
- if (id == "concat.wave-warp") { return @image-url("../assets/effect-previews/wave-warp.jpg"); }
- if (id == "concat.vortex-swirl") { return @image-url("../assets/effect-previews/vortex-swirl.jpg"); }
- if (id == "concat.prism-dispersion") { return @image-url("../assets/effect-previews/prism-dispersion.jpg"); }
- if (id == "concat.mirror-tile") { return @image-url("../assets/effect-previews/mirror-tile.jpg"); }
- if (id == "concat.bass-shockwave") { return @image-url("../assets/effect-previews/bass-shockwave.jpg"); }
- if (id == "concat.laser-beams") { return @image-url("../assets/effect-previews/laser-beams.jpg"); }
- if (id == "concat.neon-glow") { return @image-url("../assets/effect-previews/neon-glow.jpg"); }
- if (id == "concat.color-cycle") { return @image-url("../assets/effect-previews/color-cycle.jpg"); }
- // Modern Transitions
- if (id == "concat.whip-pan") { return @image-url("../assets/effect-previews/whip-pan.jpg"); }
- if (id == "concat.zoom-blur-transition") { return @image-url("../assets/effect-previews/zoom-blur-transition.jpg"); }
- if (id == "concat.light-leak-flash") { return @image-url("../assets/effect-previews/light-leak-flash.jpg"); }
- if (id == "concat.glitch-warp") { return @image-url("../assets/effect-previews/glitch-warp.jpg"); }
- return root.no-art;
- }
+
/// The category column. In-out, because it is dragged.
in-out property <length> sidebar-w: 104px;
/// Narrow enough to be a real squeeze, wide enough that a category name
@@ -2193,7 +2038,6 @@ export component MediaPane inherits Rectangle {
ShelfGrid {
entries: root.catalogue-transitions;
glyph: Glyph.transition;
- art(id) => { return root.art-of(id); }
// Transitions apply directly on single-click — no audition overlay.
auditions: false;
applied(id, label) => { root.apply-transition(id); }
@@ -2228,7 +2072,8 @@ export component MediaPane inherits Rectangle {
ShelfGrid {
entries: root.audio-shelf ? root.catalogue-audio : root.catalogue-effects;
glyph: root.audio-shelf ? Glyph.waveform : Glyph.sparkle;
- art(id) => { return root.art-of(id); }
+ // A sound has no picture: its cards are the compact kind.
+ compact: root.audio-shelf;
// Effects apply directly on single-click to the selected clip —
// auditions:false means click = apply, no monitor overlay confusion.
auditions: false;
@@ -2275,7 +2120,6 @@ export component MediaPane inherits Rectangle {
payload-kind: "filter";
auditions: true;
auditioning: root.audition;
- art(id) => { return root.art-of(id); }
auditioned(id) => { root.audition-filter(id); }
applied(id, label) => { root.apply-filter(id, label); }
}