From c7e17a7c1d49dc8cf5e140982f075bcbd27d0317 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahmet=20Kaan=20G=C3=BCm=C3=BC=C5=9F?=
 <ahmetkaangumus@proton.me>
Date: Sun, 16 Feb 2025 00:29:53 +0300
Subject: [PATCH] feat: :sparkles: auto follow camera

---
 assets/water.png | Bin 0 -> 407 bytes
 src/camera.rs    |  30 ++++++++++++++++++++++++++
 src/lib.rs       |  25 +++++++++++++++++++++
 src/main.rs      |  55 ++---------------------------------------------
 src/player.rs    |  39 +++++++++++++++++++++++++++++++++
 src/water.rs     |  15 +++++++++++++
 6 files changed, 111 insertions(+), 53 deletions(-)
 create mode 100644 assets/water.png
 create mode 100644 src/camera.rs
 create mode 100644 src/lib.rs
 create mode 100644 src/player.rs
 create mode 100644 src/water.rs

diff --git a/assets/water.png b/assets/water.png
new file mode 100644
index 0000000000000000000000000000000000000000..60aef64a461d1f5b07f5b0e451dfb7cdcb51c5ad
GIT binary patch
literal 407
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D%z13g_FLn`LH
zy=2IEK!M@F2E(f-Tv*K<*xZF#ZLOZgJy(8RFMA-Gt;5)14&x&pf%FCo<|C2{=NJk{
dg|LT2Eb9UmUERA6&jCZ4!PC{xWt~$(69CSAeh~lw

literal 0
HcmV?d00001

diff --git a/src/camera.rs b/src/camera.rs
new file mode 100644
index 0000000..4d8629a
--- /dev/null
+++ b/src/camera.rs
@@ -0,0 +1,30 @@
+use bevy::{core_pipeline::bloom::Bloom, prelude::*};
+
+use crate::{player::Player, CAMERA_DECAY_RATE};
+
+pub fn setup_camera(mut commands: Commands) {
+    commands.spawn((
+        Camera2d,
+        Camera {
+            hdr: true,
+            ..default()
+        },
+        Bloom::NATURAL,
+    ));
+}
+
+pub fn update_camera(
+    mut camera: Query<&mut Transform, (With<Camera2d>, Without<Player>)>,
+    player: Query<&Transform, (With<Player>, Without<Camera2d>)>,
+    time: Res<Time>,
+) {
+    let mut camera = camera.get_single_mut().unwrap();
+    let player = player.get_single().unwrap();
+
+    let Vec3 { x, y, .. } = player.translation;
+    let direction = Vec3::new(x, y, camera.translation.z);
+
+    camera
+        .translation
+        .smooth_nudge(&direction, CAMERA_DECAY_RATE, time.delta_secs());
+}
diff --git a/src/lib.rs b/src/lib.rs
new file mode 100644
index 0000000..caa1f13
--- /dev/null
+++ b/src/lib.rs
@@ -0,0 +1,25 @@
+use bevy::{
+    app::{App, Startup, Update},
+    DefaultPlugins,
+};
+use camera::{setup_camera, update_camera};
+use player::Player;
+use water::Water;
+
+mod camera;
+mod player;
+mod water;
+
+pub const CHARACTER_SPEED: f32 = 300.0;
+pub const CAMERA_DECAY_RATE: f32 = 3.0;
+
+pub fn start_game() {
+    App::new()
+        .add_plugins(DefaultPlugins)
+        .add_systems(
+            Startup,
+            (setup_camera, Water::setup_water, Player::setup_player),
+        )
+        .add_systems(Update, (update_camera, Player::move_player))
+        .run();
+}
diff --git a/src/main.rs b/src/main.rs
index 0f55e6e..a4821b6 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,57 +1,6 @@
-use bevy::{
-    app::{App, Startup, Update},
-    asset::AssetServer,
-    image::Image,
-    input::ButtonInput,
-    prelude::{Camera2d, Commands, Component, KeyCode, Query, Res, Transform, With},
-    sprite::Sprite,
-    time::Time,
-    DefaultPlugins,
-};
-
-const CHARACTER_SPEED: f32 = 300.0;
-
-#[derive(Debug, Component)]
-struct Player {}
+use fisher::start_game;
 
 fn main() {
     println!("Hello, world!");
-
-    App::new()
-        .add_plugins(DefaultPlugins)
-        .add_systems(Startup, load_character)
-        .add_systems(Update, move_character)
-        .run();
-}
-
-fn load_character(mut commands: Commands, asset_server: Res<AssetServer>) {
-    commands.spawn(Camera2d::default());
-    let image = asset_server.load::<Image>("character.png");
-    commands.spawn((
-        Sprite::from_image(image),
-        Transform::from_xyz(0.0, 0.0, 0.0),
-        Player {},
-    ));
-}
-
-fn move_character(
-    time: Res<Time>,
-    mut character_transform: Query<&mut Transform, With<Player>>,
-    keyboard_input: Res<ButtonInput<KeyCode>>,
-) {
-    let mut character_transform = character_transform.get_single_mut().unwrap();
-
-    let translation = CHARACTER_SPEED * time.delta_secs();
-    if keyboard_input.pressed(KeyCode::KeyW) {
-        character_transform.translation.y += translation;
-    }
-    if keyboard_input.pressed(KeyCode::KeyS) {
-        character_transform.translation.y -= translation;
-    }
-    if keyboard_input.pressed(KeyCode::KeyA) {
-        character_transform.translation.x -= translation;
-    }
-    if keyboard_input.pressed(KeyCode::KeyD) {
-        character_transform.translation.x += translation;
-    }
+    start_game();
 }
diff --git a/src/player.rs b/src/player.rs
new file mode 100644
index 0000000..71afb04
--- /dev/null
+++ b/src/player.rs
@@ -0,0 +1,39 @@
+use bevy::prelude::*;
+
+use crate::CHARACTER_SPEED;
+
+#[derive(Debug, Component)]
+pub struct Player;
+
+impl Player {
+    pub fn setup_player(mut commands: Commands, asset_server: Res<AssetServer>) {
+        let image = asset_server.load::<Image>("character.png");
+        commands.spawn((
+            Sprite::from_image(image),
+            Transform::from_xyz(0.0, 0.0, 0.0),
+            Player,
+        ));
+    }
+
+    pub fn move_player(
+        time: Res<Time>,
+        mut character_transform: Query<&mut Transform, With<Player>>,
+        keyboard_input: Res<ButtonInput<KeyCode>>,
+    ) {
+        let mut character_transform = character_transform.get_single_mut().unwrap();
+
+        let translation = CHARACTER_SPEED * time.delta_secs();
+        if keyboard_input.pressed(KeyCode::KeyW) {
+            character_transform.translation.y += translation;
+        }
+        if keyboard_input.pressed(KeyCode::KeyS) {
+            character_transform.translation.y -= translation;
+        }
+        if keyboard_input.pressed(KeyCode::KeyA) {
+            character_transform.translation.x -= translation;
+        }
+        if keyboard_input.pressed(KeyCode::KeyD) {
+            character_transform.translation.x += translation;
+        }
+    }
+}
diff --git a/src/water.rs b/src/water.rs
new file mode 100644
index 0000000..f17e6d5
--- /dev/null
+++ b/src/water.rs
@@ -0,0 +1,15 @@
+use bevy::prelude::*;
+
+#[derive(Debug, Component)]
+pub struct Water;
+
+impl Water {
+    pub fn setup_water(mut commands: Commands, asset_server: Res<AssetServer>) {
+        let image = asset_server.load::<Image>("water.png");
+        commands.spawn((
+            Sprite::from_image(image),
+            Transform::from_xyz(500.0, 0.0, 0.0),
+            Water,
+        ));
+    }
+}