fix: resolved issues found in PR

Author: Carter Hollman

game/src/camera/camera_plugin.rs

@@ -1,4 +1,5 @@
 use bevy::{input::mouse::MouseWheel, prelude::*};
+use avian2d::prelude::*;
 
 pub struct CameraPlugin;
 
@@ -13,7 +14,9 @@ pub struct MainCamera;
 impl Plugin for CameraPlugin {
     fn build(&self, app: &mut App) {
         app.add_systems(Startup, setup_main_camera);
-        app.add_systems(Update, (update_camera, zoom_camera).chain());
+        app.add_systems(PostUpdate, update_camera.after(PhysicsSet::Sync)
+                                                                    .before(TransformSystem::TransformPropagate));
+        app.add_systems(Update, zoom_camera);
     }
 }
 
@@ -27,27 +30,23 @@ fn update_camera(
     mut camera_query: Query<&mut Transform, (With<MainCamera>, Without<CameraTarget>)>,
     target_query: Query<&Transform, (With<CameraTarget>, Without<MainCamera>)>,
 ) {
-    //getting camera from query
+ 
     let Ok(mut camera) = camera_query.get_single_mut() else {
+        error!("could not execute query for single MainCamera component");
         return;
     };
 
-    //getting target from query
     let Ok(target) = target_query.get_single() else {
+        error!("Could not execute query for single CameraTarget component");
         return;
     };
 
-    //Gets the x and y coordinates of our target
+    
     let Vec3 { x, y, .. } = target.translation;
 
-    //Stores the target x y with our camera z cuz our camera z not changing
+    
     let direction = Vec3::new(x, y, camera.translation.z);
 
-    //Debug statements if we want to use them :)
-    //info!("Camera: {:?}", camera);
-    //info!("Target: {:?}", target);
-
-    //Make our camera translation match our target translation
     camera.translation = direction;
 }
 
@@ -62,14 +61,13 @@ fn zoom_camera(
     //Amount to zoom in this update cycle
     let mut zoom_amount = 0.0;
 
-    //For every event read in this cycle increase the zoom amount by 1 event * sensitivity
+
     for event in scroll_event.read() {
         zoom_amount += -event.y * zoom_factor
     }
 
-    //If we have had any mouse scroll events in this update then apply it to the camera projection
+
     if zoom_amount != 0.0 {
-        //extracting the type of projection from camera, only ever going to be Orthographic since 2d but I don't know a better way lol
         for mut projection in camera.iter_mut() {
             projection.scale += zoom_amount;
 

game/src/debug/debug_plugin.rs

@@ -1,10 +1,5 @@
-use avian2d::math::*;
-use avian2d::prelude::*;
 use bevy::prelude::*;
 
-use crate::camera::camera_plugin::*;
-use crate::movement::plugin::*;
-
 ///This plugin provides terminal debug capabilities
 ///By adding systems, requested information will be printed to the terminal
 pub struct DebugPlugin;
@@ -13,7 +8,6 @@ pub struct DebugPlugin;
 impl Plugin for DebugPlugin {
     fn build(&self, app: &mut App) {
         app.add_systems(Startup, print_debug_active_message);
-        app.add_systems(Startup, display_dudes);
     }
 }
 
@@ -23,24 +17,4 @@ fn print_debug_active_message() {
     info!("The debugger is active!");
 }
 
-//Displays two pixel like sprites where one is stationary, then the other that has the CameraTarget component
-//falls forever. Used to test camera system tracking and zooming.
-fn display_dudes(mut commands: Commands) {
-    commands
-        .spawn((
-            SpriteBundle::default(),
-            CharacterControllerBundle::new(Collider::capsule(12.5, 20.0)).with_movement(
-                1250.0,
-                0.92,
-                400.0,
-                (30.0 as Scalar).to_radians(),
-            ),
-            Friction::ZERO.with_combine_rule(CoefficientCombine::Min),
-            Restitution::ZERO.with_combine_rule(CoefficientCombine::Min),
-            ColliderDensity(2.0),
-            GravityScale(1.5),
-        ))
-        .insert(CameraTarget);
 
-    commands.spawn(SpriteBundle::default());
-}