feat: separate 2d scenes viewports and explicit cameras
This commit is contained in:
@@ -4414,6 +4414,300 @@ fn overlay_stretch_allocates_each_occurrence_without_reflowing_its_siblings() {
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn two_canvas_viewports_share_a_scene_with_independent_explicit_cameras() {
|
||||
let (mut session, initial) = ReplSession::load(
|
||||
r#"
|
||||
hits = ui.state(0)
|
||||
button = Button("shared")
|
||||
button.onClick(hits.increment)
|
||||
button.x = 40
|
||||
button.y = 20
|
||||
scene = Scene2D(button)
|
||||
first = CanvasViewport(200, 100, scene)
|
||||
second = CanvasViewport(200, 100, scene)
|
||||
first.camera.x = 20
|
||||
first.camera.zoom = 2
|
||||
page = Page()
|
||||
page.render(Row(0, 20, first, second))
|
||||
"#,
|
||||
"app.main",
|
||||
304,
|
||||
1,
|
||||
)
|
||||
.unwrap();
|
||||
initial.validate().unwrap();
|
||||
assert_eq!(
|
||||
session
|
||||
.execute("button.mounts().count", "app.main")
|
||||
.unwrap()
|
||||
.value,
|
||||
"2"
|
||||
);
|
||||
let buttons: Vec<_> = initial
|
||||
.frame
|
||||
.mounts
|
||||
.iter()
|
||||
.filter(|mount| mount.interactive)
|
||||
.collect();
|
||||
assert_eq!(buttons.len(), 2);
|
||||
assert_eq!(buttons[0].view.unwrap().zoom, 2.0);
|
||||
assert!(buttons[1].view.is_none());
|
||||
assert_eq!(buttons[0].clip, Some([0.0, 0.0, 200.0, 100.0]));
|
||||
assert_eq!(buttons[1].clip, Some([220.0, 0.0, 200.0, 100.0]));
|
||||
let first_id = buttons[0].id;
|
||||
let point = [45.0, 45.0];
|
||||
assert_eq!(
|
||||
initial
|
||||
.frame
|
||||
.hit_test(crate::geometry::Point::new(point[0], point[1]))
|
||||
.unwrap()
|
||||
.id,
|
||||
first_id
|
||||
);
|
||||
session
|
||||
.dispatch(&crate::events::Input {
|
||||
window: crate::window::MAIN_WINDOW,
|
||||
session: initial.frame.session,
|
||||
layout_version: initial.frame.layout_version,
|
||||
mount: first_id,
|
||||
kind: "click".into(),
|
||||
point: Some(point),
|
||||
press_point: Some(point),
|
||||
delta: None,
|
||||
tab_drop: None,
|
||||
screen_position: None,
|
||||
})
|
||||
.unwrap();
|
||||
assert_eq!(
|
||||
session.execute("hits.value", "app.main").unwrap().value,
|
||||
"1"
|
||||
);
|
||||
let changed = session
|
||||
.execute("first.camera.x = -40\nfirst.camera.zoom = 1", "app.main")
|
||||
.unwrap()
|
||||
.document
|
||||
.unwrap();
|
||||
changed.validate().unwrap();
|
||||
let buttons: Vec<_> = changed
|
||||
.frame
|
||||
.mounts
|
||||
.iter()
|
||||
.filter(|mount| mount.interactive)
|
||||
.collect();
|
||||
assert_eq!(buttons[0].id, first_id);
|
||||
assert_eq!(buttons[0].view.unwrap().x, 40.0);
|
||||
assert!(buttons[1].view.is_none());
|
||||
assert_eq!(source_measure_stat(&mut session, "measured"), 0);
|
||||
let shared = session
|
||||
.execute(
|
||||
"second.camera = first.camera\nfirst.camera.zoom = 2",
|
||||
"app.main",
|
||||
)
|
||||
.unwrap()
|
||||
.document
|
||||
.unwrap();
|
||||
shared.validate().unwrap();
|
||||
assert!(
|
||||
shared
|
||||
.frame
|
||||
.mounts
|
||||
.iter()
|
||||
.filter(|mount| mount.interactive)
|
||||
.all(|mount| mount.view.is_some_and(|view| view.zoom == 2.0))
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn nested_canvas_projects_pixels_and_hits_while_overlay_ui_stays_fixed() {
|
||||
let (mut session, initial) = ReplSession::load(
|
||||
r##"
|
||||
button = Button("nested")
|
||||
button.boxWidth = 20
|
||||
button.boxHeight = 20
|
||||
button.x = 10
|
||||
button.y = 10
|
||||
inner = CanvasViewport(80, 60, Scene2D(button))
|
||||
inner.camera.zoom = 0.5
|
||||
inner.x = 20
|
||||
inner.y = 20
|
||||
outer = CanvasViewport(200, 200, Scene2D(inner))
|
||||
outer.camera.zoom = 2
|
||||
hud = RectBlock(10, 10, 0, "#0000FF")
|
||||
page = Page()
|
||||
page.render(Overlay(0, 0, outer, hud))
|
||||
"##,
|
||||
"app.main",
|
||||
305,
|
||||
1,
|
||||
)
|
||||
.unwrap();
|
||||
initial.validate().unwrap();
|
||||
let button = initial
|
||||
.frame
|
||||
.mounts
|
||||
.iter()
|
||||
.find(|mount| mount.interactive)
|
||||
.unwrap();
|
||||
assert_eq!(
|
||||
button.view.unwrap(),
|
||||
crate::viewport::Transform {
|
||||
zoom: 1.0,
|
||||
x: 20.0,
|
||||
y: 20.0
|
||||
}
|
||||
);
|
||||
assert_eq!(button.clip, Some([40.0, 40.0, 160.0, 120.0]));
|
||||
let point = crate::geometry::Point::new(55.0, 55.0);
|
||||
assert_eq!(initial.frame.hit_test(point).unwrap().id, button.id);
|
||||
let inner_id = initial.frame.canvas_at(point).unwrap().id;
|
||||
let input = crate::events::Input {
|
||||
window: 1,
|
||||
session: initial.frame.session,
|
||||
layout_version: initial.frame.layout_version,
|
||||
mount: inner_id,
|
||||
kind: "viewport-pan".into(),
|
||||
delta: Some([10.0, 0.0]),
|
||||
point: None,
|
||||
press_point: None,
|
||||
tab_drop: None,
|
||||
screen_position: None,
|
||||
};
|
||||
session.dispatch(&input).unwrap();
|
||||
assert_eq!(
|
||||
session.execute("inner.camera.x", "app.main").unwrap().value,
|
||||
"10"
|
||||
);
|
||||
assert_eq!(
|
||||
session.execute("outer.camera.x", "app.main").unwrap().value,
|
||||
"0"
|
||||
);
|
||||
let document = session
|
||||
.execute("hud.invalidate(\"paint\")", "app.main")
|
||||
.unwrap()
|
||||
.document
|
||||
.unwrap();
|
||||
let mut pixels = vec![0; 200 * 200];
|
||||
crate::software_renderer::SoftwareRenderer::render(
|
||||
&document.display_list(1.0).unwrap(),
|
||||
&mut pixels,
|
||||
200,
|
||||
200,
|
||||
);
|
||||
assert_eq!(pixels[5 * 200 + 5], 0x0000FF);
|
||||
assert_ne!(pixels[55 * 200 + 45], pixels[190 * 200 + 190]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn canvas_world_paint_is_zoomed_and_clipped_in_the_software_renderer() {
|
||||
let (_, initial) = ReplSession::load(
|
||||
r##"
|
||||
rect = RectBlock(20, 20, 0, "#FF0000")
|
||||
rect.x = -10
|
||||
rect.y = 10
|
||||
view = CanvasViewport(50, 50, Scene2D(rect))
|
||||
view.camera.x = -10
|
||||
view.camera.zoom = 2
|
||||
page = Page()
|
||||
page.render(Overlay(0, 0, view, RectBlock(10, 10, 0, "#0000FF")))
|
||||
"##,
|
||||
"app.main",
|
||||
306,
|
||||
1,
|
||||
)
|
||||
.unwrap();
|
||||
initial.validate().unwrap();
|
||||
let mut pixels = vec![0; 80 * 80];
|
||||
crate::software_renderer::SoftwareRenderer::render(
|
||||
&initial.display_list(1.0).unwrap(),
|
||||
&mut pixels,
|
||||
80,
|
||||
80,
|
||||
);
|
||||
assert_eq!(pixels[5 * 80 + 5], 0x0000FF);
|
||||
assert_eq!(pixels[25 * 80 + 5], 0xFF0000);
|
||||
assert_eq!(pixels[55 * 80 + 5], pixels[79 * 80 + 79]);
|
||||
assert_eq!(pixels[25 * 80 + 45], pixels[79 * 80 + 79]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn scene_viewport_example_and_scroll_view_alias_run_as_real_source() {
|
||||
let (mut session, initial) = ReplSession::load(
|
||||
include_str!("../../../examples/scene-viewports.endor"),
|
||||
"app.main",
|
||||
307,
|
||||
1,
|
||||
)
|
||||
.unwrap();
|
||||
initial.validate().unwrap();
|
||||
assert_eq!(
|
||||
session
|
||||
.execute("increment.mounts().count", "app.main")
|
||||
.unwrap()
|
||||
.value,
|
||||
"2"
|
||||
);
|
||||
session
|
||||
.execute(
|
||||
"testScroll = ScrollView(100, 60, Row(0, 0, TextBlock(\"scroll\")))",
|
||||
"app.main",
|
||||
)
|
||||
.unwrap();
|
||||
assert_eq!(
|
||||
session
|
||||
.execute("ui.isInstance(testScroll, ScrollBlock)", "app.main")
|
||||
.unwrap()
|
||||
.value,
|
||||
"true"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn fit_view_uses_finite_scene_bounds_and_this_mounts_size() {
|
||||
let (mut session, initial) = ReplSession::load(
|
||||
r#"
|
||||
rect = RectBlock(100, 50)
|
||||
rect.x = -100
|
||||
rect.y = -25
|
||||
view = CanvasViewport(296, 196, Scene2D(rect))
|
||||
page = Page()
|
||||
page.render(view)
|
||||
"#,
|
||||
"app.main",
|
||||
308,
|
||||
1,
|
||||
)
|
||||
.unwrap();
|
||||
initial.validate().unwrap();
|
||||
let document = session
|
||||
.execute("view.mounts().at(0).fitView()", "app.main")
|
||||
.unwrap()
|
||||
.document
|
||||
.unwrap();
|
||||
document.validate().unwrap();
|
||||
for (expression, expected) in [
|
||||
("view.camera.zoom", "2"),
|
||||
("view.camera.x", "-124"),
|
||||
("view.camera.y", "-49"),
|
||||
] {
|
||||
assert_eq!(
|
||||
session.execute(expression, "app.main").unwrap().value,
|
||||
expected
|
||||
);
|
||||
}
|
||||
let rect = document
|
||||
.frame
|
||||
.mounts
|
||||
.iter()
|
||||
.find(|mount| mount.width == 100.0 && mount.height == 50.0)
|
||||
.unwrap();
|
||||
let screen = rect
|
||||
.view
|
||||
.unwrap()
|
||||
.point(crate::geometry::Point::new(rect.x, rect.y));
|
||||
assert_eq!(screen, crate::geometry::Point::new(48.0, 48.0));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn scroll_axes_wrap_shared_text_and_clamp_only_the_enabled_offsets() {
|
||||
let (mut session, initial) = ReplSession::load(
|
||||
@@ -6211,7 +6505,7 @@ page.zoom=2
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn bundled_start_page_creates_all_four_real_page_modes() {
|
||||
fn bundled_start_page_uses_independent_layout_scroll_and_scene_viewports() {
|
||||
let mut session = ReplSession::new_with_viewport(
|
||||
302,
|
||||
Some(crate::layout::Size {
|
||||
@@ -6225,12 +6519,16 @@ fn bundled_start_page_creates_all_four_real_page_modes() {
|
||||
.unwrap()
|
||||
.document
|
||||
.unwrap();
|
||||
assert_eq!(document.frame.surface.mode, crate::page::Mode::Canvas);
|
||||
for (label, mode) in [
|
||||
("窗口页面", crate::page::Mode::Window),
|
||||
("纵向延伸", crate::page::Mode::Vertical),
|
||||
("横向延伸", crate::page::Mode::Horizontal),
|
||||
] {
|
||||
assert_eq!(document.frame.surface.mode, crate::page::Mode::Window);
|
||||
assert!(
|
||||
document
|
||||
.frame
|
||||
.mounts
|
||||
.iter()
|
||||
.any(|mount| mount.canvas_viewport)
|
||||
);
|
||||
for (label, scrolling) in [("窗口页面", false), ("纵向延伸", true), ("横向延伸", true)]
|
||||
{
|
||||
let home_tab = document
|
||||
.frame
|
||||
.tabs
|
||||
@@ -6270,7 +6568,20 @@ fn bundled_start_page_creates_all_four_real_page_modes() {
|
||||
.unwrap()
|
||||
.document
|
||||
.unwrap();
|
||||
assert_eq!(document.frame.surface.mode, mode, "{label}");
|
||||
assert_eq!(
|
||||
document.frame.surface.mode,
|
||||
crate::page::Mode::Window,
|
||||
"{label}"
|
||||
);
|
||||
assert_eq!(
|
||||
document
|
||||
.frame
|
||||
.mounts
|
||||
.iter()
|
||||
.any(|mount| mount.scroll.is_some()),
|
||||
scrolling,
|
||||
"{label}"
|
||||
);
|
||||
assert!(document.frame.fault.is_none());
|
||||
let input = crate::events::Input {
|
||||
window: 1,
|
||||
|
||||
Reference in New Issue
Block a user