Skip to content

Commit

Permalink
Fixed a previous rebasing error
Browse files Browse the repository at this point in the history
  • Loading branch information
Trashtalk217 committed Jul 20, 2023
1 parent ee1381c commit 0a3ef4d
Showing 1 changed file with 7 additions and 27 deletions.
34 changes: 7 additions & 27 deletions crates/bevy_core/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ pub mod prelude {
}

use bevy_app::prelude::*;
use bevy_ecs::{
entity::Entity,
schedule::ExclusiveSystemDescriptorCoercion,
system::IntoExclusiveSystem,
};
use bevy_utils::HashSet;
use bevy_ecs::prelude::*;
use bevy_reflect::{ReflectDeserialize, ReflectSerialize};
use bevy_utils::{Duration, HashSet, Instant};
use std::borrow::Cow;
use std::ffi::OsString;
use std::marker::PhantomData;
use std::ops::Range;
use std::path::{Path, PathBuf};

Expand All @@ -40,27 +40,7 @@ pub struct TypeRegistrationPlugin;

impl Plugin for TypeRegistrationPlugin {
fn build(&self, app: &mut App) {
// Setup the default bevy task pools
app.world
.get_resource::<DefaultTaskPoolOptions>()
.cloned()
.unwrap_or_default()
.create_default_pools(&mut app.world);

app.init_resource::<Time>()
.init_resource::<FixedTimesteps>()
.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),
);
app.register_type::<Entity>().register_type::<Name>();

register_rust_types(app);
register_math_types(app);
Expand Down

0 comments on commit 0a3ef4d

Please sign in to comment.