Skip to content

Commit 793bed2

Browse files
committed
Replaced ChaCha8Rng with StdRng. Seems sufficient for our needs and reduces dependencies.
1 parent 2166a1b commit 793bed2

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ bevy_transform = { version = "0.15", default-features = false }
2828
bevy = "0.15"
2929
criterion = "0.5"
3030
rand = "0.8"
31-
rand_chacha = "0.3"
32-
rand_core = "0.6"
3331

3432
[features]
3533
# Enable performance tracing (https://github.com/bevyengine/bevy/blob/main/docs/profiling.md).

benches/benches.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ use dev::{
1919
create_dev_world, create_random_skinned_mesh_assets, spawn_random_skinned_mesh,
2020
RandomSkinnedMeshType,
2121
};
22-
use rand::SeedableRng;
23-
use rand_chacha::ChaCha8Rng;
22+
use rand::{rngs::StdRng, SeedableRng};
2423
use std::iter::repeat_with;
2524

2625
#[derive(Resource, Copy, Clone)]
@@ -71,7 +70,7 @@ fn create_meshes(
7170
mut inverse_bindposes_assets: ResMut<Assets<SkinnedMeshInverseBindposes>>,
7271
params: Res<MeshParams>,
7372
) {
74-
let mut rng = ChaCha8Rng::seed_from_u64(732935);
73+
let mut rng = StdRng::seed_from_u64(732935);
7574
let base_entity = commands.spawn(Transform::IDENTITY).id();
7675

7776
let assets = repeat_with(|| {

dev/dev.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ use bevy_render::{mesh::Mesh3d, primitives::Aabb, view::visibility::Visibility};
3434
use bevy_transform::components::{GlobalTransform, Transform};
3535
use rand::{
3636
distributions::{Distribution, Slice, Uniform},
37+
rngs::StdRng,
3738
Rng, SeedableRng,
3839
};
39-
use rand_chacha::ChaCha8Rng;
4040
use std::{borrow::Borrow, time::Duration};
4141
use std::{
4242
f32::consts::TAU,
@@ -444,7 +444,7 @@ pub fn spawn_random_mesh_selection(
444444
mut material_assets: ResMut<Assets<StandardMaterial>>,
445445
mut inverse_bindposes_assets: ResMut<Assets<SkinnedMeshInverseBindposes>>,
446446
) {
447-
let mut rng = ChaCha8Rng::seed_from_u64(732935);
447+
let mut rng = StdRng::seed_from_u64(732935);
448448

449449
let material = MeshMaterial3d(material_assets.add(StandardMaterial {
450450
base_color: Color::WHITE,
@@ -526,8 +526,8 @@ pub fn update_random_mesh_animations(
526526

527527
let noise = animation.noise.sample(time.elapsed_secs());
528528

529-
let t0 = random_transform_maybe_outlier(&mut ChaCha8Rng::seed_from_u64(noise.keys[0]));
530-
let t1 = random_transform_maybe_outlier(&mut ChaCha8Rng::seed_from_u64(noise.keys[1]));
529+
let t0 = random_transform_maybe_outlier(&mut StdRng::seed_from_u64(noise.keys[0]));
530+
let t1 = random_transform_maybe_outlier(&mut StdRng::seed_from_u64(noise.keys[1]));
531531

532532
// Blend between the transforms with a nice ease in/out over 2/3rds of a
533533
// second, then hold for 1/3rd of a second.

0 commit comments

Comments
 (0)