From 623a06284b2bfd0dd19f1da317fff2291c16b217 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Mon, 25 Dec 2023 15:35:10 -0600
Subject: [PATCH] Cleanup

---
 readme.md     |  2 +-
 src/camera.rs | 21 +++++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/readme.md b/readme.md
index 9d24f1e..e4cf36f 100644
--- a/readme.md
+++ b/readme.md
@@ -22,7 +22,7 @@ the heavy-lifting for me _plus_ it's a fun excuse to write more Rust.
       - https://github.com/bevyengine/bevy/blob/main/examples/audio/audio.rs
       - https://github.com/bevyengine/bevy/blob/main/examples/audio/audio_control.rs
       - https://github.com/bevyengine/bevy/blob/main/examples/audio/spatial_audio_2d.rs
-  - [ ] Y-sort
+  - [X] Y-sort
   - [ ] Tile system
   - [ ] Basic map
   - [ ] Enemies
diff --git a/src/camera.rs b/src/camera.rs
index 3c13240..aa7d8cc 100644
--- a/src/camera.rs
+++ b/src/camera.rs
@@ -1,13 +1,15 @@
 use bevy::prelude::*;
 
-use crate::player;
+use crate::player::Player;
+use bevy::render::camera::Camera as BevyCamera;
 
 pub struct Camera;
 
 impl Plugin for Camera {
     fn build(&self, app: &mut App) {
         app.add_systems(Startup, spawn)
-            .add_systems(PostUpdate, focus);
+            .add_systems(PostUpdate, focus)
+            .add_systems(Update, y_sort);
     }
 }
 
@@ -18,13 +20,12 @@ fn spawn(mut commands: Commands) {
 }
 
 fn focus(
-    player: Query<&Transform, With<player::Player>>,
-    mut camera: Query<
-        &mut Transform,
-        (With<bevy::render::camera::Camera>, Without<player::Player>),
-    >,
+    player: Query<&Transform, With<Player>>,
+    mut camera: Query<&mut Transform, (With<BevyCamera>, Without<Player>)>,
 ) {
-    let ply = player.single();
-    let mut camt = camera.single_mut();
-    camt.translation = ply.translation
+    camera.single_mut().translation = player.single().translation
+}
+
+fn y_sort(mut q: Query<&mut Transform>) {
+    q.for_each_mut(|mut tf| tf.translation.z = -tf.translation.y)
 }