Skip to content

Commit 93ce91e

Browse files
RabbivalRabbival
committed
update examples
* add DefaultTweenPluginsOnDefaultTime for ease of use * update examples to use it * update changelog
1 parent e363d11 commit 93ce91e

16 files changed

Lines changed: 118 additions & 73 deletions

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
Breaking:
66
- you'd now have to specify a schedule for `DefaultTweenPlugins` to run in using the `in_schedule` function
7+
- For default usage, you could either manually write: `DefaultTweenPlugins::<()>::in_schedule(PostUpdate.intern())`, or use `DefaultTweenPluginsOnDefaultTime::default()`
78
- rename `TweenAppResource`'s `schedule` field to `default_schedule` now that there can be more
89
- add `enable_time_runner_debug` field to `TweenCorePlugin`
910
- Add `enable_debug` option to `TweenCorePlugin` by [#75](https://github.com/Multirious/bevy_tween/pull/75)

‎examples/animation/banner_bounce.rs‎

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
use std::f32::consts::PI;
22

3+
use bevy::render::view::Hdr;
34
use bevy::{
4-
color::{palettes::css::WHITE, Srgba},
5-
core_pipeline::{tonemapping::Tonemapping},
5+
color::{Srgba, palettes::css::WHITE},
6+
core_pipeline::tonemapping::Tonemapping,
7+
ecs::schedule::ScheduleLabel,
68
post_process::bloom::Bloom,
79
prelude::*,
810
window,
911
};
10-
use bevy::render::view::Hdr;
1112
use bevy_tween::{
12-
combinator::{go, parallel, sequence, tween_exact, AnimationCommands},
13+
combinator::{AnimationCommands, go, parallel, sequence, tween_exact},
1314
prelude::*,
1415
};
1516

@@ -35,7 +36,7 @@ fn main() {
3536
}),
3637
..default()
3738
}),
38-
DefaultTweenPlugins,
39+
DefaultTweenPluginsOnDefaultTime::default(),
3940
))
4041
.add_systems(Startup, (animation, setup_camera))
4142
.run();
@@ -205,7 +206,8 @@ fn animation(mut commands: Commands, asset_server: Res<AssetServer>) {
205206
// ========================================================================
206207
let mut bevy_tween_text_color = bevy_tween_text.state(white_color);
207208
let mut bevy_tween_text_angle_z = bevy_tween_text.state(PI);
208-
let mut bevy_tween_text_scale = bevy_tween_text.state(Vec3::ZERO * SCALE_AS_F32);
209+
let mut bevy_tween_text_scale =
210+
bevy_tween_text.state(Vec3::ZERO * SCALE_AS_F32);
209211
let mut square_and_triangle_scale =
210212
square_and_triangle.state(Vec3::ZERO * SCALE_AS_F32);
211213
let mut square_and_triangle_alpha = square_and_triangle.state(1.);
@@ -219,7 +221,8 @@ fn animation(mut commands: Commands, asset_server: Res<AssetServer>) {
219221
cornering_right.state(cornering_right_tween_start);
220222
let mut cornering_left_translation =
221223
cornering_left.state(cornering_left_tween_start);
222-
let mut dot_grid_scale = dot_grid.state(Vec3::new(0.01, 0.01, 0.) * SCALE_AS_F32);
224+
let mut dot_grid_scale =
225+
dot_grid.state(Vec3::new(0.01, 0.01, 0.) * SCALE_AS_F32);
223226

224227
fn secs(secs: f32) -> Duration {
225228
Duration::from_secs_f32(secs)
@@ -240,18 +243,21 @@ fn animation(mut commands: Commands, asset_server: Res<AssetServer>) {
240243
tween_exact(
241244
secs(0.)..secs(9.),
242245
EaseKind::CircularOut,
243-
bevy_tween_text_scale.with(scale_to(Vec3::ONE * SCALE_AS_F32)),
246+
bevy_tween_text_scale
247+
.with(scale_to(Vec3::ONE * SCALE_AS_F32)),
244248
),
245249
tween_exact(
246250
secs(11.)..secs(11.5),
247251
EaseKind::SineOut,
248-
bevy_tween_text_scale
249-
.with(scale_to(Vec3::ONE * text_pop_scale * SCALE_AS_F32)),
252+
bevy_tween_text_scale.with(scale_to(
253+
Vec3::ONE * text_pop_scale * SCALE_AS_F32,
254+
)),
250255
),
251256
tween_exact(
252257
secs(11.5)..secs(12.),
253258
EaseKind::SineIn,
254-
bevy_tween_text_scale.with(scale_to(Vec3::ZERO * SCALE_AS_F32)),
259+
bevy_tween_text_scale
260+
.with(scale_to(Vec3::ZERO * SCALE_AS_F32)),
255261
),
256262
tween_exact(
257263
secs(10.)..secs(12.),
@@ -275,7 +281,8 @@ fn animation(mut commands: Commands, asset_server: Res<AssetServer>) {
275281
tween_exact(
276282
secs(0.)..secs(9.),
277283
EaseKind::CircularOut,
278-
square_and_triangle_scale.with(scale_to(Vec3::ONE * SCALE_AS_F32)),
284+
square_and_triangle_scale
285+
.with(scale_to(Vec3::ONE * SCALE_AS_F32)),
279286
),
280287
tween_exact(
281288
secs(4.)..secs(10.),
@@ -353,8 +360,9 @@ fn animation(mut commands: Commands, asset_server: Res<AssetServer>) {
353360
tween_exact(
354361
secs(11.5)..secs(12.),
355362
EaseKind::QuadraticInOut,
356-
dot_grid_scale
357-
.with(scale_to(Vec3::new(0.01, 0.01, 0.) * SCALE_AS_F32)),
363+
dot_grid_scale.with(scale_to(
364+
Vec3::new(0.01, 0.01, 0.) * SCALE_AS_F32,
365+
)),
358366
),
359367
),
360368
go(secs(12.)),
@@ -363,9 +371,11 @@ fn animation(mut commands: Commands, asset_server: Res<AssetServer>) {
363371

364372
type InterpolateSpriteAlpha = Box<dyn Interpolator<Item = Sprite>>;
365373
fn sprite_alpha(start: f32, end: f32) -> InterpolateSpriteAlpha {
366-
Box::new(interpolate::closure(move |sprite: &mut Sprite, value, _| {
367-
sprite.color = sprite.color.with_alpha(start.lerp(end, value));
368-
}))
374+
Box::new(interpolate::closure(
375+
move |sprite: &mut Sprite, value, _| {
376+
sprite.color = sprite.color.with_alpha(start.lerp(end, value));
377+
},
378+
))
369379
}
370380

371381
fn sprite_alpha_to(to: f32) -> impl Fn(&mut f32) -> InterpolateSpriteAlpha {

‎examples/animation/banner_triangle.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
use std::f32::consts::TAU;
21
use bevy::prelude::*;
32
use bevy::window::WindowResolution;
43
use bevy_tween::{
5-
combinator::{parallel, tween_exact, AnimationCommands},
4+
combinator::{AnimationCommands, parallel, tween_exact},
65
interpolate::{angle_z, translation},
76
prelude::*,
87
tween::{AnimationTarget, TargetComponent},
98
};
9+
use std::f32::consts::TAU;
1010

1111
fn main() {
1212
App::new()
@@ -20,7 +20,7 @@ fn main() {
2020
}),
2121
..Default::default()
2222
}),
23-
DefaultTweenPlugins,
23+
DefaultTweenPluginsOnDefaultTime::default(),
2424
))
2525
.add_systems(Startup, setup)
2626
.run();

‎examples/animation/thumbnail_triangle.rs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,18 @@ use std::f32::consts::TAU;
22

33
use bevy::prelude::*;
44
use bevy_tween::{
5-
combinator::{parallel, tween_exact, AnimationCommands},
5+
combinator::{AnimationCommands, parallel, tween_exact},
66
interpolate::angle_z,
77
prelude::*,
88
tween::TargetComponent,
99
};
1010

1111
fn main() {
1212
App::new()
13-
.add_plugins((DefaultPlugins, DefaultTweenPlugins))
13+
.add_plugins((
14+
DefaultPlugins,
15+
DefaultTweenPluginsOnDefaultTime::default(),
16+
))
1417
.add_systems(Startup, setup)
1518
.run();
1619
}

‎examples/bevy_lookup_curve.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ use bevy::prelude::*;
22
use bevy_inspector_egui::bevy_egui::EguiPlugin;
33
use bevy_tween::{
44
bevy_lookup_curve::{
5-
editor::LookupCurveEditor, Knot, KnotInterpolation, LookupCurve,
6-
LookupCurvePlugin,
5+
Knot, KnotInterpolation, LookupCurve, LookupCurvePlugin,
6+
editor::LookupCurveEditor,
77
},
88
combinator::tween,
99
interpolate::translation,
@@ -16,7 +16,7 @@ fn main() {
1616
App::new()
1717
.add_plugins((
1818
DefaultPlugins,
19-
DefaultTweenPlugins,
19+
DefaultTweenPluginsOnDefaultTime::default(),
2020
EguiPlugin::default(),
2121
LookupCurvePlugin,
2222
))

‎examples/demo/click.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@ fn secs(secs: f32) -> Duration {
1414

1515
fn main() {
1616
App::new()
17-
.add_plugins((DefaultPlugins, DefaultTweenPlugins))
17+
.add_plugins((
18+
DefaultPlugins,
19+
DefaultTweenPluginsOnDefaultTime::default(),
20+
))
1821
.add_systems(Startup, setup)
1922
.add_systems(
2023
Update,

‎examples/demo/delta_tweens.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@ fn secs(secs: f32) -> Duration {
1111

1212
fn main() {
1313
App::new()
14-
.add_plugins((DefaultPlugins, DefaultTweenPlugins))
14+
.add_plugins((
15+
DefaultPlugins,
16+
DefaultTweenPluginsOnDefaultTime::default(),
17+
))
1518
.add_systems(Startup, (setup, spawn_circle_with_tweens))
1619
.run();
1720
}

‎examples/demo/entity_event.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ use bevy_tween::{
77

88
fn main() {
99
App::new()
10-
.add_plugins((MinimalPlugins, DefaultTweenPlugins))
10+
.add_plugins((
11+
MinimalPlugins,
12+
DefaultTweenPluginsOnDefaultTime::default(),
13+
))
1114
.add_systems(Startup, setup)
1215
.add_observer(|trigger: On<TweenEvent<&'static str>>| {
1316
println!("TweenEvent: {}", trigger.data)

‎examples/demo/event.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ use bevy_tween::{
99

1010
fn main() {
1111
App::new()
12-
.add_plugins((DefaultPlugins, DefaultTweenPlugins))
12+
.add_plugins((
13+
DefaultPlugins,
14+
DefaultTweenPluginsOnDefaultTime::default(),
15+
))
1316
.add_systems(Startup, setup)
1417
.add_systems(Update, (effect_system, despawn_effect_system))
1518
.run();

‎examples/demo/follow.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ fn main() {
2020
App::new()
2121
.add_plugins((
2222
DefaultPlugins,
23-
DefaultTweenPlugins,
23+
DefaultTweenPluginsOnDefaultTime::default(),
2424
EguiPlugin::default(),
2525
ResourceInspectorPlugin::<Config>::new(),
2626
))

0 commit comments

Comments
 (0)