@@ -20,8 +20,8 @@ use cgmath::ulps_eq;
20
20
mod simplex;
21
21
22
22
const MAX_ITERATIONS : u32 = 100 ;
23
- const GJK_DISTANCE_TOLERANCE : f32 = 0.000001 ;
24
- const GJK_CONTINUOUS_TOLERANCE : f32 = 0.000001 ;
23
+ const GJK_DISTANCE_TOLERANCE : f32 = 0.000_001 ;
24
+ const GJK_CONTINUOUS_TOLERANCE : f32 = 0.000_001 ;
25
25
26
26
/// GJK algorithm for 2D, see [GJK](struct.GJK.html) for more information.
27
27
pub type GJK2 < S > = GJK < SimplexProcessor2 < S > , EPA2 < S > , S > ;
@@ -163,9 +163,9 @@ where
163
163
pub fn intersection_time_of_impact < P , PL , PR , TL , TR > (
164
164
& self ,
165
165
left : & PL ,
166
- left_transform : Range < & TL > ,
166
+ left_transform : & Range < & TL > ,
167
167
right : & PR ,
168
- right_transform : Range < & TR > ,
168
+ right_transform : & Range < & TR > ,
169
169
) -> Option < Contact < P > >
170
170
where
171
171
P : EuclideanSpace < Scalar = S > ,
@@ -506,7 +506,7 @@ where
506
506
min_distance = Some (
507
507
min_distance
508
508
. map_or ( distance, |min_distance| distance. min ( min_distance) ) ,
509
- )
509
+ ) ;
510
510
}
511
511
}
512
512
}
@@ -539,9 +539,9 @@ where
539
539
& self ,
540
540
strategy : & CollisionStrategy ,
541
541
left : & [ ( PL , TL ) ] ,
542
- left_transform : Range < & TL > ,
542
+ left_transform : & Range < & TL > ,
543
543
right : & [ ( PR , TR ) ] ,
544
- right_transform : Range < & TR > ,
544
+ right_transform : & Range < & TR > ,
545
545
) -> Option < Contact < P > >
546
546
where
547
547
P : EuclideanSpace < Scalar = S > ,
@@ -562,9 +562,9 @@ where
562
562
let right_end_transform = right_transform. end . concat ( right_local_transform) ;
563
563
if let Some ( mut contact) = self . intersection_time_of_impact (
564
564
left_primitive,
565
- & left_start_transform..& left_end_transform,
565
+ & ( & left_start_transform..& left_end_transform) ,
566
566
right_primitive,
567
- & right_start_transform..& right_end_transform,
567
+ & ( & right_start_transform..& right_end_transform) ,
568
568
) {
569
569
match * strategy {
570
570
CollisionOnly => {
@@ -670,7 +670,7 @@ mod tests {
670
670
& right,
671
671
& right_transform
672
672
)
673
- . is_none( ) )
673
+ . is_none( ) ) ;
674
674
}
675
675
676
676
#[ test]
@@ -770,23 +770,23 @@ mod tests {
770
770
let contact = gjk
771
771
. intersection_time_of_impact (
772
772
& left,
773
- & left_start_transform..& left_end_transform,
773
+ & ( & left_start_transform..& left_end_transform) ,
774
774
& right,
775
- & right_transform..& right_transform,
775
+ & ( & right_transform..& right_transform) ,
776
776
)
777
777
. unwrap ( ) ;
778
778
779
- assert_ulps_eq ! ( 0.1666667 , contact. time_of_impact) ;
779
+ assert_ulps_eq ! ( 0.166_666_7 , contact. time_of_impact) ;
780
780
assert_eq ! ( Vector2 :: new( -1. , 0. ) , contact. normal) ;
781
781
assert ! ( 0. - contact. penetration_depth <= f32 :: EPSILON ) ;
782
782
assert_eq ! ( Point2 :: new( 10. , 0. ) , contact. contact_point) ;
783
783
784
784
assert ! ( gjk
785
785
. intersection_time_of_impact(
786
786
& left,
787
- & left_start_transform..& left_start_transform,
787
+ & ( & left_start_transform..& left_start_transform) ,
788
788
& right,
789
- & right_transform..& right_transform
789
+ & ( & right_transform..& right_transform)
790
790
)
791
791
. is_none( ) ) ;
792
792
}
@@ -803,23 +803,23 @@ mod tests {
803
803
let contact = gjk
804
804
. intersection_time_of_impact (
805
805
& left,
806
- & left_start_transform..& left_end_transform,
806
+ & ( & left_start_transform..& left_end_transform) ,
807
807
& right,
808
- & right_transform..& right_transform,
808
+ & ( & right_transform..& right_transform) ,
809
809
)
810
810
. unwrap ( ) ;
811
811
812
- assert_ulps_eq ! ( 0.1666667 , contact. time_of_impact) ;
812
+ assert_ulps_eq ! ( 0.166_666_7 , contact. time_of_impact) ;
813
813
assert_eq ! ( Vector3 :: new( -1. , 0. , 0. ) , contact. normal) ;
814
814
assert ! ( 0. - contact. penetration_depth <= f32 :: EPSILON ) ;
815
815
assert_eq ! ( Point3 :: new( 10. , 0. , 0. ) , contact. contact_point) ;
816
816
817
817
assert ! ( gjk
818
818
. intersection_time_of_impact(
819
819
& left,
820
- & left_start_transform..& left_start_transform,
820
+ & ( & left_start_transform..& left_start_transform) ,
821
821
& right,
822
- & right_transform..& right_transform
822
+ & ( & right_transform..& right_transform)
823
823
)
824
824
. is_none( ) ) ;
825
825
}
0 commit comments