diff --git a/crates/bevy_app/src/app.rs b/crates/bevy_app/src/app.rs index 6e686f6671..73f243250b 100644 --- a/crates/bevy_app/src/app.rs +++ b/crates/bevy_app/src/app.rs @@ -2,7 +2,6 @@ use super::AppBuilder; use legion::prelude::*; pub struct App { - pub universe: Universe, pub world: World, pub resources: Resources, pub runner: Option>, @@ -13,9 +12,9 @@ impl Default for App { fn default() -> Self { let universe = Universe::new(); let world = universe.create_world(); - let resources = Resources::default(); + let mut resources = Resources::default(); + resources.insert(universe); App { - universe, world, resources, runner: None, diff --git a/crates/bevy_app/src/app_builder.rs b/crates/bevy_app/src/app_builder.rs index b87e34b79e..aecafdc311 100644 --- a/crates/bevy_app/src/app_builder.rs +++ b/crates/bevy_app/src/app_builder.rs @@ -4,7 +4,7 @@ use crate::{ stage, App, AppExit, Events, FromResources, System, }; -use legion::prelude::{IntoSystem, Resources, Universe, World}; +use legion::prelude::{IntoSystem, Resources, World}; static APP_MISSING_MESSAGE: &str = "This AppBuilder no longer has an App. Check to see if you already called run(). A call to app_builder.run() consumes the AppBuilder's App."; @@ -53,14 +53,6 @@ impl AppBuilder { &mut self.app_mut().world } - pub fn universe(&self) -> &Universe { - &self.app().universe - } - - pub fn universe_mut(&mut self) -> &mut Universe { - &mut self.app_mut().universe - } - pub fn resources(&self) -> &Resources { &self.app().resources } diff --git a/crates/bevy_serialization/src/lib.rs b/crates/bevy_serialization/src/lib.rs index 618a288ed7..b380bf8948 100644 --- a/crates/bevy_serialization/src/lib.rs +++ b/crates/bevy_serialization/src/lib.rs @@ -1,7 +1,3 @@ mod world; pub use world::*; - -pub fn type_name_of_val(_: T) -> &'static str { - std::any::type_name::() -}