From 4d69851438952829cf88b059666099646e9cf12f Mon Sep 17 00:00:00 2001
From: senicko <sebastianflajszer@gmail.com>
Date: Sun, 5 Feb 2023 16:58:47 +0100
Subject: [PATCH 1/3] Create boost plugin

---
 assets/img/boost.png | Bin 0 -> 1268 bytes
 src/assets.rs        |   2 ++
 src/boost.rs         |  82 +++++++++++++++++++++++++++++++++++++++++++
 src/lib.rs           |   5 +--
 4 files changed, 87 insertions(+), 2 deletions(-)
 create mode 100644 assets/img/boost.png
 create mode 100644 src/boost.rs

diff --git a/assets/img/boost.png b/assets/img/boost.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b058e460ebeb71255c737fd6136d7f276b79ecd
GIT binary patch
literal 1268
zcmV<Q1Pl9#P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px(u1Q2eRCt{2TU%=zM;JY0-E8%z*pmE|M~9L=v>_#=p^%0=goLCGp@o)0AS7<>
z-UuxvrA-@hAtdBNahpIwX`lTIvb**l$%CYoWTp?Zvls1cb}qY8;sdfq%V;&{n=|Lk
zYGpEhb%5dx#zNHts2ckPsCocZqtpV>?cFjzP6+j~K8SAbf~+n3ulN4jVGY6_B-BPu
zn-GE|gwHPuVmbx(UhJUu{t9dV6OgVQUcuhKI}vh3umDL#kRcD0P=LvEM!FC=fj+!V
z2$3cal(7UT1wg?53cjU4Uvf~MJYcv0lV^^{go%uLv_!~pS&9}y7DiK`eyqco_zwzD
zPZWZWtiB6xuPBevNC9}<P5yQw1Fj$KctxQ6Nw^5peHRX?lLs^wAe`}JZ5flTDe}iU
zY)NQP!@@gy$O8saVEm_p;;}}A``6ypM;<U?f;8UDH!`uLsJ*9`JfN`v<HrtbBrp(*
zwd|y*9oA1C&{Tl&LnoJ^iW+K1%#a5(nPB5o5O<A})6s`SBg=kFC51ugH^HzPG;De6
zM>{%)7lXDK96ewjplg%k?;8w5xd49tQ;N}jCw1deWRt`94P`*t1j*VmM)&N{o<FcT
zG50UtS10tuAWeEf5?+a&h5(rS#k{0`+^iCmO>lI_&M-0(IZg!4k-s&3+*Bcy6~JRE
zd4~0<0q`!YpuZ4G3UF`P-dP|JYx>jx0@OdyQwX&bC=_el@{#HO!bt&O@|3A!^30K@
zAguuR4?A<_%2Wd&uLyYsC~a~ytAPe;C<>_p41cqg1{*Czw7<$OQf5g=ErH>$wl?Vo
zZ6e&iaUziWc+1ILZh1RO<M#!UFuI%OAL8B+E&>4d6`Vv;lwJV$wyms&#>o!GPaHHp
ziW8h{IjDaqZiuDc9CdHmTD)QW*zu!~UySkRBIJP*3*g?28>ehi_+PpJ{%tYY+he5^
z!2LZvHHxaCamt%v3XC7gZ-6+A-y3vq*h2j%(ytMkr#l$kw<A6LLMXzh3G%oEL}D;#
zr^Q<HbXWTrjVWOGiyfKLtQiiYbuJ(|x@)6(Hh4Y#BMTicqJZIb%R4(soM{m?w9a?o
z-mxQUXr7q^1q^?-LQ|bQ?|EuyecbgsHqYrN9fsBv82n@<I693vd7AsTKIsC~i%dk9
zgDGfJz~D#AZ;Q_R;-`$Dd&5TSVwc4w0a_Q#6X($40fTE+>Y7g8&oggW{4ANM3A0Os
zasdWEScPM4@$;U_M{0$V2MoTqGOyW}zU=wyeesJPBVPKoXEvl2(Em1&eOjz7T}qzm
zG9{h|DFyU5t(c?7X8%$z^{273LLQJ%K!1a8a*(>oS-LzsYdjBy6wv?bWh~R%S9@_a
z%n^hOK(}|%-dJU%zwQNv0NAlBK_U9zSy`u=DF`hAzLxpg?XSNC2+-bG^$o4R8DARh
zE3>~83Y#F^-bH(J6_m0iLDrVpvGpF>>wya9fjl5kfa%EMgx}&tSPzQ8-r)JdoFMmF
zAn7|dzfFPmH>*>}=F0_hJ%B4<mNqXsA#8%LBYB{rJ43UC{ePRQdH_{pzW`Mapla+F
epy~lsjsF37qXF_rLR*Lc0000<MNUMnLSTZJhD)3P

literal 0
HcmV?d00001

diff --git a/src/assets.rs b/src/assets.rs
index 6759ce5..4b13297 100644
--- a/src/assets.rs
+++ b/src/assets.rs
@@ -34,4 +34,6 @@ pub struct TextureAssets {
     pub ball: Handle<Image>,
     #[asset(path = "img/block.png")]
     pub block: Handle<Image>,
+    #[asset(path = "img/boost.png")]
+    pub boost: Handle<Image>
 }
diff --git a/src/boost.rs b/src/boost.rs
new file mode 100644
index 0000000..89fbeee
--- /dev/null
+++ b/src/boost.rs
@@ -0,0 +1,82 @@
+use crate::{assets::TextureAssets, paddle::Paddle, GameState};
+use bevy::prelude::*;
+use bevy::sprite::collide_aabb::collide;
+use bevy_rapier2d::prelude::*;
+
+// This could be but inside of a boost or a boost type later.
+pub const DEFAULT_BOOST_SPEED: f32 = 150.;
+
+pub struct BoostPlugin;
+
+impl Plugin for BoostPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_system_set(SystemSet::on_enter(GameState::Playing).with_system(boost_setup))
+            .add_system_set(
+                SystemSet::on_update(GameState::Playing)
+                    .with_system(boost_movement)
+                    .with_system(boost_picker),
+            );
+    }
+}
+
+#[derive(Component)]
+pub struct Boost;
+
+#[derive(Bundle)]
+pub struct BoostBundle {
+    boost: Boost,
+    collider: Collider,
+    #[bundle]
+    sprite: SpriteBundle,
+}
+
+impl BoostBundle {
+    fn new(texture: Handle<Image>, boost_size: &Vec2) -> Self {
+        Self {
+            boost: Boost,
+            sprite: SpriteBundle {
+                texture,
+                transform: Transform::from_translation(Vec3::new(0., 200., 0.)),
+                ..default()
+            },
+            collider: Collider::cuboid(boost_size.x / 2., boost_size.y / 2.),
+        }
+    }
+}
+
+fn boost_setup(mut commands: Commands, textures: Res<TextureAssets>, images: Res<Assets<Image>>) {
+    let boost_image = images
+        .get(&textures.boost)
+        .expect("Boost texture is not loaded");
+
+    commands.spawn(BoostBundle::new(
+        textures.boost.clone(),
+        &boost_image.size(),
+    ));
+}
+
+fn boost_movement(mut boost_query: Query<&mut Transform, With<Boost>>, time: Res<Time>) {
+    for mut transform in boost_query.iter_mut() {
+        transform.translation.y -= time.delta_seconds() * DEFAULT_BOOST_SPEED;
+    }
+}
+
+// This probably can be done easier with rapier events or something
+// FIXME: Look into rapier things
+fn boost_picker(
+    paddle_query: Query<(&Collider, &Transform), (With<Paddle>, Without<Boost>)>,
+    boost_query: Query<(&Collider, &Transform), (With<Boost>, Without<Paddle>)>,
+) {
+    let (paddle_collider, paddle_transform) = paddle_query.get_single().expect("Paddle not found");
+
+    for (boost_collider, boost_transform) in boost_query.iter() {
+        if collide(
+            boost_transform.translation,
+            boost_collider.as_cuboid().unwrap().half_extents(),
+            paddle_transform.translation,
+            paddle_collider.as_cuboid().unwrap().half_extents(),
+        ).is_some() {
+            println!("boost picked");
+        }
+    }
+}
diff --git a/src/lib.rs b/src/lib.rs
index 44e9ad3..768f799 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,6 +1,5 @@
 use bevy::prelude::*;
 use bevy_rapier2d::prelude::*;
-use block::BlockPlugin;
 
 mod actions;
 mod assets;
@@ -11,6 +10,7 @@ mod cursor;
 mod menu;
 mod paddle;
 mod util;
+mod boost;
 
 #[derive(Clone, Eq, PartialEq, Debug, Hash)]
 enum GameState {
@@ -43,7 +43,8 @@ impl Plugin for ArkanoidPlugin {
             .add_plugin(paddle::PaddlePlugin)
             .add_plugin(ball::BallPlugin)
             .add_plugin(menu::MenuPlugin)
-            .add_plugin(BlockPlugin)
+            .add_plugin(block::BlockPlugin)
+            .add_plugin(boost::BoostPlugin)
             .add_state(GameState::Loading);
     }
 }

From acc6d3d2b02a581f05ac78382dd21f1db29ea3d2 Mon Sep 17 00:00:00 2001
From: senicko <sebastianflajszer@gmail.com>
Date: Sun, 5 Feb 2023 18:18:15 +0100
Subject: [PATCH 2/3] Despawn boost entity on collision with paddle

---
 src/boost.rs | 62 ++++++++++++++++++++++++++--------------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/boost.rs b/src/boost.rs
index 89fbeee..bdd3eda 100644
--- a/src/boost.rs
+++ b/src/boost.rs
@@ -1,26 +1,21 @@
 use crate::{assets::TextureAssets, paddle::Paddle, GameState};
 use bevy::prelude::*;
-use bevy::sprite::collide_aabb::collide;
 use bevy_rapier2d::prelude::*;
 
-// This could be but inside of a boost or a boost type later.
-pub const DEFAULT_BOOST_SPEED: f32 = 150.;
-
 pub struct BoostPlugin;
 
 impl Plugin for BoostPlugin {
     fn build(&self, app: &mut App) {
         app.add_system_set(SystemSet::on_enter(GameState::Playing).with_system(boost_setup))
-            .add_system_set(
-                SystemSet::on_update(GameState::Playing)
-                    .with_system(boost_movement)
-                    .with_system(boost_picker),
-            );
+            .add_system_set(SystemSet::on_update(GameState::Playing).with_system(boost_movement));
     }
 }
 
 #[derive(Component)]
-pub struct Boost;
+pub struct Boost {
+    pub name: String,
+    pub speed: f32,
+}
 
 #[derive(Bundle)]
 pub struct BoostBundle {
@@ -33,7 +28,10 @@ pub struct BoostBundle {
 impl BoostBundle {
     fn new(texture: Handle<Image>, boost_size: &Vec2) -> Self {
         Self {
-            boost: Boost,
+            boost: Boost {
+                name: "test".to_string(),
+                speed: 150.,
+            },
             sprite: SpriteBundle {
                 texture,
                 transform: Transform::from_translation(Vec3::new(0., 200., 0.)),
@@ -55,28 +53,30 @@ fn boost_setup(mut commands: Commands, textures: Res<TextureAssets>, images: Res
     ));
 }
 
-fn boost_movement(mut boost_query: Query<&mut Transform, With<Boost>>, time: Res<Time>) {
-    for mut transform in boost_query.iter_mut() {
-        transform.translation.y -= time.delta_seconds() * DEFAULT_BOOST_SPEED;
-    }
-}
-
-// This probably can be done easier with rapier events or something
-// FIXME: Look into rapier things
-fn boost_picker(
+fn boost_movement(
+    mut commands: Commands,
+    mut boost_query: Query<(&mut Transform, &Boost)>,
+    time: Res<Time>,
     paddle_query: Query<(&Collider, &Transform), (With<Paddle>, Without<Boost>)>,
-    boost_query: Query<(&Collider, &Transform), (With<Boost>, Without<Paddle>)>,
+    rapier_context: Res<RapierContext>,
 ) {
-    let (paddle_collider, paddle_transform) = paddle_query.get_single().expect("Paddle not found");
+    // Check for boost collision
+    let (paddle_collider, paddle_transform) = paddle_query.single();
 
-    for (boost_collider, boost_transform) in boost_query.iter() {
-        if collide(
-            boost_transform.translation,
-            boost_collider.as_cuboid().unwrap().half_extents(),
-            paddle_transform.translation,
-            paddle_collider.as_cuboid().unwrap().half_extents(),
-        ).is_some() {
-            println!("boost picked");
-        }
+    if let Some((entity, _)) = rapier_context.cast_shape(
+        paddle_transform.translation.truncate(),
+        0.,
+        Vec2::new(0., -1.),
+        paddle_collider,
+        1.,
+        QueryFilter::default().predicate(&|entity| boost_query.get(entity).is_ok()),
+    ) {
+        // TODO: apply boost effect or sth
+        commands.entity(entity).despawn_recursive();
+    }
+
+    // Free fall
+    for (mut transform, boost) in boost_query.iter_mut() {
+        transform.translation.y -= time.delta_seconds() * boost.speed;
     }
 }

From 225acc971c3d6a7598a7519f423e21397cb95cb8 Mon Sep 17 00:00:00 2001
From: senicko <sebastianflajszer@gmail.com>
Date: Sun, 5 Feb 2023 18:20:43 +0100
Subject: [PATCH 3/3] Fix formatting issue in lib.rs

---
 src/assets.rs | 2 +-
 src/lib.rs    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/assets.rs b/src/assets.rs
index 4b13297..88ed173 100644
--- a/src/assets.rs
+++ b/src/assets.rs
@@ -35,5 +35,5 @@ pub struct TextureAssets {
     #[asset(path = "img/block.png")]
     pub block: Handle<Image>,
     #[asset(path = "img/boost.png")]
-    pub boost: Handle<Image>
+    pub boost: Handle<Image>,
 }
diff --git a/src/lib.rs b/src/lib.rs
index 768f799..77d03c1 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -5,12 +5,12 @@ mod actions;
 mod assets;
 mod ball;
 mod block;
+mod boost;
 mod camera;
 mod cursor;
 mod menu;
 mod paddle;
 mod util;
-mod boost;
 
 #[derive(Clone, Eq, PartialEq, Debug, Hash)]
 enum GameState {