Merge branch 'main' into rigid-non-solid

spicylobstergames · Jan 31, 2024 · c6c7c1d · c6c7c1d
2 parents 7e60346 + b280004
commit c6c7c1d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/debug.rs b/src/debug.rs
@@ -291,7 +291,7 @@ impl Plugin for DebugPlugin {
         .add_plugins(RapierDebugRenderPlugin::default())
         //Frame on console
         .add_plugins((LogDiagnosticsPlugin::default(), FrameTimeDiagnosticsPlugin))
-        .init_resource::<PreviousMousePos>()
-        .init_resource::<Grabbed>();
+        .init_resource::<Grabbed>()
+        .init_resource::<PreviousMousePos>();
     }
 }
diff --git a/src/rigidbody.rs b/src/rigidbody.rs
@@ -87,7 +87,7 @@ pub fn update_rigidibodies(
 
         //let mut stop_count = 0;
         //let mut total = 0;
-
+      
         //This fills the chunks with Object atoms
         for (y, x) in (0..height).cartesian_product(0..width) {
             let pos = top_left + vec2(x as f32, y as f32).rotate(Vec2::from_angle(angle));
@@ -133,7 +133,7 @@ pub fn update_rigidibodies(
                 }
             }
         }
-
+      
         /*
         let stop_treshold = total as f32 * STOP_RATE;
         let new_gravity = ((stop_treshold - stop_count as f32) / stop_treshold).clamp(0., 1.);