From 214e0ceedc9e1f86f425a8bb34904d0fef1ba36b Mon Sep 17 00:00:00 2001
From: Michael Bradley <michaelmbrad@gmail.com>
Date: Mon, 19 May 2025 00:27:12 -0400
Subject: [PATCH] Extract systems

---
 .vscode/tasks.json          |   1 +
 src/game/mod.rs             |   3 +
 src/game/runtime.rs         |  40 +++++++
 src/{utils => game}/seed.rs |   0
 src/game/setup.rs           | 110 ++++++++++++++++++
 src/lib.rs                  | 216 +++++++-----------------------------
 src/main.rs                 |   6 +-
 src/utils/app_settings.rs   |  10 --
 src/utils/mod.rs            |   4 -
 9 files changed, 199 insertions(+), 191 deletions(-)
 create mode 100644 src/game/runtime.rs
 rename src/{utils => game}/seed.rs (100%)
 create mode 100644 src/game/setup.rs
 delete mode 100644 src/utils/app_settings.rs
 delete mode 100644 src/utils/mod.rs

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 7af499a..155290c 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -5,6 +5,7 @@
       "label": "Launch",
       "type": "cargo",
       "command": "run",
+	  "args": ["--", "--seed", "gargamel"],
       "options": {
         "env": {
           "RUST_BACKTRACE": "full"
diff --git a/src/game/mod.rs b/src/game/mod.rs
index 15ee7f6..370d386 100644
--- a/src/game/mod.rs
+++ b/src/game/mod.rs
@@ -1 +1,4 @@
 pub mod objects;
+pub mod runtime;
+pub mod seed;
+pub mod setup;
diff --git a/src/game/runtime.rs b/src/game/runtime.rs
new file mode 100644
index 0000000..645495f
--- /dev/null
+++ b/src/game/runtime.rs
@@ -0,0 +1,40 @@
+use avian2d::prelude::*;
+use bevy::prelude::*;
+
+use super::objects::Player;
+
+pub fn move_player(
+    time: Res<Time>,
+    keyboard_input: Res<ButtonInput<KeyCode>>,
+    mut velocity: Single<&mut LinearVelocity, With<Player>>,
+) -> Result {
+    let acceleration = 500.0;
+
+    let delta_time = time.delta_secs();
+
+    if keyboard_input.any_pressed([KeyCode::KeyW, KeyCode::ArrowUp]) {
+        velocity.y += acceleration * delta_time;
+    }
+    if keyboard_input.any_pressed([KeyCode::KeyS, KeyCode::ArrowDown]) {
+        velocity.y -= acceleration * delta_time;
+    }
+    if keyboard_input.any_pressed([KeyCode::KeyA, KeyCode::ArrowLeft]) {
+        velocity.x -= acceleration * delta_time;
+    }
+    if keyboard_input.any_pressed([KeyCode::KeyD, KeyCode::ArrowRight]) {
+        velocity.x += acceleration * delta_time;
+    }
+
+    Ok(())
+}
+
+pub fn quit(mut exit: EventWriter<AppExit>) {
+    exit.write(AppExit::Success);
+}
+
+pub fn move_camera(
+    mut camera: Single<&mut Transform, (Without<Player>, With<IsDefaultUiCamera>)>,
+    player: Single<&Transform, (With<Player>, Without<IsDefaultUiCamera>)>,
+) {
+    camera.translation = camera.translation.lerp(player.translation, 0.05);
+}
diff --git a/src/utils/seed.rs b/src/game/seed.rs
similarity index 100%
rename from src/utils/seed.rs
rename to src/game/seed.rs
diff --git a/src/game/setup.rs b/src/game/setup.rs
new file mode 100644
index 0000000..f1f0770
--- /dev/null
+++ b/src/game/setup.rs
@@ -0,0 +1,110 @@
+use std::{f32::consts::PI, ops::Range};
+
+use avian2d::prelude::*;
+use bevy::{
+    color::palettes::{
+        css::WHITE,
+        tailwind::{LIME_400, RED_400},
+    },
+    prelude::*,
+};
+use bevy_rand::prelude::{GlobalEntropy, WyRand};
+use rand::Rng;
+use wyrand::WyRand as LocalRng;
+
+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;
+
+#[derive(Resource)]
+pub struct PlayableArea(f32, f32);
+
+#[derive(Resource)]
+pub struct PlayerSize(f32);
+
+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(
+        rng.random_range(DIMENSION_SIZES),
+        rng.random_range(DIMENSION_SIZES),
+    ));
+}
+
+pub fn setup_ui(mut commands: Commands) {
+    commands.spawn((Name::new("Camera"), Camera2d, IsDefaultUiCamera));
+}
+
+pub fn setup_player(
+    mut commands: Commands,
+    mut materials: ResMut<Assets<ColorMaterial>>,
+    mut meshes: ResMut<Assets<Mesh>>,
+    radius: Res<PlayerSize>,
+) {
+    let circle = Circle::new(radius.0);
+    commands.spawn((
+        Player,
+        Collider::from(circle),
+        Mesh2d(meshes.add(circle)),
+        MeshMaterial2d(materials.add(Color::from(LIME_400))),
+    ));
+}
+
+pub fn setup_balls(
+    mut commands: Commands,
+    mut materials: ResMut<Assets<ColorMaterial>>,
+    mut meshes: ResMut<Assets<Mesh>>,
+    region: Res<PlayableArea>,
+) {
+    let mut random = LocalRng::new(Default::default());
+    for _ in 0..BALL_COUNT {
+        let circle = Circle::new(random.random_range(BALL_SIZES));
+        commands.spawn((
+            Ball,
+            Collider::from(circle),
+            Mesh2d(meshes.add(circle)),
+            MeshMaterial2d(materials.add(Color::from(RED_400))),
+            Transform::from_xyz(
+                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,
+            ),
+        ));
+    }
+}
+
+pub fn setup_walls(
+    mut commands: Commands,
+    mut materials: ResMut<Assets<ColorMaterial>>,
+    mut meshes: ResMut<Assets<Mesh>>,
+    region: Res<PlayableArea>,
+) {
+    let thickness = 20.0;
+
+    for i in 0..4 {
+        let (offset, length) = if i % 2 == 0 {
+            (region.0, region.1 + thickness)
+        } else {
+            (region.1, region.0 + thickness)
+        };
+
+        let mut transform = Transform::from_xyz(0.0, offset / 2.0, 0.0);
+        transform.rotate_around(
+            Vec3::ZERO,
+            Quat::from_rotation_z(((i + 1) as f32) * PI / 2.0),
+        );
+
+        commands.spawn((
+            Wall,
+            Collider::rectangle(length, thickness),
+            Mesh2d(meshes.add(Rectangle::new(length, thickness))),
+            MeshMaterial2d(materials.add(Color::from(WHITE))),
+            transform,
+        ));
+    }
+}
diff --git a/src/lib.rs b/src/lib.rs
index 9bfbc7d..b21b75b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,183 +1,51 @@
-use std::{f32::consts::PI, ops::Range};
-
 use avian2d::{math::Vector, prelude::*};
-use bevy::{
-    color::palettes::{
-        css::WHITE,
-        tailwind::{LIME_400, RED_400},
-    },
-    input::common_conditions::input_pressed,
-    prelude::*,
-};
-use bevy_rand::prelude::{EntropyPlugin, GlobalEntropy, WyRand};
-use rand::Rng;
-use wyrand::WyRand as LocalRng;
+use bevy::{input::common_conditions::input_pressed, prelude::*};
+use bevy_rand::prelude::{EntropyPlugin, WyRand};
+use clap::Parser;
 
 mod game;
-use game::objects::{Ball, Player, Wall};
-mod utils;
-pub use utils::AppSettings;
+use game::{
+    runtime::{move_camera, move_player, quit},
+    seed::Seed,
+    setup::{setup_balls, setup_player, setup_pseudo_random, setup_ui, setup_walls},
+};
 
-const BALL_COUNT: u8 = 32;
-const BALL_SIZES: Range<f32> = 10.0..25.0;
-const DIMENSION_SIZES: Range<f32> = 500.0..2000.0;
+#[derive(Parser)]
+#[command(version, about)]
+pub struct AppSettings {
+    #[arg(short, long, default_value = ":)")]
+    pub seed: Seed,
+}
 
-#[derive(Resource)]
-struct PlayableArea(f32, f32);
-
-#[derive(Resource)]
-struct PlayerSize(f32);
-
-pub fn run_app(settings: AppSettings) -> AppExit {
-    App::new()
-        .insert_resource(Gravity(Vector::ZERO))
-        .insert_resource(settings.seed.clone())
-        .add_plugins((
-            DefaultPlugins.set(WindowPlugin {
-                primary_window: Window {
-                    title: "Distributed physics test".into(),
-                    fit_canvas_to_parent: true,
+impl Plugin for AppSettings {
+    fn build(&self, app: &mut App) {
+        app.insert_resource(Gravity(Vector::ZERO))
+            .insert_resource(self.seed.clone())
+            .add_plugins((
+                DefaultPlugins.set(WindowPlugin {
+                    primary_window: Window {
+                        title: "Distributed physics test".into(),
+                        fit_canvas_to_parent: true,
+                        ..default()
+                    }
+                    .into(),
                     ..default()
-                }
-                .into(),
-                ..default()
-            }),
-            PhysicsPlugins::default().with_length_unit(50.0),
-            EntropyPlugin::<WyRand>::with_seed(settings.seed.into()),
-        ))
-        .add_systems(
-            Startup,
-            (
-                setup_pseudo_random,
-                setup_ui,
-                (setup_player, setup_balls, setup_walls).after(setup_pseudo_random),
-            ),
-        )
-        .add_systems(
-            Update,
-            (move_player, quit.run_if(input_pressed(KeyCode::KeyQ))),
-        )
-        .add_systems(PostUpdate, move_camera)
-        .run()
-}
-
-fn setup_pseudo_random(mut commands: Commands, mut rng: GlobalEntropy<WyRand>) {
-    commands.insert_resource(PlayerSize(rng.random_range(BALL_SIZES)));
-    commands.insert_resource(PlayableArea(
-        rng.random_range(DIMENSION_SIZES),
-        rng.random_range(DIMENSION_SIZES),
-    ));
-}
-
-fn setup_ui(mut commands: Commands) {
-    commands.spawn((Name::new("Camera"), Camera2d, IsDefaultUiCamera));
-}
-
-fn setup_player(
-    mut commands: Commands,
-    mut materials: ResMut<Assets<ColorMaterial>>,
-    mut meshes: ResMut<Assets<Mesh>>,
-    radius: Res<PlayerSize>,
-) {
-    let circle = Circle::new(radius.0);
-    commands.spawn((
-        Player,
-        Collider::from(circle),
-        Mesh2d(meshes.add(circle)),
-        MeshMaterial2d(materials.add(Color::from(LIME_400))),
-    ));
-}
-
-fn setup_balls(
-    mut commands: Commands,
-    mut materials: ResMut<Assets<ColorMaterial>>,
-    mut meshes: ResMut<Assets<Mesh>>,
-    region: Res<PlayableArea>,
-) {
-    let mut random = LocalRng::new(Default::default());
-    for _ in 0..BALL_COUNT {
-        let circle = Circle::new(random.random_range(BALL_SIZES));
-        commands.spawn((
-            Ball,
-            Collider::from(circle),
-            Mesh2d(meshes.add(circle)),
-            MeshMaterial2d(materials.add(Color::from(RED_400))),
-            Transform::from_xyz(
-                random.random_range(
-                    (-region.0 / 2.0 + circle.radius)..(region.0 / 2.0 - circle.radius),
+                }),
+                PhysicsPlugins::default().with_length_unit(50.0),
+                EntropyPlugin::<WyRand>::with_seed(self.seed.clone().into()),
+            ))
+            .add_systems(
+                Startup,
+                (
+                    setup_pseudo_random,
+                    setup_ui,
+                    (setup_player, setup_balls, setup_walls).after(setup_pseudo_random),
                 ),
-                random.random_range(
-                    (-region.1 / 2.0 + circle.radius)..(region.1 / 2.0 - circle.radius),
-                ),
-                0.0,
-            ),
-        ));
+            )
+            .add_systems(
+                Update,
+                (move_player, quit.run_if(input_pressed(KeyCode::KeyQ))),
+            )
+            .add_systems(PostUpdate, move_camera);
     }
 }
-
-fn setup_walls(
-    mut commands: Commands,
-    mut materials: ResMut<Assets<ColorMaterial>>,
-    mut meshes: ResMut<Assets<Mesh>>,
-    region: Res<PlayableArea>,
-) {
-    let thickness = 20.0;
-
-    for i in 0..4 {
-        let (offset, length) = if i % 2 == 0 {
-            (region.0, region.1 + thickness)
-        } else {
-            (region.1, region.0 + thickness)
-        };
-
-        let mut transform = Transform::from_xyz(0.0, offset / 2.0, 0.0);
-        transform.rotate_around(
-            Vec3::ZERO,
-            Quat::from_rotation_z(((i + 1) as f32) * PI / 2.0),
-        );
-
-        commands.spawn((
-            Wall,
-            Collider::rectangle(length, thickness),
-            Mesh2d(meshes.add(Rectangle::new(length, thickness))),
-            MeshMaterial2d(materials.add(Color::from(WHITE))),
-            transform,
-        ));
-    }
-}
-
-fn move_player(
-    time: Res<Time>,
-    keyboard_input: Res<ButtonInput<KeyCode>>,
-    mut velocity: Single<&mut LinearVelocity, With<Player>>,
-) -> Result {
-    let acceleration = 500.0;
-
-    let delta_time = time.delta_secs();
-
-    if keyboard_input.any_pressed([KeyCode::KeyW, KeyCode::ArrowUp]) {
-        velocity.y += acceleration * delta_time;
-    }
-    if keyboard_input.any_pressed([KeyCode::KeyS, KeyCode::ArrowDown]) {
-        velocity.y -= acceleration * delta_time;
-    }
-    if keyboard_input.any_pressed([KeyCode::KeyA, KeyCode::ArrowLeft]) {
-        velocity.x -= acceleration * delta_time;
-    }
-    if keyboard_input.any_pressed([KeyCode::KeyD, KeyCode::ArrowRight]) {
-        velocity.x += acceleration * delta_time;
-    }
-
-    Ok(())
-}
-
-fn quit(mut exit: EventWriter<AppExit>) {
-    exit.write(AppExit::Success);
-}
-
-fn move_camera(
-    mut camera: Single<&mut Transform, (Without<Player>, With<IsDefaultUiCamera>)>,
-    player: Single<&Transform, (With<Player>, Without<IsDefaultUiCamera>)>,
-) {
-    camera.translation = camera.translation.lerp(player.translation, 0.05);
-}
diff --git a/src/main.rs b/src/main.rs
index 372c5cb..ffb5f8a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,8 +1,8 @@
-use bevy::prelude::AppExit;
+use bevy::prelude::{App, AppExit};
 use clap::Parser;
 
-use distributed_physics_test::{AppSettings, run_app};
+use distributed_physics_test::AppSettings;
 
 fn main() -> AppExit {
-    run_app(AppSettings::parse())
+    App::new().add_plugins(AppSettings::parse()).run()
 }
diff --git a/src/utils/app_settings.rs b/src/utils/app_settings.rs
deleted file mode 100644
index 5d71cba..0000000
--- a/src/utils/app_settings.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-use clap::Parser;
-
-use super::Seed;
-
-#[derive(Parser)]
-#[command(version, about)]
-pub struct AppSettings {
-    #[arg(short, long, default_value = "")]
-    pub seed: Seed,
-}
diff --git a/src/utils/mod.rs b/src/utils/mod.rs
deleted file mode 100644
index 2a91401..0000000
--- a/src/utils/mod.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-mod seed;
-pub use seed::Seed;
-mod app_settings;
-pub use app_settings::AppSettings;