Add lazy registration support!

Cargo.toml

@@ -28,7 +28,7 @@ bevy_sprite = { version = "0.18.1", default-features = false }
 bevy_pbr = { version = "0.18.1", default-features = false }
 
 # other
-field_path = "0.3"
+field_path = "0.4.1"
 nonempty = { version = "0.12", default-features = false }
 
 [workspace.lints.clippy]

crates/bevy_motiongfx/README.md

@@ -40,17 +40,17 @@ use bevy_motiongfx::prelude::*;
 
 fn build_timeline(
     mut commands: Commands,
-    mut motiongfx: ResMut<MotionGfxWorld>,
+    mut motiongfx: ResMut<MotionGfxManager>,
 ) {
     // Spawn the Entity.
     let entity = commands
         .spawn(Transform::from_xyz(-3.0, 0.0, 0.0))
         .id();
 
     // Build the timeline.
-    let mut b = TimelineBuilder::new();
+    let mut b = motiongfx.create_builder();
     let track = b
-        .act_interp(entity, field!(<Transform>::translation::x), |x| {
+        .act_interp(entity, path!(<Transform>::translation::x), |x| {
             x + 6.0
         })
         .play(1.0)
@@ -72,7 +72,7 @@ use bevy_motiongfx::prelude::*;
 
 fn build_timeline(
     mut commands: Commands,
-    mut motiongfx: ResMut<MotionGfxWorld>,
+    mut motiongfx: ResMut<MotionGfxManager>,
     mut materials: ResMut<Assets<StandardMaterial>>
 ) {
     // Create the asset.
@@ -82,12 +82,12 @@ fn build_timeline(
     commands.spawn(MeshMaterial3d(material.clone()));
 
     // Build the timeline.
-    let mut b = TimelineBuilder::new();
+    let mut b = motiongfx.create_builder();
     let track = b
         .act_interp(
           // AssetIds must be type-erased.
           material.untyped().id(),
-          field!(<StandardMaterial>::base_color),
+          path!(<StandardMaterial>::base_color),
           |_| Srgba::RED.into(),
         )
         .play(1.0)
@@ -112,10 +112,10 @@ use bevy_motiongfx::prelude::*;
 
 fn build_timeline(
     mut commands: Commands,
-    mut motiongfx: ResMut<MotionGfxWorld>,
+    mut motiongfx: ResMut<MotionGfxManager>,
 ) {
     // Build the timeline.
-    let mut b = TimelineBuilder::new();
+    let mut b = motiongfx.create_builder();
     // Add tracks here...
     let timeline = b.compile();
 

crates/bevy_motiongfx/src/controller.rs

@@ -3,7 +3,7 @@ use bevy_ecs::prelude::*;
 use bevy_time::prelude::*;
 
 use crate::MotionGfxSet;
-use crate::world::{MotionGfxWorld, TimelineId};
+use crate::manager::{MotionGfxManager, TimelineId};
 
 pub struct ControllerPlugin;
 
@@ -18,7 +18,7 @@ impl Plugin for ControllerPlugin {
 }
 
 fn realtime_player_timing(
-    mut motiongfx: ResMut<MotionGfxWorld>,
+    mut motiongfx: ResMut<MotionGfxManager>,
     q_timelines: Query<(&TimelineId, &RealtimePlayer)>,
     time: Res<Time>,
 ) {
@@ -35,7 +35,7 @@ fn realtime_player_timing(
 }
 
 fn fixed_rate_player_timing(
-    mut motiongfx: ResMut<MotionGfxWorld>,
+    mut motiongfx: ResMut<MotionGfxManager>,
     mut q_timelines: Query<(&TimelineId, &mut FixedRatePlayer)>,
 ) {
     for (id, mut player) in

crates/bevy_motiongfx/src/interpolation.rs

@@ -2,34 +2,38 @@ use bevy_math::*;
 use motiongfx::prelude::*;
 use motiongfx::subject::SubjectId;
 
-pub trait ActionInterpTimelineExt {
+pub trait ActionInterpTimelineExt<W> {
     fn act_interp<I, S, T>(
         &mut self,
         target: I,
-        field: Field<S, T>,
+        field_acc: FieldAccessor<S, T>,
         action: impl Action<T>,
     ) -> InterpActionBuilder<'_, T>
     where
+        W: SubjectSource<I, S>,
         I: SubjectId,
         S: 'static,
-        T: Interpolation + ThreadSafe;
+        T: Interpolation + Clone + ThreadSafe;
 }
 
-impl ActionInterpTimelineExt for TimelineBuilder {
+impl<W: 'static> ActionInterpTimelineExt<W>
+    for TimelineBuilder<'_, W>
+{
     /// Add an [`Action`] with interpolation using
     /// [`Interpolation::interp`].
     fn act_interp<I, S, T>(
         &mut self,
         target: I,
-        field: Field<S, T>,
+        field_acc: FieldAccessor<S, T>,
         action: impl Action<T>,
     ) -> InterpActionBuilder<'_, T>
     where
+        W: SubjectSource<I, S>,
         I: SubjectId,
         S: 'static,
-        T: Interpolation + ThreadSafe,
+        T: Interpolation + Clone + ThreadSafe,
     {
-        self.act(target, field, action).with_interp(T::interp)
+        self.act(target, field_acc, action).with_interp(T::interp)
     }
 }
 

crates/bevy_motiongfx/src/lib.rs

@@ -5,12 +5,11 @@ use bevy_app::prelude::*;
 use bevy_ecs::prelude::*;
 
 use crate::controller::ControllerPlugin;
-use crate::world::MotionGfxWorldPlugin;
+use crate::manager::MotionGfxManagerPlugin;
 
 pub mod controller;
 pub mod interpolation;
-pub mod pipeline;
-pub mod registry;
+pub mod manager;
 pub mod world;
 
 pub mod prelude {
@@ -20,12 +19,8 @@ pub mod prelude {
     pub use crate::interpolation::{
         ActionInterpTimelineExt, Interpolation,
     };
-    pub use crate::pipeline::{
-        PipelineRegistryExt, WorldPipeline, WorldPipelineRegistry,
-    };
-    pub use crate::register_fields;
-    pub use crate::registry::FieldPathRegisterAppExt;
-    pub use crate::world::{MotionGfxWorld, TimelineId};
+    pub use crate::manager::{MotionGfxManager, TimelineId};
+    pub use crate::world::{BevyTimeline, BevyTimelineBuilder};
 }
 
 pub use motiongfx;
@@ -47,66 +42,7 @@ impl Plugin for BevyMotionGfxPlugin {
             )
                 .chain(),
         );
-        app.add_plugins((MotionGfxWorldPlugin, ControllerPlugin));
-
-        #[cfg(feature = "transform")]
-        {
-            use bevy_transform::components::Transform;
-
-            register_fields!(
-                app.register_component_field(),
-                Transform,
-                (
-                    translation(x, y, z),
-                    scale(x, y, z),
-                    rotation(x, y, z, w),
-                )
-            );
-        }
-
-        #[cfg(feature = "sprite")]
-        {
-            use bevy_sprite::prelude::*;
-
-            register_fields!(
-                app.register_component_field(),
-                Sprite,
-                (
-                    image,
-                    texture_atlas,
-                    color,
-                    flip_x,
-                    flip_y,
-                    custom_size,
-                    rect,
-                    image_mode,
-                )
-            );
-        }
-
-        #[cfg(feature = "pbr")]
-        {
-            use bevy_pbr::prelude::*;
-
-            register_fields!(
-                app.register_asset_field(),
-                StandardMaterial,
-                (
-                    base_color,
-                    emissive,
-                    perceptual_roughness,
-                    metallic,
-                    reflectance,
-                    specular_tint,
-                    diffuse_transmission,
-                    specular_transmission,
-                    thickness,
-                    ior,
-                    attenuation_distance,
-                    attenuation_color,
-                )
-            );
-        }
+        app.add_plugins((MotionGfxManagerPlugin, ControllerPlugin));
     }
 }