Viewer: the 3D Renderer menu shows the comp's renderer and switches it (#307)
The Composition panel's bottom bar drew a hard-coded "Classic 3D" dropdown that ignored the comp's renderer and did nothing when clicked, so an Advanced 3D comp still read Classic 3D. It now shows the comp's renderer (translated) and, as in After Effects, its menu switches it through comp.settings (one undo step); the automation label is the renderer's name. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01QiAJeFttZp83Fh7YuzAR5f
This commit is contained in:
@@ -719,9 +719,23 @@ pub(crate) fn bottom_bar(app: &mut EffectcraftApp, ui: &mut egui::Ui, bar: Rect,
|
||||
x += 4.0;
|
||||
// 3D renderer + view.
|
||||
if comp.has_3d() {
|
||||
// The comp's 3D renderer, as After Effects' Composition panel shows it: the menu switches
|
||||
// it through Composition Settings (undoable), and the automation label is the renderer.
|
||||
use effectcraft_engine::project::Renderer;
|
||||
let renderers = [(Renderer::Classic3D, "Classic 3D", "classic3D"), (Renderer::Advanced3D, "Advanced 3D", "advanced3D")];
|
||||
let current = renderers.iter().find(|(r, ..)| *r == comp.renderer).map_or("Classic 3D", |(_, label, _)| *label);
|
||||
let r = Rect::from_min_size(pos2(x, cy - 10.0), vec2(96.0, 20.0));
|
||||
let _ = widgets::dropdown(ui, r, "Classic 3D", &t, egui::Id::new("vw-3d"));
|
||||
app.auto.add("viewer.renderer3d", r, "3D Renderer");
|
||||
if widgets::dropdown(ui, r, crate::i18n::tr(current), &t, egui::Id::new("vw-3d")).clicked() {
|
||||
toggle_popup(ui, "vw-3d-pop");
|
||||
}
|
||||
app.auto.add("viewer.renderer3d", r, current);
|
||||
let items: Vec<(String, bool)> = renderers.iter().map(|(r, label, _)| (label.to_string(), *r == comp.renderer)).collect();
|
||||
if let Some((renderer, _, id)) = popup(app, ui, "vw-3d-pop", r, &items, "renderer3dItem").and_then(|i| renderers.get(i))
|
||||
&& *renderer != comp.renderer
|
||||
&& let Err(e) = app.session.execute("comp.settings", json!({"renderer": id}))
|
||||
{
|
||||
app.ui.status = e.to_string();
|
||||
}
|
||||
x = r.max.x + 4.0;
|
||||
let cid = app.session.active_comp_id();
|
||||
let cur = cid.and_then(|c| app.session.state.views3d.get(&c)).map(|v| v.current).unwrap_or_default();
|
||||
|
||||
@@ -47,6 +47,37 @@ fn viewer_registers_3d_controls() {
|
||||
assert!(ids.iter().any(|i| i.starts_with("viewer.camera.")), "camera wireframe registered");
|
||||
}
|
||||
|
||||
/// Click the centre of the automation element `id`.
|
||||
fn click_id(h: &mut Harness<'_, EffectcraftApp>, id: &str) {
|
||||
let [x, y, w, hh] = h.state().auto.find(id).unwrap_or_else(|| panic!("{id} is registered")).rect;
|
||||
let p = egui::pos2(x + w / 2.0, y + hh / 2.0);
|
||||
h.input_mut().events.push(egui::Event::PointerMoved(p));
|
||||
h.input_mut().events.push(egui::Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed: true, modifiers: egui::Modifiers::NONE });
|
||||
h.step();
|
||||
h.input_mut().events.push(egui::Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed: false, modifiers: egui::Modifiers::NONE });
|
||||
h.run_steps(3);
|
||||
}
|
||||
|
||||
/// #307: the viewer's 3D Renderer menu shows the comp's renderer (it always read "Classic 3D")
|
||||
/// and switches it, as After Effects' Composition panel does.
|
||||
#[test]
|
||||
fn renderer_menu_shows_and_switches_the_comp_renderer() {
|
||||
let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).build_eframe(|_| app());
|
||||
h.state_mut().session.execute("comp.settings", json!({"renderer": "classic3D"})).unwrap();
|
||||
h.run_steps(3);
|
||||
let label = |h: &Harness<'_, EffectcraftApp>| h.state().auto.find("viewer.renderer3d").map(|e| e.label.clone());
|
||||
assert_eq!(label(&h).as_deref(), Some("Classic 3D"));
|
||||
click_id(&mut h, "viewer.renderer3d");
|
||||
click_id(&mut h, "viewer.renderer3dItem.1");
|
||||
let renderer = h.state().session.active_comp().unwrap().renderer;
|
||||
assert_eq!(renderer, effectcraft_engine::project::Renderer::Advanced3D);
|
||||
h.run_steps(2);
|
||||
assert_eq!(label(&h).as_deref(), Some("Advanced 3D"));
|
||||
// One undoable Composition Settings step.
|
||||
h.state_mut().session.execute("edit.undo", json!({})).unwrap();
|
||||
assert_eq!(h.state().session.active_comp().unwrap().renderer, effectcraft_engine::project::Renderer::Classic3D);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn camera_and_light_dialogs_create_layers() {
|
||||
let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).build_eframe(|_| app());
|
||||
|
||||
Reference in New Issue
Block a user