Implementation overhaul

examples/animation/banner_bounce.rs

@@ -1,13 +1,13 @@
 use std::f32::consts::PI;
 
 use bevy::{
-    color::{Srgba, palettes::css::WHITE},
+    color::{palettes::css::WHITE, Srgba},
     core_pipeline::{bloom::BloomSettings, tonemapping::Tonemapping},
     prelude::*,
     window,
 };
 use bevy_tween::{
-    combinator::{go, parallel, tween_exact, AnimationCommands},
+    builder::{go, parallel, tween_exact, AnimationCommands},
     prelude::*,
 };
 
@@ -223,7 +223,7 @@ fn animation(mut commands: Commands, asset_server: Res<AssetServer>) {
     commands
         .animation()
         .repeat(Repeat::Infinitely)
-        .insert(parallel((
+        .add(parallel((
             (
                 set_value(
                     bevy_tween_text_color.with(sprite_color_to(white_color)),

examples/animation/banner_triangle.rs

@@ -2,7 +2,7 @@ use std::f32::consts::TAU;
 
 use bevy::prelude::*;
 use bevy_tween::{
-    combinator::{parallel, tween_exact, AnimationCommands},
+    builder::{parallel, tween_exact, AnimationCommands},
     interpolate::{angle_z, translation},
     prelude::*,
     tween::{AnimationTarget, TargetComponent},
@@ -65,7 +65,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
     commands
         .animation()
         .repeat(Repeat::Infinitely)
-        .insert(parallel((
+        .add(parallel((
             snap_rotate(triangles[4].clone(), secs, 7, 4., ease),
             snap_rotate(triangles[3].clone(), secs, 7, 6., ease),
             snap_rotate(triangles[2].clone(), secs, 7, 8., ease),

examples/animation/thumbnail_triangle.rs

@@ -2,7 +2,7 @@ use std::f32::consts::TAU;
 
 use bevy::prelude::*;
 use bevy_tween::{
-    combinator::{parallel, tween_exact, AnimationCommands},
+    builder::{parallel, tween_exact, AnimationCommands},
     interpolate::angle_z,
     prelude::*,
     tween::TargetComponent,
@@ -68,7 +68,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
     commands
         .animation()
         .repeat(Repeat::Infinitely)
-        .insert(parallel((
+        .add(parallel((
             snap_rotate(triangles[4].clone(), secs, 7, 4., ease),
             snap_rotate(triangles[3].clone(), secs, 7, 6., ease),
             snap_rotate(triangles[2].clone(), secs, 7, 8., ease),

examples/bevy_lookup_curve.rs

@@ -4,7 +4,7 @@ use bevy_tween::{
         editor::LookupCurveEditor, Knot, KnotInterpolation, LookupCurve,
         LookupCurvePlugin,
     },
-    combinator::tween,
+    builder::tween,
     interpolate::translation,
     prelude::*,
     tween::{AnimationTarget, TargetComponent},
@@ -50,7 +50,7 @@ fn setup(mut commands: Commands, mut curves: ResMut<Assets<LookupCurve>>) {
         .animation()
         .repeat(Repeat::Infinitely)
         .repeat_style(RepeatStyle::PingPong)
-        .insert(tween(
+        .add(tween(
             Duration::from_secs(1),
             (curve.clone(), LookupCurveEditor::new(curve)),
             sprite.with(translation(

examples/demo/click.rs

@@ -3,8 +3,7 @@ use bevy::{
     prelude::*,
 };
 use bevy_tween::{
-    bevy_time_runner::TimeRunnerEnded, combinator::*, prelude::*,
-    tween::AnimationTarget,
+    bevy_time_runner::TimeRunnerEnded, builder::parallel, items, prelude::*,
 };
 mod utils;
 
@@ -43,47 +42,40 @@ fn click_spawn_circle(
     key: Res<ButtonInput<MouseButton>>,
     asset_server: Res<AssetServer>,
 ) {
-    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((
-                    SpriteBundle {
-                        texture: circle_filled_image,
-                        transform,
-                        ..Default::default()
-                    },
-                    AnimationTarget,
-                ))
-                .animation()
-                .insert(parallel((
-                    tween(
-                        secs(2.),
-                        EaseFunction::ExponentialOut,
-                        circle_transform.translation_to(end),
-                    ),
-                    tween(
-                        secs(1.),
-                        EaseFunction::BackIn,
-                        circle_transform.scale_to(Vec3::ZERO),
-                    ),
-                    tween(
-                        secs(1.),
-                        EaseFunction::Linear,
-                        circle.with(sprite_color(
-                            into_color(WHITE),
-                            into_color(DEEP_PINK),
-                        )),
-                    ),
-                )));
+            let cursor = Vec3::new(coord.x, coord.y, 1.);
+
+            let transform = Transform::from_translation(cursor);
+            let mut entity_commands = commands.spawn((SpriteBundle {
+                texture: circle_filled_image,
+                transform,
+                ..Default::default()
+            },));
+            let circle = entity_commands.id().into_target();
+            entity_commands.animation().add(parallel((
+                circle.set(items::Translation).tween(
+                    cursor,
+                    Vec3::ZERO,
+                    secs(2.),
+                    EaseFunction::ExponentialOut,
+                ),
+                circle.set(items::Scale).tween(
+                    Vec3::ONE,
+                    Vec3::ZERO,
+                    secs(1.),
+                    EaseFunction::BackIn,
+                ),
+                circle.set(items::SpriteColor).tween(
+                    into_color(WHITE),
+                    into_color(DEEP_PINK),
+                    secs(1.),
+                    EaseFunction::Linear,
+                ),
+            )));
         }
     }
 }

examples/demo/entity_event.rs

@@ -2,7 +2,7 @@ use bevy::prelude::*;
 use bevy_eventlistener::prelude::*;
 use bevy_tween::{
     bevy_time_runner::TimeRunnerEnded,
-    combinator::{event, forward, sequence},
+    builder::{event, forward, sequence},
     prelude::*,
 };
 
@@ -26,7 +26,7 @@ fn setup(mut commands: Commands) {
         ))
         .animation()
         .repeat(Repeat::times(5))
-        .insert(forward(Duration::from_secs_f32(0.5)));
+        .add(forward(Duration::from_secs_f32(0.5)));
 
     commands
         .spawn(On::<TweenEvent<&'static str>>::run(
@@ -35,7 +35,7 @@ fn setup(mut commands: Commands) {
             },
         ))
         .animation()
-        .insert(sequence((
+        .add(sequence((
             forward(Duration::from_secs_f32(3.)),
             event("event"),
             forward(Duration::from_secs_f32(0.5)),