From 4dd5b14ea1e8f496c087913d0e66c0a574fec0f8 Mon Sep 17 00:00:00 2001
From: LorrensP-2158466 <lorrens.pantelis@student.uhasselt.be>
Date: Sat, 5 Apr 2025 20:00:50 +0200
Subject: [PATCH] fix plugin shit

---
 src/main.rs                           |  7 +++----
 src/{physics_plugin.rs => physics.rs} | 14 +++++++-------
 src/player.rs                         |  4 +---
 3 files changed, 11 insertions(+), 14 deletions(-)
 rename src/{physics_plugin.rs => physics.rs} (89%)

diff --git a/src/main.rs b/src/main.rs
index 4bfb43a..f23d9f2 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,12 +1,11 @@
 use asset_loading::ImageAssets;
 use bevy::prelude::*;
-use physics_plugin::PhysicsPlugin;
 
 mod asset_loading;
 mod bevy_plugin;
 mod level_instantiation;
 mod main_menu;
-mod physics_plugin;
+mod physics;
 mod player;
 
 fn main() {
@@ -14,9 +13,9 @@ fn main() {
         .add_plugins((
             bevy_plugin::plugin,
             asset_loading::plugin,
-            player::plugin,
-            PhysicsPlugin,
+            physics::plugin,
             level_instantiation::map_plugin,
+            player::plugin,
             main_menu::plugin,
         ))
         .init_state::<GameState>()
diff --git a/src/physics_plugin.rs b/src/physics.rs
similarity index 89%
rename from src/physics_plugin.rs
rename to src/physics.rs
index 65199db..14e93f7 100644
--- a/src/physics_plugin.rs
+++ b/src/physics.rs
@@ -20,12 +20,12 @@ pub struct PreviousPhysicalTranslation(pub Vec3);
 #[derive(Debug, Component, Clone, Copy, PartialEq, Default, Deref, DerefMut)]
 pub struct AccumulatedInput(pub Vec3);
 
-pub struct PhysicsPlugin;
-impl Plugin for PhysicsPlugin {
-    fn build(&self, app: &mut App) {
-        app.add_systems(RunFixedMainLoop, interpolate_rendered_transform.in_set(RunFixedMainLoopSystem::AfterFixedMainLoop))
-            .add_systems(FixedUpdate, step);
-    }
+pub fn plugin(app: &mut App) {
+    app.add_systems(
+        RunFixedMainLoop,
+        interpolate_rendered_transform.in_set(RunFixedMainLoopSystem::AfterFixedMainLoop),
+    )
+    .add_systems(FixedUpdate, step);
 }
 
 pub fn interpolate_rendered_transform(
@@ -69,4 +69,4 @@ pub fn step(
         current_physical_translation.0 += velocity.0 * fixed_time.delta_secs();
         input.0 = Vec3::ZERO;
     }
-}
\ No newline at end of file
+}
diff --git a/src/player.rs b/src/player.rs
index 06bf49d..a291cd0 100644
--- a/src/player.rs
+++ b/src/player.rs
@@ -1,8 +1,6 @@
 use crate::{
     GameState,
-    physics_plugin::{
-        AccumulatedInput, PhysicalTranslation, PreviousPhysicalTranslation, Velocity,
-    },
+    physics::{AccumulatedInput, PhysicalTranslation, PreviousPhysicalTranslation, Velocity},
 };
 use bevy::{
     input::mouse::AccumulatedMouseMotion, pbr::NotShadowCaster, prelude::*,