Remove the '3d' feature flag

Author: merwaaan

Cargo.toml

@@ -11,11 +11,6 @@ edition = "2024"
 resolver = "3"
 exclude = ["assets/example.gif", "assets/example3d.gif"]
 
-[features]
-default = ["3d"]
-3d = ["bevy/bevy_pbr"]
-custom_cursor = ["bevy/custom_cursor"]
-
 [dependencies]
 bevy = { version = "0.17.0", default-features = false, features = [
   "bevy_log",

src/animator.rs

@@ -15,12 +15,13 @@ use bevy::{
     window::{CursorIcon, CustomCursor, CustomCursorImage},
 };
 
-#[cfg(feature = "3d")]
-use crate::components::sprite3d::Sprite3d;
 use crate::{
     animation::AnimationId,
     animator::iterator::{AnimationIterator, IteratorFrame},
-    components::spritesheet_animation::{AnimationProgress, SpritesheetAnimation},
+    components::{
+        sprite3d::Sprite3d,
+        spritesheet_animation::{AnimationProgress, SpritesheetAnimation},
+    },
     events::AnimationEvent,
     library::AnimationLibrary,
 };
@@ -56,7 +57,6 @@ pub struct SpritesheetAnimationQuery {
     entity: Entity,
     spritesheet_animation: &'static mut SpritesheetAnimation,
     sprite: Option<&'static mut Sprite>,
-    #[cfg(feature = "3d")]
     sprite3d: Option<&'static mut Sprite3d>,
     image_node: Option<&'static mut ImageNode>,
     cursor_icon: Option<&'static mut CursorIcon>,
@@ -233,7 +233,8 @@ impl Animator {
                 atlas.index = frame.atlas_index;
             }
 
-            #[cfg(feature = "3d")]
+            // 3D sprites
+
             if let Some(atlas) = item
                 .sprite3d
                 .as_deref_mut()
@@ -243,6 +244,8 @@ impl Animator {
                 atlas.index = frame.atlas_index;
             }
 
+            // Images
+
             if let Some(atlas) = item
                 .image_node
                 .as_deref_mut()
@@ -252,7 +255,7 @@ impl Animator {
                 atlas.index = frame.atlas_index;
             }
 
-            // Custom cursor
+            // Cursors
 
             if let Some(atlas) = item
                 .cursor_icon

src/components.rs

@@ -1,4 +1,2 @@
-#[cfg(feature = "3d")]
 pub mod sprite3d;
-
 pub mod spritesheet_animation;

src/lib.rs

@@ -91,16 +91,13 @@ pub mod prelude {
             Animation, AnimationDirection, AnimationDuration, AnimationId, AnimationRepeat,
         },
         clip::{Clip, ClipId},
-        components::spritesheet_animation::SpritesheetAnimation,
+        components::{sprite3d::Sprite3d, spritesheet_animation::SpritesheetAnimation},
         easing::{Easing, EasingVariety},
         events::{AnimationEvent, AnimationMarkerId},
         library::{AnimationLibrary, LibraryError},
         plugin::SpritesheetAnimationPlugin,
         spritesheet::Spritesheet,
     };
-
-    #[cfg(feature = "3d")]
-    pub use super::components::sprite3d::Sprite3d;
 }
 
 const CRATE_NAME: &str = "bevy_spritesheet_animation";

src/plugin.rs

@@ -5,11 +5,12 @@ use bevy::{
 };
 
 use crate::{
-    animator::Animator, components::spritesheet_animation::SpritesheetAnimation,
-    events::AnimationEvent, library::AnimationLibrary, systems::spritesheet_animation,
+    animator::Animator,
+    components::{sprite3d::Sprite3d, spritesheet_animation::SpritesheetAnimation},
+    events::AnimationEvent,
+    library::AnimationLibrary,
+    systems::{sprite3d, spritesheet_animation},
 };
-#[cfg(feature = "3d")]
-use crate::{components::sprite3d::Sprite3d, systems::sprite3d};
 
 /// Set for systems that update the animation state.
 #[derive(Debug, PartialEq, Eq, Clone, Hash, SystemSet)]
@@ -66,20 +67,15 @@ impl Plugin for SpritesheetAnimationPlugin {
             .register_type::<SpritesheetAnimation>()
             // Animations events
             .add_message::<AnimationEvent>()
-            // Systems
+            // Animation system
             .add_systems(
                 PostUpdate,
-                // Main animation system
                 spritesheet_animation::play_animations.in_set(AnimationSystemSet),
-            );
-
-        #[cfg(feature = "3d")]
-        app
-            // Cache for 3D sprites
+            )
+            // 3D sprites
             .init_resource::<sprite3d::Cache>()
             .register_type::<sprite3d::Cache>()
             .register_type::<Sprite3d>()
-            // 3D sprite systems
             .add_systems(
                 PostUpdate,
                 (

src/systems.rs

@@ -1,4 +1,2 @@
-#[cfg(feature = "3d")]
 pub mod sprite3d;
-
 pub mod spritesheet_animation;

src/systems/sprite3d.rs

@@ -13,7 +13,6 @@ use bevy::{
     render::{alpha::AlphaMode, render_resource::Face},
 };
 
-#[cfg(feature = "3d")]
 use crate::prelude::Sprite3d;
 
 /// Cached data for the 3D sprites