feat: separate 2d scenes viewports and explicit cameras

This commit is contained in:
2026-11-10 22:42:56 +08:00
parent 32d7ada3ab
commit 040b779f5f
29 changed files with 1309 additions and 70 deletions
+74 -18
View File
@@ -50,6 +50,7 @@ pub struct TesseraApp {
sidebar: crate::sidebar::State,
sidebar_keyboard: bool,
panning: bool,
pan_viewport: Option<u64>,
space_down: bool,
modifiers: ModifiersState,
activity: Activity,
@@ -87,6 +88,7 @@ impl TesseraApp {
sidebar: crate::sidebar::State::default(),
sidebar_keyboard: false,
panning: false,
pan_viewport: None,
space_down: false,
modifiers: ModifiersState::default(),
activity,
@@ -605,8 +607,21 @@ impl TesseraApp {
self.request_redraw();
}
fn begin_pan(&mut self) -> bool {
self.pan_viewport = None;
let Some(point) = self.guest_point() else {
return false;
};
let Ok(current) = self.namespace.read() else {
return false;
};
let frame = &current.document.frame;
self.pan_viewport = frame.canvas_at(point).map(|mount| mount.id);
self.pan_viewport.is_some() || frame.surface.mode != crate::page::Mode::Window
}
fn page_view(&mut self, kind: &str, delta: [f32; 2]) {
if self.guest_covered(self.pointer) {
if !self.panning && self.guest_covered(self.pointer) {
return;
}
let point = Point::new(self.pointer.x - self.sidebar.left(), self.pointer.y);
@@ -614,13 +629,58 @@ impl TesseraApp {
let frame = &current.document.frame;
if frame.session == 0
|| frame.fault.is_some()
|| frame.surface.mode == crate::page::Mode::Window
|| !self.panning
&& (point.x < 0.0
|| point.y < 0.0
|| current
.viewport
.is_some_and(|size| point.x >= size.width || point.y >= size.height))
{
return None;
}
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)
})
} else {
frame.canvas_at(world)
};
if self.panning && self.pan_viewport.is_some() && viewport.is_none() {
return None;
}
if let Some(viewport) = viewport {
return Some(crate::events::Input {
window: self.resource,
session: frame.session,
layout_version: frame.layout_version,
mount: viewport.id,
kind: if kind == "page-zoom" {
"viewport-zoom"
} else {
"viewport-pan"
}
.into(),
point: (kind == "page-zoom").then_some([world.x, world.y]),
press_point: None,
delta: Some([
delta[0]
/ if kind == "page-pan" {
frame.surface.zoom
} else {
1.0
},
delta[1] / frame.surface.zoom,
]),
tab_drop: None,
screen_position: None,
});
}
if frame.surface.mode == crate::page::Mode::Window
|| kind == "page-zoom" && frame.surface.mode != crate::page::Mode::Canvas
|| point.x < 0.0
|| point.y < 0.0
|| current
.viewport
.is_some_and(|size| point.x >= size.width || point.y >= size.height)
{
return None;
}
@@ -1053,12 +1113,7 @@ impl ApplicationHandler<AppEvent> for TesseraApp {
button: MouseButton::Middle,
..
} => {
self.panning = state == ElementState::Pressed
&& self.guest_point().is_some()
&& self
.namespace
.read()
.is_ok_and(|n| n.document.frame.surface.mode == crate::page::Mode::Canvas);
self.panning = state == ElementState::Pressed && self.begin_pan();
self.guest_pressed = None;
window.request_redraw();
}
@@ -1088,7 +1143,7 @@ impl ApplicationHandler<AppEvent> for TesseraApp {
let _ = window.drag_window();
}
} else if self.space_down && self.guest_point().is_some() {
self.panning = true;
self.panning = self.begin_pan();
self.guest_pressed = None;
} else {
self.sidebar_keyboard = false;
@@ -1152,10 +1207,11 @@ impl ApplicationHandler<AppEvent> for TesseraApp {
window.request_redraw();
return;
}
let canvas = self
.namespace
.read()
.is_ok_and(|n| n.document.frame.surface.mode == crate::page::Mode::Canvas);
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())
});
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();