moved animation file, moved player function to enitity, tile now uses animation, move drawing from npc tile player to animation

1 files changed, 0 insertions, 117 deletions

diff --git a/src/animation.rs b/src/animation.rs
deleted file mode 100644
index bc7e493..0000000
--- a/src/animation.rs
+++ /dev/null
@@ -1,117 +0,0 @@
-use ggez::graphics::Rect;
-use std::collections::HashMap;
-use std::time::Instant;
-
-use crate::entity::Action;
-use crate::tileset::Tileset;
-
-#[derive(Clone, PartialEq)]
-pub struct Frame {
-    pub source: Rect,
-    pub delay: Option<usize>,
-    pub rotation: f32,
-}
-
-impl Frame {
-    pub fn new(source: Rect, delay: Option<usize>, rotation: f32) -> Frame {
-        Frame {
-            source,
-            delay,
-            rotation,
-        }
-    }
-}
-
-#[derive(Clone, PartialEq)]
-pub struct Animation {
-    pub frames: Vec<Frame>,
-    pub timer: Instant,
-    pub current: Frame,
-}
-
-impl Animation {
-    pub fn new() -> Animation {
-        Animation {
-            current: Frame::new(Rect::zero(), None, 0.0),
-            timer: Instant::now(),
-            frames: Vec::new(),
-        }
-    }
-
-    pub fn give_frames(&mut self, frames: Vec<Frame>) {
-        self.frames = frames;
-    }
-
-    pub fn update(&mut self) {
-        if let Some(mut i) = self.frames.iter().position(|a| a == &self.current) {
-            if let Some(delay) = self.current.delay {
-                if self.timer.elapsed().as_millis() > delay as u128 {
-                    i = if i == self.frames.len() - 1 { 0 } else { i + 1 };
-                    self.current = self.frames[i].clone();
-                    self.timer = Instant::now();
-                }
-            }
-        } else if !self.frames.is_empty() {
-            self.current = self.frames[0].clone();
-        }
-    }
-}
-
-#[derive(Clone)]
-pub struct Animations {
-    pub available: HashMap<Action, Animation>,
-    pub current: Animation,
-}
-
-impl Animations {
-    pub fn new(tileset: &Tileset) -> Animations {
-        let mut available = HashMap::new();
-
-        let mut idle = tileset.get_frame_by_entity_keyframe("player-top", 0);
-        idle.source.h += tileset
-            .get_frame_by_entity_keyframe("player-bottom", 0)
-            .source
-            .h;
-
-        let mut animation = Animation::new();
-        animation.give_frames(vec![idle.clone()]);
-        available.insert(Action::IdleLeft, animation.clone());
-
-        let mut moving = tileset.get_frame_by_entity_keyframe("player-top", 1);
-        moving.source.h += tileset
-            .get_frame_by_entity_keyframe("player-bottom", 1)
-            .source
-            .h;
-
-        animation.give_frames(vec![idle.clone(), moving.clone()]);
-        available.insert(Action::MovingLeft, animation.clone());
-        available.insert(Action::MovingUpLeft, animation.clone());
-        available.insert(Action::MovingDownLeft, animation.clone());
-
-        animation.give_frames(vec![flip(idle.clone())]);
-        available.insert(Action::IdleRight, animation.clone());
-
-        animation.give_frames(vec![flip(idle.clone()), flip(moving.clone())]);
-        available.insert(Action::MovingRight, animation.clone());
-        available.insert(Action::MovingUpRight, animation.clone());
-        available.insert(Action::MovingDownRight, animation.clone());
-
-        Animations {
-            available,
-            current: Animation::new(),
-        }
-    }
-
-    pub fn update(&mut self, action: &Action) {
-        let animation = self.available.get(&action).cloned().unwrap();
-        self.current.give_frames(animation.frames);
-        self.current.update();
-    }
-}
-
-pub fn flip(frame: Frame) -> Frame {
-    let mut f = frame.clone();
-    f.source.x *= -1.0;
-    f.source.x -= frame.source.w;
-    f
-}