feat: update bevy_vello package

rename BevyMotionGfxPlugin -> MotionGfxPlugin
voxell-tech · Sep 6, 2024 · a82a4b0 · a82a4b0
1 parent 2adb726
commit a82a4b0
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 21 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/motiongfx_core/src/f32lerp/vello_f32lerp.rs b/crates/motiongfx_core/src/f32lerp/vello_f32lerp.rs
@@ -1,5 +1,5 @@
 use bevy::prelude::*;
-use bevy_vello_graphics::prelude::*;
+use bevy_vello_graphics::bevy_vello::vello::{kurbo, peniko};
 
 use super::F32Lerp;
 

diff --git a/crates/motiongfx_core/src/lib.rs b/crates/motiongfx_core/src/lib.rs
@@ -25,9 +25,9 @@ pub mod prelude {
     };
 }
 
-pub struct MotionGfxPlugin;
+pub struct MotionGfxCorePlugin;
 
-impl Plugin for MotionGfxPlugin {
+impl Plugin for MotionGfxCorePlugin {
     fn build(&self, app: &mut App) {
         app.add_systems(
             Update,

diff --git a/crates/motiongfx_vello/src/motion/fill_motion.rs b/crates/motiongfx_vello/src/motion/fill_motion.rs
@@ -1,5 +1,5 @@
 use bevy::prelude::*;
-use bevy_vello_graphics::prelude::*;
+use bevy_vello_graphics::{bevy_vello::vello::peniko, prelude::*};
 use motiongfx_core::prelude::*;
 
 pub trait FillMotion<const N: usize> {

diff --git a/examples/easings.rs b/examples/easings.rs
@@ -1,12 +1,12 @@
 use bevy::{core_pipeline::bloom::BloomSettings, pbr::NotShadowCaster, prelude::*};
-use bevy_motiongfx::{prelude::*, BevyMotionGfxPlugin};
+use bevy_motiongfx::{prelude::*, MotionGfxPlugin};
 
 fn main() {
     App::new()
         // Bevy plugins
         .add_plugins(DefaultPlugins)
         // Custom plugins
-        .add_plugins(BevyMotionGfxPlugin)
+        .add_plugins(MotionGfxPlugin)
         .add_systems(Startup, (setup, easings))
         .add_systems(Update, timeline_movement)
         .run();

diff --git a/examples/hello_world.rs b/examples/hello_world.rs
@@ -1,12 +1,12 @@
 use bevy::{core_pipeline::tonemapping::Tonemapping, pbr::NotShadowCaster, prelude::*};
-use bevy_motiongfx::{prelude::*, BevyMotionGfxPlugin};
+use bevy_motiongfx::{prelude::*, MotionGfxPlugin};
 
 fn main() {
     App::new()
         // Bevy plugins
         .add_plugins(DefaultPlugins)
         // Custom plugins
-        .add_plugins(BevyMotionGfxPlugin)
+        .add_plugins(MotionGfxPlugin)
         .add_systems(Startup, (setup, hello_world))
         .add_systems(Update, timeline_movement)
         .run();

diff --git a/examples/slide_basic.rs b/examples/slide_basic.rs
@@ -1,12 +1,12 @@
 use bevy::{core_pipeline::bloom::BloomSettings, pbr::NotShadowCaster, prelude::*};
-use bevy_motiongfx::{prelude::*, BevyMotionGfxPlugin};
+use bevy_motiongfx::{prelude::*, MotionGfxPlugin};
 
 fn main() {
     App::new()
         // Bevy plugins
         .add_plugins(DefaultPlugins)
         // Custom plugins
-        .add_plugins(BevyMotionGfxPlugin)
+        .add_plugins(MotionGfxPlugin)
         .add_systems(Startup, (setup, slide_basic))
         .add_systems(Update, slide_movement)
         .run();

diff --git a/examples/vello_basic.rs b/examples/vello_basic.rs
@@ -1,12 +1,12 @@
 use bevy::{math::DVec2, prelude::*};
-use bevy_motiongfx::{prelude::*, BevyMotionGfxPlugin};
+use bevy_motiongfx::motiongfx_vello::bevy_vello_graphics::bevy_vello::{prelude::*, VelloPlugin};
+use bevy_motiongfx::{prelude::*, MotionGfxPlugin};
 
 fn main() {
     App::new()
-        // Bevy plugins
-        .add_plugins(DefaultPlugins)
+        .add_plugins((DefaultPlugins, VelloPlugin::default()))
         // Custom plugins
-        .add_plugins(BevyMotionGfxPlugin)
+        .add_plugins(MotionGfxPlugin)
         .add_systems(Startup, (setup, vello_basic))
         .add_systems(Update, timeline_movement)
         .run();

diff --git a/src/lib.rs b/src/lib.rs
@@ -44,11 +44,11 @@ pub mod prelude {
     pub use motiongfx_vello::prelude::*;
 }
 
-pub struct BevyMotionGfxPlugin;
+pub struct MotionGfxPlugin;
 
-impl Plugin for BevyMotionGfxPlugin {
+impl Plugin for MotionGfxPlugin {
     fn build(&self, app: &mut App) {
-        app.add_plugins(motiongfx_core::MotionGfxPlugin);
+        app.add_plugins(motiongfx_core::MotionGfxCorePlugin);
         #[cfg(feature = "common")]
         app.add_plugins(motiongfx_common::MotionGfxCommonPlugin);
         #[cfg(feature = "vello_graphics")]