Refactor

Author: Multirious

examples/demo/click.rs

@@ -40,46 +40,45 @@ fn click_spawn_circle(
 ) {
     use interpolate::sprite_color;
     let circle_filled_image = asset_server.load("circle_filled.png");
-    if let Some(coord) = coord.0 {
-        if key.just_pressed(MouseButton::Left)
-            || key.pressed(MouseButton::Right)
-        {
-            let start = Vec3::new(coord.x, coord.y, 1.);
-            let end = Vec3::new(0., 0., 0.);
-            let transform = Transform::from_translation(start);
-            let circle = AnimationTarget.into_target();
-            let mut circle_transform = circle.transform_state(transform);
-            commands
-                .spawn((
-                    Sprite {
-                        image: circle_filled_image,
-                        ..default()
-                    },
-                    transform,
-                    AnimationTarget,
-                ))
-                .animation()
-                .insert(parallel((
-                    tween(
-                        secs(2.),
-                        EaseKind::ExponentialOut,
-                        circle_transform.translation_to(end),
-                    ),
-                    tween(
-                        secs(1.),
-                        EaseKind::BackIn,
-                        circle_transform.scale_to(Vec3::ZERO),
-                    ),
-                    tween(
-                        secs(1.),
-                        EaseKind::Linear,
-                        circle.with(sprite_color(
-                            into_color(WHITE),
-                            into_color(DEEP_PINK),
-                        )),
-                    ),
-                )));
-        }
+    if let Some(coord) = coord.0
+        && (key.just_pressed(MouseButton::Left)
+            || key.pressed(MouseButton::Right))
+    {
+        let start = Vec3::new(coord.x, coord.y, 1.);
+        let end = Vec3::new(0., 0., 0.);
+        let transform = Transform::from_translation(start);
+        let circle = AnimationTarget.into_target();
+        let mut circle_transform = circle.transform_state(transform);
+        commands
+            .spawn((
+                Sprite {
+                    image: circle_filled_image,
+                    ..default()
+                },
+                transform,
+                AnimationTarget,
+            ))
+            .animation()
+            .insert(parallel((
+                tween(
+                    secs(2.),
+                    EaseKind::ExponentialOut,
+                    circle_transform.translation_to(end),
+                ),
+                tween(
+                    secs(1.),
+                    EaseKind::BackIn,
+                    circle_transform.scale_to(Vec3::ZERO),
+                ),
+                tween(
+                    secs(1.),
+                    EaseKind::Linear,
+                    circle.with(sprite_color(
+                        into_color(WHITE),
+                        into_color(DEEP_PINK),
+                    )),
+                ),
+            )));
     }
 }
 

examples/demo/sprite_sheet.rs

@@ -5,8 +5,6 @@ mod interpolate {
     use bevy::{ecs::schedule::ScheduleLabel, prelude::*};
     use bevy_tween::prelude::*;
 
-    pub use bevy_tween::interpolate::*;
-
     pub fn custom_interpolators_plugin(app: &mut App) {
         app.add_tween_systems(
             PostUpdate.intern(),