From b3e1359c637db4a92f09f07bd3409b549fc72dda Mon Sep 17 00:00:00 2001
From: Crizomb <clementbart.45@gmail.com>
Date: Sun, 28 Dec 2025 21:07:03 +0100
Subject: [PATCH] sprite sheet

---
 assets/sprites/Sprite_kirby-Sheet.png | Bin 0 -> 1839 bytes
 assets/sprites/bubble.png             | Bin 0 -> 180 bytes
 assets/sprites/kirby_item.png         | Bin 0 -> 204 bytes
 assets/sprites/shield.png             | Bin 0 -> 193 bytes
 assets/sprites/speed.png              | Bin 0 -> 181 bytes
 src/animation.rs                      |  60 ++++++++++++++++++++++++++
 src/box_collider.rs                   |   7 ---
 src/{lana.rs => bubble.rs}            |  23 ++++------
 src/kirby.rs                          |  42 +++++++++++++++---
 src/main.rs                           |  15 ++++---
 10 files changed, 112 insertions(+), 35 deletions(-)
 create mode 100644 assets/sprites/Sprite_kirby-Sheet.png
 create mode 100644 assets/sprites/bubble.png
 create mode 100644 assets/sprites/kirby_item.png
 create mode 100644 assets/sprites/shield.png
 create mode 100644 assets/sprites/speed.png
 create mode 100644 src/animation.rs
 delete mode 100644 src/box_collider.rs
 rename src/{lana.rs => bubble.rs} (71%)

diff --git a/assets/sprites/Sprite_kirby-Sheet.png b/assets/sprites/Sprite_kirby-Sheet.png
new file mode 100644
index 0000000000000000000000000000000000000000..75ee4bea5b669295b6837d25c527567ffd0e067b
GIT binary patch
literal 1839
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

literal 0
HcmV?d00001

diff --git a/assets/sprites/bubble.png b/assets/sprites/bubble.png
new file mode 100644
index 0000000000000000000000000000000000000000..75a53229d88245ddba81f5ffff46b7af1ab89ed6
GIT binary patch
literal 180
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|@;qG}Lo9le
zQw}gbI&b&0|4e*_&fyMU**1k;ZY2$Q0$lAA(sJ4kNE)2AtP$b?fndA63a13rf^v>M
zixMm0bTV7a>{gWH&gL^ELr#Xxz-WRbH_wF?OZvD^6te0l2I^}HXLH;;({f%R=B6aW
XE-s@jzoT+Nu3_+W^>bP0l+XkKCyzJ0

literal 0
HcmV?d00001

diff --git a/assets/sprites/kirby_item.png b/assets/sprites/kirby_item.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9133ad8b0a4c7344c2dd9683810b8f4557fe664
GIT binary patch
literal 204
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|+B{txLo9le
z6C^SYbhy8>H_Y0|`7b>oA>l{i3#~4N_PJ(ZwkKrPNL^&y<!HeCFL|?|TH6^n<Bo}(
z>q}i2)N-~7GcTz6_qc>{)50G*2VS%CS?4}+ILs9>K~y-|c$byfj0d|n<n3UJ@pB7j
z|ID=SiU&u4x|AWqwuZx^GbB7`vK%;Z;J^U}hBRfPIgxYjJO#Rl!PC{xWt~$(696t<
BNSOct

literal 0
HcmV?d00001

diff --git a/assets/sprites/shield.png b/assets/sprites/shield.png
new file mode 100644
index 0000000000000000000000000000000000000000..5075be52f9e9fe67c6b16796f6adcce44d39676f
GIT binary patch
literal 193
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|sy$sCLo9le
z6C^SYbU6R9-}vex>px=y1A{YhyJc6uyOQ9~Q+tB#&+(;#?T$S>K;ZMkWdEKD#?_1g
zTmMhwJ+M-8x}rhDWro69W|3Jb%pI&D+%BtjG-!k?-0nNeu%~T7_OVokFy{@K$I=<P
m6nB^iGyi*hG6G}}55rbT-RY;98ft*fVDNPHb6Mw<&;$TGy+Tj`

literal 0
HcmV?d00001

diff --git a/assets/sprites/speed.png b/assets/sprites/speed.png
new file mode 100644
index 0000000000000000000000000000000000000000..8186b798f7f6529415c611b20111792fb87616a3
GIT binary patch
literal 181
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|@;zM~Lo9l?
zPBav2FyL@r>>u8L`S*Fb<=N~pF$X3+_<Yjir>Dk&<55R;udGx{SZsd%M*ru7DNL#o
z3}KTT4n<zxdB5P42jf(=bq)_BkFtEsnX%^ajJInScs)pX+PDAQi#w7!!WtIZ(t9JH
fGOzR~{lK*JzvhR%H~v2cTFv0;>gTe~DWM4fKRHRF

literal 0
HcmV?d00001

diff --git a/src/animation.rs b/src/animation.rs
new file mode 100644
index 0000000..6d487c7
--- /dev/null
+++ b/src/animation.rs
@@ -0,0 +1,60 @@
+use bevy::prelude::*;
+// Source : https://bevy.org/examples/2d-rendering/sprite-sheet/
+
+fn main() {
+    App::new()
+        .add_plugins(DefaultPlugins.set(ImagePlugin::default_nearest())) // prevents blurry sprites
+        .add_systems(Startup, setup)
+        .add_systems(Update, animate_sprite)
+        .run();
+}
+
+#[derive(Component)]
+pub struct AnimationIndices {
+    pub first: usize,
+    pub last: usize,
+}
+
+#[derive(Component, Deref, DerefMut)]
+pub struct AnimationTimer(pub Timer);
+
+pub fn animate_sprite(time: Res<Time>, mut query: Query<(&AnimationIndices, &mut AnimationTimer, &mut Sprite)>) {
+    for (indices, mut timer, mut sprite) in &mut query {
+        timer.tick(time.delta());
+
+        if timer.just_finished()
+            && let Some(atlas) = &mut sprite.texture_atlas
+        {
+            atlas.index = if atlas.index >= indices.last || atlas.index < indices.first {
+                indices.first
+            } else {
+                atlas.index + 1
+            };
+        }
+    }
+}
+
+#[allow(dead_code)]
+fn setup(
+    mut commands: Commands,
+    asset_server: Res<AssetServer>,
+    mut texture_atlas_layouts: ResMut<Assets<TextureAtlasLayout>>,
+) {
+    let texture = asset_server.load("textures/rpg/chars/gabe/gabe-idle-run.png");
+    let layout = TextureAtlasLayout::from_grid(UVec2::splat(24), 7, 1, None, None);
+    let texture_atlas_layout = texture_atlas_layouts.add(layout);
+    // Use only the subset of sprites in the sheet that make up the run animation
+    let animation_indices = AnimationIndices { first: 1, last: 6 };
+
+    commands.spawn(Camera2d);
+
+    commands.spawn((
+        Sprite::from_atlas_image(
+            texture,
+            TextureAtlas { layout: texture_atlas_layout, index: animation_indices.first },
+        ),
+        Transform::from_scale(Vec3::splat(6.0)),
+        animation_indices,
+        AnimationTimer(Timer::from_seconds(0.1, TimerMode::Repeating)),
+    ));
+}
diff --git a/src/box_collider.rs b/src/box_collider.rs
deleted file mode 100644
index f4bd138..0000000
--- a/src/box_collider.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-use bevy::{prelude::*, render::renderer};
-
-#[derive(Component, Default)]
-#[require(Transform)]
-pub struct BoxCollider {
-    pub dimensions: Vec2,
-}
diff --git a/src/lana.rs b/src/bubble.rs
similarity index 71%
rename from src/lana.rs
rename to src/bubble.rs
index c71fa83..bfe7cc3 100644
--- a/src/lana.rs
+++ b/src/bubble.rs
@@ -1,20 +1,19 @@
 use crate::density_grid::DensityObject;
 use crate::kirby::Kirby;
 use crate::physics_body::PhysicsBody;
-use crate::sphere_collider::SphereCollider;
 use bevy::prelude::*;
 use rand::Rng;
 use std::f32::consts::TAU;
 use std::fmt::Debug;
 
 #[derive(Component)]
-#[require(Sprite, PhysicsBody, SphereCollider, DensityObject)]
-pub struct Lana {
+#[require(Sprite, PhysicsBody, DensityObject)]
+pub struct Bubble {
     move_force: f32,
 }
 
-pub fn lana_spawn(mut commands: Commands, asset_server: Res<AssetServer>) {
-    let texture: Handle<Image> = asset_server.load("sprites/lana.png");
+pub fn bubble_spawn(mut commands: Commands, asset_server: Res<AssetServer>) {
+    let texture: Handle<Image> = asset_server.load("sprites/bubble.png");
     let mut rng = rand::rng();
 
     for _ in 0..1000 {
@@ -22,16 +21,16 @@ pub fn lana_spawn(mut commands: Commands, asset_server: Res<AssetServer>) {
         let pos = Vec2::from_angle(angle) * 500.0;
 
         commands.spawn((
-            Lana { move_force: 3000.0 },
+            Bubble { move_force: 3000.0 },
             Sprite { image: texture.clone(), ..default() },
-            Transform::from_translation(pos.extend(0.0)).with_scale(Vec3::splat(0.01)),
+            Transform::from_translation(pos.extend(0.0)).with_scale(Vec3::splat(1.0)),
             PhysicsBody { mass: 10.0, force: Vec2::ZERO, velocity: Vec2::ZERO, drag: 0.05 },
         ));
     }
 }
 
-pub fn lana_move(
-    mut lana_query: Query<(&mut PhysicsBody, &Transform, &Lana), With<Lana>>,
+pub fn bubble_move(
+    mut lana_query: Query<(&mut PhysicsBody, &Transform, &Bubble), With<Bubble>>,
     kirby_query: Query<(&Transform, &Kirby), With<Kirby>>,
 ) {
     for (mut lana_body, lana_transform, lana) in &mut lana_query {
@@ -50,9 +49,3 @@ pub fn lana_move(
         lana_body.force += dir * lana.move_force;
     }
 }
-
-#[derive(Component)]
-#[require(Sprite, Transform)]
-pub struct KirbySuction {
-    box_size: Vec2,
-}
diff --git a/src/kirby.rs b/src/kirby.rs
index 202306d..375263e 100644
--- a/src/kirby.rs
+++ b/src/kirby.rs
@@ -1,3 +1,4 @@
+use crate::animation::{AnimationIndices, AnimationTimer};
 use crate::physics_body::PhysicsBody;
 use crate::sphere_collider::SphereCollider;
 use bevy::prelude::*;
@@ -8,15 +9,32 @@ pub struct Kirby {
     speed_force: f32,
 }
 
-pub fn kirby_spawn(mut commands: Commands, asset_server: Res<AssetServer>) {
-    let sprite = Sprite::from_image(asset_server.load("sprites/kirby.png"));
+pub fn kirby_spawn(
+    mut commands: Commands,
+    asset_server: Res<AssetServer>,
+    mut texture_atlas_layouts: ResMut<Assets<TextureAtlasLayout>>,
+) {
+    let texture: Handle<Image> = asset_server.load("sprites/Sprite_kirby-Sheet.png");
     let body = PhysicsBody { mass: 10.0, force: Vec2::ZERO, velocity: Vec2::ZERO, drag: 0.05 };
-    let transform = Transform::from_xyz(0.0, 0.0, 0.0).with_scale(Vec3::ONE * 0.25);
-    commands.spawn((Kirby { speed_force: 10000.0 }, transform, sprite, body));
+    let layout = TextureAtlasLayout::from_grid(UVec2::splat(32), 3, 3, None, None);
+    let texture_atlas_layout = texture_atlas_layouts.add(layout);
+    let animation_indices = AnimationIndices { first: 3, last: 5 }; // idle
+
+    commands.spawn((
+        Kirby { speed_force: 10000.0 },
+        Sprite::from_atlas_image(
+            texture,
+            TextureAtlas { layout: texture_atlas_layout, index: animation_indices.first },
+        ),
+        Transform::from_scale(Vec3::splat(3.0)),
+        animation_indices,
+        AnimationTimer(Timer::from_seconds(0.1, TimerMode::Repeating)),
+        body,
+    ));
 }
 
 pub fn get_dir(keys: Res<ButtonInput<KeyCode>>) -> Vec2 {
-    if keys.pressed(KeyCode::Space) {
+    if keys.just_pressed(KeyCode::Space) {
         println!("SUCKING");
     }
 
@@ -38,13 +56,23 @@ pub fn get_dir(keys: Res<ButtonInput<KeyCode>>) -> Vec2 {
     dir.normalize_or_zero()
 }
 
-pub fn kirby_player_move(keys: Res<ButtonInput<KeyCode>>, mut query: Query<(&mut PhysicsBody, &Kirby), With<Kirby>>) {
+pub fn kirby_player_move(
+    keys: Res<ButtonInput<KeyCode>>,
+    mut query: Query<(&mut PhysicsBody, &Kirby, &mut AnimationIndices), With<Kirby>>,
+) {
     if keys.pressed(KeyCode::Space) {
         println!("SUCKING");
     }
     let dir = get_dir(keys);
-    for (mut body, kirby) in &mut query {
+    for (mut body, kirby, mut anim_indices) in &mut query {
         body.force += dir * kirby.speed_force;
+        if (dir == Vec2::ZERO) {
+            anim_indices.first = 3;
+            anim_indices.last = 5;
+        } else {
+            anim_indices.first = 6;
+            anim_indices.last = 8;
+        }
     }
 }
 
diff --git a/src/main.rs b/src/main.rs
index 173b145..6ebcb52 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,4 +1,7 @@
+use animation::animate_sprite;
 use bevy::prelude::*;
+use bubble::bubble_move;
+use bubble::bubble_spawn;
 use camera::spawn_camera;
 use density_grid::DensityGrid;
 use density_grid::density_grid_force;
@@ -6,32 +9,32 @@ use density_grid::density_grid_update;
 use density_grid::init_density_object;
 use kirby::kirby_player_move;
 use kirby::kirby_spawn;
-use lana::lana_move;
-use lana::lana_spawn;
 use map::MapBounds;
 use physics_body::integrate;
 
+mod animation;
+mod bubble;
 mod camera;
 mod density_grid;
 mod globals;
 mod kirby;
-mod lana;
 mod map;
 mod physics_body;
 mod sphere_collider;
 
 fn main() {
     App::new()
-        .add_plugins(DefaultPlugins)
+        .add_plugins(DefaultPlugins.set(ImagePlugin::default_nearest()))
         .insert_resource(MapBounds { min: Vec2::ONE * -600.0, max: Vec2::ONE * 600.0 })
         .insert_resource(DensityGrid::new())
         .add_systems(Startup, spawn_camera)
         .add_systems(Startup, kirby_spawn)
-        .add_systems(Startup, lana_spawn)
+        .add_systems(Startup, bubble_spawn)
         .add_systems(PostStartup, init_density_object)
+        .add_systems(Update, animate_sprite)
         .add_systems(FixedUpdate, (density_grid_update, density_grid_force).chain())
         .add_systems(FixedUpdate, kirby_player_move)
-        .add_systems(FixedUpdate, lana_move)
+        .add_systems(FixedUpdate, bubble_move)
         .add_systems(FixedPostUpdate, integrate)
         .run();
 }