oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

timeline: adjustment layers and first-class transitions

Browse Source 
Adjustment layers (docs/zh/plans/adjustment-layers-and-transitions.md):
a new timeline block type whose effect chain grades the composite of
every video track below it, over its own range (spanning clips or a
slice of one). The graph path flushes the lower tracks at the block's
track boundary and sweeps the composite through the chain via a
transient texture-source node; the montage path mirrors it with
AdjustmentSpan tickets (wire-compatible), so worker previews and
exports agree. An empty-area context menu creates one; the block
trims/moves/deletes like a clip, with undo everywhere.

Transitions: seam blocks come alive - cross dissolve/fade/wipe/slide
evaluate both neighbors through the graph path with progress from the
transition's own range (never the whole clip). Ctrl+Shift+D or the clip
menu inserts a default transition; the gpui wedges render and drag to
resize offsets undoably, and TransitionRemoveCommand now restores
offsets and edges on undo. The transitionfx node form runs the same
shaders on an adjustment layer with progress_in auto-filled from the
layer's span (explicit value wins).

Also: every built-in effect name and parameter name is now
translatable (360 node.* keys per locale, zh-CN fully translated, two
coverage tests guard future gaps); the new nodes register in
nodes/mod.rs with the factory smoke table updated; textfootage and
adjustment-layer i18n keys included.
This commit is contained in:
Mike-Solar
2026-09-10 22:03:15 +08:00
parent 1e0d48578e
commit 4a2614b3fc
48 changed files with 10837 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/oak-node/tests/factory_smoke_test.rs
+25
View File
@@ -56,6 +56,8 @@ const EXPECTED_ORDER: &[&str] = &[
"org.olivevideoeditor.Olive.flip",
"org.olivevideoeditor.Olive.noise",
"org.olivevideoeditor.Olive.timeoffset",
"org.olivevideoeditor.Olive.transition",
"org.olivevideoeditor.Olive.transitionfx",
"org.olivevideoeditor.Olive.cornerpin",
"org.olivevideoeditor.Olive.displaytransform",
"org.olivevideoeditor.Olive.ociogradingtransformlinear",
@@ -71,6 +73,29 @@ const EXPECTED_ORDER: &[&str] = &[
"org.olivevideoeditor.Olive.tile",
"org.olivevideoeditor.Olive.swirl",
"org.olivevideoeditor.Olive.ripple",
"org.olivevideoeditor.Olive.colormatrix",
"org.olivevideoeditor.Olive.dilate",
"org.olivevideoeditor.Olive.edgedetect",
"org.olivevideoeditor.Olive.erode",
// The OpenFX-Misc cleanroom GPU ports, registered between the C++
// menu order and multicam (see `nodes::register_all`).
"org.olivevideoeditor.Olive.colorcorrect",
"org.olivevideoeditor.Olive.gamma",
"org.olivevideoeditor.Olive.saturation",
"org.olivevideoeditor.Olive.invert",
"org.olivevideoeditor.Olive.clamp",
"org.olivevideoeditor.Olive.grade",
"org.olivevideoeditor.Olive.dirblur",
"org.olivevideoeditor.Olive.sharpen",
"org.olivevideoeditor.Olive.dissolve",
"org.olivevideoeditor.Olive.keymix",
"org.olivevideoeditor.Olive.premult",
"org.olivevideoeditor.Olive.unpremult",
"org.olivevideoeditor.Olive.position",
"org.olivevideoeditor.Olive.mirror",
"org.olivevideoeditor.Olive.checkerboard",
"org.olivevideoeditor.Olive.colorbars",
"org.olivevideoeditor.Olive.ramp",
"org.olivevideoeditor.Olive.multicam",
];
crates/oak-node/tests/serializer_test.rs
+44 -2
View File
@@ -229,7 +229,10 @@ fn golden_project_with_footage_loads() {
/// chain with keyframes, plus settings and a link.
fn build_full_project() -> std::sync::Arc<std::sync::Mutex<oak_node::project::Project>> {
use oak_core::{Rational, TimeRange};
use oak_node::block::{clip_create, gap_create, ClipBlockBehavior, GapBlockBehavior};
use oak_node::block::{
adjustment_create, clip_create, gap_create, AdjustmentBlockBehavior, ClipBlockBehavior,
GapBlockBehavior,
};
use oak_node::folder::FolderBehavior;
use oak_node::footage::{FootageBehavior, StreamInfo};
use oak_node::keyframe::{Interpolation, Keyframe};
@@ -425,6 +428,18 @@ fn build_full_project() -> std::sync::Arc<std::sync::Mutex<oak_node::project::Pr
p.graph.add_node(core, behavior)
};
// A standalone adjustment layer at the end of the video track.
let adj_id = {
let (core, mut behavior) = adjustment_create();
let a = behavior
.as_any_mut()
.and_then(|a| a.downcast_mut::<AdjustmentBlockBehavior>())
.unwrap();
a.core.range = TimeRange::new(Rational::new(220, 25), Rational::new(260, 25));
a.core.track = Some(vtrack_id);
p.graph.add_node(core, behavior)
};
// Wire the hierarchy (behavior fields, the Rust model).
{
let entry = p.graph.get_mut(seq_id).unwrap();
@@ -463,7 +478,7 @@ fn build_full_project() -> std::sync::Arc<std::sync::Mutex<oak_node::project::Pr
.as_any_mut()
.and_then(|a| a.downcast_mut::<TrackBehavior>())
.unwrap();
t.blocks = vec![clip1_id, gap1_id, clip2_id];
t.blocks = vec![clip1_id, gap1_id, clip2_id, adj_id];
}
{
let entry = p.graph.get_mut(alist_id).unwrap();
@@ -675,9 +690,11 @@ fn assert_full_roundtrip_fields(orig: &oak_node::project::Project, loaded: &oak_
let o_clip1 = o_t.blocks[0];
let o_gap1 = o_t.blocks[1];
let o_clip2 = o_t.blocks[2];
let o_adj = o_t.blocks[3];
let l_clip1 = l_t.blocks[0];
let l_gap1 = l_t.blocks[1];
let l_clip2 = l_t.blocks[2];
let l_adj = l_t.blocks[3];
// Clip 1: range/media_in/speed/reversed/enabled/pitch/loop, track
// and footage backrefs, and the effect connection.
@@ -754,6 +771,31 @@ fn assert_full_roundtrip_fields(orig: &oak_node::project::Project, loaded: &oak_
assert_eq!(l_c2.core.loop_mode, o_c2.core.loop_mode, "clip2 loop");
assert_eq!(l_c2.footage, Some(l_footage), "clip2 footage backref");
// Adjustment layer: type, range and track backref.
let o_a = orig
.graph
.get(o_adj)
.unwrap()
.behavior
.as_any()
.and_then(|a| a.downcast_ref::<oak_node::block::AdjustmentBlockBehavior>())
.unwrap();
let l_a = loaded
.graph
.get(l_adj)
.unwrap()
.behavior
.as_any()
.and_then(|a| a.downcast_ref::<oak_node::block::AdjustmentBlockBehavior>())
.unwrap();
assert_eq!(
loaded.graph.get(l_adj).unwrap().behavior.type_id(),
"org.olivevideoeditor.Olive.adjustment",
"adjustment type id"
);
assert_eq!(l_a.core.range, o_a.core.range, "adjustment range");
assert_eq!(l_a.core.track, Some(l_vtrack), "adjustment track backref");
// Audio track + clip 3.
let o_at = orig
.graph