From 8f749c6e47dd300b53ea49d976682d526c2776fe Mon Sep 17 00:00:00 2001 From: CAD97 Date: Mon, 21 Dec 2020 01:30:45 -0500 Subject: [PATCH] Update examples' usage of Rng::gen_range --- examples/2d/contributors.rs | 12 ++++++------ examples/3d/spawner.rs | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/examples/2d/contributors.rs b/examples/2d/contributors.rs index b1f562737219d..f8cf2512c7c4e 100644 --- a/examples/2d/contributors.rs +++ b/examples/2d/contributors.rs @@ -66,8 +66,8 @@ fn setup( let mut rnd = rand::thread_rng(); for name in contribs { - let pos = (rnd.gen_range(-400.0, 400.0), rnd.gen_range(0.0, 400.0)); - let dir = rnd.gen_range(-1.0, 1.0); + let pos = (rnd.gen_range(-400.0..400.0), rnd.gen_range(0.0..400.0)); + let dir = rnd.gen_range(-1.0..1.0); let velocity = Vec3::new(dir * 500.0, 0.0, 0.0); let col = gen_color(&mut rnd); @@ -254,7 +254,7 @@ fn collision_system( if bottom < ground { t.translation.y = ground + SPRITE_SIZE / 2.0; // apply an impulse upwards - v.translation.y = rnd.gen_range(700.0, 1000.0); + v.translation.y = rnd.gen_range(700.0..1000.0); } if top > ceiling { t.translation.y = ceiling - SPRITE_SIZE / 2.0; @@ -312,9 +312,9 @@ fn contributors() -> Contributors { /// Because there is no `Mul for Color` instead `[f32; 3]` is /// used. fn gen_color(rng: &mut impl Rng) -> [f32; 3] { - let r = rng.gen_range(0.2, 1.0); - let g = rng.gen_range(0.2, 1.0); - let b = rng.gen_range(0.2, 1.0); + let r = rng.gen_range(0.2..1.0); + let g = rng.gen_range(0.2..1.0); + let b = rng.gen_range(0.2..1.0); let v = Vec3::new(r, g, b); v.normalize().into() } diff --git a/examples/3d/spawner.rs b/examples/3d/spawner.rs index c2a5c7f045619..bb3d05735bd00 100644 --- a/examples/3d/spawner.rs +++ b/examples/3d/spawner.rs @@ -56,15 +56,15 @@ fn setup( mesh: cube_handle.clone(), material: materials.add(StandardMaterial { albedo: Color::rgb( - rng.gen_range(0.0, 1.0), - rng.gen_range(0.0, 1.0), - rng.gen_range(0.0, 1.0), + rng.gen_range(0.0..1.0), + rng.gen_range(0.0..1.0), + rng.gen_range(0.0..1.0), ), ..Default::default() }), transform: Transform::from_translation(Vec3::new( - rng.gen_range(-50.0, 50.0), - rng.gen_range(-50.0, 50.0), + rng.gen_range(-50.0..50.0), + rng.gen_range(-50.0..50.0), 0.0, )), ..Default::default()