forked from 1b-agent/opencadstudio-upstream
feat(snap): snap paper space through layout viewports
Paper-space commands could not pick model geometry displayed by a layout viewport: `hit_test_wires` deliberately excludes viewport content in PSPACE, and that has to stay true for selection. This adds the capability as a separate query rather than by changing those semantics. `OpenCADStudio::paper_viewport_snap` walks the current layout's displayed content viewports top-most first, skips those whose display is off or whose clip boundary excludes the cursor, and for each one runs the EXISTING snap engine against that viewport's model wires using the viewport's own camera and screen rectangle (`viewport_edit_frame_for`). The accepted model point is mapped back onto the sheet with `ViewportFrame::model_to_paper`, so everything downstream keeps working in paper coordinates — LINE still draws at the projected paper point. Grid snap and the paper-space rubber-band origin are suppressed for that pass; results outside the clip are rejected so no snap lands on a clip cut. Locked viewports snap like unlocked ones. No projected geometry is rebuilt per pointer event: the wire set is the renderer's resident per-viewport Arc (`model_wires_for_viewport_arc`) and the broad phase reuses the shared interaction index over it. The result is merged with the ordinary paper-sheet snap by `snap::merge_snap`, which applies the engine's own priority-then-distance rule, in both the cursor-move and the click paths. `SnapResult` gains Copy fields `viewport: Option<Handle>` and `source: Option<DimensionAssociationSource>`; the engine fills `source` from the owning wire wherever it knows it. `AcceptedSnap::from_snap` converts a result plus frame into the shared PR2/PR3 contract type. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
This commit is contained in:
1 parent
53576fabdf
commit
6def465ba5
5 files changed
+525
-33
No files matched your search
@@ -2089,6 +2089,31 @@ impl OpenCADStudio {
|
||||
)
|
||||
};
|
||||
|
||||
// Paper-space snapping THROUGH layout viewports (PR1). `edit_cam`
|
||||
// is None here, so `cursor_world` is the paper point and the sheet
|
||||
// fills the canvas (pane-local == canvas pixels). The viewport hit
|
||||
// arrives already projected onto the sheet, so everything
|
||||
// downstream keeps working in paper coordinates — LINE still draws
|
||||
// at the projected paper point.
|
||||
self.vp_snap_frame = None;
|
||||
if edit_cam.is_none() && !needs_entity && !is_gathering && !needs_structure
|
||||
&& !needs_tan
|
||||
{
|
||||
if let Some((vp_hit, frame)) =
|
||||
self.paper_viewport_snap(i, p_full, vp_size, cursor_world)
|
||||
{
|
||||
let merged = crate::snap::merge_snap(
|
||||
self.tabs[i].snap_result,
|
||||
Some(vp_hit),
|
||||
p_full,
|
||||
);
|
||||
if merged.is_some_and(|hit| hit.viewport.is_some()) {
|
||||
self.vp_snap_frame = Some(frame);
|
||||
}
|
||||
self.tabs[i].snap_result = merged;
|
||||
}
|
||||
}
|
||||
|
||||
let wants_point = self.tabs[i].active_cmd.as_ref().is_some_and(|command| {
|
||||
!command.needs_entity_pick()
|
||||
&& !command.needs_tangent_pick()
|
||||
@@ -2376,6 +2401,8 @@ impl OpenCADStudio {
|
||||
extension_base2: None,
|
||||
extension_origin: None,
|
||||
extension_dir: None,
|
||||
viewport: None,
|
||||
source: None,
|
||||
});
|
||||
if let Some(cmd) = self.tabs[i].active_cmd.as_mut() {
|
||||
cmd.set_acquisition_hint(Some(pick.label));
|
||||
@@ -3646,6 +3673,24 @@ impl OpenCADStudio {
|
||||
}
|
||||
}
|
||||
}
|
||||
// Paper-space snapping through layout viewports (PR1). Mirrors
|
||||
// the cursor-move pass: the click recomputes snapping from
|
||||
// scratch, so the viewport query has to run here too. The hit
|
||||
// comes back already projected onto the sheet.
|
||||
let mut click_frame: Option<crate::scene::viewport_ref::ViewportFrame> = None;
|
||||
if edit_cam.is_none() && !needs_entity_click && !needs_tan {
|
||||
if let Some((vp_hit, frame)) =
|
||||
self.paper_viewport_snap(i, p_full, (vw, vh), raw)
|
||||
{
|
||||
let merged =
|
||||
crate::snap::merge_snap(snap_hit, Some(vp_hit), p_full);
|
||||
if merged.is_some_and(|hit| hit.viewport.is_some()) {
|
||||
click_frame = Some(frame);
|
||||
}
|
||||
snap_hit = merged;
|
||||
}
|
||||
}
|
||||
self.pending_click_snap = snap_hit.map(|hit| (hit, click_frame));
|
||||
// Snap runs in model space; the result is already model.
|
||||
let mut pt = snap_hit.map(|s| s.world).unwrap_or(raw);
|
||||
// When no UCS is active clamp to world XY; with a UCS the point is
|
||||
@@ -4100,6 +4145,16 @@ impl OpenCADStudio {
|
||||
}
|
||||
}
|
||||
self.last_point = Some(world_pt);
|
||||
// Record what this point step accepted, alongside the point
|
||||
// itself (PR1): paper point, model point, viewport, frame and
|
||||
// geometry identity. Commands that don't care keep consuming
|
||||
// `world_pt` exactly as before.
|
||||
let pending = self.pending_click_snap.take();
|
||||
self.record_accepted_snap(
|
||||
pending.map(|(hit, _)| hit),
|
||||
pending.and_then(|(_, frame)| frame),
|
||||
world_pt,
|
||||
);
|
||||
// The one-shot snap override is spent by this pick —
|
||||
// restore the running osnap configuration (#337).
|
||||
self.snapper.clear_override();
|
||||
|
||||
Reference in new issue
Block a user