Skip to content

EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust

Merge main into enhance/avi-import

tylerjenningsw4439770a058a
diff --cc crates/export/tests/it/movie_bytes.rs
index c761f274c,1f48efd1e..7a3fba611
--- a/crates/export/tests/it/movie_bytes.rs
+++ b/crates/export/tests/it/movie_bytes.rs
@@@ -94,7 -94,7 +94,7 @@@ fn export_bytes(format: OutputFormat, n
#[test]
fn h264_movie_bytes_are_pinned() {
let data = export_bytes(OutputFormat::H264, "/out/pinned.mp4");
- assert_eq!((data.len(), fnv1a(&data)), (104_322, 11_051_847_956_767_423_392), "H.264 MP4");
- assert_eq!((data.len(), fnv1a(&data)), (104_180, 8_728_430_532_616_484_528), "H.264 MP4");
++ assert_eq!((data.len(), fnv1a(&data)), (104_341, 17_655_680_090_264_218_914), "H.264 MP4");
}
#[test]
diff --cc crates/render/src/footage.rs
index 0b4b798b8,04dd706db..db1561ad6
--- a/crates/render/src/footage.rs
+++ b/crates/render/src/footage.rs
@@@ -1,4 -1,4 +1,4 @@@
- use super::*;
-use super::{Arc, AtomicBool, Footage, Image, ItemId, Ordering, Tick};
++use super::{Arc, AtomicBool, Footage, Image, ItemId, ItemKind, Ordering, Tick};
/// How a [`FootageSource`] hands over float footage (OpenEXR, float TIFF), whose values are
/// linear light: encoded with a curve, as the compositor takes footage, or as stored. Other
diff --cc crates/ui-egui/src/panels/project.rs
index a18855b5d,1944f333f..fb54ade3e
--- a/crates/ui-egui/src/panels/project.rs
+++ b/crates/ui-egui/src/panels/project.rs
@@@ -671,60 -1224,18 +1224,15 @@@ pub fn show(app: &mut EffectcraftApp, u
}
let _ = i;
let x0 = r.min.x + 8.0 + 14.0 * *depth as f32;
+ let g = RowGeom { lp: &lp, list, r, x0 };
if it.is_folder() {
- let open = app.ui.project_open_folders.contains(&id.0);
- let tw = Rect::from_center_size(pos2(x0 + 4.0, r.center().y), vec2(12.0, 12.0));
- let tresp = widgets::twirl(ui, tw, open, egui::Id::unique(("pf", id.0)), &t);
- tresp.widget_info(|| {
- let name = crate::i18n::tr_args(if open { "Close folder {}" } else { "Open folder {}" }, &[&it.name]);
- egui::WidgetInfo::labeled(egui::Role::Button, true, name)
- });
- if tresp.clicked() {
- // Alt/Cmd-click twirls every folder inside it too.
- let mut ids = vec![*id];
- if ui.input(|i| i.modifiers.alt || i.modifiers.command) {
- let mut at = 0;
- while let Some(f) = ids.get(at).copied() {
- ids.extend(app.session.project.children(Some(f)).into_iter().filter(|c| c.is_folder()).map(|c| c.id));
- at += 1;
- }
- }
- for f in ids {
- if open {
- app.ui.project_open_folders.remove(&f.0);
- } else {
- app.ui.project_open_folders.insert(f.0);
- }
- }
- }
- app.auto.add(&format!("project.item.{}.twirl", id.0), tw, &it.name);
+ folder_twirl(app, ui, &g, it);
}
icons::paint(&lp, Rect::from_center_size(pos2(x0 + 18.0, r.center().y), vec2(14.0, 14.0)), item_icon(it), t.text_dim);
- // Proxy indicator: filled = the proxy is used, hollow = set but off. Click to switch.
- if let Some(px) = it.proxy.as_ref() {
- let pr = Rect::from_center_size(pos2(x0 + 4.0, r.center().y), vec2(9.0, 9.0));
- if px.enabled {
- lp.rect_filled(pr, 1.0, t.text);
- } else {
- lp.rect_stroke(pr, 1.0, Stroke::new(1.0, t.text), egui::StrokeKind::Inside);
- }
- let presp = ui.interact(pr.expand(2.0).intersect(list), egui::Id::unique(("pproxy", id.0)), Sense::click()).on_hover_text(format!(
- "Proxy: {} ({})",
- px.footage.path,
- if px.enabled { "in use" } else { "off" }
- ));
- app.auto.add(&format!("project.item.{}.proxy", id.0), pr, if px.enabled { "Proxy in use" } else { "Proxy off" });
- presp.widget_info(|| {
- let name = crate::i18n::tr_args(if px.enabled { "Proxy of {}: in use" } else { "Proxy of {}: off" }, &[&it.name]);
- egui::WidgetInfo::labeled(egui::Role::Button, true, name)
- });
- if presp.clicked() {
- actions.push(("file.useProxy".into(), json!({"item": id.0})));
- }
- }
+ proxy_indicator(app, ui, &g, it, &mut actions);
- // Footage that can't be decoded (no decoder for its codec / profile): a warning marker
- // at the end of the name cell, the reason on hover.
- let problem = match &it.kind {
- ItemKind::Footage(f) => app.session.footage.problem(f),
- _ => None,
- };
+ // Footage (or the proxy in use) that can't be decoded (no decoder for its codec /
+ // profile): a warning marker at the end of the name cell, the reason on hover.
+ let problem = app.session.footage.item_problem(it);
let name_clip =
Rect::from_min_max(pos2(x0 + 30.0, r.min.y), pos2(r.min.x + name_w + 4.0 - if problem.is_some() { 16.0 } else { 0.0 }, r.max.y)).intersect(list);
if let Some(why) = &problem {
diff --cc crates/ui-egui/src/panels/viewer.rs
index ec2139b35,bcae99bc5..8c4a2c219
--- a/crates/ui-egui/src/panels/viewer.rs
+++ b/crates/ui-egui/src/panels/viewer.rs
@@@ -499,23 -690,17 +690,10 @@@ fn phase_scene(app: &mut EffectcraftApp
app.auto.add("viewer.warpBanner", r, &text);
}
- // Footage that can't be decoded (no decoder for its codec / profile): say why on the layer
- // instead of leaving a black picture.
- let mut notices = 0;
- for layer in comp.layers.iter().filter(|l| l.is_active_at(time) && l.switches.video) {
- let effectcraft_engine::project::LayerSource::Footage { item } = &layer.source else { continue };
- let Some(effectcraft_engine::project::ItemKind::Footage(f)) = app.session.project.item(*item).map(|i| &i.kind) else { continue };
- let Some(why) = app.session.footage.problem(f) else { continue };
- if notices >= 3 {
- break;
- }
+ // Footage (or the proxy in use for footage or a precomp) that can't be decoded (no decoder
- // for its codec / profile): say why on the layer instead of leaving a black picture. A
- // collapsed precomp draws its own layers, never the comp's proxy.
- let problems: Vec<(&Layer, String)> = {
- let r = Renderer::new(&snap_project, &*app.session.footage, Default::default());
- comp.layers
- .iter()
- .filter(|l| l.is_active_at(time) && l.switches.video && r.collapsed(&ectx, l).is_none())
- .filter_map(|layer| {
- let (LayerSource::Footage { item } | LayerSource::Comp { item }) = &layer.source else { return None };
- Some((layer, snap_project.item(*item).and_then(|i| app.session.footage.item_problem(i))?))
- })
- .take(3)
- .collect()
- };
- for (notices, (layer, why)) in problems.into_iter().enumerate() {
- let (m, _) = l2c(&ectx, layer);
++ // for its codec / profile): say why on the layer instead of leaving a black picture.
++ for (notices, (layer, why)) in footage_problems(app, ectx, comp, time).into_iter().enumerate() {
+ let (m, _) = l2c(ectx, layer);
let (w, h) = effectcraft_engine::render::source_size(&app.session.project, layer);
let c = m.apply(effectcraft_engine::geom::vec2(w as f64 / 2.0, h as f64 / 2.0));
let at = map.to_screen([c.x, c.y]);
@@@ -526,8 -711,27 +704,42 @@@
painter.rect_stroke(r, 3.0, Stroke::new(1.0, t.warning), StrokeKind::Inside);
painter.galley(pos2(r.min.x + 12.0, r.center().y - galley.size().y / 2.0), galley, Color32::WHITE);
app.auto.add(&format!("viewer.footageProblem.{}", layer.id.0), r, &text);
- notices += 1;
}
+ v.vertex_marks = vertex_marks;
+ v.track_hits = track_hits;
+ v.track_cur = track_cur;
+ v.has_3d = has_3d;
+ }
+
++/// Up to three layers active at `time` whose footage, or the proxy in use for footage or a
++/// precomp, can't be decoded, each with the reason. A collapsed precomp draws its own layers,
++/// never the comp's proxy.
++fn footage_problems<'c>(app: &EffectcraftApp, ectx: &EvalCtx, comp: &'c Comp, time: Tick) -> Vec<(&'c Layer, String)> {
++ let r = Renderer::new(ectx.project, &*app.session.footage, Default::default());
++ comp.layers
++ .iter()
++ .filter(|l| l.is_active_at(time) && l.switches.video && r.collapsed(ectx, l).is_none())
++ .filter_map(|layer| {
++ let (LayerSource::Footage { item } | LayerSource::Comp { item }) = &layer.source else { return None };
++ Some((layer, ectx.project.item(*item).and_then(|i| app.session.footage.item_problem(i))?))
++ })
++ .take(3)
++ .collect()
++}
+
+ fn phase_rigs(app: &mut EffectcraftApp, ui: &mut egui::Ui, ectx: &EvalCtx, v: &mut Vw<'_>) {
+ let t = v.t;
+ let cid = v.cid;
+ let area = v.area;
+ let map = v.map;
+ let time = v.time;
+ let ctx = v.ctx.clone();
+ let painter = v.painter.clone();
+ let selected = v.selected.clone();
+ let paths = std::mem::take(&mut v.paths);
+ let mut pin_hits = std::mem::take(&mut v.pin_hits);
+ let mut puppet_layers = std::mem::take(&mut v.puppet_layers);
+ let comp = v.comp;
// Free transform box of a path (double-click a path with the Selection tool).
let ft = ov::draw_free_transform(app, &ctx, &painter, &map, &paths);