feat: render programmable 3d scenes cameras and picking
This commit is contained in:
@@ -4560,7 +4560,7 @@ fn nested_canvas_projects_pixels_and_hits_while_overlay_ui_stays_fixed() {
|
||||
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 inner_id = initial.frame.camera_at(point).unwrap().id;
|
||||
let input = crate::events::Input {
|
||||
window: 1,
|
||||
session: initial.frame.session,
|
||||
@@ -4593,7 +4593,8 @@ fn nested_canvas_projects_pixels_and_hits_while_overlay_ui_stays_fixed() {
|
||||
&mut pixels,
|
||||
200,
|
||||
200,
|
||||
);
|
||||
)
|
||||
.unwrap();
|
||||
assert_eq!(pixels[5 * 200 + 5], 0x0000FF);
|
||||
assert_ne!(pixels[55 * 200 + 45], pixels[190 * 200 + 190]);
|
||||
}
|
||||
@@ -4623,7 +4624,8 @@ fn canvas_world_paint_is_zoomed_and_clipped_in_the_software_renderer() {
|
||||
&mut pixels,
|
||||
80,
|
||||
80,
|
||||
);
|
||||
)
|
||||
.unwrap();
|
||||
assert_eq!(pixels[5 * 80 + 5], 0x0000FF);
|
||||
assert_eq!(pixels[25 * 80 + 5], 0xFF0000);
|
||||
assert_eq!(pixels[55 * 80 + 5], pixels[79 * 80 + 79]);
|
||||
@@ -4708,6 +4710,220 @@ fn fit_view_uses_finite_scene_bounds_and_this_mounts_size() {
|
||||
assert_eq!(screen, crate::geometry::Point::new(48.0, 48.0));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn real_scene3d_renders_depth_with_independent_perspective_and_orthographic_cameras() {
|
||||
let (mut session, initial) = ReplSession::load(
|
||||
r##"
|
||||
back = Box3D(2, 2, 2, "#FF0000")
|
||||
front = Box3D(1, 1, 1, "#0000FF")
|
||||
front.z = 1.5
|
||||
scene = Scene3D(front, back)
|
||||
scene.ambient = 1
|
||||
perspective = Viewport3D(120, 100, scene)
|
||||
orthographic = Viewport3D(120, 100, scene)
|
||||
orthographic.camera = OrthographicCamera()
|
||||
orthographic.camera.height = 4
|
||||
page = Page()
|
||||
page.render(Row(0, 10, perspective, orthographic))
|
||||
"##,
|
||||
"app.main",
|
||||
309,
|
||||
1,
|
||||
)
|
||||
.unwrap();
|
||||
initial.validate().unwrap();
|
||||
let commands: Vec<_> = initial
|
||||
.frame
|
||||
.commands
|
||||
.iter()
|
||||
.filter_map(|command| {
|
||||
if let RenderCommand::Scene3D { view, .. } = command {
|
||||
Some(view)
|
||||
} else {
|
||||
None
|
||||
}
|
||||
})
|
||||
.collect();
|
||||
assert_eq!(commands.len(), 2);
|
||||
let hit = commands[0].pick(0.5, 0.5, 1.2).unwrap();
|
||||
assert!((hit.distance - 3.0).abs() < 1e-5);
|
||||
assert_eq!(hit.point, crate::scene3d::math::Vec3::new(0., 0., 2.));
|
||||
assert!(matches!(
|
||||
commands[1].camera.projection,
|
||||
crate::scene3d::math::Projection::Orthographic { height: 4.0 }
|
||||
));
|
||||
let mut pixels = vec![0; 250 * 100];
|
||||
crate::software_renderer::SoftwareRenderer::render(
|
||||
&initial.display_list(1.).unwrap(),
|
||||
&mut pixels,
|
||||
250,
|
||||
100,
|
||||
)
|
||||
.unwrap();
|
||||
assert_eq!(pixels[50 * 250 + 60], 0x0000FF);
|
||||
assert_eq!(pixels[50 * 250 + 190], 0x0000FF);
|
||||
let updated = session
|
||||
.execute("front.x=10\nperspective.camera.z=8", "app.main")
|
||||
.unwrap()
|
||||
.document
|
||||
.unwrap();
|
||||
updated.validate().unwrap();
|
||||
let cameras: Vec<_> = updated
|
||||
.frame
|
||||
.commands
|
||||
.iter()
|
||||
.filter_map(|command| {
|
||||
if let RenderCommand::Scene3D { view, .. } = command {
|
||||
Some(view.camera.position.z)
|
||||
} else {
|
||||
None
|
||||
}
|
||||
})
|
||||
.collect();
|
||||
assert_eq!(cameras, vec![8., 5.]);
|
||||
crate::software_renderer::SoftwareRenderer::render(
|
||||
&updated.display_list(1.).unwrap(),
|
||||
&mut pixels,
|
||||
250,
|
||||
100,
|
||||
)
|
||||
.unwrap();
|
||||
assert_eq!(pixels[50 * 250 + 60], 0xFF0000);
|
||||
assert_eq!(pixels[50 * 250 + 190], 0xFF0000);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn ray_pick_returns_managed_mesh_and_native_pointer_event_updates_its_material() {
|
||||
let (mut session, initial) = ReplSession::load(
|
||||
r##"
|
||||
class Actions {
|
||||
function select(self: Actions, event: Event): Unit { event.hit.mesh.color = "#00FF00" }
|
||||
}
|
||||
mesh = Box3D(2,2,2,"#FF0000")
|
||||
scene = Scene3D(mesh)
|
||||
scene.ambient = 1
|
||||
view = Viewport3D(100,100,scene)
|
||||
actions = Actions()
|
||||
view.onClick(actions.select)
|
||||
page = Page()
|
||||
page.render(view)
|
||||
"##,
|
||||
"app.main",
|
||||
310,
|
||||
1,
|
||||
)
|
||||
.unwrap();
|
||||
initial.validate().unwrap();
|
||||
assert_eq!(
|
||||
session
|
||||
.execute("view.mounts().at(0).pick3D(50,50).point.z", "app.main")
|
||||
.unwrap()
|
||||
.value,
|
||||
"1"
|
||||
);
|
||||
assert_eq!(
|
||||
session
|
||||
.execute("view.mounts().at(0).pick3D(50,50).mesh.color", "app.main")
|
||||
.unwrap()
|
||||
.value,
|
||||
"\"#FF0000\""
|
||||
);
|
||||
let frame = session
|
||||
.execute("view.invalidate(\"paint\")", "app.main")
|
||||
.unwrap()
|
||||
.document
|
||||
.unwrap()
|
||||
.frame;
|
||||
let mount = frame
|
||||
.mounts
|
||||
.iter()
|
||||
.find(|mount| mount.scene3d_viewport)
|
||||
.unwrap();
|
||||
let updated = session
|
||||
.dispatch(&crate::events::Input {
|
||||
window: 1,
|
||||
session: frame.session,
|
||||
layout_version: frame.layout_version,
|
||||
mount: mount.id,
|
||||
kind: "click".into(),
|
||||
point: Some([50., 50.]),
|
||||
press_point: Some([50., 50.]),
|
||||
delta: None,
|
||||
tab_drop: None,
|
||||
screen_position: None,
|
||||
})
|
||||
.unwrap()
|
||||
.document
|
||||
.unwrap();
|
||||
assert_eq!(
|
||||
session.execute("mesh.color", "app.main").unwrap().value,
|
||||
"\"#00FF00\""
|
||||
);
|
||||
let mut pixels = vec![0; 100 * 100];
|
||||
crate::software_renderer::SoftwareRenderer::render(
|
||||
&updated.display_list(1.).unwrap(),
|
||||
&mut pixels,
|
||||
100,
|
||||
100,
|
||||
)
|
||||
.unwrap();
|
||||
assert_eq!(pixels[50 * 100 + 50], 0x00FF00);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn scene3d_example_custom_geometry_and_cycle_diagnostics_use_real_source() {
|
||||
let (mut session, document) = ReplSession::load(
|
||||
include_str!("../../../examples/scene3d.endor"),
|
||||
"app.main",
|
||||
311,
|
||||
1,
|
||||
)
|
||||
.unwrap();
|
||||
document.validate().unwrap();
|
||||
session.execute("actions.rotate()", "app.main").unwrap();
|
||||
assert_eq!(
|
||||
session.execute("cube.rotationY", "app.main").unwrap().value,
|
||||
"40"
|
||||
);
|
||||
session.execute(r##"
|
||||
geometry=Geometry3D(ObjectList(Vec3(-1,-1,0),Vec3(1,-1,0),Vec3(0,1,0)),ObjectList(Triangle3D(0,1,2)))
|
||||
custom=Mesh3D(geometry,"#112233")
|
||||
scene.children=ObjectList(custom)
|
||||
"##,"app.main").unwrap().document.unwrap().validate().unwrap();
|
||||
let error = ReplSession::load(
|
||||
r##"
|
||||
group=Group3D()
|
||||
scene=Scene3D(group)
|
||||
group.children=ObjectList(group)
|
||||
page=Page()
|
||||
page.render(Viewport3D(100,100,scene))
|
||||
"##,
|
||||
"app.main",
|
||||
312,
|
||||
1,
|
||||
)
|
||||
.err()
|
||||
.unwrap();
|
||||
assert!(
|
||||
format!("{error:#}").contains("cyclic 3D scene graph"),
|
||||
"{error:#}"
|
||||
);
|
||||
let error = ReplSession::load(
|
||||
r##"
|
||||
geometry=Geometry3D(ObjectList(Vec3(0,0,0)),ObjectList(Triangle3D(0,1,2)))
|
||||
"##,
|
||||
"app.main",
|
||||
313,
|
||||
1,
|
||||
)
|
||||
.err()
|
||||
.unwrap();
|
||||
assert!(
|
||||
format!("{error:#}").contains("invalid Geometry3D buffers"),
|
||||
"{error:#}"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn scroll_axes_wrap_shared_text_and_clamp_only_the_enabled_offsets() {
|
||||
let (mut session, initial) = ReplSession::load(
|
||||
|
||||
Reference in New Issue
Block a user