From d4705b141786c329e9fc1a9811df2225732a4816 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rezan=20Kizilg=C3=BCn?= Date: Sun, 11 Aug 2024 15:35:13 +0200 Subject: [PATCH] Upgraded to bevy 0.14 --- Cargo.toml | 14 +++++++++----- examples/custom_skip.rs | 9 ++++----- examples/layouts.rs | 16 ++++++++-------- examples/screens.rs | 12 ++++++------ examples/simple.rs | 12 ++++++------ src/lens.rs | 11 ++++++----- src/lib.rs | 22 ++++++++++++---------- src/splash.rs | 9 +++++---- src/systems.rs | 9 +++++---- 9 files changed, 61 insertions(+), 53 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 3a7f278..ec434eb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,12 +17,13 @@ opt-level = 1 opt-level = 3 [dev-dependencies] -bevy = { version = "0.13", default-features = false, features = [ - "multi-threaded", +bevy = { version = "0.14.1", default-features = false, features = [ + "multi_threaded", "bevy_asset", "bevy_winit", "bevy_render", "bevy_sprite", + "bevy_state", "png", ] } @@ -35,9 +36,10 @@ dev = [ "bevy/bevy_core_pipeline", "bevy/bevy_render", "bevy/bevy_sprite", + "bevy/bevy_state", "bevy/bevy_text", "bevy/bevy_ui", - "bevy/multi-threaded", + "bevy/multi_threaded", "bevy/png", "bevy/ktx2", "bevy/x11", @@ -66,8 +68,10 @@ required-features = ["dev"] path = "./examples/simple.rs" [dependencies] -bevy = { version = "0.13", default-features = false } -bevy_tweening = "0.10" +bevy = { version = "0.14.1", default-features = false , features = [ + "bevy_state", +] } +bevy_tweening = "0.11.0" [patch.crates-io] bevy_tweening = { git = "https://github.com/SergioRibera/bevy_tweening", branch = "infinite_mirrored" } diff --git a/examples/custom_skip.rs b/examples/custom_skip.rs index ae1a46f..d8649e6 100644 --- a/examples/custom_skip.rs +++ b/examples/custom_skip.rs @@ -80,7 +80,7 @@ fn main() { ) .add_systems(Startup, create_scene) .add_systems(Update, button_system) - .run() + .run(); } fn create_scene(mut cmd: Commands, assets: ResMut) { @@ -110,7 +110,7 @@ fn create_scene(mut cmd: Commands, assets: ResMut) { align_items: AlignItems::Center, ..default() }, - background_color: BackgroundColor(Color::WHITE.with_a(0.)), + background_color: BackgroundColor(Color::WHITE.with_alpha(0.)), ..default() }) .with_children(|cmd| { @@ -146,9 +146,8 @@ fn button_system( mut send_skip: EventWriter, ) { for interaction in &mut interaction_query { - match *interaction { - Interaction::Pressed => send_skip.send(SplashScreenSkipEvent), - _ => {} + if *interaction == Interaction::Pressed { + send_skip.send(SplashScreenSkipEvent); } } } diff --git a/examples/layouts.rs b/examples/layouts.rs index 775f4cf..ac1d84e 100644 --- a/examples/layouts.rs +++ b/examples/layouts.rs @@ -1,8 +1,8 @@ -use std::time::Duration; - +use bevy::color::palettes; use bevy::prelude::*; use bevy_splash_screen::{SplashAssetType, SplashItem, SplashPlugin, SplashScreen, SplashType}; use bevy_tweening::EaseFunction; +use std::time::Duration; #[derive(Clone, Copy, Debug, Default, States, Hash, PartialEq, Eq)] enum ScreenStates { @@ -35,7 +35,7 @@ fn main() { "by\n", TextStyle { font_size: 24., - color: Color::WHITE.with_a(0.75), + color: Color::WHITE.with_alpha(0.75), ..default() }, ), @@ -51,7 +51,7 @@ fn main() { .with_justify(JustifyText::Center), "FiraSans-Bold.ttf".to_string(), ), - tint: Color::SEA_GREEN, + tint: palettes::css::SEA_GREEN.into(), width: Val::Percent(30.), height: Val::Px(150.), ease_function: EaseFunction::QuarticInOut.into(), @@ -98,7 +98,7 @@ fn main() { .with_justify(JustifyText::Center), "FiraSans-Bold.ttf".to_string(), ), - tint: Color::YELLOW, + tint: palettes::basic::YELLOW.into(), width: Val::Percent(30.), height: Val::Px(150.), ease_function: EaseFunction::QuarticInOut.into(), @@ -118,7 +118,7 @@ fn main() { .with_justify(JustifyText::Center), "FiraSans-Bold.ttf".to_string(), ), - tint: Color::BLUE, + tint: Srgba::BLUE.into(), width: Val::Percent(30.), height: Val::Px(150.), ease_function: EaseFunction::QuarticInOut.into(), @@ -158,7 +158,7 @@ fn main() { .with_justify(JustifyText::Center), "FiraSans-Bold.ttf".to_string(), ), - tint: Color::PURPLE, + tint: palettes::basic::PURPLE.into(), width: Val::Percent(30.), height: Val::Px(150.), ease_function: EaseFunction::QuarticInOut.into(), @@ -173,7 +173,7 @@ fn main() { }), ) .add_systems(Startup, create_scene) - .run() + .run(); } fn create_scene(mut cmd: Commands) { diff --git a/examples/screens.rs b/examples/screens.rs index 75a715f..266f2a8 100644 --- a/examples/screens.rs +++ b/examples/screens.rs @@ -1,8 +1,8 @@ -use std::time::Duration; - +use bevy::color::palettes; use bevy::prelude::*; use bevy_splash_screen::{SplashAssetType, SplashItem, SplashPlugin, SplashScreen}; use bevy_tweening::EaseFunction; +use std::time::Duration; #[derive(Clone, Copy, Debug, Default, States, Hash, PartialEq, Eq)] enum ScreenStates { @@ -33,7 +33,7 @@ fn main() { "by\n", TextStyle { font_size: 24., - color: Color::WHITE.with_a(0.75), + color: Color::WHITE.with_alpha(0.75), ..default() }, ), @@ -49,7 +49,7 @@ fn main() { .with_justify(JustifyText::Center), "FiraSans-Bold.ttf".to_string(), ), - tint: Color::SEA_GREEN, + tint: palettes::css::SEA_GREEN.into(), width: Val::Percent(30.), height: Val::Px(150.), ease_function: EaseFunction::QuarticInOut.into(), @@ -98,7 +98,7 @@ fn main() { .with_justify(JustifyText::Center), "FiraSans-Bold.ttf".to_string(), ), - tint: Color::RED, + tint: Srgba::RED.into(), width: Val::Percent(30.), height: Val::Px(150.), ease_function: EaseFunction::QuarticInOut.into(), @@ -111,7 +111,7 @@ fn main() { }), ) .add_systems(Startup, create_scene) - .run() + .run(); } fn create_scene(mut cmd: Commands) { diff --git a/examples/simple.rs b/examples/simple.rs index 810460b..fddf0fb 100644 --- a/examples/simple.rs +++ b/examples/simple.rs @@ -1,8 +1,8 @@ -use std::time::Duration; - +use bevy::color::palettes; use bevy::prelude::*; use bevy_splash_screen::{SplashAssetType, SplashItem, SplashPlugin, SplashScreen}; use bevy_tweening::EaseFunction; +use std::time::Duration; #[derive(Clone, Copy, Debug, Default, States, Hash, PartialEq, Eq)] enum ScreenStates { @@ -35,7 +35,7 @@ fn main() { "by\n", TextStyle { font_size: 24., - color: Color::WHITE.with_a(0.75), + color: Color::WHITE.with_alpha(0.75), ..default() }, ), @@ -43,7 +43,7 @@ fn main() { "Sergio Ribera", TextStyle { font_size: 32., - color: Color::BLUE, + color: Srgba::BLUE.into(), ..default() }, ), @@ -51,7 +51,7 @@ fn main() { .with_justify(JustifyText::Center), "FiraSans-Bold.ttf".to_string(), ), - tint: Color::SEA_GREEN, + tint: palettes::css::SEA_GREEN.into(), width: Val::Percent(30.), height: Val::Px(150.), ease_function: EaseFunction::QuarticInOut.into(), @@ -73,7 +73,7 @@ fn main() { }), ) .add_systems(Startup, create_scene) - .run() + .run(); } fn create_scene(mut cmd: Commands) { diff --git a/src/lens.rs b/src/lens.rs index eaaea64..f443297 100644 --- a/src/lens.rs +++ b/src/lens.rs @@ -1,5 +1,6 @@ use bevy::prelude::*; use bevy_tweening::lens::*; +use bevy_tweening::Targetable; pub trait InstanceLens { fn create(start: Color, end: Color) -> Self; @@ -27,14 +28,14 @@ impl SplashTextColorLens { } impl Lens for SplashTextColorLens { - fn lerp(&mut self, target: &mut Text, ratio: f32) { + fn lerp(&mut self, target: &mut dyn Targetable, ratio: f32) { target .sections .iter_mut() .enumerate() .for_each(|(i, section)| { use crate::ColorLerper as _; - let value = self.0[i].with_a(0.).lerp(&self.0[i], ratio); + let value = self.0[i].with_alpha(0.).lerp(&self.0[i], ratio); section.style.color = value; }); } @@ -46,10 +47,10 @@ impl InstanceLens for SplashImageColorLens { } } -impl Lens for SplashImageColorLens { - fn lerp(&mut self, target: &mut BackgroundColor, ratio: f32) { +impl Lens for SplashImageColorLens { + fn lerp(&mut self, target: &mut dyn Targetable, ratio: f32) { use crate::ColorLerper as _; let value = self.start.lerp(&self.end, ratio); - target.0 = value; + target.color = value; } } diff --git a/src/lib.rs b/src/lib.rs index ac30184..15abaa3 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,6 +1,7 @@ use std::time::Duration; use bevy::prelude::*; +use bevy::state::state::FreelyMutableState; use bevy_tweening::*; mod lens; @@ -61,7 +62,7 @@ pub(crate) struct SplashScreenSkipable(bool, bool); #[derive(Default, Clone, Resource)] pub(crate) struct SplashScreens(Vec); -pub struct SplashPlugin { +pub struct SplashPlugin { state: S, next: S, skipable: bool, @@ -71,7 +72,7 @@ pub struct SplashPlugin { impl SplashPlugin where - S: States, + S: FreelyMutableState, { pub fn new(splash_state: S, next_state: S) -> Self { Self { @@ -101,7 +102,7 @@ where impl Plugin for SplashPlugin where - S: States, + S: FreelyMutableState, { fn build(&self, app: &mut App) { if self.screens.0.is_empty() { @@ -124,8 +125,7 @@ where .add_systems( Update, ( - component_animator_system:: - .run_if(in_state(self.state.clone())), + component_animator_system::.run_if(in_state(self.state.clone())), update_splash::.run_if(in_state(self.state.clone())), splash_skip::, ), @@ -143,10 +143,12 @@ trait ColorLerper { #[allow(dead_code)] impl ColorLerper for Color { fn lerp(&self, target: &Color, ratio: f32) -> Color { - let r = self.r().lerp(target.r(), ratio); - let g = self.g().lerp(target.g(), ratio); - let b = self.b().lerp(target.b(), ratio); - let a = self.a().lerp(target.a(), ratio); - Color::rgba(r, g, b, a) + let mut linear = self.to_linear(); + let linear_target = target.to_linear(); + linear.red = linear.red.lerp(linear_target.red, ratio); + linear.green = linear.green.lerp(linear_target.green, ratio); + linear.blue = linear.blue.lerp(linear_target.blue, ratio); + linear.alpha = linear.alpha.lerp(linear_target.alpha, ratio); + linear.into() } } diff --git a/src/splash.rs b/src/splash.rs index c85636f..1af79ae 100644 --- a/src/splash.rs +++ b/src/splash.rs @@ -118,7 +118,7 @@ pub(crate) fn create_splash( SplashTextColorLens::new( text.sections .iter() - .map(|_| Color::WHITE.with_a(0.)) + .map(|_| Color::WHITE.with_alpha(0.)) .collect(), ), ) @@ -148,6 +148,7 @@ pub(crate) fn create_splash( texture: assets.load(handler), flip_x: false, flip_y: false, + ..default() }, style: Style { width: brand.width, @@ -156,7 +157,7 @@ pub(crate) fn create_splash( }, ..default() }, - create_animator::( + create_animator::( brand, max_duration, i_screen, @@ -181,14 +182,14 @@ where Tween::new( brand.ease_function, Duration::from_secs(1), - L::create(brand.tint.with_a(0.), brand.tint.with_a(0.)), + L::create(brand.tint.with_alpha(0.), brand.tint.with_alpha(0.)), ) .then( Delay::new(max_duration).then( Tween::new( brand.ease_function, brand.duration, - L::create(brand.tint.with_a(0.), brand.tint), + L::create(brand.tint.with_alpha(0.), brand.tint), ) .with_repeat_strategy(RepeatStrategy::MirroredRepeat) .with_repeat_count(RepeatCount::Finite(2)) diff --git a/src/systems.rs b/src/systems.rs index cf7e1c9..9c6d81e 100644 --- a/src/systems.rs +++ b/src/systems.rs @@ -3,6 +3,7 @@ use std::collections::HashMap; use bevy::{ input::{gamepad::GamepadEvent, keyboard::KeyboardInput, mouse::MouseButtonInput}, prelude::*, + state::state::{FreelyMutableState, NextState, States}, }; use bevy_tweening::TweenCompleted; @@ -25,7 +26,7 @@ pub(crate) struct SplashBackground { // // Remove all nodes when splash end // -pub(crate) fn splash_end<'a, S: States>( +pub(crate) fn splash_end<'a, S: FreelyMutableState>( mut cmd: Commands, next_state: S, brands: impl Iterator, @@ -33,13 +34,13 @@ pub(crate) fn splash_end<'a, S: States>( for (entity, _, _) in brands { cmd.entity(entity).despawn_recursive(); } - cmd.insert_resource(NextState(Some(next_state))); + cmd.insert_resource(NextState::Pending(next_state)); } // // Logic to end splash and change background color // -pub(crate) fn update_splash( +pub(crate) fn update_splash( cmd: Commands, brands: Query<(Entity, &Node, &ClearSplash)>, mut background: Query<(&Node, &mut BackgroundColor, &SplashBackground)>, @@ -78,7 +79,7 @@ pub(crate) fn update_splash( // // System for skip splash // -pub(crate) fn splash_skip( +pub(crate) fn splash_skip( cmd: Commands, mut kbd: EventReader, mut mouse: EventReader,