From b35458f2f5e7e21dc604601fc0983ac3c5680f0e5e9a2b5832ab902c183179ab Mon Sep 17 00:00:00 2001
From: Stef <stbuwalda@gmail.com>
Date: Wed, 24 Dec 2025 12:40:18 +0100
Subject: [PATCH] Moved physics related code into a physics module and split up
 the physics into seperate files.

---
 app/src/camera.rs           | 65 +++++++++++++++++++++++++++
 app/src/main.rs             | 88 +++++--------------------------------
 app/src/physics/gravity.rs  | 10 +++++
 app/src/physics/mod.rs      |  6 +++
 app/src/physics/plugin.rs   | 27 ++++++++++++
 app/src/physics/velocity.rs | 12 +++++
 6 files changed, 132 insertions(+), 76 deletions(-)
 create mode 100644 app/src/camera.rs
 create mode 100644 app/src/physics/gravity.rs
 create mode 100644 app/src/physics/mod.rs
 create mode 100644 app/src/physics/plugin.rs
 create mode 100644 app/src/physics/velocity.rs

diff --git a/app/src/camera.rs b/app/src/camera.rs
new file mode 100644
index 0000000..b0c38a3
--- /dev/null
+++ b/app/src/camera.rs
@@ -0,0 +1,65 @@
+use bevy::input::mouse::MouseMotion;
+use bevy::prelude::*;
+
+pub const CAMERA_SPEED: f32 = 20.0;
+pub const CAMERA_SENSITIVITY: f32 = 1.0;
+
+pub struct CameraPlugin;
+
+impl Plugin for CameraPlugin {
+    fn build(&self, app: &mut App) {
+        app
+            .add_systems(Update, camera_movement_controller)
+            .add_systems(Update, camera_rotation_controller);
+    }
+}
+
+fn camera_movement_controller(
+    time: Res<Time>,
+    keyboard_input: Res<ButtonInput<KeyCode>>,
+    mut camera: Single<&mut Transform, With<Camera3d>>,
+) {
+    let mut direction = Vec3::ZERO;
+
+    if keyboard_input.pressed(KeyCode::KeyW) {
+        direction.z -= 1.0;
+    }
+    if keyboard_input.pressed(KeyCode::KeyS) {
+        direction.z += 1.0;
+    }
+    if keyboard_input.pressed(KeyCode::KeyA) {
+        direction.x -= 1.0;
+    }
+    if keyboard_input.pressed(KeyCode::KeyD) {
+        direction.x += 1.0;
+    }
+    if keyboard_input.pressed(KeyCode::Space) {
+        direction.y += 1.0;
+    }
+    if keyboard_input.pressed(KeyCode::ShiftLeft) {
+        direction.y -= 1.0;
+    }
+
+    let rotation = camera.rotation;
+    camera.translation += rotation * direction * CAMERA_SPEED * time.delta_secs(); // or use time.delta_seconds()
+}
+
+fn camera_rotation_controller(
+    time: Res<Time>,
+    mut mouse_motion: MessageReader<MouseMotion>,
+    mut camera: Single<&mut Transform, With<Camera3d>>,
+    keyboard_input: Res<ButtonInput<KeyCode>>,
+){
+    for motion in mouse_motion.read() {
+        let rotation: Vec3 = vec3(-motion.delta.y,-motion.delta.x,0.0) * time.delta_secs() * CAMERA_SENSITIVITY;
+        let translation: Quat = Quat::from_scaled_axis(rotation);
+        camera.rotation *= translation;
+    }
+
+    if keyboard_input.pressed(KeyCode::KeyQ){
+        camera.rotation *= Quat::from_scaled_axis(Vec3::Z * CAMERA_SENSITIVITY * time.delta_secs());
+    }
+    if keyboard_input.pressed(KeyCode::KeyE){
+        camera.rotation *= Quat::from_scaled_axis(Vec3::NEG_Z * CAMERA_SENSITIVITY * time.delta_secs());
+    }
+}
diff --git a/app/src/main.rs b/app/src/main.rs
index 9afa646..07664fc 100644
--- a/app/src/main.rs
+++ b/app/src/main.rs
@@ -1,18 +1,19 @@
-use std::ops::Add;
-use bevy::input::mouse::MouseMotion;
-use bevy::log;
-use bevy::prelude::*;                   // Core Bevy types
+mod physics;
+mod camera;
 
-const GRAVITY: f32 = -0.981;
-const CAMERA_SPEED: f32 = 20.0; // units per second
-const CAMERA_SENSITIVITY: f32 = 1.0;
+use bevy::log;
+use bevy::prelude::*;
+use crate::camera::CameraPlugin;
+use crate::physics::{PhysicsPlugin, Velocity};
+use crate::physics::gravity::Gravity;
 
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .insert_resource(Gravity(-0.981))
+        .add_plugins(PhysicsPlugin)
+        .add_plugins(CameraPlugin)
         .add_systems(Startup, setup)
-        .add_systems(Update, (apply_gravity, velocity_timestep).chain())
-        .add_systems(Update, (camera_movement_controller, camera_rotation_controller))
         .run();
 }
 
@@ -33,7 +34,7 @@ fn setup(
         Mesh3d(meshes.add(Cuboid::new(1.0, 1.0, 1.0))),
         MeshMaterial3d(materials.add(Color::srgb_u8(124, 144, 255))),
         Transform::from_xyz(0.0, 0.5, 0.0),
-        Velocity(vec3(0.0, 2.0, 0.0)),
+        Velocity::from_xyz(0.0, 2.0, 0.0),
     ));
     // light
     commands.spawn((
@@ -46,73 +47,8 @@ fn setup(
     // camera
     commands.spawn((
         Camera3d::default(),
-        Transform::from_xyz(-2.5, 4.5, 9.0).looking_at(Vec3::ZERO, Vec3::Y),
+        Transform::from_xyz(-2.5, 4.5, 9.0),
     ));
 
     log::info!("Setup finished");
 }
-
-#[derive(Component)]
-struct Velocity(Vec3);
-
-fn velocity_timestep(time: Res<Time>, mut query: Query<(&Velocity, &mut Transform)>) {
-    for (velocity, mut transform) in query.iter_mut() {
-        transform.translation += velocity.0 * time.delta_secs();
-    }
-}
-
-fn apply_gravity(time: Res<Time>, mut query: Query<&mut Velocity>) {
-    for mut velocity in query.iter_mut() {
-        velocity.0.y += GRAVITY * time.delta_secs();
-    }
-}
-
-fn camera_movement_controller(
-    time: Res<Time>,
-    keyboard_input: Res<ButtonInput<KeyCode>>,
-    mut camera: Single<&mut Transform, With<Camera3d>>,
-) {
-    let mut direction = Vec3::ZERO;
-
-    if keyboard_input.pressed(KeyCode::KeyW) {
-        direction.z -= 1.0;
-    }
-    if keyboard_input.pressed(KeyCode::KeyS) {
-        direction.z += 1.0;
-    }
-    if keyboard_input.pressed(KeyCode::KeyA) {
-        direction.x -= 1.0;
-    }
-    if keyboard_input.pressed(KeyCode::KeyD) {
-        direction.x += 1.0;
-    }
-    if keyboard_input.pressed(KeyCode::Space) {
-        direction.y += 1.0;
-    }
-    if keyboard_input.pressed(KeyCode::ShiftLeft) {
-        direction.y -= 1.0;
-    }
-
-    let rotation = camera.rotation;
-    camera.translation += rotation * direction * CAMERA_SPEED * time.delta_secs(); // or use time.delta_seconds()
-}
-
-fn camera_rotation_controller(
-    time: Res<Time>,
-    mut mouse_motion: MessageReader<MouseMotion>,
-    mut camera: Single<&mut Transform, With<Camera3d>>,
-    keyboard_input: Res<ButtonInput<KeyCode>>,
-){
-    for motion in mouse_motion.read() {
-        let rotation: Vec3 = vec3(-motion.delta.y,-motion.delta.x,0.0) * time.delta_secs() * CAMERA_SENSITIVITY;
-        let translation: Quat = Quat::from_scaled_axis(rotation);
-        camera.rotation *= translation;
-    }
-
-    if keyboard_input.pressed(KeyCode::KeyQ){
-        camera.rotation *= Quat::from_scaled_axis(Vec3::Z * CAMERA_SENSITIVITY * time.delta_secs());
-    }
-    if keyboard_input.pressed(KeyCode::KeyE){
-        camera.rotation *= Quat::from_scaled_axis(Vec3::NEG_Z * CAMERA_SENSITIVITY * time.delta_secs());
-    }
-}
\ No newline at end of file
diff --git a/app/src/physics/gravity.rs b/app/src/physics/gravity.rs
new file mode 100644
index 0000000..ebef61b
--- /dev/null
+++ b/app/src/physics/gravity.rs
@@ -0,0 +1,10 @@
+use bevy::prelude::Resource;
+
+#[derive(Resource)]
+pub struct Gravity(pub f32);
+
+impl Default for Gravity {
+    fn default() -> Self {
+        Gravity(-9.81) // default gravity
+    }
+}
\ No newline at end of file
diff --git a/app/src/physics/mod.rs b/app/src/physics/mod.rs
new file mode 100644
index 0000000..1e40982
--- /dev/null
+++ b/app/src/physics/mod.rs
@@ -0,0 +1,6 @@
+pub mod gravity;
+pub mod velocity;
+pub mod plugin;
+
+pub use plugin::PhysicsPlugin;
+pub use velocity::Velocity;
\ No newline at end of file
diff --git a/app/src/physics/plugin.rs b/app/src/physics/plugin.rs
new file mode 100644
index 0000000..d8d4c68
--- /dev/null
+++ b/app/src/physics/plugin.rs
@@ -0,0 +1,27 @@
+use bevy::app::{App, Plugin, Update};
+use bevy::prelude::{IntoScheduleConfigs, Query, Res, Time, Transform};
+use crate::physics::gravity::Gravity;
+use crate::physics::velocity::Velocity;
+
+pub struct PhysicsPlugin;
+
+impl Plugin for PhysicsPlugin {
+    fn build(&self, app: &mut App) {
+        app
+            .init_resource::<Gravity>()
+            .add_systems(Update, apply_gravity)
+            .add_systems(Update, velocity_timestep.after(apply_gravity));
+    }
+}
+
+fn velocity_timestep(time: Res<Time>, mut query: Query<(&Velocity, &mut Transform)>) {
+    for (velocity, mut transform) in query.iter_mut() {
+        transform.translation += velocity.0 * time.delta_secs();
+    }
+}
+
+fn apply_gravity(time: Res<Time>, gravity: Res<Gravity>, mut query: Query<&mut Velocity>) {
+    for mut velocity in query.iter_mut() {
+        velocity.0.y += gravity.0 * time.delta_secs();
+    }
+}
\ No newline at end of file
diff --git a/app/src/physics/velocity.rs b/app/src/physics/velocity.rs
new file mode 100644
index 0000000..e896e92
--- /dev/null
+++ b/app/src/physics/velocity.rs
@@ -0,0 +1,12 @@
+use bevy::math::Vec3;
+use bevy::prelude::Component;
+
+#[derive(Component)]
+pub struct Velocity(pub Vec3);
+
+impl Velocity {
+
+    pub fn from_xyz(x: f32, y: f32, z: f32) -> Self {
+        Velocity(Vec3::new(x, y, z))
+    }
+}
\ No newline at end of file