Skip to content

Commit c6d976a

Browse files
nstoddardkvark
authored andcommitted
Update most dependencies
This updates all dependencies except for `approx` and `genmesh`, which would require more work to update. Fixes #117.
1 parent 80f3422 commit c6d976a

File tree

6 files changed

+25
-25
lines changed

6 files changed

+25
-25
lines changed

Cargo.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@ keywords = ["gamedev", "cgmath", "collision"]
3232
name = "collision"
3333

3434
[dependencies]
35-
rand = "0.6"
35+
rand = "0.8.4"
3636
approx = "0.4" # Only for the macros; for all other instances use the re-exported cgmath ones.
37-
cgmath = "0.18"
38-
serde = { version = "1.0", optional = true, features = ["derive"] }
39-
bit-set = "0.5"
40-
smallvec = "0.6.1"
37+
cgmath = "0.18.0"
38+
serde = { version = "1.0.126", optional = true, features = ["derive"] }
39+
bit-set = "0.5.2"
40+
smallvec = "1.6.1"
4141

4242
[target.'cfg(feature="serde")'.dependencies]
43-
cgmath = { version = "0.18", features = ["serde"] }
44-
num = { version = "0.2", features = ["serde"] }
43+
cgmath = { version = "0.18.0", features = ["serde"] }
44+
num = { version = "0.4.0", features = ["serde"] }
4545

4646
[dev-dependencies]
4747
genmesh = "0.5"

benches/dbvt.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ fn benchmark_insert(b: &mut Bencher) {
4848
let mut tree = DynamicBoundingVolumeTree::<Value>::new();
4949
let mut i = 0;
5050
b.iter(|| {
51-
let offset = rng.gen_range(0., 100.);
51+
let offset = rng.gen_range(0.0..100.0);
5252
tree.insert(Value::new(
5353
i,
5454
aabb2(offset + 2., offset + 2., offset + 4., offset + 4.),
@@ -63,7 +63,7 @@ fn benchmark_do_refit(b: &mut Bencher) {
6363
let mut tree = DynamicBoundingVolumeTree::<Value>::new();
6464
let mut i = 0;
6565
b.iter(|| {
66-
let offset = rng.gen_range(0., 100.);
66+
let offset = rng.gen_range(0.0..100.0);
6767
tree.insert(Value::new(
6868
i,
6969
aabb2(offset + 2., offset + 2., offset + 4., offset + 4.),
@@ -80,8 +80,8 @@ fn benchmark_query(b: &mut Bencher) {
8080
for i in 0..100000 {
8181
let neg_y = if rng.gen::<bool>() { -1. } else { 1. };
8282
let neg_x = if rng.gen::<bool>() { -1. } else { 1. };
83-
let offset_x = neg_x * rng.gen_range(9000., 10000.);
84-
let offset_y = neg_y * rng.gen_range(9000., 10000.);
83+
let offset_x = neg_x * rng.gen_range(9000.0..10000.0);
84+
let offset_y = neg_y * rng.gen_range(9000.0..10000.0);
8585
tree.insert(Value::new(
8686
i,
8787
aabb2(offset_x + 2., offset_y + 2., offset_x + 4., offset_y + 4.),
@@ -92,10 +92,10 @@ fn benchmark_query(b: &mut Bencher) {
9292
let rays: Vec<Ray2<f32>> = (0..1000)
9393
.map(|_| {
9494
let p = Point2::new(
95-
rng.gen_range(-10000., 10000.),
96-
rng.gen_range(-10000., 10000.),
95+
rng.gen_range(-10000.0..10000.0),
96+
rng.gen_range(-10000.0..10000.0),
9797
);
98-
let d = Vector2::new(rng.gen_range(-1., 1.), rng.gen_range(-1., 1.)).normalize();
98+
let d = Vector2::new(rng.gen_range(-1.0..1.0), rng.gen_range(-1.0..1.0)).normalize();
9999
Ray2::new(p, d)
100100
})
101101
.collect();
@@ -119,8 +119,8 @@ fn benchmark_ray_closest_query(b: &mut Bencher) {
119119
for i in 0..100000 {
120120
let neg_y = if rng.gen::<bool>() { -1. } else { 1. };
121121
let neg_x = if rng.gen::<bool>() { -1. } else { 1. };
122-
let offset_x = neg_x * rng.gen_range(9000., 10000.);
123-
let offset_y = neg_y * rng.gen_range(9000., 10000.);
122+
let offset_x = neg_x * rng.gen_range(9000.0..10000.0);
123+
let offset_y = neg_y * rng.gen_range(9000.0..10000.0);
124124
tree.insert(Value::new(
125125
i,
126126
aabb2(offset_x + 2., offset_y + 2., offset_x + 4., offset_y + 4.),
@@ -131,10 +131,10 @@ fn benchmark_ray_closest_query(b: &mut Bencher) {
131131
let rays: Vec<Ray2<f32>> = (0..1000)
132132
.map(|_| {
133133
let p = Point2::new(
134-
rng.gen_range(-10000., 10000.),
135-
rng.gen_range(-10000., 10000.),
134+
rng.gen_range(-10000.0..10000.0),
135+
rng.gen_range(-10000.0..10000.0),
136136
);
137-
let d = Vector2::new(rng.gen_range(-1., 1.), rng.gen_range(-1., 1.)).normalize();
137+
let d = Vector2::new(rng.gen_range(-1.0..1.0), rng.gen_range(-1.0..1.0)).normalize();
138138
Ray2::new(p, d)
139139
})
140140
.collect();

benches/polyhedron.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ fn dirs(n: usize) -> Vec<Vector3<f32>> {
8282
(0..n)
8383
.map(|_| {
8484
Vector3::new(
85-
rng.gen_range(-1., 1.),
86-
rng.gen_range(-1., 1.),
87-
rng.gen_range(-1., 1.),
85+
rng.gen_range(-1.0..1.0),
86+
rng.gen_range(-1.0..1.0),
87+
rng.gen_range(-1.0..1.0),
8888
)
8989
})
9090
.collect::<Vec<_>>()

src/dbvt/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -900,7 +900,7 @@ where
900900

901901
// Only do rotations occasionally, as they are fairly expensive, and shouldn't be overused.
902902
// For most scenarios, the majority of shapes will not have moved, so this is fine.
903-
if rand::thread_rng().gen_range(0, 100) < PERFORM_ROTATION_PERCENTAGE {
903+
if rand::thread_rng().gen_range(0..100) < PERFORM_ROTATION_PERCENTAGE {
904904
self.rotate(node_index);
905905
}
906906
}

tests/bound.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ extern crate collision;
22

33
use collision::PlaneBound;
44

5-
fn _box(_: Box<PlaneBound<f32>>) {}
5+
fn _box(_: Box<dyn PlaneBound<f32>>) {}
66

77
#[test]
88
fn bound_box() {}

tests/dbvt.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ fn test_add_20() {
122122
let mut tree = DynamicBoundingVolumeTree::<Value2>::new();
123123
let mut rng = rand::thread_rng();
124124
for i in 0..20 {
125-
let offset = rng.gen_range(-10., 10.);
125+
let offset = rng.gen_range(-10.0..10.0);
126126
tree.insert(Value2::new(
127127
i,
128128
aabb2(offset + 0.1, offset + 0.1, offset + 0.3, offset + 0.3),

0 commit comments

Comments
 (0)