Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ required-features = [
"bevy/bevy_pbr",
"bevy/hdr",
"bevy/tonemapping_luts",
"bevy/bevy_post_process",
]

[[example]]
Expand All @@ -68,23 +69,24 @@ required-features = [
"bevy_text",
"bevy/bevy_winit",
"bevy/bevy_picking",
"bevy/bevy_ui_render",
]

[[example]]
name = "colormaterial_color"
required-features = ["bevy_sprite", "bevy/bevy_winit", "bevy/bevy_picking"]
required-features = ["bevy_sprite", "bevy/bevy_winit", "bevy/bevy_picking", "bevy/bevy_text"]

[[example]]
name = "sprite_color"
required-features = ["bevy_sprite", "bevy/bevy_winit", "bevy/bevy_picking"]
required-features = ["bevy_sprite", "bevy/bevy_winit", "bevy/bevy_picking", "bevy/bevy_text"]

[[example]]
name = "transform_translation"
required-features = ["bevy_sprite", "bevy/bevy_winit", "bevy/bevy_picking"]
required-features = ["bevy_sprite", "bevy/bevy_winit", "bevy/bevy_picking", "bevy/bevy_text"]

[[example]]
name = "transform_rotation"
required-features = ["bevy_sprite", "bevy/bevy_winit", "bevy/bevy_picking"]
required-features = ["bevy_sprite", "bevy/bevy_winit", "bevy/bevy_picking", "bevy/bevy_text"]

[[example]]
name = "ui_position"
Expand All @@ -93,6 +95,7 @@ required-features = [
"bevy_ui",
"bevy/bevy_winit",
"bevy/bevy_picking",
"bevy/bevy_ui_render",
]

[[example]]
Expand All @@ -102,6 +105,7 @@ required-features = [
"bevy_text",
"bevy/bevy_winit",
"bevy/bevy_picking",
"bevy/bevy_ui_render",
]

[[example]]
Expand Down
6 changes: 3 additions & 3 deletions examples/ambient_light.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use std::{
time::Duration,
};

use bevy::{color::palettes::css::*, core_pipeline::bloom::Bloom, prelude::*};
use bevy::{color::palettes::css::*, post_process::bloom::Bloom, prelude::*, render::view::Hdr};
use bevy_tweening::{lens::*, *};

mod utils;
Expand All @@ -34,7 +34,7 @@ fn main() {
.add_plugins(DefaultPlugins.set(WindowPlugin {
primary_window: Some(Window {
title: "AmbientLightLens".to_string(),
resolution: (1200., 600.).into(),
resolution: bevy::window::WindowResolution::new(1200, 600),
present_mode: bevy::window::PresentMode::Fifo, // vsync
..default()
}),
Expand All @@ -56,10 +56,10 @@ fn setup(
// brightness.
commands.spawn((
Camera {
hdr: true,
clear_color: Color::BLACK.into(),
..default()
},
Hdr,
Bloom {
intensity: 0.2,
..default()
Expand Down
2 changes: 1 addition & 1 deletion examples/colormaterial_color.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ fn main() {
.add_plugins(DefaultPlugins.set(WindowPlugin {
primary_window: Some(Window {
title: "ColorMaterialColorLens".to_string(),
resolution: (1200., 600.).into(),
resolution: bevy::window::WindowResolution::new(1200, 600),
present_mode: bevy::window::PresentMode::Fifo, // vsync
..default()
}),
Expand Down
6 changes: 3 additions & 3 deletions examples/follow.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ fn main() {
.add_plugins(DefaultPlugins.set(WindowPlugin {
primary_window: Some(Window {
title: "Follow".to_string(),
resolution: (1200., 600.).into(),
resolution: bevy::window::WindowResolution::new(1200, 600),
present_mode: bevy::window::PresentMode::Fifo, // vsync
..default()
}),
Expand Down Expand Up @@ -112,12 +112,12 @@ fn change_option(keyboard: Res<ButtonInput<KeyCode>>, mut q_anim: Single<&mut An

fn follow(
mut commands: Commands,
mut ev: EventReader<CursorMoved>,
mut message_reader: MessageReader<CursorMoved>,
q_follower: Single<&Transform, With<Follower>>,
q_camera: Single<(&GlobalTransform, &Camera)>,
mut q_anim: Single<(Entity, &Anim, &mut TweenAnim)>,
) {
let Some(ev) = ev.read().last() else {
let Some(ev) = message_reader.read().last() else {
return;
};
let (camera_transform, camera) = *q_camera;
Expand Down
34 changes: 16 additions & 18 deletions examples/menu.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,13 @@ fn main() {
DefaultPlugins.set(WindowPlugin {
primary_window: Some(Window {
title: "Menu".to_string(),
resolution: (800., 400.).into(),
resolution: bevy::window::WindowResolution::new(800, 400),
present_mode: bevy::window::PresentMode::Fifo, // vsync
..default()
}),
..default()
}),
EguiPlugin {
enable_multipass_for_primary_context: true,
},
EguiPlugin::default(),
WorldInspectorPlugin::new(),
TweeningPlugin,
))
Expand All @@ -55,7 +53,7 @@ fn main() {
}

fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
commands.spawn(Camera2d::default());
commands.spawn(Camera2d);

let font = asset_server.load("fonts/FiraMono-Regular.ttf");

Expand Down Expand Up @@ -91,9 +89,9 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
let tween_scale = Tween::new(
EaseFunction::BounceOut,
Duration::from_secs(2),
TransformScaleLens {
start: Vec3::splat(0.01),
end: Vec3::ONE,
UiTransformScaleLens {
start: Vec2::splat(0.01),
end: Vec2::ONE,
},
)
.with_cycle_completed_event(true);
Expand All @@ -114,7 +112,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
..default()
},
BackgroundColor(NORMAL_COLOR),
Transform::from_scale(Vec3::splat(0.01)),
UiTransform::from_scale(Vec2::splat(0.01)),
label,
children![(
Text::new(text.to_string()),
Expand All @@ -124,7 +122,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
..default()
},
TextColor(TEXT_COLOR),
TextLayout::new_with_justify(JustifyText::Center),
TextLayout::new_with_justify(Justify::Center),
)],
))
.id();
Expand All @@ -139,7 +137,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
.spawn((
InitialAnimMarker,
TweenAnim::new(tweenable),
AnimTarget::component::<Transform>(target),
AnimTarget::component::<UiTransform>(target),
))
.observe(enable_interaction_after_initial_animation);

Expand All @@ -149,7 +147,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
}

fn enable_interaction_after_initial_animation(
trigger: Trigger<AnimCompletedEvent>,
trigger: On<AnimCompletedEvent>,
mut commands: Commands,
q_names: Query<&Name>,
) {
Expand All @@ -170,7 +168,7 @@ fn enable_interaction_after_initial_animation(
// Spawn an Entity to hold the animation itself. We add the AnimTarget, which
// doesn't change, but not yet any TweenAnim since we have no animation to play.
let anim_entity = commands
.spawn(AnimTarget::component::<Transform>(*target_entity))
.spawn(AnimTarget::component::<UiTransform>(*target_entity))
.id();

// Add the HoverAnim component which also acts as a marker
Expand All @@ -195,7 +193,7 @@ fn interaction(
mut commands: Commands,
mut interaction_query: Query<
(
&Transform,
&UiTransform,
&Interaction,
&mut BackgroundColor,
&ButtonLabel,
Expand Down Expand Up @@ -231,9 +229,9 @@ fn interaction(
let tween = Tween::new(
EaseFunction::QuadraticIn,
Duration::from_millis(200),
TransformScaleLens {
UiTransformScaleLens {
start: transform.scale,
end: Vec3::splat(1.1),
end: Vec2::splat(1.1),
},
);

Expand All @@ -247,9 +245,9 @@ fn interaction(
let tween = Tween::new(
EaseFunction::QuadraticIn,
Duration::from_millis(200),
TransformScaleLens {
UiTransformScaleLens {
start: transform.scale,
end: Vec3::ONE,
end: Vec2::ONE,
},
);

Expand Down
6 changes: 3 additions & 3 deletions examples/sequence.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ fn main() {
.add_plugins(DefaultPlugins.set(WindowPlugin {
primary_window: Some(Window {
title: "Sequence".to_string(),
resolution: (600., 600.).into(),
resolution: bevy::window::WindowResolution::new(600, 600),
present_mode: bevy::window::PresentMode::Fifo, // vsync
..default()
}),
Expand Down Expand Up @@ -51,7 +51,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) -> Result<()> {
let text_color_red = TextColor(RED.into());
let text_color_blue = TextColor(AQUA.into());

let justify = JustifyText::Center;
let justify = Justify::Center;

// Text with the index of the active tween in the sequence
commands
Expand Down Expand Up @@ -233,7 +233,7 @@ fn update_text(
mut q_textspans: Query<&mut TextSpan, With<ProgressValue>>,
q_anim_red: Single<Option<&TweenAnim>, With<RedAnimMarker>>,
q_anim_blue: Single<Option<&TweenAnim>, With<BlueAnimMarker>>,
mut q_event_completed: EventReader<AnimCompletedEvent>,
mut q_event_completed: MessageReader<AnimCompletedEvent>,
) {
let anim_red = *q_anim_red;
let progress_red = if let Some(anim) = anim_red {
Expand Down
2 changes: 1 addition & 1 deletion examples/sprite_color.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ fn main() {
.add_plugins(DefaultPlugins.set(WindowPlugin {
primary_window: Some(Window {
title: "SpriteColorLens".to_string(),
resolution: (1200., 600.).into(),
resolution: bevy::window::WindowResolution::new(1200, 600),
present_mode: bevy::window::PresentMode::Fifo, // vsync
..default()
}),
Expand Down
10 changes: 5 additions & 5 deletions examples/text_color.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ use bevy_tweening::{lens::*, *};

mod utils;

const WIDTH: f32 = 1200.;
const HEIGHT: f32 = 600.;
const WIDTH: u32 = 1200;
const HEIGHT: u32 = 600;

fn main() {
App::default()
.add_plugins(DefaultPlugins.set(WindowPlugin {
primary_window: Some(Window {
title: "TextColorLens".to_string(),
resolution: (WIDTH, HEIGHT).into(),
resolution: bevy::window::WindowResolution::new(WIDTH, HEIGHT),
present_mode: bevy::window::PresentMode::Fifo, // vsync
..default()
}),
Expand All @@ -31,8 +31,8 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
let size_x = 140.;
let size_y = 40.;

let delta_x = WIDTH / 5.;
let delta_y = HEIGHT / 6.;
let delta_x = WIDTH as f32 / 5.;
let delta_y = HEIGHT as f32 / 6.;

let mut x = 20.;
let mut y = 20.;
Expand Down
6 changes: 2 additions & 4 deletions examples/transform_rotation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,13 @@ fn main() {
DefaultPlugins.set(WindowPlugin {
primary_window: Some(Window {
title: "TransformRotationLens".to_string(),
resolution: (1400., 600.).into(),
resolution: bevy::window::WindowResolution::new(1400, 600).into(),
present_mode: bevy::window::PresentMode::Fifo, // vsync
..default()
}),
..default()
}),
EguiPlugin {
enable_multipass_for_primary_context: true,
},
EguiPlugin::default(),
ResourceInspectorPlugin::<Options>::new(),
TweeningPlugin,
))
Expand Down
6 changes: 2 additions & 4 deletions examples/transform_translation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,13 @@ fn main() {
DefaultPlugins.set(WindowPlugin {
primary_window: Some(Window {
title: "TransformPositionLens".to_string(),
resolution: (1400., 600.).into(),
resolution: bevy::window::WindowResolution::new(1400, 600).into(),
present_mode: bevy::window::PresentMode::Fifo, // vsync
..default()
}),
..default()
}),
EguiPlugin {
enable_multipass_for_primary_context: true,
},
EguiPlugin::default(),
//DefaultInspectorConfigPlugin,
ResourceInspectorPlugin::<Options>::new(),
TweeningPlugin,
Expand Down
6 changes: 2 additions & 4 deletions examples/ui_position.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,13 @@ fn main() {
DefaultPlugins.set(WindowPlugin {
primary_window: Some(Window {
title: "UiPositionLens".to_string(),
resolution: (1400., 600.).into(),
resolution: bevy::window::WindowResolution::new(1400, 600).into(),
present_mode: bevy::window::PresentMode::Fifo, // vsync
..default()
}),
..default()
}),
EguiPlugin {
enable_multipass_for_primary_context: true,
},
EguiPlugin::default(),
ResourceInspectorPlugin::<Options>::new(),
TweeningPlugin,
))
Expand Down
2 changes: 1 addition & 1 deletion examples/utils/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

use bevy::prelude::*;

pub fn close_on_esc(mut ev_app_exit: EventWriter<AppExit>, input: Res<ButtonInput<KeyCode>>) {
pub fn close_on_esc(mut ev_app_exit: MessageWriter<AppExit>, input: Res<ButtonInput<KeyCode>>) {
if input.just_pressed(KeyCode::Escape) {
ev_app_exit.write(AppExit::Success);
}
Expand Down
16 changes: 8 additions & 8 deletions run_examples.bat
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
@echo on
echo Run all examples
REM Default
cargo r --example menu --no-default-features --features="bevy_ui bevy_text bevy/bevy_winit bevy/bevy_picking"
cargo r --example transform_translation --no-default-features --features="bevy_sprite bevy/bevy_winit bevy/bevy_picking"
cargo r --example transform_rotation --no-default-features --features="bevy_sprite bevy/bevy_winit bevy/bevy_picking"
cargo r --example menu --no-default-features --features="bevy_ui bevy_text bevy/bevy_winit bevy/bevy_picking bevy/bevy_ui_render"
cargo r --example transform_translation --no-default-features --features="bevy_sprite bevy/bevy_winit bevy/bevy_picking bevy/bevy_text"
cargo r --example transform_rotation --no-default-features --features="bevy_sprite bevy/bevy_winit bevy/bevy_picking bevy/bevy_text"
cargo r --example sequence --no-default-features --features="bevy_sprite bevy_text bevy/bevy_winit bevy/bevy_picking"
cargo r --example ambient_light --no-default-features --features="bevy_ui bevy_text bevy/bevy_winit bevy/bevy_picking bevy/bevy_pbr bevy/hdr bevy/tonemapping_luts"
cargo r --example ambient_light --no-default-features --features="bevy_ui bevy_text bevy/bevy_winit bevy/bevy_picking bevy/bevy_pbr bevy/hdr bevy/tonemapping_luts bevy/bevy_post_process"
cargo r --example follow --no-default-features --features="bevy_sprite bevy_text bevy/bevy_winit bevy/bevy_picking"
REM bevy_sprite
cargo r --example sprite_color --no-default-features --features="bevy_sprite bevy/bevy_winit bevy/bevy_picking"
cargo r --example colormaterial_color --no-default-features --features="bevy_sprite bevy/bevy_winit bevy/bevy_picking"
cargo r --example sprite_color --no-default-features --features="bevy_sprite bevy/bevy_winit bevy/bevy_picking bevy/bevy_text"
cargo r --example colormaterial_color --no-default-features --features="bevy_sprite bevy/bevy_winit bevy/bevy_picking bevy/bevy_text"
REM bevy_ui
cargo r --example ui_position --no-default-features --features="bevy_sprite bevy_ui bevy/bevy_winit bevy/bevy_picking"
cargo r --example ui_position --no-default-features --features="bevy_sprite bevy_ui bevy/bevy_winit bevy/bevy_picking bevy/bevy_ui_render"
REM bevy_text
cargo r --example text_color --no-default-features --features="bevy_text bevy_ui bevy/bevy_winit bevy/bevy_picking"
cargo r --example text_color --no-default-features --features="bevy_text bevy_ui bevy/bevy_winit bevy/bevy_picking bevy/bevy_ui_render"
Loading
Loading