feat: render programmable 3d scenes cameras and picking
This commit is contained in:
+51
-9
@@ -51,6 +51,7 @@ pub struct TesseraApp {
|
||||
sidebar_keyboard: bool,
|
||||
panning: bool,
|
||||
pan_viewport: Option<u64>,
|
||||
orbiting: bool,
|
||||
space_down: bool,
|
||||
modifiers: ModifiersState,
|
||||
activity: Activity,
|
||||
@@ -89,6 +90,7 @@ impl TesseraApp {
|
||||
sidebar_keyboard: false,
|
||||
panning: false,
|
||||
pan_viewport: None,
|
||||
orbiting: false,
|
||||
space_down: false,
|
||||
modifiers: ModifiersState::default(),
|
||||
activity,
|
||||
@@ -616,7 +618,7 @@ impl TesseraApp {
|
||||
return false;
|
||||
};
|
||||
let frame = ¤t.document.frame;
|
||||
self.pan_viewport = frame.canvas_at(point).map(|mount| mount.id);
|
||||
self.pan_viewport = frame.camera_at(point).map(|mount| mount.id);
|
||||
self.pan_viewport.is_some() || frame.surface.mode != crate::page::Mode::Window
|
||||
}
|
||||
|
||||
@@ -641,13 +643,14 @@ impl TesseraApp {
|
||||
let world = frame.surface.to_world(point);
|
||||
let viewport = if self.panning {
|
||||
self.pan_viewport.and_then(|id| {
|
||||
frame
|
||||
.mounts
|
||||
.iter()
|
||||
.find(|mount| mount.id == id && mount.canvas_viewport)
|
||||
frame.mounts.iter().find(|mount| {
|
||||
mount.id == id
|
||||
&& (mount.canvas_viewport
|
||||
|| mount.scene3d_viewport && mount.camera_controls)
|
||||
})
|
||||
})
|
||||
} else {
|
||||
frame.canvas_at(world)
|
||||
frame.camera_at(world)
|
||||
};
|
||||
if self.panning && self.pan_viewport.is_some() && viewport.is_none() {
|
||||
return None;
|
||||
@@ -658,7 +661,15 @@ impl TesseraApp {
|
||||
session: frame.session,
|
||||
layout_version: frame.layout_version,
|
||||
mount: viewport.id,
|
||||
kind: if kind == "page-zoom" {
|
||||
kind: if viewport.scene3d_viewport {
|
||||
if kind == "page-zoom" {
|
||||
"scene-zoom"
|
||||
} else if self.orbiting {
|
||||
"scene-orbit"
|
||||
} else {
|
||||
"scene-pan"
|
||||
}
|
||||
} else if kind == "page-zoom" {
|
||||
"viewport-zoom"
|
||||
} else {
|
||||
"viewport-pan"
|
||||
@@ -925,7 +936,8 @@ impl TesseraApp {
|
||||
let mut buffer = surface
|
||||
.buffer_mut()
|
||||
.map_err(|error| anyhow::anyhow!("{error}"))?;
|
||||
SoftwareRenderer::render(&scene.display_list, &mut buffer, size.width, size.height);
|
||||
SoftwareRenderer::render(&scene.display_list, &mut buffer, size.width, size.height)
|
||||
.map_err(anyhow::Error::msg)?;
|
||||
buffer
|
||||
.present()
|
||||
.map_err(|error| anyhow::anyhow!("{error}"))?;
|
||||
@@ -1073,6 +1085,24 @@ impl ApplicationHandler<AppEvent> for TesseraApp {
|
||||
self.sidebar
|
||||
.interaction
|
||||
.pointer_moved(next, &self.sidebar.targets);
|
||||
if !self.panning
|
||||
&& let Some(press) = &self.guest_pressed
|
||||
&& let Some(point) = self.guest_point()
|
||||
&& let Some(start) = press.point
|
||||
{
|
||||
let is_3d = self.namespace.read().is_ok_and(|current| {
|
||||
current.document.frame.mounts.iter().any(|mount| {
|
||||
mount.id == press.mount
|
||||
&& mount.scene3d_viewport
|
||||
&& mount.camera_controls
|
||||
})
|
||||
});
|
||||
if is_3d && (point.x - start[0]).hypot(point.y - start[1]) > 3. {
|
||||
self.orbiting = true;
|
||||
self.panning = self.begin_pan();
|
||||
self.guest_pressed = None;
|
||||
}
|
||||
}
|
||||
if self.panning {
|
||||
self.page_view("page-pan", [-delta.x, -delta.y]);
|
||||
window.request_redraw();
|
||||
@@ -1113,6 +1143,7 @@ impl ApplicationHandler<AppEvent> for TesseraApp {
|
||||
button: MouseButton::Middle,
|
||||
..
|
||||
} => {
|
||||
self.orbiting = false;
|
||||
self.panning = state == ElementState::Pressed && self.begin_pan();
|
||||
self.guest_pressed = None;
|
||||
window.request_redraw();
|
||||
@@ -1143,6 +1174,7 @@ impl ApplicationHandler<AppEvent> for TesseraApp {
|
||||
let _ = window.drag_window();
|
||||
}
|
||||
} else if self.space_down && self.guest_point().is_some() {
|
||||
self.orbiting = false;
|
||||
self.panning = self.begin_pan();
|
||||
self.guest_pressed = None;
|
||||
} else {
|
||||
@@ -1210,13 +1242,23 @@ impl ApplicationHandler<AppEvent> for TesseraApp {
|
||||
let point = self.guest_point();
|
||||
let canvas = self.namespace.read().is_ok_and(|n| {
|
||||
n.document.frame.surface.mode == crate::page::Mode::Canvas
|
||||
|| point.is_some_and(|point| n.document.frame.canvas_at(point).is_some())
|
||||
|| point.is_some_and(|point| n.document.frame.camera_at(point).is_some())
|
||||
});
|
||||
if canvas && (self.modifiers.super_key() || self.modifiers.control_key()) {
|
||||
self.page_view("page-zoom", [(dy * 0.005).exp().clamp(0.1, 10.0), 0.0]);
|
||||
window.request_redraw();
|
||||
return;
|
||||
}
|
||||
let scene3d = self.namespace.read().is_ok_and(|current| {
|
||||
point
|
||||
.and_then(|point| current.document.frame.camera_at(point))
|
||||
.is_some_and(|mount| mount.scene3d_viewport)
|
||||
});
|
||||
if scene3d {
|
||||
self.page_view("page-zoom", [(dy * 0.005).exp().clamp(0.1, 10.), 0.]);
|
||||
window.request_redraw();
|
||||
return;
|
||||
}
|
||||
let point = self.guest_point();
|
||||
let input = point.and_then(|point| {
|
||||
self.namespace.read().ok().and_then(|namespace| {
|
||||
|
||||
Reference in New Issue
Block a user