EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust
Keyframes: offer Unmute Keyframes in the Animation menu
Camille Moine8ac2dec42abe
diff --git a/crates/engine/src/menus.rs b/crates/engine/src/menus.rsindex 3a240fc60..a7418ae58 100644--- a/crates/engine/src/menus.rs+++ b/crates/engine/src/menus.rs@@ -1037,6 +1037,7 @@ AnimationAdd Keyframe | anim.addKeyframeToggle Hold Keyframe | keys.toggleHoldMute Keyframes | keys.setMuted+ Unmute Keyframes | keys.setMuted {"muted":false}Keyframe Interpolation... | keys.interpolationKeyframe Velocity... | keys.velocityKeyframe Assistantdiff --git a/crates/engine/src/tests/menu_cmds.rs b/crates/engine/src/tests/menu_cmds.rsindex f5db9500c..cfbbb4966 100644--- a/crates/engine/src/tests/menu_cmds.rs+++ b/crates/engine/src/tests/menu_cmds.rs@@ -1509,6 +1509,42 @@ fn muting_keys_skips_them_in_the_timeline_value_and_undoes() {assert!(!layer(&s, a).props.prop("transform/opacity").unwrap().keys[1].muted);}+/// Both Animation-menu rows mute and unmute through `Session::execute`, and undo/redo work.+#[test]+fn mute_and_unmute_keyframes_menu_rows_work_and_undo() {+ fn rows(nodes: &[crate::menus::MenuNode], out: &mut Vec<(String, Value)>) {+ for n in nodes {+ match n {+ crate::menus::MenuNode::Item(e) if e.command == "keys.setMuted" => out.push((e.label.clone(), e.params.clone())),+ crate::menus::MenuNode::Submenu { children, .. } => rows(children, out),+ _ => {}+ }+ }+ }+ let mut menu = vec![];+ rows(&crate::menus::parse(crate::menus::TREE, false).unwrap(), &mut menu);+ assert_eq!(menu.iter().map(|(l, _)| l.as_str()).collect::<Vec<_>>(), ["Mute Keyframes", "Unmute Keyframes"], "{menu:?}");++ let mut s = comp();+ let a = solid(&mut s, "#ff0000");+ for (t, v) in [(0.0, 0.0), (1.0, 100.0)] {+ s.execute("prop.addKey", json!({"layer": a, "path": "transform/opacity", "time": t, "value": v})).unwrap();+ }+ let muted = |s: &Session| layer(s, a).props.prop("transform/opacity").unwrap().keys[1].muted;+ s.execute("keys.select", json!({"keys": [{"layer": a, "path": "transform/opacity", "time": 1.0}]})).unwrap();+ let run = |s: &mut Session, params: &Value| {+ s.execute("keys.setMuted", if params.is_null() { json!({}) } else { params.clone() }).unwrap();+ };+ run(&mut s, &menu[0].1);+ assert!(muted(&s));+ s.undo();+ assert!(!muted(&s));+ s.redo();+ assert!(muted(&s));+ run(&mut s, &menu[1].1);+ assert!(!muted(&s));+}+#[test]fn transform_drags_apply_their_whole_offset_to_the_keys_they_started_with() {let mut s = comp();diff --git a/crates/keyframe/src/tests.rs b/crates/keyframe/src/tests.rsindex 18e9b37be..312703239 100644--- a/crates/keyframe/src/tests.rs+++ b/crates/keyframe/src/tests.rs@@ -398,8 +398,7 @@ proptest::proptest! {#[test]fn muted_keys_are_skipped_by_evaluation() {- let mut keys =- vec![Keyframe::new(s(0.0), Value::Scalar(0.0)), Keyframe::new(s(1.0), Value::Scalar(100.0)), Keyframe::new(s(2.0), Value::Scalar(300.0))];+ let mut keys = vec![Keyframe::new(s(0.0), Value::Scalar(0.0)), Keyframe::new(s(1.0), Value::Scalar(100.0)), Keyframe::new(s(2.0), Value::Scalar(300.0))];let at = |keys: &[Keyframe], t: f64| evaluate(keys, s(t), false).unwrap().as_f64();assert!((at(&keys, 0.5) - 50.0).abs() < 1e-9);assert!((at(&keys, 1.5) - 200.0).abs() < 1e-9);diff --git a/crates/ui-egui/src/i18n.rs b/crates/ui-egui/src/i18n.rsindex 8712ab74f..6da705ef1 100644--- a/crates/ui-egui/src/i18n.rs+++ b/crates/ui-egui/src/i18n.rs@@ -837,6 +837,7 @@ const SIMPLIFIED_CHINESE: &[(&str, &str, &str)] = &[("anim.addKeyframe", "Add Keyframe", "添加关键帧"),("keys.toggleHold", "Toggle Hold Keyframe", "切换定格关键帧"),("keys.setMuted", "Mute Keyframes", "静音关键帧"),+ ("keys.setMuted", "Unmute Keyframes", "取消静音关键帧"),("keys.interpolation", "Keyframe Interpolation...", "关键帧插值..."),("keys.velocity", "Keyframe Velocity...", "关键帧速度..."),("", "Keyframe Assistant", "关键帧辅助"),@@ -1474,6 +1475,7 @@ const TRADITIONAL_CHINESE: &[(&str, &str, &str)] = &[("anim.addKeyframe", "Add Keyframe", "新增關鍵影格"),("keys.toggleHold", "Toggle Hold Keyframe", "切換定格關鍵影格"),("keys.setMuted", "Mute Keyframes", "靜音關鍵影格"),+ ("keys.setMuted", "Unmute Keyframes", "取消靜音關鍵影格"),("keys.interpolation", "Keyframe Interpolation...", "關鍵影格插補..."),("keys.velocity", "Keyframe Velocity...", "關鍵影格速度..."),("", "Keyframe Assistant", "關鍵影格輔助"),@@ -2108,6 +2110,7 @@ const JAPANESE: &[(&str, &str, &str)] = &[("anim.addKeyframe", "Add Keyframe", "キーフレームを追加"),("keys.toggleHold", "Toggle Hold Keyframe", "停止したキーフレームの切り替え"),("keys.setMuted", "Mute Keyframes", "キーフレームをミュート"),+ ("keys.setMuted", "Unmute Keyframes", "キーフレームのミュートを解除"),("keys.interpolation", "Keyframe Interpolation...", "キーフレーム補間法..."),("keys.velocity", "Keyframe Velocity...", "キーフレーム速度..."),("", "Keyframe Assistant", "キーフレーム補助"),@@ -2745,6 +2748,7 @@ const UKRAINIAN: &[(&str, &str, &str)] = &[("anim.addKeyframe", "Add Keyframe", "Додати ключовий кадр"),("keys.toggleHold", "Toggle Hold Keyframe", "Перемкнути утримання ключового кадру"),("keys.setMuted", "Mute Keyframes", "Заглушити ключові кадри"),+ ("keys.setMuted", "Unmute Keyframes", "Зняти заглушення ключових кадрів"),("keys.interpolation", "Keyframe Interpolation...", "Інтерполяція ключових кадрів..."),("keys.velocity", "Keyframe Velocity...", "Швидкість ключових кадрів..."),("", "Keyframe Assistant", "Помічник ключових кадрів"),@@ -3383,6 +3387,7 @@ const SPANISH: &[(&str, &str, &str)] = &[("anim.addKeyframe", "Add Keyframe", "Añadir fotograma clave"),("keys.toggleHold", "Toggle Hold Keyframe", "Conmutar mantener fotograma clave"),("keys.setMuted", "Mute Keyframes", "Silenciar fotogramas clave"),+ ("keys.setMuted", "Unmute Keyframes", "Reactivar fotogramas clave"),("keys.interpolation", "Keyframe Interpolation...", "Interpolación de fotogramas clave..."),("keys.velocity", "Keyframe Velocity...", "Velocidad de fotogramas clave..."),("", "Keyframe Assistant", "Asistente de fotogramas clave"),@@ -4019,6 +4024,7 @@ const PORTUGUESE: &[(&str, &str, &str)] = &[("anim.addKeyframe", "Add Keyframe", "Adicionar quadro-chave"),("keys.toggleHold", "Toggle Hold Keyframe", "Alternar quadro-chave de retenção"),("keys.setMuted", "Mute Keyframes", "Silenciar quadros-chave"),+ ("keys.setMuted", "Unmute Keyframes", "Reativar quadros-chave"),("keys.interpolation", "Keyframe Interpolation...", "Interpolação de quadro-chave..."),("keys.velocity", "Keyframe Velocity...", "Velocidade do quadro-chave..."),("", "Keyframe Assistant", "Assistente de quadro-chave"),@@ -4662,6 +4668,7 @@ const RUSSIAN: &[(&str, &str, &str)] = &[("anim.addKeyframe", "Add Keyframe", "Добавить ключевой кадр"),("keys.toggleHold", "Toggle Hold Keyframe", "Переключить фиксацию ключевого кадра"),("keys.setMuted", "Mute Keyframes", "Отключить ключевые кадры"),+ ("keys.setMuted", "Unmute Keyframes", "Включить ключевые кадры"),("keys.interpolation", "Keyframe Interpolation...", "Интерполяция ключевых кадров..."),("keys.velocity", "Keyframe Velocity...", "Скорость ключевых кадров..."),("", "Keyframe Assistant", "Помощник по ключевым кадрам"),@@ -5298,6 +5305,7 @@ const FRENCH: &[(&str, &str, &str)] = &[("anim.addKeyframe", "Add Keyframe", "Ajouter une image clé"),("keys.toggleHold", "Toggle Hold Keyframe", "Activer/Désactiver l'image clé figée"),("keys.setMuted", "Mute Keyframes", "Désactiver les images clés"),+ ("keys.setMuted", "Unmute Keyframes", "Réactiver les images clés"),("keys.interpolation", "Keyframe Interpolation...", "Interpolation des images clés..."),("keys.velocity", "Keyframe Velocity...", "Vitesse des images clés..."),("", "Keyframe Assistant", "Assistant d'images clés"),@@ -5934,6 +5942,7 @@ const GERMAN: &[(&str, &str, &str)] = &[("anim.addKeyframe", "Add Keyframe", "Keyframe hinzufügen"),("keys.toggleHold", "Toggle Hold Keyframe", "Halte-Keyframe umschalten"),("keys.setMuted", "Mute Keyframes", "Keyframes stummschalten"),+ ("keys.setMuted", "Unmute Keyframes", "Keyframes wieder aktivieren"),("keys.interpolation", "Keyframe Interpolation...", "Keyframe-Interpolation..."),("keys.velocity", "Keyframe Velocity...", "Keyframe-Geschwindigkeit..."),("", "Keyframe Assistant", "Keyframe-Assistent"),@@ -6571,6 +6580,7 @@ const CZECH: &[(&str, &str, &str)] = &[("anim.addKeyframe", "Add Keyframe", "Přidat klíčový snímek"),("keys.toggleHold", "Toggle Hold Keyframe", "Přepnout podržení klíčového snímku"),("keys.setMuted", "Mute Keyframes", "Ztlumit klíčové snímky"),+ ("keys.setMuted", "Unmute Keyframes", "Obnovit klíčové snímky"),("keys.interpolation", "Keyframe Interpolation...", "Interpolace klíčových snímků..."),("keys.velocity", "Keyframe Velocity...", "Rychlost klíčového snímku..."),("", "Keyframe Assistant", "Pomocník klíčových snímků"),@@ -7202,6 +7212,8 @@ const GEORGIAN: &[(&str, &str, &str)] = &[("layer.applyTextPreset", "Drop In Lines", "სტრიქონების ჩამოვარდნა"),("anim.addKeyframe", "Add Keyframe", "საკვანძო კადრის დამატება"),("keys.toggleHold", "Toggle Hold Keyframe", "ფიქსირებული საკვანძო კადრის გადართვა"),+ ("keys.setMuted", "Mute Keyframes", "საკვანძო კადრების დადუმება"),+ ("keys.setMuted", "Unmute Keyframes", "საკვანძო კადრების დადუმების მოხსნა"),("keys.interpolation", "Keyframe Interpolation...", "საკვანძო კადრის ინტერპოლაცია..."),("keys.velocity", "Keyframe Velocity...", "საკვანძო კადრის სიჩქარე..."),("", "Keyframe Assistant", "საკვანძო კადრების ასისტენტი"),