cad-editor/src/modules/draw/modify/offset.rs

1189 lines
42 KiB
Rust
Raw Normal View History

2026-03-22 14:56:27 +03:00
// Offset tool — ribbon definition + interactive command.
//
// Command: OFFSET (O)
// OFFSET: Creates a parallel copy of an object (line, arc, circle,
// or lwpolyline) at a specified distance on the chosen side.
//
// Steps:
// 1. Text input: "Specify offset distance <last>:" → enter float or Enter for default
// 2. Pick object to offset (Line, Arc, Circle, LwPolyline)
// 3. Pick a point on the side to offset toward, or choose Multiple
// to keep offsetting the newly created result at the same distance
2026-03-22 14:56:27 +03:00
use std::f64::consts::TAU;
use crate::modules::draw::modify::spline_ops::{spline_pts_wire, spline_sample_xy};
2026-03-22 14:56:27 +03:00
use acadrust::entities::LwVertex;
2026-05-12 10:36:15 +03:00
use acadrust::entities::{
Arc as ArcEnt, Circle as CircleEnt, Ellipse as EllipseEnt, Line as LineEnt, LwPolyline,
Spline as SplineEnt, XLine as XLineEnt,
2026-05-12 10:36:15 +03:00
};
2026-03-22 14:56:27 +03:00
use acadrust::{EntityType, Handle};
use cavalier_contours::core::math::Vector2 as CavVector2;
use cavalier_contours::polyline::internal::pline_offset::{
create_raw_offset_polyline, slices_from_dual_raw_offsets, stitch_slices_together,
};
use cavalier_contours::polyline::{
seg_tangent_vector, PlineOffsetOptions, PlineSource, PlineSourceMut,
Polyline as CavPolyline,
};
use glam::{DVec3, Vec3};
2026-03-22 14:56:27 +03:00
use crate::command::{CadCommand, CmdResult};
use crate::modules::draw::defaults;
2026-03-22 14:56:27 +03:00
use crate::modules::{IconKind, ModuleEvent, ToolDef};
use crate::scene::model::wire_model::WireModel;
2026-03-22 14:56:27 +03:00
2026-07-25 18:49:18 +03:00
use super::entity_index::ModifyEntityIndex;
2026-03-22 14:56:27 +03:00
// ── Ribbon definition ──────────────────────────────────────────────────────
pub fn tool() -> ToolDef {
ToolDef {
id: "OFFSET",
label: "Offset",
icon: IconKind::Svg(include_bytes!("../../../../assets/icons/offset.svg")),
event: ModuleEvent::Command("OFFSET".to_string()),
}
}
// ── Geometry helpers ────────────────────────────────────────────────────────
/// Infinite-line intersection in 2D. Returns the point or None if parallel.
fn isect_lines(p0: [f64; 2], p1: [f64; 2], q0: [f64; 2], q1: [f64; 2]) -> Option<[f64; 2]> {
let dx = p1[0] - p0[0];
let dy = p1[1] - p0[1];
let ex = q1[0] - q0[0];
let ey = q1[1] - q0[1];
let det = dx * ey - dy * ex;
if det.abs() < 1e-10 {
return None;
}
let t = ((q0[0] - p0[0]) * ey - (q0[1] - p0[1]) * ex) / det;
Some([p0[0] + t * dx, p0[1] + t * dy])
}
fn norm_rad(a: f64) -> f64 {
((a % TAU) + TAU) % TAU
}
// ── Line offset ────────────────────────────────────────────────────────────
fn offset_line(l: &LineEnt, dist: f64, side_pt: Vec3) -> Option<EntityType> {
let dx = l.end.x - l.start.x;
let dy = l.end.y - l.start.y;
let len = (dx * dx + dy * dy).sqrt();
if len < 1e-12 {
return None;
}
let nx = -dy / len; // left-perpendicular
let ny = dx / len;
let vx = side_pt.x as f64 - l.start.x;
let vy = side_pt.y as f64 - l.start.y;
let cross = dx * vy - dy * vx;
let sign = if cross >= 0.0 { 1.0 } else { -1.0 };
let ox = sign * nx * dist;
let oy = sign * ny * dist;
let mut new_l = l.clone();
new_l.common.handle = Handle::NULL;
new_l.start.x += ox;
new_l.start.y += oy;
new_l.end.x += ox;
new_l.end.y += oy;
Some(EntityType::Line(new_l))
}
// ── XLine (infinite construction line) offset ────────────────────────────────
// A parallel infinite line: same direction, base point shifted perpendicular by
// `dist` toward the side the cursor is on. (#296)
fn offset_xline(x: &XLineEnt, dist: f64, side_pt: Vec3) -> Option<EntityType> {
let dx = x.direction.x;
let dy = x.direction.y;
let len = (dx * dx + dy * dy).sqrt();
if len < 1e-12 {
return None;
}
let nx = -dy / len; // left-perpendicular
let ny = dx / len;
let vx = side_pt.x as f64 - x.base_point.x;
let vy = side_pt.y as f64 - x.base_point.y;
let cross = dx * vy - dy * vx;
let sign = if cross >= 0.0 { 1.0 } else { -1.0 };
let mut new_x = x.clone();
new_x.common.handle = Handle::NULL;
new_x.base_point.x += sign * nx * dist;
new_x.base_point.y += sign * ny * dist;
Some(EntityType::XLine(new_x))
}
2026-03-22 14:56:27 +03:00
// ── Circle offset ──────────────────────────────────────────────────────────
fn offset_circle(c: &CircleEnt, dist: f64, side_pt: Vec3) -> Option<EntityType> {
let px = side_pt.x as f64;
let py = side_pt.y as f64;
let dc = ((px - c.center.x).powi(2) + (py - c.center.y).powi(2)).sqrt();
let new_r = if dc < c.radius {
c.radius - dist
} else {
c.radius + dist
};
if new_r <= 1e-9 {
return None;
}
let mut new_c = c.clone();
new_c.common.handle = Handle::NULL;
new_c.radius = new_r;
Some(EntityType::Circle(new_c))
}
// ── Arc offset ─────────────────────────────────────────────────────────────
fn offset_arc(a: &ArcEnt, dist: f64, side_pt: Vec3) -> Option<EntityType> {
let px = side_pt.x as f64;
let py = side_pt.y as f64;
let dc = ((px - a.center.x).powi(2) + (py - a.center.y).powi(2)).sqrt();
let new_r = if dc < a.radius {
a.radius - dist
} else {
a.radius + dist
};
if new_r <= 1e-9 {
return None;
}
let mut new_a = a.clone();
new_a.common.handle = Handle::NULL;
new_a.radius = new_r;
Some(EntityType::Arc(new_a))
}
// ── LwPolyline offset ──────────────────────────────────────────────────────
//
// A raw exact line/arc offset can fold over itself at concave corners or when
// the distance is larger than a narrow part of the polyline. The selected
// algorithm splits that raw curve at every intersection, rejects slices whose
// distance to the source is below the requested offset, and stitches the
// remaining slices. This can legitimately return several disconnected
// polylines.
const OFFSET_POS_EPS: f64 = 1e-5;
const OFFSET_JOIN_EPS: f64 = 1e-4;
/// Convert an acad LWPOLYLINE to the line/arc representation used by the
/// topology pass. Coordinates are translated and divided by `dist`, so the
/// offset passed to the algorithm is always ±1. This avoids fixed-epsilon
/// failures on tiny drawings and on UTM-scale coordinates.
fn normalized_offset_source(
p: &LwPolyline,
dist: f64,
) -> Option<(CavPolyline<f64>, [f64; 2])> {
let first = p.vertices.first()?;
let origin = [first.location.x, first.location.y];
let normalize = |point: [f64; 2]| {
[
(point[0] - origin[0]) / dist,
(point[1] - origin[1]) / dist,
]
};
2026-03-22 14:56:27 +03:00
let n = p.vertices.len();
if n < 2 {
return None;
}
let segment_count = if p.is_closed { n } else { n - 1 };
let mut source = if p.is_closed {
CavPolyline::new_closed()
} else {
CavPolyline::new()
};
2026-03-22 14:56:27 +03:00
for index in 0..segment_count {
let start = &p.vertices[index];
let end = &p.vertices[(index + 1) % n];
let p0 = [start.location.x, start.location.y];
let p1 = [end.location.x, end.location.y];
let bulge = if start.bulge.is_finite() {
start.bulge
} else {
0.0
};
let q0 = normalize(p0);
// CavalierContours represents arcs up to a half turn per segment.
// Split major bulge arcs at their exact midpoint; both halves retain
// the original circle and traversal direction.
if bulge.abs() > 1.0 {
if let Some(arc) =
crate::entities::common::BulgeArc::from_bulge(p0, p1, bulge)
{
let half_bulge = (arc.sweep / 8.0).tan();
let midpoint = normalize(arc.sample(0.5));
source.add(q0[0], q0[1], half_bulge);
source.add(midpoint[0], midpoint[1], half_bulge);
continue;
}
}
2026-03-22 14:56:27 +03:00
source.add(q0[0], q0[1], bulge);
}
2026-03-22 14:56:27 +03:00
if !p.is_closed {
let last = &p.vertices[n - 1];
let point = normalize([last.location.x, last.location.y]);
source.add(point[0], point[1], 0.0);
}
2026-03-22 14:56:27 +03:00
let source = source
.remove_repeat_pos(OFFSET_POS_EPS)
.unwrap_or(source);
(source.vertex_count() >= 2).then_some((source, origin))
}
2026-03-22 14:56:27 +03:00
/// CavalierContours deliberately connects diverging line offsets with a round
/// arc. OFFSETGAPTYPE=0 (and OpenCADStudio's previous behavior) instead extends
/// the two lines to a sharp projected intersection. Replace only those
/// generated line-line connection arcs before the self-intersection pass.
fn sharpen_line_connections(raw: &mut CavPolyline<f64>, source: &CavPolyline<f64>) {
loop {
let count = raw.vertex_data.len();
if count < 4 {
return;
}
2026-03-22 14:56:27 +03:00
let mut changed = false;
for index in 0..count {
if !raw.is_closed && index == 0 {
continue;
}
let next = if index + 1 < count {
index + 1
} else if raw.is_closed {
0
} else {
continue;
2026-03-22 14:56:27 +03:00
};
let after = if next + 1 < count {
next + 1
} else if raw.is_closed {
0
} else {
continue;
2026-03-22 14:56:27 +03:00
};
let previous = if index > 0 {
index - 1
} else if raw.is_closed {
count - 1
} else {
continue;
2026-03-22 14:56:27 +03:00
};
let arc_start = raw.vertex_data[index];
let arc_end = raw.vertex_data[next];
if arc_start.bulge.abs() < OFFSET_POS_EPS
|| raw.vertex_data[previous].bulge.abs() >= OFFSET_POS_EPS
|| arc_end.bulge.abs() >= OFFSET_POS_EPS
{
continue;
}
let Some(connection) = crate::entities::common::BulgeArc::from_bulge(
[arc_start.x, arc_start.y],
[arc_end.x, arc_end.y],
arc_start.bulge,
) else {
continue;
};
if (connection.radius - 1.0).abs() > OFFSET_JOIN_EPS {
continue;
}
let generated_at_source_vertex = source.iter_vertexes().any(|vertex| {
let dx = vertex.x - connection.center[0];
let dy = vertex.y - connection.center[1];
dx * dx + dy * dy <= OFFSET_JOIN_EPS * OFFSET_JOIN_EPS
});
if !generated_at_source_vertex {
continue;
}
let before = raw.vertex_data[previous];
let after_vertex = raw.vertex_data[after];
let Some(point) = isect_lines(
[before.x, before.y],
[arc_start.x, arc_start.y],
[arc_end.x, arc_end.y],
[after_vertex.x, after_vertex.y],
) else {
continue;
2026-03-22 14:56:27 +03:00
};
raw.vertex_data[index].x = point[0];
raw.vertex_data[index].y = point[1];
raw.vertex_data[index].bulge = 0.0;
raw.vertex_data.remove(next);
changed = true;
break;
2026-03-22 14:56:27 +03:00
}
if !changed {
return;
2026-03-22 14:56:27 +03:00
}
}
}
2026-03-22 14:56:27 +03:00
fn cleaned_parallel_offset(
source: &CavPolyline<f64>,
signed_offset: f64,
) -> Vec<CavPolyline<f64>> {
let options = PlineOffsetOptions {
handle_self_intersects: true,
pos_equal_eps: OFFSET_POS_EPS,
slice_join_eps: OFFSET_JOIN_EPS,
offset_dist_eps: OFFSET_JOIN_EPS,
..Default::default()
};
let source_index = source.create_approx_aabb_index();
let mut raw: CavPolyline<f64> =
create_raw_offset_polyline(source, signed_offset, OFFSET_POS_EPS);
if raw.is_empty() {
return Vec::new();
2026-03-22 14:56:27 +03:00
}
let mut dual: CavPolyline<f64> =
create_raw_offset_polyline(source, -signed_offset, OFFSET_POS_EPS);
sharpen_line_connections(&mut raw, source);
sharpen_line_connections(&mut dual, source);
let slices = slices_from_dual_raw_offsets(
source,
&raw,
&dual,
&source_index,
signed_offset,
&options,
);
stitch_slices_together::<_, f64, CavPolyline<f64>>(
&raw,
&slices,
source.is_closed(),
raw.vertex_count(),
&options,
)
}
2026-03-22 14:56:27 +03:00
fn offset_lwpolylines(p: &LwPolyline, dist: f64, side_pt: Vec3) -> Vec<EntityType> {
let dist = dist.abs();
if dist < 1e-12 {
return Vec::new();
}
let Some((source, origin)) = normalized_offset_source(p, dist) else {
return Vec::new();
};
let side = CavVector2::new(
(side_pt.x as f64 - origin[0]) / dist,
(side_pt.y as f64 - origin[1]) / dist,
);
let Some(closest) = source.closest_point(side, OFFSET_POS_EPS) else {
return Vec::new();
};
let start_index = closest.seg_start_index;
let tangent = seg_tangent_vector(
source.at(start_index),
source.at(source.next_wrapping_index(start_index)),
closest.seg_point,
);
let toward_pick = side - closest.seg_point;
let cross = tangent.x * toward_pick.y - tangent.y * toward_pick.x;
let signed_offset = if cross >= 0.0 { 1.0 } else { -1.0 };
cleaned_parallel_offset(&source, signed_offset)
.into_iter()
.filter(|result| result.vertex_count() >= 2)
.map(|result| {
let mut new_polyline = p.clone();
new_polyline.common.handle = Handle::NULL;
new_polyline.is_closed = result.is_closed();
new_polyline.vertices = result
.iter_vertexes()
.map(|vertex| {
let mut output = LwVertex::from_coords(
origin[0] + vertex.x * dist,
origin[1] + vertex.y * dist,
);
output.bulge = vertex.bulge;
output
})
.collect();
EntityType::LwPolyline(new_polyline)
})
.collect()
}
#[cfg(test)]
fn offset_lwpolyline(p: &LwPolyline, dist: f64, side_pt: Vec3) -> Option<EntityType> {
offset_lwpolylines(p, dist, side_pt).into_iter().next()
2026-03-22 14:56:27 +03:00
}
// ── Ellipse offset ─────────────────────────────────────────────────────────
//
// A true offset of an ellipse is a Lamé curve, not an ellipse. As an
// acceptable CAD approximation we scale both semi-axes uniformly and keep
// the same orientation, center and parameter range. The sign of the offset
// is determined by whether side_pt is inside or outside the ellipse.
fn offset_ellipse(e: &EllipseEnt, dist: f64, side_pt: Vec3) -> Option<EntityType> {
let a = (e.major_axis.x.powi(2) + e.major_axis.y.powi(2)).sqrt();
2026-05-12 10:36:15 +03:00
if a < 1e-9 {
return None;
}
let b = a * e.minor_axis_ratio;
let nx = e.major_axis.x / a;
let ny = e.major_axis.y / a;
// Project side_pt onto ellipse local frame and test inside/outside.
let rx = side_pt.x as f64 - e.center.x;
let ry = side_pt.y as f64 - e.center.y;
2026-05-12 10:36:15 +03:00
let xl = rx * nx + ry * ny;
let yl = -rx * ny + ry * nx;
let inside = (xl / a).powi(2) + (yl / b).powi(2) < 1.0;
let sign = if inside { -1.0 } else { 1.0 };
let new_a = a + sign * dist;
let new_b = b + sign * dist;
2026-05-12 10:36:15 +03:00
if new_a <= 1e-9 || new_b <= 1e-9 {
return None;
}
let mut new_e = e.clone();
new_e.common.handle = Handle::NULL;
// Scale the major_axis vector proportionally.
let scale = new_a / a;
new_e.major_axis.x *= scale;
new_e.major_axis.y *= scale;
new_e.major_axis.z *= scale;
new_e.minor_axis_ratio = new_b / new_a;
Some(EntityType::Ellipse(new_e))
}
// ── Spline offset ──────────────────────────────────────────────────────────
//
// Strategy: sample the spline into N points, offset each sample point by
// `dist` along the local perpendicular (based on the finite-difference
// tangent), then fit a new spline through the offset points.
fn offset_spline(spl: &SplineEnt, dist: f64, side_pt: Vec3) -> Option<EntityType> {
let (ts_knot, pts) = spline_sample_xy(spl, 64);
let n = pts.len();
2026-05-12 10:36:15 +03:00
if n < 2 {
return None;
}
// Determine offset sign from the first non-degenerate tangent.
let sign: f64 = (0..n - 1).find_map(|i| {
let dx = pts[i + 1][0] - pts[i][0];
let dy = pts[i + 1][1] - pts[i][1];
let len = (dx * dx + dy * dy).sqrt();
2026-05-12 10:36:15 +03:00
if len < 1e-12 {
return None;
}
let vx = side_pt.x as f64 - pts[i][0];
let vy = side_pt.y as f64 - pts[i][1];
let cross = dx * vy - dy * vx;
Some(if cross >= 0.0 { 1.0 } else { -1.0 })
})?;
// Offset each sample point along the local normal.
let offset_pts: Vec<acadrust::types::Vector3> = pts
.iter()
.enumerate()
.map(|(i, p)| {
// Tangent via central / forward / backward difference.
let (dx, dy) = if i == 0 {
let d = [pts[1][0] - pts[0][0], pts[1][1] - pts[0][1]];
(d[0], d[1])
} else if i == n - 1 {
let d = [pts[n - 1][0] - pts[n - 2][0], pts[n - 1][1] - pts[n - 2][1]];
(d[0], d[1])
} else {
2026-05-12 10:36:15 +03:00
(
(pts[i + 1][0] - pts[i - 1][0]) * 0.5,
(pts[i + 1][1] - pts[i - 1][1]) * 0.5,
)
};
let len = (dx * dx + dy * dy).sqrt().max(1e-12);
2026-05-12 10:36:15 +03:00
let nx = -dy / len; // left perpendicular
let ny = dx / len;
let z = spl.control_points.first().map(|v| v.z).unwrap_or(0.0);
2026-05-12 10:36:15 +03:00
acadrust::types::Vector3::new(p[0] + sign * nx * dist, p[1] + sign * ny * dist, z)
})
.collect();
let _ = ts_knot;
// Build a new spline from the offset control points (treat sample pts as fit pts → ctrl pts).
let degree = spl.degree.max(1) as usize;
let new_ctrl: Vec<acadrust::types::Vector3> = offset_pts;
let n_ctrl = new_ctrl.len();
let kv = truck_modeling::KnotVec::uniform_knot(degree, n_ctrl - 1);
let mut new_spl = spl.clone();
new_spl.common.handle = Handle::NULL;
new_spl.control_points = new_ctrl;
new_spl.knots = kv.iter().copied().collect();
new_spl.fit_points.clear();
new_spl.weights.clear();
Some(EntityType::Spline(new_spl))
}
2026-03-22 14:56:27 +03:00
// ── Dispatch ───────────────────────────────────────────────────────────────
fn compute_offsets(entity: &EntityType, dist: f64, side_pt: Vec3) -> Vec<EntityType> {
2026-03-22 14:56:27 +03:00
match entity {
EntityType::Line(l) => offset_line(l, dist, side_pt).into_iter().collect(),
EntityType::Circle(c) => offset_circle(c, dist, side_pt).into_iter().collect(),
EntityType::Arc(a) => offset_arc(a, dist, side_pt).into_iter().collect(),
EntityType::LwPolyline(p) => offset_lwpolylines(p, dist, side_pt),
EntityType::Ellipse(e) => offset_ellipse(e, dist, side_pt).into_iter().collect(),
EntityType::Spline(s) => offset_spline(s, dist, side_pt).into_iter().collect(),
EntityType::XLine(x) => offset_xline(x, dist, side_pt).into_iter().collect(),
_ => Vec::new(),
2026-03-22 14:56:27 +03:00
}
}
// ── Through-mode distance ─────────────────────────────────────────────────
//
// Nearest distance from the cursor to the entity outline, used by "through"
// mode so the offset copy passes through the cursor. Measured against the
// tessellated wire (point-to-segment), which approximates the perpendicular
// distance for every supported entity type.
fn perp_distance(entity: &EntityType, pt: Vec3) -> f64 {
let pts = entity_wire_pts(entity);
if pts.len() < 2 {
return 0.0;
}
let px = pt.x as f64;
let py = pt.y as f64;
let mut best = f64::INFINITY;
for w in pts.windows(2) {
let ax = w[0][0] as f64;
let ay = w[0][1] as f64;
let bx = w[1][0] as f64;
let by = w[1][1] as f64;
let dx = bx - ax;
let dy = by - ay;
let len2 = dx * dx + dy * dy;
let t = if len2 < 1e-12 {
0.0
} else {
(((px - ax) * dx + (py - ay) * dy) / len2).clamp(0.0, 1.0)
};
let cx = ax + t * dx;
let cy = ay + t * dy;
let d = ((px - cx).powi(2) + (py - cy).powi(2)).sqrt();
if d < best {
best = d;
}
}
best
}
2026-03-22 14:56:27 +03:00
// ── Wire preview points ─────────────────────────────────────────────────────
fn entity_wire_pts(e: &EntityType) -> Vec<[f32; 3]> {
match e {
EntityType::Line(l) => vec![
[l.start.x as f32, l.start.y as f32, l.start.z as f32],
[l.end.x as f32, l.end.y as f32, l.end.z as f32],
],
EntityType::Circle(c) => {
let steps = 64usize;
(0..=steps)
.map(|i| {
let a = TAU * i as f64 / steps as f64;
[
(c.center.x + c.radius * a.cos()) as f32,
(c.center.y + c.radius * a.sin()) as f32,
c.center.z as f32,
]
})
.collect()
}
EntityType::Arc(a) => {
let a0 = norm_rad(a.start_angle);
let a1 = norm_rad(a.end_angle);
2026-03-22 14:56:27 +03:00
let span = {
let s = a1 - a0;
if s <= 0.0 {
s + TAU
} else {
s
}
};
let steps = ((span.abs() * 20.0).ceil() as usize).max(4);
(0..=steps)
.map(|i| {
let ang = a0 + span * (i as f64 / steps as f64);
[
(a.center.x + a.radius * ang.cos()) as f32,
(a.center.y + a.radius * ang.sin()) as f32,
a.center.z as f32,
]
})
.collect()
}
EntityType::LwPolyline(p) => lwpolyline_pts(p),
EntityType::Ellipse(e) => {
let a = (e.major_axis.x.powi(2) + e.major_axis.y.powi(2)).sqrt();
2026-05-12 10:36:15 +03:00
if a < 1e-9 {
return vec![];
}
let b = a * e.minor_axis_ratio;
let nx = e.major_axis.x / a;
let ny = e.major_axis.y / a;
let t0 = e.start_parameter;
let mut t1 = e.end_parameter;
2026-05-12 10:36:15 +03:00
if t1 <= t0 {
t1 += TAU;
}
let span = t1 - t0;
let steps = ((span.abs() * 20.0).ceil() as usize).max(4);
2026-05-12 10:36:15 +03:00
(0..=steps)
.map(|i| {
let t = t0 + span * (i as f64 / steps as f64);
let lx = a * t.cos();
let ly = b * t.sin();
[
(e.center.x + lx * nx - ly * ny) as f32,
(e.center.y + lx * ny + ly * nx) as f32,
e.center.z as f32,
]
})
.collect()
}
EntityType::Spline(s) => spline_pts_wire(s),
EntityType::XLine(x) => {
// Infinite in both directions — represent it as a very long segment
// for hit-testing and the offset preview. Long enough to read as
// infinite at any working zoom; the committed XLine renders true.
const HL: f64 = 1.0e6;
let (bx, by, bz) = (x.base_point.x, x.base_point.y, x.base_point.z);
let (dx, dy, dz) = (x.direction.x, x.direction.y, x.direction.z);
vec![
[(bx - dx * HL) as f32, (by - dy * HL) as f32, (bz - dz * HL) as f32],
[(bx + dx * HL) as f32, (by + dy * HL) as f32, (bz + dz * HL) as f32],
]
}
2026-03-22 14:56:27 +03:00
_ => vec![],
}
}
/// Tessellate a LwPolyline into wire points (straight segments + arc bulges).
fn lwpolyline_pts(p: &LwPolyline) -> Vec<[f32; 3]> {
let n = p.vertices.len();
if n < 2 {
return vec![];
}
let z = p.elevation as f32;
let n_segs = if p.is_closed { n } else { n - 1 };
let mut pts: Vec<[f32; 3]> = Vec::new();
for i in 0..n_segs {
let v0 = &p.vertices[i];
let v1 = &p.vertices[(i + 1) % n];
let x0 = v0.location.x;
let y0 = v0.location.y;
let x1 = v1.location.x;
let y1 = v1.location.y;
if pts.is_empty() {
pts.push([x0 as f32, y0 as f32, z]);
}
if v0.bulge.abs() < 1e-10 {
pts.push([x1 as f32, y1 as f32, z]);
} else {
// Arc from bulge
let b = v0.bulge;
let chord_x = x1 - x0;
let chord_y = y1 - y0;
let chord_len = (chord_x * chord_x + chord_y * chord_y).sqrt();
if chord_len < 1e-12 {
pts.push([x1 as f32, y1 as f32, z]);
continue;
}
let b2 = b * b;
let r = chord_len * (1.0 + b2) / (4.0 * b.abs());
let d = r * (1.0 - b2) / (1.0 + b2);
let mx = (x0 + x1) * 0.5;
let my = (y0 + y1) * 0.5;
let perp_x = -chord_y / chord_len;
let perp_y = chord_x / chord_len;
let sign = b.signum();
let cx = mx + sign * d * perp_x;
let cy = my + sign * d * perp_y;
let a0 = norm_rad((y0 - cy).atan2(x0 - cx));
let a1 = norm_rad((y1 - cy).atan2(x1 - cx));
let span = if b > 0.0 {
let s = a1 - a0;
if s <= 0.0 {
s + TAU
} else {
s
}
} else {
let s = a0 - a1;
if s <= 0.0 {
s + TAU
} else {
s
}
};
let steps = ((span.abs() * 20.0).ceil() as usize).max(4);
for j in 1..=steps {
let t = j as f64 / steps as f64;
let ang = if b > 0.0 {
a0 + span * t
} else {
a0 - span * t
};
pts.push([(cx + r * ang.cos()) as f32, (cy + r * ang.sin()) as f32, z]);
}
}
}
if p.is_closed {
if let Some(&first) = pts.first() {
pts.push(first);
}
}
pts
}
// ── Command implementation ─────────────────────────────────────────────────
enum Step {
/// Classic first step (#418): type the offset distance, press Enter /
/// Space to accept the last one, or choose Through mode.
Distance,
/// Pick the object to offset. `locked == None` is "through" mode: the
/// magnitude follows the cursor (perpendicular distance to the object).
SelectObject { locked: Option<f64> },
2026-03-22 14:56:27 +03:00
PickSide {
/// The object(s) being offset — one from a pick, or the whole
/// pre-selection when OFFSET starts with objects selected (#422).
targets: Vec<EntityType>,
locked: Option<f64>,
/// True when the targets came from the pre-selection: the commit ends
/// the command instead of looping back for another pick.
from_selection: bool,
/// Keep the side-pick step active and use each new result as the source
/// for the next offset.
multiple: bool,
2026-03-22 14:56:27 +03:00
},
}
pub struct OffsetCommand {
step: Step,
all_entities: Vec<EntityType>,
2026-07-25 18:49:18 +03:00
entity_index: ModifyEntityIndex,
/// Pre-selected offsettable objects (pick-first, #422); consumed when the
/// distance step resolves.
preselected: Vec<EntityType>,
2026-03-22 14:56:27 +03:00
}
/// The entity types `compute_offsets` can offset.
pub fn is_offsettable(e: &EntityType) -> bool {
matches!(
e,
EntityType::Line(_)
| EntityType::Circle(_)
| EntityType::Arc(_)
| EntityType::LwPolyline(_)
| EntityType::Ellipse(_)
| EntityType::Spline(_)
| EntityType::XLine(_)
)
}
2026-03-22 14:56:27 +03:00
impl OffsetCommand {
pub fn new(all_entities: Vec<EntityType>) -> Self {
2026-07-25 18:49:18 +03:00
let entity_index = ModifyEntityIndex::build(&all_entities);
2026-03-22 14:56:27 +03:00
Self {
step: Step::Distance,
2026-03-22 14:56:27 +03:00
all_entities,
2026-07-25 18:49:18 +03:00
entity_index,
preselected: Vec::new(),
2026-03-22 14:56:27 +03:00
}
}
/// Pick-first flow (#422): the distance step still comes first, then the
/// pre-selected objects go straight to the side step.
pub fn with_selection(all_entities: Vec<EntityType>, targets: Vec<EntityType>) -> Self {
2026-07-25 18:49:18 +03:00
let entity_index = ModifyEntityIndex::build(&all_entities);
Self {
step: Step::Distance,
all_entities,
2026-07-25 18:49:18 +03:00
entity_index,
preselected: targets,
}
}
/// Leave the distance step with the given mode (Some = locked distance,
/// None = through): pre-selected objects jump to the side step, otherwise
/// the object-pick loop starts.
fn advance_from_distance(&mut self, locked: Option<f64>) -> CmdResult {
if self.preselected.is_empty() {
self.step = Step::SelectObject { locked };
} else {
self.step = Step::PickSide {
targets: std::mem::take(&mut self.preselected),
locked,
from_selection: true,
multiple: false,
};
}
CmdResult::NeedPoint
}
2026-03-22 14:56:27 +03:00
}
impl CadCommand for OffsetCommand {
fn name(&self) -> &'static str {
"OFFSET"
}
fn prompt(&self) -> String {
match &self.step {
Step::Distance => format!(
"OFFSET Specify offset distance or [Through] <{:.4}>:",
defaults::get_offset_dist()
2026-03-22 14:56:27 +03:00
),
Step::SelectObject { .. } => {
"OFFSET Select object to offset (Enter to finish):".into()
}
Step::PickSide {
targets,
locked,
multiple,
..
} => {
let n = if targets.len() > 1 {
format!(" ({} objects)", targets.len())
} else {
String::new()
};
match (locked, multiple) {
(Some(d), false) => {
format!("OFFSET{n} Click side or [Multiple] [distance {d:.4}]:")
}
(Some(d), true) => {
format!("OFFSET{n} Multiple Click next side [distance {d:.4}]:")
}
(None, false) => {
format!("OFFSET{n} Click through point or [Multiple]:")
}
(None, true) => format!("OFFSET{n} Multiple Click next through point:"),
}
}
}
}
fn options(&self) -> Vec<crate::command::CmdOption> {
match &self.step {
Step::Distance => vec![
crate::command::CmdOption::new("Through", "T"),
crate::command::CmdOption::enter(&format!(
"{:.4}",
defaults::get_offset_dist()
)),
],
Step::PickSide {
multiple: false, ..
} => vec![crate::command::CmdOption::new("Multiple", "M")],
_ => Vec::new(),
2026-03-22 14:56:27 +03:00
}
}
fn needs_entity_pick(&self) -> bool {
matches!(self.step, Step::SelectObject { .. })
2026-03-22 14:56:27 +03:00
}
fn on_entity_pick(&mut self, handle: Handle, _pt: DVec3) -> CmdResult {
let locked = match &self.step {
Step::SelectObject { locked } => *locked,
_ => return CmdResult::NeedPoint,
};
if handle.is_null() {
2026-03-22 14:56:27 +03:00
return CmdResult::NeedPoint;
}
let entity = self
2026-07-25 18:49:18 +03:00
.entity_index.get(&self.all_entities, handle)
2026-03-22 14:56:27 +03:00
.cloned();
// Accept every type compute_offsets can offset — including XLine (#296),
// and Ellipse/Spline whose offset functions existed but weren't reachable.
2026-03-22 14:56:27 +03:00
match entity {
Some(e) if is_offsettable(&e) => {
2026-03-22 14:56:27 +03:00
self.step = Step::PickSide {
targets: vec![e],
locked,
from_selection: false,
multiple: false,
2026-03-22 14:56:27 +03:00
};
CmdResult::NeedPoint
}
_ => CmdResult::NeedPoint,
}
}
// The distance step takes a typed magnitude; the side step accepts one
// too, re-locking the distance mid-command.
fn wants_text_input(&self) -> bool {
matches!(self.step, Step::Distance | Step::PickSide { .. })
}
fn dyn_field(&self) -> crate::command::DynField {
match self.step {
Step::Distance | Step::PickSide { .. } => crate::command::DynField::Scalar,
_ => crate::command::DynField::Point,
}
}
fn dyn_live_value(&self, cursor: DVec3) -> Option<f64> {
match &self.step {
Step::Distance => Some(defaults::get_offset_dist()),
Step::PickSide { targets, locked, .. } => Some(locked.unwrap_or_else(|| {
targets
.first()
.map(|e| perp_distance(e, cursor.as_vec3()))
.unwrap_or(0.0)
})),
_ => None,
}
}
fn on_text_input(&mut self, text: &str) -> Option<CmdResult> {
let t = text.trim().replace(',', ".");
match &mut self.step {
Step::Distance => {
if t.eq_ignore_ascii_case("t") || t.eq_ignore_ascii_case("through") {
return Some(self.advance_from_distance(None));
}
if let Ok(d) = t.parse::<f64>() {
let d = d.abs().max(1e-9);
defaults::set_offset_dist(d);
return Some(self.advance_from_distance(Some(d)));
}
Some(CmdResult::NeedPoint)
}
Step::PickSide {
locked,
multiple,
..
} => {
if t.eq_ignore_ascii_case("m") || t.eq_ignore_ascii_case("multiple") {
*multiple = true;
return Some(CmdResult::NeedPoint);
}
if !t.is_empty() {
if let Ok(d) = t.parse::<f64>() {
let d = d.abs().max(1e-9);
defaults::set_offset_dist(d);
*locked = Some(d);
}
}
// Stay on the side step — the click chooses which side.
Some(CmdResult::NeedPoint)
}
_ => None,
}
}
fn on_hover_entity(&mut self, handle: Handle, _pt: DVec3) -> Vec<WireModel> {
if handle.is_null() || !matches!(self.step, Step::SelectObject { .. }) {
2026-03-22 14:56:27 +03:00
return vec![];
}
if let Some(entity) = self
2026-07-25 18:49:18 +03:00
.entity_index.get(&self.all_entities, handle)
2026-03-22 14:56:27 +03:00
{
let pts = entity_wire_pts(entity);
if !pts.is_empty() {
return vec![WireModel::solid(
"offset_hover".into(),
pts,
WireModel::CYAN,
false,
)];
}
}
vec![]
}
fn on_point(&mut self, pt: DVec3) -> CmdResult {
let (locked, targets, from_selection, multiple) = match &self.step {
Step::PickSide {
locked,
targets,
from_selection,
multiple,
} => (*locked, targets.clone(), *from_selection, *multiple),
2026-03-22 14:56:27 +03:00
_ => return CmdResult::NeedPoint,
};
// Each target offsets by its own through-distance (or the locked
// magnitude), toward the clicked side.
let mut news: Vec<EntityType> = Vec::new();
for entity in &targets {
let mag = locked.unwrap_or_else(|| perp_distance(entity, pt.as_vec3()));
if mag < 1e-9 {
continue;
}
news.extend(compute_offsets(entity, mag, pt.as_vec3()));
}
if news.is_empty() {
return CmdResult::NeedPoint;
}
if multiple {
// Multiple mode chains from the result just created, matching
// OFFSET's repeated fixed-distance behavior (parallel/concentric
// series instead of duplicate copies at the first offset).
self.step = Step::PickSide {
targets: news.clone(),
locked,
from_selection,
multiple: true,
};
return if news.len() == 1 {
CmdResult::CommitEntity(news.pop().unwrap())
} else {
CmdResult::CommitEntities(news)
};
}
if from_selection {
// Pre-selection commit ends the command in one undo step.
return CmdResult::ReplaceMany(vec![], news);
}
// Classic loop (#418): commit this offset and go back to the object
// pick at the same distance, until Enter / Esc finishes.
self.step = Step::SelectObject { locked };
if news.len() == 1 {
CmdResult::CommitEntity(news.pop().unwrap())
} else {
CmdResult::ReplaceMany(vec![], news)
2026-03-22 14:56:27 +03:00
}
}
fn on_preview_wires(&mut self, pt: DVec3) -> Vec<WireModel> {
let (locked, targets) = match &self.step {
Step::PickSide { locked, targets, .. } => (*locked, targets.clone()),
2026-03-22 14:56:27 +03:00
_ => return vec![],
};
let mut wires = Vec::new();
for (target_index, entity) in targets.iter().enumerate() {
let mag = locked.unwrap_or_else(|| perp_distance(entity, pt.as_vec3()));
if mag < 1e-9 {
continue;
}
for (result_index, result) in compute_offsets(entity, mag, pt.as_vec3())
.into_iter()
.enumerate()
{
let pts = entity_wire_pts(&result);
if !pts.is_empty() {
wires.push(WireModel::solid(
format!("offset_preview_{target_index}_{result_index}"),
pts,
WireModel::CYAN,
false,
));
}
2026-03-22 14:56:27 +03:00
}
}
wires
2026-03-22 14:56:27 +03:00
}
fn on_enter(&mut self) -> CmdResult {
match &self.step {
// Enter / Space on the distance step accepts the last distance —
// the "repeat the same value with just Space" flow (#418).
Step::Distance => {
let d = defaults::get_offset_dist();
self.advance_from_distance(Some(d.abs().max(1e-9)))
}
_ => CmdResult::Cancel,
}
2026-03-22 14:56:27 +03:00
}
fn on_escape(&mut self) -> CmdResult {
CmdResult::Cancel
}
}
// ── Autocomplete registry ─────────────────────────────────
inventory::submit!(crate::command::CommandRegistration { names: &["OFFSET"] }); // OffsetCommand
#[cfg(test)]
mod offset_tests {
use super::*;
use acadrust::types::Vector2;
fn rect(corners: &[[f64; 2]]) -> LwPolyline {
LwPolyline {
vertices: corners
.iter()
.map(|&[x, y]| LwVertex::new(Vector2::new(x, y)))
.collect(),
is_closed: true,
..Default::default()
}
}
/// Offset `corners` by 10 toward `side` and return the result's XY bounds.
fn offset_bbox(corners: &[[f64; 2]], side: Vec3) -> [f64; 4] {
let out = offset_lwpolyline(&rect(corners), 10.0, side);
let Some(EntityType::LwPolyline(r)) = out else {
panic!("offset did not return an lwpolyline");
};
let (mut minx, mut miny, mut maxx, mut maxy) =
(f64::INFINITY, f64::INFINITY, f64::NEG_INFINITY, f64::NEG_INFINITY);
for v in &r.vertices {
minx = minx.min(v.location.x);
miny = miny.min(v.location.y);
maxx = maxx.max(v.location.x);
maxy = maxy.max(v.location.y);
}
[minx, miny, maxx, maxy]
}
fn approx(a: [f64; 4], b: [f64; 4]) -> bool {
a.iter().zip(b).all(|(x, y)| (x - y).abs() < 1e-6)
}
// A pick *outside* the loop must offset outward and a pick *inside* must
// offset inward, regardless of the rectangle's winding. Regression for the
// first-segment sign heuristic, which sent a CCW rectangle inward when the
// outward pick sat beside it (issue 166).
#[test]
fn rect_offset_direction_is_winding_independent() {
let ccw = [[0.0, 0.0], [100.0, 0.0], [100.0, 60.0], [0.0, 60.0]];
let cw = [[0.0, 0.0], [0.0, 60.0], [100.0, 60.0], [100.0, 0.0]];
let out = [-10.0, -10.0, 110.0, 70.0];
let inn = [10.0, 10.0, 90.0, 50.0];
// Pick beside the rectangle (outside, mid-height) → outward, both windings.
assert!(approx(offset_bbox(&ccw, Vec3::new(-10.0, 30.0, 0.0)), out));
assert!(approx(offset_bbox(&cw, Vec3::new(-10.0, 30.0, 0.0)), out));
// Pick inside → inward, both windings.
assert!(approx(offset_bbox(&ccw, Vec3::new(50.0, 30.0, 0.0)), inn));
assert!(approx(offset_bbox(&cw, Vec3::new(50.0, 30.0, 0.0)), inn));
// Pick clearly outside below → outward (the case that worked before).
assert!(approx(offset_bbox(&ccw, Vec3::new(50.0, -10.0, 0.0)), out));
}
}