Skip to content

Commit a93d9ee

Browse files
committed
- fix line_segment_between_line_segment_test
1 parent e6483fb commit a93d9ee

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

src/lib.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1072,8 +1072,8 @@ pub fn shortest_line_segment_between_line_segments<T: Float + SignedNumberOps<T>
10721072
}
10731073

10741074
let numer = d1343 * d4321 - d1321 * d4343;
1075-
let mua = numer / denom;
1076-
let mub = (d1343 + d4321 * mua) / d4343;
1075+
let mua = saturate(numer / denom);
1076+
let mub = saturate((d1343 + d4321 * mua) / d4343);
10771077

10781078
Some((
10791079
p1 + (p21 * mua),
@@ -1377,6 +1377,7 @@ pub fn map_to_range<T: Float, X: Base<T>>(v: X, in_start: X, in_end: X, out_star
13771377
// https://web.archive.org/web/20120414063459/http://local.wasp.uwa.edu.au/~pbourke//geometry/lineline3d/
13781378

13791379
// TODO:
1380+
// line_segment_between_line_segment_test
13801381
// missing fail cases
13811382
// closest point on line seg to line seg
13821383
// projection, ndc

tests/tests.rs

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2678,19 +2678,16 @@ fn ray_vs_line_segment_test() {
26782678

26792679
#[test]
26802680
fn line_segment_between_line_segment_test() {
2681-
let l1 = Vec2f::new(-100.0, 0.0);
2682-
let l2 = Vec2f::new(100.0, 0.0);
2683-
let l3 = Vec2f::new(-100.0, 10.0);
2684-
let l4 = Vec2f::new(100.0, 10.0);
2681+
let l1 = Vec2f::new(-10.0, 0.0);
2682+
let l2 = Vec2f::new(10.0, 0.0);
2683+
let l3 = Vec2f::new(-10.0, 10.0);
2684+
let l4 = Vec2f::new(10.0, 11.0);
26852685
let result = shortest_line_segment_between_line_segments(l1, l2, l3, l4);
2686-
2687-
/*
26882686
assert_eq!(result.is_some(), true);
26892687
if let Some((p1, p2)) = result {
2690-
assert_eq!(p1, Vec2f::new(0.0, 0.0));
2691-
assert_eq!(p2, Vec2f::new(0.0, 10.0));
2688+
assert_eq!(p1, Vec2f::new(-10.0, 0.0));
2689+
assert_eq!(p2, Vec2f::new(-10.0, 10.0));
26922690
}
2693-
*/
26942691
}
26952692

26962693
#[test]

0 commit comments

Comments
 (0)