refactor!: begin switching to bevy ECS, all tests broken, all systems broken

src/entity/item.rs

@@ -1,117 +1,117 @@
-use crate::{
-    constants,
-    entity::{collision::Collidable, graph::Graph},
-    error::{EntityError, GameResult},
-    texture::sprite::{Sprite, SpriteAtlas},
-};
-use sdl2::render::{Canvas, RenderTarget};
-use strum_macros::{EnumCount, EnumIter};
+// use crate::{
+//     constants,
+//     entity::{collision::Collidable, graph::Graph},
+//     error::{EntityError, GameResult},
+//     texture::sprite::{Sprite, SpriteAtlas},
+// };
+// use sdl2::render::{Canvas, RenderTarget};
+// use strum_macros::{EnumCount, EnumIter};
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum ItemType {
-    Pellet,
-    Energizer,
-    #[allow(dead_code)]
-    Fruit {
-        kind: FruitKind,
-    },
-}
+// #[derive(Debug, Clone, Copy, PartialEq, Eq)]
+// pub enum ItemType {
+//     Pellet,
+//     Energizer,
+//     #[allow(dead_code)]
+//     Fruit {
+//         kind: FruitKind,
+//     },
+// }
 
-impl ItemType {
-    pub fn get_score(self) -> u32 {
-        match self {
-            ItemType::Pellet => 10,
-            ItemType::Energizer => 50,
-            ItemType::Fruit { kind } => kind.get_score(),
-        }
-    }
-}
+// impl ItemType {
+//     pub fn get_score(self) -> u32 {
+//         match self {
+//             ItemType::Pellet => 10,
+//             ItemType::Energizer => 50,
+//             ItemType::Fruit { kind } => kind.get_score(),
+//         }
+//     }
+// }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, EnumIter, EnumCount)]
-#[allow(dead_code)]
-pub enum FruitKind {
-    Apple,
-    Strawberry,
-    Orange,
-    Melon,
-    Bell,
-    Key,
-    Galaxian,
-}
+// #[derive(Debug, Clone, Copy, PartialEq, Eq, EnumIter, EnumCount)]
+// #[allow(dead_code)]
+// pub enum FruitKind {
+//     Apple,
+//     Strawberry,
+//     Orange,
+//     Melon,
+//     Bell,
+//     Key,
+//     Galaxian,
+// }
 
-impl FruitKind {
-    #[allow(dead_code)]
-    pub fn index(self) -> u8 {
-        match self {
-            FruitKind::Apple => 0,
-            FruitKind::Strawberry => 1,
-            FruitKind::Orange => 2,
-            FruitKind::Melon => 3,
-            FruitKind::Bell => 4,
-            FruitKind::Key => 5,
-            FruitKind::Galaxian => 6,
-        }
-    }
+// impl FruitKind {
+//     #[allow(dead_code)]
+//     pub fn index(self) -> u8 {
+//         match self {
+//             FruitKind::Apple => 0,
+//             FruitKind::Strawberry => 1,
+//             FruitKind::Orange => 2,
+//             FruitKind::Melon => 3,
+//             FruitKind::Bell => 4,
+//             FruitKind::Key => 5,
+//             FruitKind::Galaxian => 6,
+//         }
+//     }
 
-    pub fn get_score(self) -> u32 {
-        match self {
-            FruitKind::Apple => 100,
-            FruitKind::Strawberry => 300,
-            FruitKind::Orange => 500,
-            FruitKind::Melon => 700,
-            FruitKind::Bell => 1000,
-            FruitKind::Key => 2000,
-            FruitKind::Galaxian => 3000,
-        }
-    }
-}
+//     pub fn get_score(self) -> u32 {
+//         match self {
+//             FruitKind::Apple => 100,
+//             FruitKind::Strawberry => 300,
+//             FruitKind::Orange => 500,
+//             FruitKind::Melon => 700,
+//             FruitKind::Bell => 1000,
+//             FruitKind::Key => 2000,
+//             FruitKind::Galaxian => 3000,
+//         }
+//     }
+// }
 
-pub struct Item {
-    pub node_index: usize,
-    pub item_type: ItemType,
-    pub sprite: Sprite,
-    pub collected: bool,
-}
+// pub struct Item {
+//     pub node_index: usize,
+//     pub item_type: ItemType,
+//     pub sprite: Sprite,
+//     pub collected: bool,
+// }
 
-impl Item {
-    pub fn new(node_index: usize, item_type: ItemType, sprite: Sprite) -> Self {
-        Self {
-            node_index,
-            item_type,
-            sprite,
-            collected: false,
-        }
-    }
+// impl Item {
+//     pub fn new(node_index: usize, item_type: ItemType, sprite: Sprite) -> Self {
+//         Self {
+//             node_index,
+//             item_type,
+//             sprite,
+//             collected: false,
+//         }
+//     }
 
-    pub fn is_collected(&self) -> bool {
-        self.collected
-    }
+//     pub fn is_collected(&self) -> bool {
+//         self.collected
+//     }
 
-    pub fn collect(&mut self) {
-        self.collected = true;
-    }
+//     pub fn collect(&mut self) {
+//         self.collected = true;
+//     }
 
-    pub fn get_score(&self) -> u32 {
-        self.item_type.get_score()
-    }
+//     pub fn get_score(&self) -> u32 {
+//         self.item_type.get_score()
+//     }
 
-    pub fn render<T: RenderTarget>(&self, canvas: &mut Canvas<T>, atlas: &mut SpriteAtlas, graph: &Graph) -> GameResult<()> {
-        if self.collected {
-            return Ok(());
-        }
+//     pub fn render<T: RenderTarget>(&self, canvas: &mut Canvas<T>, atlas: &mut SpriteAtlas, graph: &Graph) -> GameResult<()> {
+//         if self.collected {
+//             return Ok(());
+//         }
 
-        let node = graph
-            .get_node(self.node_index)
-            .ok_or(EntityError::NodeNotFound(self.node_index))?;
-        let position = node.position + constants::BOARD_PIXEL_OFFSET.as_vec2();
+//         let node = graph
+//             .get_node(self.node_index)
+//             .ok_or(EntityError::NodeNotFound(self.node_index))?;
+//         let position = node.position + constants::BOARD_PIXEL_OFFSET.as_vec2();
 
-        self.sprite.render(canvas, atlas, position)?;
-        Ok(())
-    }
-}
+//         self.sprite.render(canvas, atlas, position)?;
+//         Ok(())
+//     }
+// }
 
-impl Collidable for Item {
-    fn position(&self) -> crate::entity::traversal::Position {
-        crate::entity::traversal::Position::AtNode(self.node_index)
-    }
-}
+// impl Collidable for Item {
+//     fn position(&self) -> crate::entity::traversal::Position {
+//         crate::entity::traversal::Position::AtNode(self.node_index)
+//     }
+// }