From 6f95a8fd9fbb7b98db16da12fd300d6b9637ccde Mon Sep 17 00:00:00 2001
From: Carson Webster <CarsonWebster@hotmail.com>
Date: Sat, 9 Dec 2023 14:59:13 -0800
Subject: [PATCH] Bee sprite and wing animations

---
 Cargo.lock     | 34 ++++++++++++++++++++++++++++++++
 Cargo.toml     |  1 +
 src/bees.rs    | 53 +++++++++++++++++++++++++++++++++++++++++++++-----
 src/boids.rs   | 28 +++++++++++++-------------
 src/lib.rs     |  4 ++--
 src/loading.rs | 15 +++++++++++++-
 src/tilemap.rs |  2 +-
 7 files changed, 114 insertions(+), 23 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 27e0050..3f2d13a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -705,6 +705,7 @@ dependencies = [
  "image",
  "quadtree",
  "rand",
+ "time",
  "webbrowser",
  "winit",
 ]
@@ -1682,6 +1683,15 @@ version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
 
+[[package]]
+name = "deranged"
+version = "0.3.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc"
+dependencies = [
+ "powerfmt",
+]
+
 [[package]]
 name = "derive-getters"
 version = "0.3.0"
@@ -3131,6 +3141,12 @@ dependencies = [
  "miniz_oxide",
 ]
 
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
 [[package]]
 name = "pp-rs"
 version = "0.2.1"
@@ -3729,6 +3745,24 @@ dependencies = [
  "weezl",
 ]
 
+[[package]]
+name = "time"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
+dependencies = [
+ "deranged",
+ "powerfmt",
+ "serde",
+ "time-core",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+
 [[package]]
 name = "tinyvec"
 version = "1.6.0"
diff --git a/Cargo.toml b/Cargo.toml
index 5c58660..65384d8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -70,6 +70,7 @@ bevy_ecs_tilemap = { git = "https://github.com/divark/bevy_ecs_tilemap", branch
 bevy_ecs_ldtk = { git = "https://github.com/Trouv/bevy_ecs_ldtk.git", branch = "feat/bevy-0.12" }
 bevy-inspector-egui = "0.21.0"
 quadtree = { git = "https://github.com/MickHarrigan/quadtree.git" }
+time = "0.3.30"
 
 
 [build-dependencies]
diff --git a/src/bees.rs b/src/bees.rs
index f12acb4..f69d52e 100644
--- a/src/bees.rs
+++ b/src/bees.rs
@@ -26,6 +26,7 @@ impl Plugin for BeesPlugin {
             .add_systems(OnEnter(GameState::Playing), setup)
             .add_systems(Update, create_boid_group.run_if(in_state(GameState::Playing)))
             .add_systems(Update, place_bee.run_if(in_state(GameState::Playing)))
+            .add_systems(Update, animate_wings.run_if(in_state(GameState::Playing)))
             .add_systems(
                 Update,
                 (build_or_update_quadtree, update_boids, move_system).run_if(
@@ -154,6 +155,33 @@ fn setup(mut _commands: Commands) {
     // });
 }
 
+#[derive(Component)]
+struct AnimationIndices {
+    first: usize,
+    last: usize,
+}
+#[derive(Component, Deref, DerefMut)]
+struct AnimationTimer(Timer);
+
+fn animate_wings(
+    time: Res<Time>,
+    mut query: Query<(
+        &AnimationIndices,
+        &mut AnimationTimer,
+        &mut TextureAtlasSprite,
+    )>,
+) {
+    for (indices, mut timer, mut sprite) in &mut query {
+        timer.tick(time.delta());
+        if timer.just_finished() {
+            sprite.index = if sprite.index == indices.last {
+                indices.first
+            } else {
+                sprite.index + 1
+            };
+        }
+    }
+}
 
 fn place_bee(
     mut commands: Commands,
@@ -162,10 +190,9 @@ fn place_bee(
     mouse_input: Res<Input<MouseButton>>,
 ) {
     if mouse_input.just_pressed(MouseButton::Right) {
-        commands.spawn((
-            SpriteSheetBundle {
-                texture_atlas: textures.planes.clone(),
-                sprite: TextureAtlasSprite::new(11),
+        let bee_entity = commands.spawn((
+            SpriteBundle {
+                texture: textures.beebody1.clone(),
                 transform: Transform::from_xyz(
                     mouse_position.0.x,
                     mouse_position.0.y,
@@ -179,7 +206,23 @@ fn place_bee(
             Highlightable,
             Collider::new(5.0),
             Velocity::default(),
-        ));
+        )).id();
+
+        // Create the wings
+        let texture_atlas_handle = textures.bee1wingmap.clone();
+
+        // Spawn the wings as a child of the bee body
+        commands.entity(bee_entity).with_children(|parent| {
+            parent.spawn(SpriteSheetBundle {
+                texture_atlas: textures.bee1wingmap.clone(),
+                sprite: TextureAtlasSprite::new(0), // Set the initial sprite index
+                transform: Transform::from_xyz(0.0, 0.0, 1.0), // Adjust the position of the wings relative to the bee body
+                ..Default::default()
+            })
+                .insert(AnimationIndices { first: 0, last: 3 - 1 })
+                .insert(AnimationTimer(Timer::from_seconds(0.3, TimerMode::Repeating)));
+        });
+
         info!("Bee spawned");
     }
 }
diff --git a/src/boids.rs b/src/boids.rs
index a905492..52fedb2 100644
--- a/src/boids.rs
+++ b/src/boids.rs
@@ -1,34 +1,34 @@
 use crate::{
     bees::{Body, Team},
-    world::LdtkLevel,
+    // world::LdtkLevel,
 };
 use bevy::prelude::*;
-use bevy_ecs_ldtk::prelude::*;
+// use bevy_ecs_ldtk::prelude::*;
 
 use crate::bees::{BoidGroup, Collider, Velocity};
+use crate::tilemap::LevelData;
 
 #[derive(Component)]
 pub struct Boid;
 
 pub fn create_boid_group(
     mut comms: Commands,
-    level: Res<Assets<LdtkProject>>,
-    handle: Res<LdtkLevel>,
+    // level: Res<Assets<LdtkProject>>,
+    // handle: Res<LdtkLevel>,
+    level_data: Res<LevelData>,
     mut loaded: Local<bool>,
 ) {
     if *loaded {
         return;
     }
-    if let Some(data) = level.get(&handle.0) {
-        let height = data.iter_root_levels().next().unwrap().px_hei;
-        let width = data.iter_root_levels().next().unwrap().px_wid;
-        comms.spawn(BoidGroup::new(
-            Vec2::new(0., 0.),
-            Vec2::new(width as f32, height as f32),
-            Team(0),
-        ));
-        *loaded = true;
-    }
+    let height = level_data.level_height;
+    let width = level_data.level_width;
+    comms.spawn(BoidGroup::new(
+        Vec2::new(0., 0.),
+        Vec2::new(width, height),
+        Team(0),
+    ));
+    *loaded = true;
 }
 
 pub fn update_boids(
diff --git a/src/lib.rs b/src/lib.rs
index f444862..0cd8640 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -72,8 +72,8 @@ impl Plugin for GamePlugin {
             CameraPlugin,
             MapPlugin,
             // WorldPlugin,
-            // InteractionsPlugin,
-            // BeesPlugin,
+            InteractionsPlugin,
+            BeesPlugin,
         ));
 
         #[cfg(debug_assertions)]
diff --git a/src/loading.rs b/src/loading.rs
index dc5690f..8c83b79 100644
--- a/src/loading.rs
+++ b/src/loading.rs
@@ -2,6 +2,7 @@ use crate::GameState;
 use bevy::prelude::*;
 use bevy_asset_loader::prelude::*;
 use bevy_kira_audio::AudioSource;
+use bevy_asset_loader::asset_collection::AssetCollection;
 
 pub struct LoadingPlugin;
 
@@ -31,8 +32,10 @@ pub struct AudioAssets {
 pub struct TextureAssets {
     #[asset(path = "textures/bevy.png")]
     pub bevy: Handle<Image>,
+
     #[asset(path = "textures/github.png")]
     pub github: Handle<Image>,
+
     #[asset(texture_atlas(
         tile_size_x = 16.,
         tile_size_y = 16.,
@@ -45,6 +48,7 @@ pub struct TextureAssets {
     ))]
     #[asset(path = "textures/shmup.png")]
     pub shmup: Handle<TextureAtlas>,
+
     #[asset(texture_atlas(
         tile_size_x = 32.,
         tile_size_y = 32.,
@@ -57,6 +61,15 @@ pub struct TextureAssets {
     ))]
     #[asset(path = "textures/airplanes.png")]
     pub planes: Handle<TextureAtlas>,
+
+    // #[asset(texture_atlas(tile_size_x = 720., tile_size_y = 720., columns = 4, rows = 1, padding_x = 0., padding_y = 0., offset_x = 0., offset_y = 0.))]
     #[asset(path = "textures/ground/ground.png")]
-    pub ground: Handle<Image>
+    pub ground: Handle<Image>,
+
+    #[asset(texture_atlas(tile_size_x = 720., tile_size_y = 720., columns = 3, rows = 1, padding_x = 0., padding_y = 0., offset_x = 0., offset_y = 0.))]
+    #[asset(path = "textures/bee1/wingmap.png")]
+    pub bee1wingmap: Handle<TextureAtlas>,
+
+    #[asset(path = "textures/bee1/beebody.png")]
+    pub beebody1: Handle<Image>,
 }
diff --git a/src/tilemap.rs b/src/tilemap.rs
index 990f7fc..076655a 100644
--- a/src/tilemap.rs
+++ b/src/tilemap.rs
@@ -3,7 +3,7 @@ use bevy::prelude::*;
 use bevy_ecs_tilemap::prelude::*;
 use crate::loading::TextureAssets;
 
-use rand::Rng;
+use rand::Rng;  
 
 pub struct MapPlugin;
 impl Plugin for MapPlugin {