remove animator system and related code

B-Reif · Jul 23, 2021 · cd9fd5f · cd9fd5f
1 parent 9c07a79
commit cd9fd5f
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 334 deletions.
diff --git a/examples/simple/main.rs b/examples/simple/main.rs
@@ -3,10 +3,8 @@ use std::path::Path;
 use bevy::{input::system::exit_on_esc_system, prelude::*};
 use bevy_ase::{
     self,
-    animate::{self, AnimationInfo},
-    animation_index::{AnimationId, AnimationIndex},
     loader::{self, AseAsset, Loader},
-    timer, Animation,
+    Animation,
 };
 
 mod ids;

diff --git a/examples/tilemap/main.rs b/examples/tilemap/main.rs
@@ -1,14 +1,13 @@
 use std::path::Path;
 
 use bevy::{input::system::exit_on_esc_system, prelude::*};
-use bevy_ase::{self, loader, loader::Loader, timer, Tileset};
+use bevy_ase::{self, loader, loader::Loader, Tileset};
 use bevy_ecs_tilemap::prelude::*;
 
 fn main() {
     App::build()
         .add_plugins(DefaultPlugins)
         .add_plugin(TilemapPlugin)
-        .add_plugin(timer::GameTimePlugin)
         .add_plugin(loader::AseLoaderPlugin)
         .add_system(exit_on_esc_system.system())
         .add_state(AppState::Loading)

diff --git a/src/animate.rs b/src/animate.rs
diff --git a/src/animation_index.rs b/src/animation_index.rs
diff --git a/src/lib.rs b/src/lib.rs
@@ -14,9 +14,7 @@
 //! [`Bevy`]: https://bevyengine.org/
 //! [`Aseprite`]: https://www.aseprite.org/
 //! [`Resources`]: https://bevyengine.org/learn/book/getting-started/resources/
-pub mod animate;
 mod animation;
-pub mod animation_index;
 mod ase;
 pub mod loader;
 mod processing;
@@ -25,7 +23,6 @@ mod sprite;
 #[cfg(test)]
 mod tests;
 mod tileset;
-pub mod timer;
 
 pub use animation::{Animation, Frame};
 pub use ase::AseId;

diff --git a/src/loader.rs b/src/loader.rs
@@ -1,4 +1,3 @@
-use crate::animate::AnimationInfo;
 use crate::animation::Animation;
 use crate::processing::{self, ResourceData};
 use crate::slice::Slice;
@@ -229,7 +228,6 @@ impl Loader {
 
 pub(crate) struct AseAssetResources<'a> {
     pub animations: Option<&'a mut Assets<Animation>>,
-    pub anim_info: Option<&'a mut AnimationInfo>,
     pub textures: Option<&'a mut Assets<Texture>>,
     pub atlases: Option<&'a mut Assets<TextureAtlas>>,
     pub tilesets: Option<&'a mut Assets<Tileset>>,
@@ -258,7 +256,6 @@ pub fn ase_importer(
     mut textures: Option<ResMut<Assets<Texture>>>,
     mut atlases: Option<ResMut<Assets<TextureAtlas>>>,
     mut animations: Option<ResMut<Assets<Animation>>>,
-    mut anim_info: Option<ResMut<AnimationInfo>>,
     mut tilesets: Option<ResMut<Assets<Tileset>>>,
     mut slices: Option<ResMut<Assets<Slice>>>,
 ) {
@@ -272,12 +269,10 @@ pub fn ase_importer(
     let textures = textures.as_mut().map(DerefMut::deref_mut);
     let atlases = atlases.as_mut().map(DerefMut::deref_mut);
     let animations = animations.as_mut().map(DerefMut::deref_mut);
-    let anim_info = anim_info.as_mut().map(DerefMut::deref_mut);
     let tilesets = tilesets.as_mut().map(DerefMut::deref_mut);
     let slices = slices.as_mut().map(DerefMut::deref_mut);
     let resources = AseAssetResources {
         animations,
-        anim_info,
         textures,
         atlases,
         tilesets,

diff --git a/src/processing.rs b/src/processing.rs
@@ -141,7 +141,6 @@ impl ResourceData {
     pub(crate) fn move_into_resources(self, resources: &mut AseAssetResources) {
         let AseAssetResources {
             animations,
-            anim_info,
             textures,
             atlases,
             tilesets,
@@ -180,9 +179,6 @@ impl ResourceData {
                             });
                         }
                         let handle = animations.add(Animation::new(frames));
-                        if let Some(anim_info) = anim_info {
-                            anim_info.add_anim(tmp_anim.file, tmp_anim.tag, handle);
-                        }
                     }
                 }
             }