forked from 1b-agent/opencadstudio-upstream
feat(ucs): dynamic-input deltas and angle in the active UCS
The on-canvas dynamic-input boxes measured relative X/Y deltas and the polar angle in world axes. They now read in the active UCS plane (via UcsXform::vec_to_ucs on the offset-invariant delta), matching the UCS ortho/polar constraints and coordinate readout. Identity UCS reproduces the world-frame values; absolute first-point fields are unchanged. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
1 parent
d78ed60582
commit
b676874a6f
2 files changed
+13
-5
No files matched your search
@@ -110,7 +110,6 @@ impl UcsXform {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// WCS direction → UCS (rotation only, no origin shift).
|
/// WCS direction → UCS (rotation only, no origin shift).
|
||||||
#[allow(dead_code)]
|
|
||||||
pub(super) fn vec_to_ucs(&self, v: glam::Vec3) -> glam::Vec3 {
|
pub(super) fn vec_to_ucs(&self, v: glam::Vec3) -> glam::Vec3 {
|
||||||
glam::Vec3::new(v.dot(self.x), v.dot(self.y), v.dot(self.z))
|
glam::Vec3::new(v.dot(self.x), v.dot(self.y), v.dot(self.z))
|
||||||
}
|
}
|
||||||
|
|||||||
+13
-4
@@ -296,7 +296,7 @@ impl OpenCADStudio {
|
|||||||
{
|
{
|
||||||
format!("{lv:.4}")
|
format!("{lv:.4}")
|
||||||
}
|
}
|
||||||
_ => dyn_component_value(f, w, base),
|
_ => dyn_component_value(f, w, base, &tab.ucs_xform()),
|
||||||
};
|
};
|
||||||
overlay::DynBox {
|
overlay::DynBox {
|
||||||
label: f.role.label().to_string(),
|
label: f.role.label().to_string(),
|
||||||
@@ -4356,13 +4356,22 @@ fn viewport_controls<'a>(
|
|||||||
/// The string shown inside a dynamic-input box: the typed buffer when the
|
/// The string shown inside a dynamic-input box: the typed buffer when the
|
||||||
/// field is locked, otherwise the live value derived from the cursor
|
/// field is locked, otherwise the live value derived from the cursor
|
||||||
/// world position (and the base point for polar quantities).
|
/// world position (and the base point for polar quantities).
|
||||||
fn dyn_component_value(f: &DynFieldEntry, w: glam::Vec3, base: Option<glam::Vec3>) -> String {
|
fn dyn_component_value(
|
||||||
|
f: &DynFieldEntry,
|
||||||
|
w: glam::Vec3,
|
||||||
|
base: Option<glam::Vec3>,
|
||||||
|
xf: &super::helpers::UcsXform,
|
||||||
|
) -> String {
|
||||||
if let Some(b) = &f.buffer {
|
if let Some(b) = &f.buffer {
|
||||||
return b.clone();
|
return b.clone();
|
||||||
}
|
}
|
||||||
let b = base.unwrap_or(glam::Vec3::ZERO);
|
let b = base.unwrap_or(glam::Vec3::ZERO);
|
||||||
let dx = (w.x - b.x) as f64;
|
// Relative deltas and the polar angle read in the active UCS plane. The
|
||||||
let dy = (w.y - b.y) as f64;
|
// delta is offset-invariant, so only the axis rotation matters (identity
|
||||||
|
// xf reproduces the world-frame deltas).
|
||||||
|
let d = xf.vec_to_ucs(w - b);
|
||||||
|
let dx = d.x as f64;
|
||||||
|
let dy = d.y as f64;
|
||||||
// When a base point exists (DYN-on after the first pick) the cartesian
|
// When a base point exists (DYN-on after the first pick) the cartesian
|
||||||
// fields show relative deltas — matching the typed-value convention
|
// fields show relative deltas — matching the typed-value convention
|
||||||
// in `dyn_resolve_point` so the live preview and the committed
|
// in `dyn_resolve_point` so the live preview and the committed
|
||||||
|
|||||||
Reference in new issue
Block a user