From 57db0aff22354e4823ba71cacdc72ef152a88862 Mon Sep 17 00:00:00 2001
From: Crizomb <clementbart.45@gmail.com>
Date: Sat, 27 Dec 2025 17:54:55 +0100
Subject: [PATCH] map bounds

---
 src/{collider.rs => box_collider.rs} |  4 +++-
 src/kirby.rs                         |  8 ++++----
 src/main.rs                          |  6 ++++++
 src/map.rs                           | 17 +++++++++++++++++
 src/physics_body.rs                  | 27 ++++++++++++++++++++++++---
 5 files changed, 54 insertions(+), 8 deletions(-)
 rename src/{collider.rs => box_collider.rs} (64%)
 create mode 100644 src/map.rs

diff --git a/src/collider.rs b/src/box_collider.rs
similarity index 64%
rename from src/collider.rs
rename to src/box_collider.rs
index dc307ed..f4bd138 100644
--- a/src/collider.rs
+++ b/src/box_collider.rs
@@ -2,4 +2,6 @@ use bevy::{prelude::*, render::renderer};
 
 #[derive(Component, Default)]
 #[require(Transform)]
-pub struct Collider;
+pub struct BoxCollider {
+    pub dimensions: Vec2,
+}
diff --git a/src/kirby.rs b/src/kirby.rs
index bf282bb..e17b7b1 100644
--- a/src/kirby.rs
+++ b/src/kirby.rs
@@ -5,7 +5,7 @@ use bevy::prelude::*;
 #[derive(Component)]
 #[require(Sprite, PhysicsBody, SphereCollider)]
 pub struct Kirby {
-    move_speed: f32,
+    speed_force: f32,
 }
 
 pub fn kirby_spawn(mut commands: Commands, asset_server: Res<AssetServer>) {
@@ -14,10 +14,10 @@ pub fn kirby_spawn(mut commands: Commands, asset_server: Res<AssetServer>) {
         mass: 10.0,
         force: Vec2::ZERO,
         velocity: Vec2::ZERO,
-        drag: 0.01,
+        drag: 0.05,
     };
     let transform = Transform::from_xyz(0.0, 0.0, 0.0).with_scale(Vec3::ONE * 0.25);
-    commands.spawn((Kirby { move_speed: 200.0 }, transform, sprite, body));
+    commands.spawn((Kirby { speed_force: 50.0 }, transform, sprite, body));
 }
 
 pub fn get_dir(keys: Res<ButtonInput<KeyCode>>) -> Vec2 {
@@ -52,7 +52,7 @@ pub fn kirby_player_move(
     }
     let dir = get_dir(keys);
     for (mut body, kirby) in &mut query {
-        body.velocity = dir * kirby.move_speed;
+        body.velocity += dir * kirby.speed_force;
     }
 }
 
diff --git a/src/main.rs b/src/main.rs
index 3a42a27..f2fd2a2 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -2,16 +2,22 @@ use bevy::prelude::*;
 use camera::spawn_camera;
 use kirby::kirby_player_move;
 use kirby::kirby_spawn;
+use map::MapBounds;
 use physics_body::integrate;
 
 mod camera;
 mod kirby;
+mod map;
 mod physics_body;
 mod sphere_collider;
 
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .insert_resource(MapBounds {
+            min: Vec2::ONE * -400.0,
+            max: Vec2::ONE * 400.0,
+        })
         .add_systems(Startup, spawn_camera)
         .add_systems(Startup, kirby_spawn)
         .add_systems(FixedUpdate, (kirby_player_move, integrate).chain())
diff --git a/src/map.rs b/src/map.rs
new file mode 100644
index 0000000..8fdb0c8
--- /dev/null
+++ b/src/map.rs
@@ -0,0 +1,17 @@
+use bevy::{prelude::*, render::renderer};
+
+#[derive(Component)]
+pub struct MapRoot;
+
+#[derive(Resource)]
+pub struct MapBounds {
+    pub min: Vec2,
+    pub max: Vec2,
+}
+
+pub fn setup_map_bounds(mut commands: Commands) {
+    commands.insert_resource(MapBounds {
+        min: Vec2::new(-320.0, -240.0),
+        max: Vec2::new(320.0, 240.0),
+    });
+}
diff --git a/src/physics_body.rs b/src/physics_body.rs
index 29c8984..f027df6 100644
--- a/src/physics_body.rs
+++ b/src/physics_body.rs
@@ -1,4 +1,5 @@
-use bevy::{prelude::*, render::renderer};
+use crate::map::MapBounds;
+use bevy::prelude::*;
 
 #[derive(Component)]
 #[require(Transform)]
@@ -20,7 +21,11 @@ impl Default for PhysicsBody {
     }
 }
 
-pub fn integrate(mut query: Query<(&mut Transform, &mut PhysicsBody)>, time: Res<Time<Fixed>>) {
+pub fn integrate(
+    bounds: Res<MapBounds>,
+    mut query: Query<(&mut Transform, &mut PhysicsBody)>,
+    time: Res<Time<Fixed>>,
+) {
     for (mut transform, mut physicsbody) in &mut query {
         let force = physicsbody.force;
         let mass = physicsbody.mass;
@@ -28,11 +33,27 @@ pub fn integrate(mut query: Query<(&mut Transform, &mut PhysicsBody)>, time: Res
         let delta_secs = time.delta_secs();
 
         physicsbody.velocity += force * delta_secs / mass;
-        // Drag because stability is good you know
         physicsbody.velocity *= 1.0 - drag;
 
+        bounce(&mut physicsbody.velocity, &transform, &bounds);
+
         transform.translation.x += physicsbody.velocity.x * delta_secs;
         transform.translation.y += physicsbody.velocity.y * delta_secs;
+
         physicsbody.force = Vec2::ZERO;
     }
 }
+
+fn bounce(velocity: &mut Vec2, transform: &Transform, bounds: &MapBounds) {
+    if (transform.translation.x < bounds.min.x && velocity.x < 0.0)
+        || (transform.translation.x > bounds.max.x && velocity.x > 0.0)
+    {
+        velocity.x *= -1.5;
+    }
+
+    if (transform.translation.y < bounds.min.y && velocity.y < 0.0)
+        || (transform.translation.y > bounds.max.y && velocity.y > 0.0)
+    {
+        velocity.y *= -1.5;
+    }
+}