mirror of
https://github.com/bevyengine/bevy
synced 2024-11-26 06:30:19 +00:00
b724a0f586
# Objective - Remove all the `.system()` possible. - Check for remaining missing cases. ## Solution - Remove all `.system()`, fix compile errors - 32 calls to `.system()` remains, mostly internals, the few others should be removed after #2446
89 lines
2.6 KiB
Rust
89 lines
2.6 KiB
Rust
mod anchors;
|
|
mod flex;
|
|
mod focus;
|
|
mod margins;
|
|
mod render;
|
|
mod ui_node;
|
|
|
|
pub mod entity;
|
|
pub mod update;
|
|
pub mod widget;
|
|
|
|
pub use anchors::*;
|
|
pub use flex::*;
|
|
pub use focus::*;
|
|
pub use margins::*;
|
|
pub use render::*;
|
|
pub use ui_node::*;
|
|
|
|
pub mod prelude {
|
|
#[doc(hidden)]
|
|
pub use crate::{entity::*, ui_node::*, widget::Button, Anchors, Interaction, Margins};
|
|
}
|
|
|
|
use bevy_app::prelude::*;
|
|
use bevy_ecs::schedule::{ParallelSystemDescriptorCoercion, SystemLabel};
|
|
use bevy_input::InputSystem;
|
|
use bevy_math::{Rect, Size};
|
|
use bevy_render::RenderStage;
|
|
use bevy_transform::TransformSystem;
|
|
use update::ui_z_system;
|
|
|
|
#[derive(Default)]
|
|
pub struct UiPlugin;
|
|
|
|
#[derive(Debug, Hash, PartialEq, Eq, Clone, SystemLabel)]
|
|
pub enum UiSystem {
|
|
/// After this label, the ui flex state has been updated
|
|
Flex,
|
|
Focus,
|
|
}
|
|
|
|
impl Plugin for UiPlugin {
|
|
fn build(&self, app: &mut App) {
|
|
app.init_resource::<FlexSurface>()
|
|
.register_type::<AlignContent>()
|
|
.register_type::<AlignItems>()
|
|
.register_type::<AlignSelf>()
|
|
.register_type::<Direction>()
|
|
.register_type::<Display>()
|
|
.register_type::<FlexDirection>()
|
|
.register_type::<FlexWrap>()
|
|
.register_type::<JustifyContent>()
|
|
.register_type::<Node>()
|
|
.register_type::<PositionType>()
|
|
.register_type::<Size<f32>>()
|
|
.register_type::<Size<Val>>()
|
|
.register_type::<Rect<Val>>()
|
|
.register_type::<Style>()
|
|
.register_type::<Val>()
|
|
.add_system_to_stage(
|
|
CoreStage::PreUpdate,
|
|
ui_focus_system.label(UiSystem::Focus).after(InputSystem),
|
|
)
|
|
// add these stages to front because these must run before transform update systems
|
|
.add_system_to_stage(
|
|
CoreStage::PostUpdate,
|
|
widget::text_system.before(UiSystem::Flex),
|
|
)
|
|
.add_system_to_stage(
|
|
CoreStage::PostUpdate,
|
|
widget::image_node_system.before(UiSystem::Flex),
|
|
)
|
|
.add_system_to_stage(
|
|
CoreStage::PostUpdate,
|
|
flex_node_system
|
|
.label(UiSystem::Flex)
|
|
.before(TransformSystem::TransformPropagate),
|
|
)
|
|
.add_system_to_stage(
|
|
CoreStage::PostUpdate,
|
|
ui_z_system
|
|
.after(UiSystem::Flex)
|
|
.before(TransformSystem::TransformPropagate),
|
|
)
|
|
.add_system_to_stage(RenderStage::Draw, widget::draw_text_system);
|
|
|
|
crate::render::add_ui_graph(&mut app.world);
|
|
}
|
|
}
|