AI_Assistant/cad-editor
Watch
1
0
Fork
You've already forked cad-editor
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(viewport): migrate model-space tiling to iced pane_grid

Browse source 
Replace the custom model_tiles tiling with iced 0.14 pane_grid as the layout
source of truth, while paper-space floating viewports are left untouched (they
overlap/free-place, which pane_grid cannot model).

Each Model pane is its own shader widget rendering its camera into the pane
bounds; the renderer Primitive carries a base_slot so several shader widgets
share the type-keyed MultiPipeline storage on disjoint slots. A second pane_grid
of transparent mouse_areas (plus on_resize) layers above the crosshair overlay
to receive input — the overlay's Hidden cursor interaction otherwise levitates
the cursor and starves any layer beneath it. The active pane follows the cursor
(hover-activate), and grid / crosshair / UCS icon render per pane while the
ViewCube and render-mode picker stay on the active pane only.

Split / close / VPORTS presets and the VPort table round-trip now drive
pane_grid (guillotine reconstruction on load). Adds drag-to-swap via a controls
bar handle with a ghost-card preview, visible pane dividers from the pane_grid
split regions, a default model background of RGB(33,40,48), and removes all the
superseded custom-tile code.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Hakan Seven 2026-06-27 11:50:11 +03:00
commit 495b13ec4f
18 changed files with 1004 additions and 733 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/app/commands/view.rs
View file

@ -370,31 +370,33 @@ impl OpenCADStudio {
.push_info("VPORTS Configuration [SIngle/2H/2V/4]:");
return Some(self.focus_cmd_input());
}
// Model space: split the tiled viewport layout.
use iced::Rectangle as R;
let full = R { x: 0.0, y: 0.0, width: 1.0, height: 1.0 };
let rects: Option<Vec<R>> = match sub.as_str() {
"SINGLE" | "SI" | "1" => Some(vec![full]),
"2H" | "2" => Some(vec![
R { x: 0.0, y: 0.0, width: 1.0, height: 0.5 },
R { x: 0.0, y: 0.5, width: 1.0, height: 0.5 },
]),
"2V" => Some(vec![
R { x: 0.0, y: 0.0, width: 0.5, height: 1.0 },
R { x: 0.5, y: 0.0, width: 0.5, height: 1.0 },
]),
"4" => Some(vec![
R { x: 0.0, y: 0.0, width: 0.5, height: 0.5 },
R { x: 0.5, y: 0.0, width: 0.5, height: 0.5 },
R { x: 0.0, y: 0.5, width: 0.5, height: 0.5 },
R { x: 0.5, y: 0.5, width: 0.5, height: 0.5 },
]),
// Model space: split the tiled viewport layout via pane_grid.
use iced::widget::pane_grid::{Axis, Configuration as C};
let split = |axis, a, b| C::Split {
axis,
ratio: 0.5,
a: Box::new(a),
b: Box::new(b),
};
let config: Option<(C<usize>, usize)> = match sub.as_str() {
"SINGLE" | "SI" | "1" => Some((C::Pane(0), 1)),
"2H" | "2" => {
Some((split(Axis::Horizontal, C::Pane(0), C::Pane(1)), 2))
}
"2V" => Some((split(Axis::Vertical, C::Pane(0), C::Pane(1)), 2)),
"4" => Some((
split(
Axis::Vertical,
split(Axis::Horizontal, C::Pane(0), C::Pane(2)),
split(Axis::Horizontal, C::Pane(1), C::Pane(3)),
),
4,
)),
_ => None,
};
match rects {
Some(rects) => {
let n = rects.len();
self.tabs[i].scene.set_model_tile_layout(rects);
match config {
Some((config, n)) => {
self.tabs[i].scene.set_model_panes(config);
self.tabs[i].scene.camera_generation += 1;
self.command_line
.push_output(&format!("VPORTS: {n} viewport(s)."));