1b-agent/OneCAD-Draft
1
0 Fork 0
forked from 1b-agent/opencadstudio-upstream
Code Pull Requests Activity

feat(ucs): ortho/polar constrain in the active UCS plane

Browse Source 
Ortho and polar drawing constraints snapped to world X/Y; under an active
UCS they now snap to the UCS axes, routed through the shared UcsXform
(identity = unchanged world-XY behaviour). Applied at all three input
sites (grip drag, command point, command preview). Typed coordinates
already flow through the converter via ucs_to_wcs / ucs_rotate_vec.

Co-Authored-By: Claude Opus 4.8 <[email protected]>
This commit is contained in:
Hakan SevenandClaude Opus 4.8 committed 2026-06-22 10:00:53 +03:00
1 parent 4aa1e90dcf
commit 746a2c97be
2 files changed
+41 -21
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/app/update.rs
+9 -3
View File
@@ -2653,8 +2653,9 @@ impl OpenCADStudio {
if snap_hit.is_none() {
let base = grip.origin_world;
let ucs_xf = self.tabs[i].ucs_xform();
if self.ortho_mode {
snapped = ortho_constrain(snapped, base);
snapped = ortho_constrain(snapped, base, &ucs_xf);
} else if self.polar_mode {
snapped = polar_constrain_near(
snapped,
@@ -2663,6 +2664,7 @@ impl OpenCADStudio {
vp_mat,
bounds,
self.snapper.osnap_radius_px,
&ucs_xf,
);
}
}
@@ -2871,8 +2873,9 @@ impl OpenCADStudio {
.is_some_and(|s| s.snap_type != crate::snap::SnapType::Grid);
if !osnap_locked {
if let Some(base) = self.last_point {
let ucs_xf = self.tabs[i].ucs_xform();
if self.ortho_mode {
pt = ortho_constrain(pt, base);
pt = ortho_constrain(pt, base, &ucs_xf);
} else if self.polar_mode {
pt = polar_constrain_near(
pt,
@@ -2881,6 +2884,7 @@ impl OpenCADStudio {
view_proj,
bounds,
self.snapper.osnap_radius_px,
&ucs_xf,
);
}
}
@@ -3477,8 +3481,9 @@ impl OpenCADStudio {
// Object snap wins over ortho/polar — a snapped point
// commits as-is. Grid snap still combines. (#132)
if let Some(base) = self.last_point {
let ucs_xf = self.tabs[i].ucs_xform();
if self.ortho_mode {
pt = ortho_constrain(pt, base);
pt = ortho_constrain(pt, base, &ucs_xf);
} else if self.polar_mode {
pt = polar_constrain_near(
pt,
@@ -3487,6 +3492,7 @@ impl OpenCADStudio {
vp_mat,
bounds,
self.snapper.osnap_radius_px,
&ucs_xf,
);
}
}