Split TimePlugin out of CorePlugin

Author: CAD97

crates/bevy_core/Cargo.toml

@@ -17,7 +17,6 @@ bevy_ecs = { path = "../bevy_ecs", version = "0.6.0", features = ["bevy_reflect"
 bevy_math = { path = "../bevy_math", version = "0.6.0" }
 bevy_reflect = { path = "../bevy_reflect", version = "0.6.0", features = ["bevy"] }
 bevy_tasks = { path = "../bevy_tasks", version = "0.6.0" }
-bevy_time = { path = "../bevy_time", version = "0.6.0" }
 bevy_utils = { path = "../bevy_utils", version = "0.6.0" }
 
 # other

crates/bevy_core/src/lib.rs

@@ -17,27 +17,14 @@ pub mod prelude {
 }
 
 use bevy_app::prelude::*;
-use bevy_ecs::{
-    entity::Entity,
-    schedule::{ExclusiveSystemDescriptorCoercion, SystemLabel},
-    system::{IntoExclusiveSystem, ResMut},
-};
-use bevy_time::{FixedTimesteps, Time, Timer};
+use bevy_ecs::entity::Entity;
 use bevy_utils::HashSet;
 use std::ops::Range;
 
 /// Adds core functionality to Apps.
 #[derive(Default)]
 pub struct CorePlugin;
 
-/// A `SystemLabel` enum for ordering systems relative to core Bevy systems.
-#[derive(Debug, PartialEq, Eq, Clone, Hash, SystemLabel)]
-pub enum CoreSystem {
-    /// Updates the elapsed time. Any system that interacts with [Time] component should run after
-    /// this.
-    Time,
-}
-
 impl Plugin for CorePlugin {
     fn build(&self, app: &mut App) {
         // Setup the default bevy task pools
@@ -47,30 +34,17 @@ impl Plugin for CorePlugin {
             .unwrap_or_default()
             .create_default_pools(&mut app.world);
 
-        app.init_resource::<Time>()
-            .init_resource::<FixedTimesteps>()
-            .register_type::<HashSet<String>>()
+        app.register_type::<HashSet<String>>()
             .register_type::<Option<String>>()
             .register_type::<Entity>()
             .register_type::<Name>()
-            .register_type::<Range<f32>>()
-            .register_type::<Timer>()
-            // time system is added as an "exclusive system" to ensure it runs before other systems
-            // in CoreStage::First
-            .add_system_to_stage(
-                CoreStage::First,
-                time_system.exclusive_system().label(CoreSystem::Time),
-            );
+            .register_type::<Range<f32>>();
 
         register_rust_types(app);
         register_math_types(app);
     }
 }
 
-fn time_system(mut time: ResMut<Time>) {
-    time.update();
-}
-
 fn register_rust_types(app: &mut App) {
     app.register_type::<bool>()
         .register_type::<u8>()

crates/bevy_internal/Cargo.toml

@@ -65,6 +65,7 @@ bevy_transform = { path = "../bevy_transform", version = "0.6.0" }
 bevy_utils = { path = "../bevy_utils", version = "0.6.0" }
 bevy_window = { path = "../bevy_window", version = "0.6.0" }
 bevy_tasks = { path = "../bevy_tasks", version = "0.6.0" }
+bevy_time = { path = "../bevy_time", version = "0.6.0" }
 # bevy (optional)
 bevy_audio = { path = "../bevy_audio", optional = true, version = "0.6.0" }
 bevy_core_pipeline = { path = "../bevy_core_pipeline", optional = true, version = "0.6.0" }

crates/bevy_internal/src/default_plugins.rs

@@ -26,6 +26,7 @@ impl PluginGroup for DefaultPlugins {
     fn build(&mut self, group: &mut PluginGroupBuilder) {
         group.add(bevy_log::LogPlugin::default());
         group.add(bevy_core::CorePlugin::default());
+        group.add(bevy_time::TimePlugin::default());
         group.add(bevy_transform::TransformPlugin::default());
         group.add(bevy_diagnostic::DiagnosticsPlugin::default());
         group.add(bevy_input::InputPlugin::default());
@@ -69,6 +70,7 @@ impl PluginGroup for DefaultPlugins {
 
 /// Minimal plugin group that will add the following plugins:
 /// * [`CorePlugin`](bevy_core::CorePlugin)
+/// * [`TimePlugin`](bevy_time::TimePlugin)
 /// * [`ScheduleRunnerPlugin`](bevy_app::ScheduleRunnerPlugin)
 ///
 /// See also [`DefaultPlugins`] for a more complete set of plugins
@@ -77,6 +79,7 @@ pub struct MinimalPlugins;
 impl PluginGroup for MinimalPlugins {
     fn build(&mut self, group: &mut PluginGroupBuilder) {
         group.add(bevy_core::CorePlugin::default());
+        group.add(bevy_time::TimePlugin::default());
         group.add(bevy_app::ScheduleRunnerPlugin::default());
     }
 }

crates/bevy_internal/src/lib.rs

@@ -18,7 +18,7 @@ pub mod asset {
 }
 
 pub mod core {
-    //! Contains core plugins and utilities for time.
+    //! Contains core plugins.
     pub use bevy_core::*;
 }
 
@@ -65,6 +65,11 @@ pub mod tasks {
     pub use bevy_tasks::*;
 }
 
+pub mod time {
+    //! Contains time utilities.
+    pub use bevy_time::*;
+}
+
 pub mod transform {
     //! Local and global transforms (e.g. translation, scale, rotation).
     pub use bevy_transform::*;

crates/bevy_internal/src/prelude.rs

@@ -1,7 +1,7 @@
 #[doc(hidden)]
 pub use crate::{
     app::prelude::*, asset::prelude::*, core::prelude::*, ecs::prelude::*, input::prelude::*,
-    log::prelude::*, math::prelude::*, reflect::prelude::*, scene::prelude::*,
+    log::prelude::*, math::prelude::*, reflect::prelude::*, scene::prelude::*, time::prelude::*,
     transform::prelude::*, utils::prelude::*, window::prelude::*, DefaultPlugins, MinimalPlugins,
 };
 

crates/bevy_time/Cargo.toml

@@ -11,6 +11,7 @@ keywords = ["bevy"]
 
 [dependencies]
 # bevy
+bevy_app = { path = "../bevy_app", version = "0.6.0", features = ["bevy_reflect"] }
 bevy_ecs = { path = "../bevy_ecs", version = "0.6.0", features = ["bevy_reflect"] }
 bevy_reflect = { path = "../bevy_reflect", version = "0.6.0", features = ["bevy"] }
 bevy_utils = { path = "../bevy_utils", version = "0.6.0" }

crates/bevy_time/src/lib.rs

@@ -14,3 +14,33 @@ pub mod prelude {
     #[doc(hidden)]
     pub use crate::{Time, Timer};
 }
+
+use bevy_app::prelude::*;
+use bevy_ecs::prelude::*;
+
+/// Adds time functionality to Apps.
+#[derive(Default)]
+pub struct TimePlugin;
+
+#[derive(Debug, PartialEq, Eq, Clone, Hash, SystemLabel)]
+/// Updates the elapsed time. Any system that interacts with [Time] component should run after
+/// this.
+pub struct TimeSystem;
+
+impl Plugin for TimePlugin {
+    fn build(&self, app: &mut App) {
+        app.init_resource::<Time>()
+            .init_resource::<FixedTimesteps>()
+            .register_type::<Timer>()
+            // time system is added as an "exclusive system" to ensure it runs before other systems
+            // in CoreStage::First
+            .add_system_to_stage(
+                CoreStage::First,
+                time_system.exclusive_system().label(TimeSystem),
+            );
+    }
+}
+
+fn time_system(mut time: ResMut<Time>) {
+    time.update();
+}

examples/2d/rotation.rs

@@ -1,7 +1,7 @@
 use bevy::{
-    core::FixedTimestep,
     math::{const_vec2, Vec3Swizzles},
     prelude::*,
+    time::FixedTimestep,
 };
 
 const TIME_STEP: f32 = 1.0 / 60.0;

examples/ecs/fixed_timestep.rs

@@ -1,6 +1,6 @@
 use bevy::{
-    core::{FixedTimestep, FixedTimesteps},
     prelude::*,
+    time::{FixedTimestep, FixedTimesteps},
 };
 
 const LABEL: &str = "my_fixed_timestep";

examples/ecs/iter_combinations.rs

@@ -1,4 +1,4 @@
-use bevy::{core::FixedTimestep, pbr::AmbientLight, prelude::*, render::camera::Camera};
+use bevy::{pbr::AmbientLight, prelude::*, render::camera::Camera, time::FixedTimestep};
 use rand::{thread_rng, Rng};
 
 #[derive(Debug, Hash, PartialEq, Eq, Clone, StageLabel)]

examples/game/alien_cake_addict.rs

@@ -1,5 +1,5 @@
 use bevy::{
-    core::FixedTimestep, ecs::schedule::SystemSet, prelude::*, render::camera::CameraPlugin,
+    ecs::schedule::SystemSet, prelude::*, render::camera::CameraPlugin, time::FixedTimestep,
 };
 use rand::Rng;
 

examples/game/breakout.rs

@@ -1,7 +1,7 @@
 use bevy::{
-    core::FixedTimestep,
     prelude::*,
     sprite::collide_aabb::{collide, Collision},
+    time::FixedTimestep,
 };
 
 /// An implementation of the classic game "Breakout"

examples/tools/bevymark.rs

@@ -1,7 +1,7 @@
 use bevy::{
-    core::FixedTimestep,
     diagnostic::{Diagnostics, FrameTimeDiagnosticsPlugin, LogDiagnosticsPlugin},
     prelude::*,
+    time::FixedTimestep,
     window::PresentMode,
 };
 use rand::{thread_rng, Rng};