forked from 1b-agent/opencadstudio-upstream
Use curve spans for arc and ellipse breaks
This commit is contained in:
1 parent
a3eee372e4
commit
6b12dfc9e7
1 file changed
+43
-138
@@ -91,73 +91,47 @@ fn break_line(line: &LineEnt, p1: DVec3, p2: DVec3) -> Vec<EntityType> {
|
|||||||
result
|
result
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn picked_spans(curve: &cadkernel::space::PlanarCurve, p1: DVec3, p2: DVec3) -> Option<Vec<[f64; 2]>> {
|
||||||
|
let first = curve.plane.project(p1.to_array())?;
|
||||||
|
let second = curve.plane.project(p2.to_array())?;
|
||||||
|
let a = cadkernel::geom2d::closest_point(&curve.curve, first).t;
|
||||||
|
let b = cadkernel::geom2d::closest_point(&curve.curve, second).t;
|
||||||
|
cadkernel::geom2d::break_spans(&curve.curve, a, b, cadkernel::geom2d::Tolerance::new(1e-9))
|
||||||
|
}
|
||||||
|
|
||||||
fn break_arc(arc: &ArcEnt, p1: DVec3, p2: DVec3) -> Vec<EntityType> {
|
fn break_arc(arc: &ArcEnt, p1: DVec3, p2: DVec3) -> Vec<EntityType> {
|
||||||
let cx = arc.center.x;
|
let curve = crate::entities::curve::arc_curve(arc);
|
||||||
let cy = arc.center.y;
|
let Some(spans) = picked_spans(&curve, p1, p2) else {
|
||||||
let r = arc.radius;
|
|
||||||
|
|
||||||
let plane = crate::entities::curve::arc_curve(arc).plane;
|
|
||||||
let Some(q1) = plane.project(p1.to_array()) else {
|
|
||||||
return vec![EntityType::Arc(arc.clone())];
|
return vec![EntityType::Arc(arc.clone())];
|
||||||
};
|
};
|
||||||
let Some(q2) = plane.project(p2.to_array()) else {
|
let cadkernel::geom2d::Curve::Arc(geometry) = &curve.curve else { unreachable!() };
|
||||||
return vec![EntityType::Arc(arc.clone())];
|
spans.into_iter().map(|[from, to]| {
|
||||||
};
|
let mut result = arc.clone();
|
||||||
let a1 = angle_on_arc(cx, cy, DVec3::new(q1[0], q1[1], 0.0));
|
result.common.handle = Handle::NULL;
|
||||||
let a2 = angle_on_arc(cx, cy, DVec3::new(q2[0], q2[1], 0.0));
|
result.start_angle = geometry.start_angle + from * geometry.sweep();
|
||||||
|
result.end_angle = geometry.start_angle + to * geometry.sweep();
|
||||||
let start = arc.start_angle;
|
EntityType::Arc(result)
|
||||||
let end = arc.end_angle;
|
}).collect()
|
||||||
|
|
||||||
// Normalize: clamp a1 to arc range, then remove CCW from a1 to a2
|
|
||||||
let a1_on = clamp_to_arc(a1, start, end);
|
|
||||||
let a2_on = clamp_to_arc(a2, start, end);
|
|
||||||
|
|
||||||
// Keep the span outside the two break points.
|
|
||||||
if (a1_on - a2_on).abs() < 0.01 {
|
|
||||||
// Single-point break: return original unchanged (no gap)
|
|
||||||
return vec![EntityType::Arc(arc.clone())];
|
|
||||||
}
|
|
||||||
|
|
||||||
let _ = r; // radius unchanged
|
|
||||||
let mut result = arc.clone();
|
|
||||||
result.common.handle = Handle::NULL;
|
|
||||||
result.start_angle = a2_on;
|
|
||||||
result.end_angle = a1_on;
|
|
||||||
vec![EntityType::Arc(result)]
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn break_circle(circle: &acadrust::entities::Circle, p1: DVec3, p2: DVec3) -> Vec<EntityType> {
|
fn break_circle(circle: &acadrust::entities::Circle, p1: DVec3, p2: DVec3) -> Vec<EntityType> {
|
||||||
let cx = circle.center.x;
|
let curve = crate::entities::curve::circle_curve(circle);
|
||||||
let cy = circle.center.y;
|
let Some(spans) = picked_spans(&curve, p1, p2) else {
|
||||||
|
|
||||||
let plane = crate::entities::curve::circle_curve(circle).plane;
|
|
||||||
let Some(q1) = plane.project(p1.to_array()) else {
|
|
||||||
return vec![EntityType::Circle(circle.clone())];
|
return vec![EntityType::Circle(circle.clone())];
|
||||||
};
|
};
|
||||||
let Some(q2) = plane.project(p2.to_array()) else {
|
spans.into_iter().map(|[from, to]| {
|
||||||
return vec![EntityType::Circle(circle.clone())];
|
let mut arc = ArcEnt::new();
|
||||||
};
|
arc.common = circle.common.clone();
|
||||||
let a1 = angle_on_arc(cx, cy, DVec3::new(q1[0], q1[1], 0.0));
|
arc.common.handle = Handle::NULL;
|
||||||
let a2 = angle_on_arc(cx, cy, DVec3::new(q2[0], q2[1], 0.0));
|
arc.center = circle.center;
|
||||||
|
arc.radius = circle.radius;
|
||||||
if (a1 - a2).abs() < 0.01 {
|
arc.thickness = circle.thickness;
|
||||||
return vec![EntityType::Circle(circle.clone())];
|
arc.normal = circle.normal;
|
||||||
}
|
arc.start_angle = from * std::f64::consts::TAU;
|
||||||
|
arc.end_angle = (to * std::f64::consts::TAU).rem_euclid(std::f64::consts::TAU);
|
||||||
// Convert circle to arc, removing CCW from a1 to a2
|
EntityType::Arc(arc)
|
||||||
let mut arc = ArcEnt::new();
|
}).collect()
|
||||||
arc.common = circle.common.clone();
|
|
||||||
arc.common.handle = Handle::NULL;
|
|
||||||
arc.center = circle.center.clone();
|
|
||||||
arc.radius = circle.radius;
|
|
||||||
arc.thickness = circle.thickness;
|
|
||||||
arc.normal = circle.normal.clone();
|
|
||||||
arc.start_angle = a2;
|
|
||||||
arc.end_angle = a1;
|
|
||||||
vec![EntityType::Arc(arc)]
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn break_lwpolyline(p: &LwPolyline, p1: DVec3, p2: DVec3) -> Vec<EntityType> {
|
fn break_lwpolyline(p: &LwPolyline, p1: DVec3, p2: DVec3) -> Vec<EntityType> {
|
||||||
// For LwPolyline, find the nearest vertex indices for p1 and p2,
|
// For LwPolyline, find the nearest vertex indices for p1 and p2,
|
||||||
// then split into two polylines at those vertices.
|
// then split into two polylines at those vertices.
|
||||||
@@ -202,90 +176,21 @@ fn break_lwpolyline(p: &LwPolyline, p1: DVec3, p2: DVec3) -> Vec<EntityType> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn break_ellipse(ell: &EllipseEnt, p1: DVec3, p2: DVec3) -> Vec<EntityType> {
|
fn break_ellipse(ell: &EllipseEnt, p1: DVec3, p2: DVec3) -> Vec<EntityType> {
|
||||||
// Compute the eccentric-anomaly parameter of a world point relative to ellipse.
|
let Some(curve) = crate::entities::curve::ellipse_curve(ell) else {
|
||||||
// World = DXF (XY drawing plane).
|
|
||||||
let cx = ell.center.x;
|
|
||||||
let cy = ell.center.y;
|
|
||||||
let a = (ell.major_axis.x.powi(2) + ell.major_axis.y.powi(2)).sqrt();
|
|
||||||
if a < 1e-9 {
|
|
||||||
return vec![EntityType::Ellipse(ell.clone())];
|
return vec![EntityType::Ellipse(ell.clone())];
|
||||||
}
|
|
||||||
let _b = a * ell.minor_axis_ratio;
|
|
||||||
let nx = ell.major_axis.x / a;
|
|
||||||
let ny = ell.major_axis.y / a;
|
|
||||||
|
|
||||||
// Project a point onto the ellipse parameter (eccentric anomaly)
|
|
||||||
let param_of = |pt: DVec3| -> f64 {
|
|
||||||
let rx = pt.x - cx;
|
|
||||||
let ry = pt.y - cy;
|
|
||||||
let xl = rx * nx + ry * ny;
|
|
||||||
let yl = -rx * ny + ry * nx;
|
|
||||||
yl.atan2(xl) // atan2(yl/b*b, xl/a*a) simplifies to atan2(yl,xl) for ordering
|
|
||||||
};
|
};
|
||||||
|
let Some(spans) = picked_spans(&curve, p1, p2) else {
|
||||||
let t0 = ell.start_parameter;
|
|
||||||
let t1 = ell.end_parameter;
|
|
||||||
|
|
||||||
let pa1 = param_of(p1);
|
|
||||||
let pa2 = param_of(p2);
|
|
||||||
|
|
||||||
// Clamp both params to arc range (same logic as clamp_to_arc for arcs)
|
|
||||||
let span_deg = {
|
|
||||||
let s = t1 - t0;
|
|
||||||
if s <= 0.0 {
|
|
||||||
s + std::f64::consts::TAU
|
|
||||||
} else {
|
|
||||||
s
|
|
||||||
}
|
|
||||||
};
|
|
||||||
let clamp = |a: f64| -> f64 {
|
|
||||||
let rel =
|
|
||||||
((a - t0) % std::f64::consts::TAU + std::f64::consts::TAU) % std::f64::consts::TAU;
|
|
||||||
if rel <= span_deg {
|
|
||||||
a
|
|
||||||
} else if rel < span_deg + (std::f64::consts::TAU - span_deg) / 2.0 {
|
|
||||||
t1
|
|
||||||
} else {
|
|
||||||
t0
|
|
||||||
}
|
|
||||||
};
|
|
||||||
let a1_on = clamp(pa1);
|
|
||||||
let a2_on = clamp(pa2);
|
|
||||||
|
|
||||||
if (a1_on - a2_on).abs() < 1e-4 {
|
|
||||||
return vec![EntityType::Ellipse(ell.clone())];
|
return vec![EntityType::Ellipse(ell.clone())];
|
||||||
}
|
};
|
||||||
|
let cadkernel::geom2d::Curve::Ellipse(geometry) = &curve.curve else { unreachable!() };
|
||||||
// Remove CCW from a1_on to a2_on → result goes from a2_on to a1_on
|
spans.into_iter().map(|[from, to]| {
|
||||||
let mut result = ell.clone();
|
let mut result = ell.clone();
|
||||||
result.common.handle = Handle::NULL;
|
result.common.handle = Handle::NULL;
|
||||||
result.start_parameter = a2_on;
|
result.start_parameter = geometry.start_parameter + from * geometry.sweep();
|
||||||
result.end_parameter = a1_on;
|
result.end_parameter = geometry.start_parameter + to * geometry.sweep();
|
||||||
vec![EntityType::Ellipse(result)]
|
EntityType::Ellipse(result)
|
||||||
|
}).collect()
|
||||||
}
|
}
|
||||||
|
|
||||||
// ── Small utilities ────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
/// Returns the angle (radians, 0-2π) of `pt` viewed from (cx, cy) in the world XY plane.
|
|
||||||
fn angle_on_arc(cx: f64, cy: f64, pt: DVec3) -> f64 {
|
|
||||||
let dx = pt.x - cx;
|
|
||||||
let dy = pt.y - cy;
|
|
||||||
dy.atan2(dx).rem_euclid(std::f64::consts::TAU)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Clamp angle `a` to within the arc's angular range (CCW from `start` to `end`).
|
|
||||||
fn clamp_to_arc(a: f64, start: f64, end: f64) -> f64 {
|
|
||||||
let span = (end - start).rem_euclid(std::f64::consts::TAU);
|
|
||||||
let rel = (a - start).rem_euclid(std::f64::consts::TAU);
|
|
||||||
if rel <= span {
|
|
||||||
a
|
|
||||||
} else if rel < span + (std::f64::consts::TAU - span) / 2.0 {
|
|
||||||
end
|
|
||||||
} else {
|
|
||||||
start
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Find the index of the polyline vertex closest to `pt`.
|
/// Find the index of the polyline vertex closest to `pt`.
|
||||||
fn nearest_pline_param(p: &LwPolyline, pt: DVec3) -> usize {
|
fn nearest_pline_param(p: &LwPolyline, pt: DVec3) -> usize {
|
||||||
p.vertices
|
p.vertices
|
||||||
|
|||||||
Reference in new issue
Block a user