.vscode/settings.json

@@ -10,7 +10,6 @@
     "despawn",
     "Despawns",
     "lerp",
-    "PRNG",
     "recip",
     "respawns",
     "timestep",

Cargo.toml

@@ -37,5 +37,5 @@ log = { version = "*", features = [
 	"max_level_debug",
 	"release_max_level_warn",
 ] }
-rand = { version = "0.9.1", default-features = false, features = ["std", "thread_rng"] }
+rand = { version = "0.9.1", default-features = false, features = ["std"] }
 wyrand = "0.3.2"

src/game/mod.rs

@@ -1,5 +1,4 @@
-mod objects;
-mod rng;
+pub mod objects;
 pub mod runtime;
 pub mod seed;
 pub mod setup;

src/game/objects.rs

@@ -1,22 +1,18 @@
 use avian2d::prelude::*;
 use bevy::prelude::*;
 
-/// Basic implementation of a physics object
 #[derive(Component, Default)]
 #[require(Collider, Mesh2d, MeshMaterial2d<ColorMaterial>, Restitution = Restitution::new(1.0), RigidBody, TransformInterpolation, Transform)]
 struct GameObject;
 
-/// A basic ball with which to interact
 #[derive(Component, Default)]
 #[require(GameObject, RigidBody = RigidBody::Dynamic)]
 pub struct Ball;
 
-/// The controllable ball
 #[derive(Component, Default)]
 #[require(Ball)]
 pub struct Player;
 
-/// The static objects bounding the playable area
 #[derive(Component, Default)]
 #[require(GameObject, RigidBody = RigidBody::Static)]
 pub struct Wall;

src/game/rng.rs

@@ -1,7 +0,0 @@
-use rand::random;
-use wyrand::WyRand;
-
-/// Initialize a `WyRand` using `rand`'s thread-local random number generator
-pub fn thread_rng() -> WyRand {
-    WyRand::new(random())
-}

src/game/runtime.rs

@@ -6,7 +6,6 @@ use bevy::{
 
 use super::objects::Player;
 
-/// Move the player character based on the keyboard input
 pub fn move_player(
     time: Res<Time>,
     keyboard_input: Res<ButtonInput<KeyCode>>,
@@ -32,12 +31,10 @@ pub fn move_player(
     Ok(())
 }
 
-/// Neatly exit game
 pub fn quit(mut exit: EventWriter<AppExit>) {
     exit.write(AppExit::Success);
 }
 
-/// Follow the player character with the camera
 pub fn move_camera(
     mut camera: Single<&mut Transform, (Without<Player>, With<IsDefaultUiCamera>)>,
     player: Single<&Transform, (With<Player>, Without<IsDefaultUiCamera>)>,
@@ -45,7 +42,6 @@ pub fn move_camera(
     camera.translation = camera.translation.lerp(player.translation, 0.05);
 }
 
-/// Adjust the camera zoom based on the scroll wheel input
 pub fn zoom_camera(
     mut camera: Single<&mut Projection, With<IsDefaultUiCamera>>,
     scroll: Res<AccumulatedMouseScroll>,

src/game/seed.rs

@@ -2,12 +2,10 @@ use std::hash::{DefaultHasher, Hash, Hasher};
 
 use bevy::prelude::*;
 
-/// Value with which to initialize the PRNG
 #[derive(Clone, Resource)]
 pub struct Seed(u64);
 
 impl From<String> for Seed {
-    /// Attempt to parse as an integer, fall back to hashing string
     fn from(value: String) -> Self {
         Self(value.parse::<u64>().unwrap_or_else(|_| {
             let mut state = DefaultHasher::new();
@@ -18,7 +16,6 @@ impl From<String> for Seed {
 }
 
 impl From<Seed> for [u8; 8] {
-    /// Convert to a u8 array for ingestion by random number generator
     fn from(value: Seed) -> Self {
         value.0.to_le_bytes()
     }

src/game/setup.rs

@@ -9,26 +9,21 @@ use bevy::{
     prelude::*,
 };
 use bevy_rand::prelude::{GlobalEntropy, WyRand};
-use rand::Rng as _;
+use rand::Rng;
+use wyrand::WyRand as LocalRng;
 
-use super::{
-    objects::{Ball, Player, Wall},
-    rng::thread_rng,
-};
+use super::objects::{Ball, Player, Wall};
 
 const BALL_COUNT: u8 = 32;
 const BALL_SIZES: Range<f32> = 10.0..25.0;
 const DIMENSION_SIZES: Range<f32> = 500.0..2000.0;
 
-/// The size of the playable area (x, y)
 #[derive(Resource)]
 pub struct PlayableArea(f32, f32);
 
-/// The size of the player character
 #[derive(Resource)]
 pub struct PlayerSize(f32);
 
-/// Initialize deterministic values
 pub fn setup_pseudo_random(mut commands: Commands, mut rng: GlobalEntropy<WyRand>) {
     commands.insert_resource(PlayerSize(rng.random_range(BALL_SIZES)));
     commands.insert_resource(PlayableArea(
@@ -41,7 +36,6 @@ pub fn setup_ui(mut commands: Commands) {
     commands.spawn((Name::new("Camera"), Camera2d, IsDefaultUiCamera));
 }
 
-/// Create the playable character
 pub fn setup_player(
     mut commands: Commands,
     mut materials: ResMut<Assets<ColorMaterial>>,
@@ -57,14 +51,13 @@ pub fn setup_player(
     ));
 }
 
-/// Create a random distribution of balls in the playable area
 pub fn setup_balls(
     mut commands: Commands,
     mut materials: ResMut<Assets<ColorMaterial>>,
     mut meshes: ResMut<Assets<Mesh>>,
     region: Res<PlayableArea>,
 ) {
-    let mut random = thread_rng();
+    let mut random = LocalRng::new(Default::default());
     for _ in 0..BALL_COUNT {
         let circle = Circle::new(random.random_range(BALL_SIZES));
         commands.spawn((
@@ -73,15 +66,18 @@ pub fn setup_balls(
             Mesh2d(meshes.add(circle)),
             MeshMaterial2d(materials.add(Color::from(RED_400))),
             Transform::from_xyz(
-                random.random::<f32>() * (region.0 - 2.0 * circle.radius) + circle.radius,
-                random.random::<f32>() * (region.1 - 2.0 * circle.radius) + circle.radius,
+                random.random_range(
+                    (-region.0 / 2.0 + circle.radius)..(region.0 / 2.0 - circle.radius),
+                ),
+                random.random_range(
+                    (-region.1 / 2.0 + circle.radius)..(region.1 / 2.0 - circle.radius),
+                ),
                 0.0,
             ),
         ));
     }
 }
 
-/// Create the 4 walls that enclose the playable area
 pub fn setup_walls(
     mut commands: Commands,
     mut materials: ResMut<Assets<ColorMaterial>>,

src/lib.rs

@@ -10,8 +10,6 @@ use game::{
     setup::{setup_balls, setup_player, setup_pseudo_random, setup_ui, setup_walls},
 };
 
-/// The initial configuration passed to the game's setup functions.
-/// Also functions as a Bevy plugin to pass the configuration into the app.
 #[derive(Parser)]
 #[command(version, about)]
 pub struct AppSettings {