forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename default_stage to stage

Browse Source
This commit is contained in:
Carter Anderson 2020-04-06 02:00:00 -07:00
parent 683a70d8e7
commit 016bf2152c
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bevy_app/src/app_builder.rs
View File

@ -1,5 +1,5 @@
use crate::{
default_stage,
stage,
plugin::{load_plugin, AppPlugin},
schedule_plan::SchedulePlan,
App, Events,
@ -119,7 +119,7 @@ impl AppBuilder {
}
pub fn add_system(&mut self, system: Box<dyn Schedulable>) -> &mut Self {
self.add_system_to_stage(default_stage::UPDATE, system)
self.add_system_to_stage(stage::UPDATE, system)
}
pub fn add_startup_system_to_stage(
@ -134,16 +134,16 @@ impl AppBuilder {
pub fn add_startup_system(&mut self, system: Box<dyn Schedulable>) -> &mut Self {
self.startup_schedule_plan
.add_system_to_stage(default_stage::STARTUP, system);
.add_system_to_stage(stage::STARTUP, system);
self
}
pub fn add_default_stages(&mut self) -> &mut Self {
self.add_startup_stage(default_stage::STARTUP)
.add_stage(default_stage::FIRST)
.add_stage(default_stage::EVENT_UPDATE)
.add_stage(default_stage::UPDATE)
.add_stage(default_stage::LAST)
self.add_startup_stage(stage::STARTUP)
.add_stage(stage::FIRST)
.add_stage(stage::EVENT_UPDATE)
.add_stage(stage::UPDATE)
.add_stage(stage::LAST)
}
pub fn build_system<F>(&mut self, build: F) -> &mut Self
@ -189,7 +189,7 @@ impl AppBuilder {
{
self.add_resource(Events::<T>::default())
.add_system_to_stage(
default_stage::EVENT_UPDATE,
stage::EVENT_UPDATE,
Events::<T>::build_update_system(),
)
}

2
bevy_app/src/lib.rs
View File

@ -4,7 +4,7 @@ mod event;
mod plugin;
pub mod schedule_plan;
pub mod schedule_runner;
pub mod default_stage;
pub mod stage;
pub use app::*;
pub use app_builder::*;

0
bevy_app/src/default_stage.rs → bevy_app/src/stage.rs
View File

6
bevy_core/src/lib.rs
View File

@ -1,7 +1,7 @@
pub mod bytes;
pub mod time;
use bevy_app::{default_stage, AppBuilder, AppPlugin};
use bevy_app::{stage, AppBuilder, AppPlugin};
use bevy_transform::transform_system_bundle;
use time::{start_timer_system, stop_timer_system};
@ -15,7 +15,7 @@ impl AppPlugin for CorePlugin {
}
app.add_resource(time::Time::new())
.add_system_to_stage(default_stage::FIRST, start_timer_system())
.add_system_to_stage(default_stage::LAST, stop_timer_system());
.add_system_to_stage(stage::FIRST, start_timer_system())
.add_system_to_stage(stage::LAST, stop_timer_system());
}
}

4
bevy_render/src/lib.rs
View File

@ -48,7 +48,7 @@ use self::{
},
};
use bevy_app::{AppBuilder, AppPlugin, GetEventReader, default_stage};
use bevy_app::{AppBuilder, AppPlugin, GetEventReader, stage};
use bevy_transform::prelude::LocalToWorld;
use bevy_asset::AssetStorage;
use bevy_window::WindowResized;
@ -96,7 +96,7 @@ impl AppPlugin for RenderPlugin {
asset_batchers.batch_types2::<Mesh, StandardMaterial>();
app
.add_system(build_entity_render_resource_assignments_system())
.add_stage_after(default_stage::UPDATE, RENDER_STAGE)
.add_stage_after(stage::UPDATE, RENDER_STAGE)
.add_resource(RenderGraph::default())
.add_resource(AssetStorage::<Mesh>::new())
.add_resource(AssetStorage::<Texture>::new())