AI_Assistant/cad-editor
Watch
1
0
Fork
You've already forked cad-editor
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix: guard UCS icon drawing against zero-size viewport and non-finite projections

Browse source 
Before layout completes the viewport bounds are 0×0, causing project_point3
to produce NaN/Inf coordinates which panicked in lyon_path assertions.
Added early-return when bounds < 10px, and finite checks on all projected
and derived coordinates before calling any canvas drawing functions.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Hakan Seven 2026-04-03 21:53:19 +03:00
commit b6c2b1130e
1 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/ui/overlay.rs
View file

@ -728,24 +728,32 @@ const UCS_ICON_LEN: f32 = 35.0; // axis arm length in screen pixels
const UCS_ICON_TIP: f32 = 6.0; // arrowhead size in pixels
fn draw_ucs_icon(frame: &mut canvas::Frame, vp: Mat4, bounds: iced::Rectangle) {
// Guard against zero-size viewport (before layout pass) or degenerate matrix.
if bounds.width < 10.0 || bounds.height < 10.0 {
return;
}
// Project world origin and axis unit vectors to NDC, then to screen px.
let w2s = |world: Vec3| -> Point {
let w2s = |world: Vec3| -> Option<Point> {
let ndc = vp.project_point3(world);
Point::new(
if !ndc.x.is_finite() || !ndc.y.is_finite() {
return None;
}
Some(Point::new(
(ndc.x + 1.0) * 0.5 * bounds.width,
(1.0 - ndc.y) * 0.5 * bounds.height,
)
))
};
// Origin in screen space — used to compute axis directions.
let origin_s = w2s(Vec3::ZERO);
let x_tip_s = w2s(Vec3::X);
let y_tip_s = w2s(Vec3::Y);
let z_tip_s = w2s(Vec3::Z);
let Some(origin_s) = w2s(Vec3::ZERO) else { return };
let Some(x_tip_s) = w2s(Vec3::X) else { return };
let Some(y_tip_s) = w2s(Vec3::Y) else { return };
let Some(z_tip_s) = w2s(Vec3::Z) else { return };
// Icon origin: fixed bottom-left corner.
let ox = UCS_ICON_MARGIN;
let oy = bounds.height - UCS_ICON_MARGIN;
let oy = (bounds.height - UCS_ICON_MARGIN).max(UCS_ICON_MARGIN);
let icon_origin = Point::new(ox, oy);
// Compute normalized screen-space axis directions, then scale to UCS_ICON_LEN.
@ -761,6 +769,7 @@ fn draw_ucs_icon(frame: &mut canvas::Frame, vp: Mat4, bounds: iced::Rectangle) {
let draw_axis = |frame: &mut canvas::Frame, dir: Point, r: f32, g: f32, b: f32| {
let tip = Point::new(icon_origin.x + dir.x, icon_origin.y + dir.y);
if !tip.x.is_finite() || !tip.y.is_finite() { return; }
let path = canvas::Path::new(|p| {
p.move_to(icon_origin);
p.line_to(tip);