forked from 1b-agent/opencadstudio-upstream
feat: apply OCS→WCS transform for LwPolyline (elevation + normal)
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
1 parent
e64eb0f463
commit
f4160c4e8a
1 file changed
+24
-11
+24
-11
@@ -76,13 +76,21 @@ fn to_truck(pline: &LwPolyline) -> TruckEntity {
|
||||
}
|
||||
|
||||
let elev = pline.elevation;
|
||||
let normal = (pline.normal.x, pline.normal.y, pline.normal.z);
|
||||
let count = verts.len();
|
||||
let seg_count = if pline.is_closed { count } else { count - 1 };
|
||||
let mut edges: Vec<Edge> = Vec::new();
|
||||
let mut tangents: Vec<TangentGeom> = Vec::new();
|
||||
let mut key_verts: Vec<[f32; 3]> = Vec::new();
|
||||
|
||||
let to_pt = |v: &LwVertex| -> Point3 { Point3::new(v.location.x, v.location.y, elev) };
|
||||
// Convert OCS (x, y, elevation) to WCS Point3.
|
||||
let to_wcs = |x: f64, y: f64| -> (f64, f64, f64) {
|
||||
crate::scene::transform::ocs_point_to_wcs((x, y, elev), normal)
|
||||
};
|
||||
let to_pt = |v: &LwVertex| -> Point3 {
|
||||
let (wx, wy, wz) = to_wcs(v.location.x, v.location.y);
|
||||
Point3::new(wx, wy, wz)
|
||||
};
|
||||
|
||||
for i in 0..seg_count {
|
||||
let v0 = &verts[i];
|
||||
@@ -100,35 +108,40 @@ fn to_truck(pline: &LwPolyline) -> TruckEntity {
|
||||
p2: [p1.x as f32, p1.y as f32, p1.z as f32],
|
||||
});
|
||||
} else {
|
||||
// Arc centre/midpoint computed in OCS, then transformed to WCS.
|
||||
let (ox0, oy0) = (v0.location.x, v0.location.y);
|
||||
let (ox1, oy1) = (v1.location.x, v1.location.y);
|
||||
let angle = 4.0 * (bulge as f64).atan();
|
||||
let dx = p1.x - p0.x;
|
||||
let dy = p1.y - p0.y;
|
||||
let dx = ox1 - ox0;
|
||||
let dy = oy1 - oy0;
|
||||
let d = (dx * dx + dy * dy).sqrt();
|
||||
let r = (d / 2.0) / (angle / 2.0).sin().abs();
|
||||
let mx = (p0.x + p1.x) * 0.5;
|
||||
let my = (p0.y + p1.y) * 0.5;
|
||||
let mx = (ox0 + ox1) * 0.5;
|
||||
let my = (oy0 + oy1) * 0.5;
|
||||
let len = d.max(1e-12);
|
||||
let px = -dy / len;
|
||||
let py = dx / len;
|
||||
let sagitta_sign = if bulge > 0.0 { 1.0_f64 } else { -1.0_f64 };
|
||||
let h = r - (r * r - d * d / 4.0).max(0.0).sqrt();
|
||||
let cx = mx + sagitta_sign * px * (r - h);
|
||||
let cy = my + sagitta_sign * py * (r - h);
|
||||
let ocx = mx + sagitta_sign * px * (r - h);
|
||||
let ocy = my + sagitta_sign * py * (r - h);
|
||||
let mid_a = {
|
||||
let a0 = (p0.y - cy).atan2(p0.x - cx);
|
||||
let a1 = (p1.y - cy).atan2(p1.x - cx);
|
||||
let a0 = (oy0 - ocy).atan2(ox0 - ocx);
|
||||
let a1 = (oy1 - ocy).atan2(ox1 - ocx);
|
||||
let (sa, mut ea) = if bulge > 0.0 { (a0, a1) } else { (a1, a0) };
|
||||
if ea < sa {
|
||||
ea += TAU;
|
||||
}
|
||||
sa + (ea - sa) * 0.5
|
||||
};
|
||||
let p_mid = Point3::new(cx + r * mid_a.cos(), cy + r * mid_a.sin(), p0.z);
|
||||
let (mid_wx, mid_wy, mid_wz) = to_wcs(ocx + r * mid_a.cos(), ocy + r * mid_a.sin());
|
||||
let p_mid = Point3::new(mid_wx, mid_wy, mid_wz);
|
||||
let tv0 = builder::vertex(p0);
|
||||
let tv1 = builder::vertex(p1);
|
||||
edges.push(builder::circle_arc(&tv0, &tv1, p_mid));
|
||||
let (wcx, wcy, wcz) = to_wcs(ocx, ocy);
|
||||
tangents.push(TangentGeom::Circle {
|
||||
center: [cx as f32, cy as f32, p0.z as f32],
|
||||
center: [wcx as f32, wcy as f32, wcz as f32],
|
||||
radius: r as f32,
|
||||
});
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user