frame position by item

src/main.rs

@@ -7,42 +7,48 @@ use ggez::{Context, GameResult};
 use std::env;
 use std::path;
 
+const TARGET_ANIMATION_FPS: u32 = 10;
+
 struct SpriteInfo {
-    start: na::Point2<f32>,
+    start_y: f32,
     tile_count: u16,
     relative_tile_width: f32,
     relative_tile_height: f32,
+    current_frame: u16,
 }
 
 impl SpriteInfo {
-    pub fn new(start: na::Point2<f32>, tile_count: u16) -> Self {
+    pub fn new(start_y: f32, tile_count: u16) -> Self {
+        // FIXME BS NOW: en fait ca ce base sur la hauteur complète de l'image
         let relative_tile_width: f32 = 1.0 / tile_count as f32;
         Self {
-            start,
+            start_y,
             tile_count,
             relative_tile_width,
             relative_tile_height: 1.0,
+            current_frame: 0,
         }
     }
 
     pub fn from_type(type_: &SpriteType) -> Self {
         match type_ {
-            SpriteType::WalkingSoldier => Self::new(na::Point2::new(0.0, 0.0), 7),
+            SpriteType::WalkingSoldier => Self::new(0.0, 7),
+            SpriteType::JumpingSoldier => Self::new(24.0, 2),
         }
     }
 }
 
 enum SpriteType {
     WalkingSoldier,
+    JumpingSoldier,
 }
 
 fn sprite_batch_part_from_sprite_info(
     sprite_info: &SpriteInfo,
-    frame_i: u32,
 ) -> graphics::DrawParam {
     let src = graphics::Rect::new(
-        frame_i as f32 * sprite_info.relative_tile_width,
-        0.0,
+        sprite_info.current_frame as f32 * sprite_info.relative_tile_width,
+        sprite_info.start_y,
         sprite_info.relative_tile_width,
         sprite_info.relative_tile_height,
     );
@@ -61,12 +67,22 @@ impl SceneItem {
             position,
         }
     }
+
+    pub fn tick_frame(&mut self) {
+        self.sprite_info.current_frame += 1;
+        if self.sprite_info.current_frame >= self.sprite_info.tile_count {
+            self.sprite_info.current_frame = 0;
+        }
+    }
+}
+
+enum Message {
+
 }
 
 struct MainState {
     scene_items_sprite_batch: graphics::spritebatch::SpriteBatch,
     scene_items: Vec<SceneItem>,
-    i: u32,
 }
 
 impl MainState {
@@ -75,8 +91,14 @@ impl MainState {
         let batch = graphics::spritebatch::SpriteBatch::new(image);
 
         let mut scene_items = vec![];
-        for x in 0..10 {
-            for y in 0..10 {
+        for x in 0..1 {
+            for y in 0..4 {
+                let type_ = if y % 2 == 0 {
+                    SpriteType::WalkingSoldier
+                } else {
+                    SpriteType::JumpingSoldier
+                };
+
                 scene_items.push(SceneItem::new(
                     SpriteType::WalkingSoldier,
                     na::Point2::new(x as f32 * 24.0, y as f32 * 24.0),
@@ -87,19 +109,19 @@ impl MainState {
         let s = MainState {
             scene_items_sprite_batch: batch,
             scene_items,
-            i: 0,
         };
         Ok(s)
     }
 }
+
 impl event::EventHandler for MainState {
     fn update(&mut self, ctx: &mut Context) -> GameResult {
-        if check_update_time(ctx, 5) {
-            self.i += 1;
-        }
-        if self.i > 6 {
-            self.i = 0;
+        while check_update_time(ctx, TARGET_ANIMATION_FPS) {
+            for scene_item in self.scene_items.iter_mut() {
+                scene_item.tick_frame();
+            }
         }
+
         Ok(())
     }
 
@@ -107,7 +129,7 @@ impl event::EventHandler for MainState {
         graphics::clear(ctx, graphics::BLACK);
 
         for scene_item in self.scene_items.iter() {
-            let sprite_batch_part = sprite_batch_part_from_sprite_info(&scene_item.sprite_info, self.i)
+            let sprite_batch_part = sprite_batch_part_from_sprite_info(&scene_item.sprite_info)
                 .dest(scene_item.position.clone());
             self.scene_items_sprite_batch.add(sprite_batch_part);
         }
@@ -115,10 +137,10 @@ impl event::EventHandler for MainState {
             ctx,
             &self.scene_items_sprite_batch,
             graphics::DrawParam::new().dest(na::Point2::new(0.0, 0.0)),
-        );
+        )?;
 
         self.scene_items_sprite_batch.clear();
-        graphics::present(ctx);
+        graphics::present(ctx)?;
 
         println!("FPS: {}", ggez::timer::fps(ctx));
         Ok(())