rei-mirrors/Fornjot
1
0
Fork 0
mirror of https://github.com/hannobraun/Fornjot synced 2025-02-22 07:05:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor

Browse Source
This commit is contained in:
Hanno Braun 2023-02-15 14:54:43 +01:00
parent 57eaaabda5
commit 8c78a11fe1
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
crates/fj-math/src/arc.rs
View File

@ -57,7 +57,6 @@ impl Arc {
} else { } else {
(Scalar::ONE, Scalar::ZERO) (Scalar::ONE, Scalar::ZERO)
}; };
let [[x0, y0], [x1, y1]] = [p0, p1].map(|p| p.coords.components);
let unit_vector_p0_to_p1 = let unit_vector_p0_to_p1 =
(p1 - p0) / distance_between_endpoints * uv_factor; (p1 - p0) / distance_between_endpoints * uv_factor;
let unit_vector_midpoint_to_center = let unit_vector_midpoint_to_center =
@ -66,8 +65,14 @@ impl Arc {
coords: (p0.coords + p1.coords) / 2. coords: (p0.coords + p1.coords) / 2.
+ unit_vector_midpoint_to_center * distance_center_to_midpoint, + unit_vector_midpoint_to_center * distance_center_to_midpoint,
}; };
let start_angle = (y0 - center.v).atan2(x0 - center.u); let start_angle = {
let end_angle = (y1 - center.v).atan2(x1 - center.u) + end_angle_offset; let center_to_start = p0 - center;
center_to_start.v.atan2(center_to_start.u)
};
let end_angle = {
let center_to_end = p1 - center;
center_to_end.v.atan2(center_to_end.u) + end_angle_offset
};
Self { Self {
center, center,
radius, radius,