diff --git a/crates/bevy_app/src/app.rs b/crates/bevy_app/src/app.rs index 02402e8878..fc20912964 100644 --- a/crates/bevy_app/src/app.rs +++ b/crates/bevy_app/src/app.rs @@ -1,4 +1,4 @@ -use super::AppBuilder; +use crate::app_builder::AppBuilder; use bevy_ecs::{ParallelExecutor, Resources, Schedule, World}; #[derive(Default)] diff --git a/crates/bevy_app/src/app_builder.rs b/crates/bevy_app/src/app_builder.rs index fd01e10b89..1979f5efda 100644 --- a/crates/bevy_app/src/app_builder.rs +++ b/crates/bevy_app/src/app_builder.rs @@ -1,8 +1,7 @@ use crate::{ plugin::{load_plugin, AppPlugin}, - stage, startup_stage, App, AppExit, Events, + stage, startup_stage, app::{AppExit, App}, event::Events }; - use bevy_ecs::{FromResources, IntoQuerySystem, Resources, System, World}; pub struct AppBuilder { diff --git a/crates/bevy_app/src/lib.rs b/crates/bevy_app/src/lib.rs index 66a257e362..57d3eeceb2 100644 --- a/crates/bevy_app/src/lib.rs +++ b/crates/bevy_app/src/lib.rs @@ -1,13 +1,26 @@ +pub mod stage; + mod app; mod app_builder; mod event; mod plugin; -pub mod schedule_runner; -pub mod stage; -pub mod startup_stage; +mod schedule_runner; +mod startup_stage; pub use app::*; pub use app_builder::*; pub use bevy_derive::DynamicAppPlugin; pub use event::*; pub use plugin::*; +pub use schedule_runner::*; +pub use startup_stage::*; + +pub mod prelude { + pub use crate::{ + app::App, + app_builder::AppBuilder, + event::{EventReader, Events}, + plugin::AppPlugin, + stage, DynamicAppPlugin, + }; +} diff --git a/crates/bevy_app/src/plugin.rs b/crates/bevy_app/src/plugin.rs index a76b1b7fa2..b1faf82153 100644 --- a/crates/bevy_app/src/plugin.rs +++ b/crates/bevy_app/src/plugin.rs @@ -1,6 +1,6 @@ -use super::AppBuilder; use libloading::{Library, Symbol}; use std::any::Any; +use crate::AppBuilder; pub trait AppPlugin: Any + Send + Sync { fn build(&self, app: &mut AppBuilder); diff --git a/crates/bevy_app/src/schedule_runner.rs b/crates/bevy_app/src/schedule_runner.rs index 25269f815d..912682d197 100644 --- a/crates/bevy_app/src/schedule_runner.rs +++ b/crates/bevy_app/src/schedule_runner.rs @@ -1,6 +1,6 @@ -use super::{App, AppBuilder, AppPlugin}; -use crate::{AppExit, EventReader, Events}; +use super::{App, AppBuilder}; use std::{thread, time::Duration}; +use crate::{event::{Events, EventReader}, plugin::AppPlugin, app::AppExit}; #[derive(Copy, Clone, Debug)] pub enum RunMode { diff --git a/crates/bevy_asset/src/assets.rs b/crates/bevy_asset/src/assets.rs index 36758895cb..beb21d480c 100644 --- a/crates/bevy_asset/src/assets.rs +++ b/crates/bevy_asset/src/assets.rs @@ -2,7 +2,7 @@ use crate::{ update_asset_storage_system, AssetChannel, AssetLoader, AssetServer, ChannelAssetHandler, Handle, HandleId, }; -use bevy_app::{AppBuilder, Events}; +use bevy_app::{prelude::Events, AppBuilder}; use bevy_ecs::{FromResources, IntoQuerySystem, ResMut, Resource}; use bevy_type_registry::RegisterType; use std::collections::HashMap; diff --git a/crates/bevy_asset/src/lib.rs b/crates/bevy_asset/src/lib.rs index 5cc44f5edb..e052a8e51e 100644 --- a/crates/bevy_asset/src/lib.rs +++ b/crates/bevy_asset/src/lib.rs @@ -12,7 +12,7 @@ pub use handle::*; pub use load_request::*; pub use loader::*; -use bevy_app::{AppBuilder, AppPlugin}; +use bevy_app::{prelude::AppPlugin, AppBuilder}; use bevy_ecs::IntoQuerySystem; use bevy_type_registry::RegisterType; diff --git a/crates/bevy_audio/src/lib.rs b/crates/bevy_audio/src/lib.rs index 055f628f24..886e3f8b8c 100644 --- a/crates/bevy_audio/src/lib.rs +++ b/crates/bevy_audio/src/lib.rs @@ -4,7 +4,7 @@ mod audio_source; pub use audio_output::*; pub use audio_source::*; -use bevy_app::{stage, AppBuilder, AppPlugin}; +use bevy_app::prelude::*; use bevy_asset::AddAsset; use bevy_ecs::IntoQuerySystem; diff --git a/crates/bevy_core/src/lib.rs b/crates/bevy_core/src/lib.rs index f5a6b78ea1..5ef35d465a 100644 --- a/crates/bevy_core/src/lib.rs +++ b/crates/bevy_core/src/lib.rs @@ -6,7 +6,7 @@ pub use bytes::*; pub use float_ord::*; pub use time::*; -use bevy_app::{stage, AppBuilder, AppPlugin}; +use bevy_app::prelude::*; use bevy_ecs::IntoQuerySystem; use bevy_math::{Mat3, Mat4, Quat, Vec2, Vec3}; use bevy_type_registry::RegisterType; diff --git a/crates/bevy_diagnostic/src/frame_time_diagnostics_plugin.rs b/crates/bevy_diagnostic/src/frame_time_diagnostics_plugin.rs index b483e0fee3..50427115bd 100644 --- a/crates/bevy_diagnostic/src/frame_time_diagnostics_plugin.rs +++ b/crates/bevy_diagnostic/src/frame_time_diagnostics_plugin.rs @@ -1,5 +1,5 @@ use crate::{Diagnostic, DiagnosticId, Diagnostics}; -use bevy_app::AppPlugin; +use bevy_app::prelude::*; use bevy_core::Time; use bevy_ecs::{IntoQuerySystem, Res, ResMut}; diff --git a/crates/bevy_diagnostic/src/lib.rs b/crates/bevy_diagnostic/src/lib.rs index 76371b09ff..159eacb769 100644 --- a/crates/bevy_diagnostic/src/lib.rs +++ b/crates/bevy_diagnostic/src/lib.rs @@ -7,7 +7,7 @@ pub use diagnostic::*; pub use frame_time_diagnostics_plugin::FrameTimeDiagnosticsPlugin; pub use print_diagnostics_plugin::PrintDiagnosticsPlugin; -use bevy_app::{AppBuilder, AppPlugin}; +use bevy_app::prelude::*; pub struct PrintDiagnostics {} diff --git a/crates/bevy_diagnostic/src/print_diagnostics_plugin.rs b/crates/bevy_diagnostic/src/print_diagnostics_plugin.rs index c694fc47aa..717a6bf3eb 100644 --- a/crates/bevy_diagnostic/src/print_diagnostics_plugin.rs +++ b/crates/bevy_diagnostic/src/print_diagnostics_plugin.rs @@ -1,5 +1,5 @@ use super::{Diagnostic, DiagnosticId, Diagnostics}; -use bevy_app::{stage, AppPlugin}; +use bevy_app::prelude::*; use bevy_core::{Time, Timer}; use bevy_ecs::{IntoQuerySystem, Res, ResMut}; use std::time::Duration; diff --git a/crates/bevy_gltf/src/lib.rs b/crates/bevy_gltf/src/lib.rs index 5728e4b9a2..48e897dee5 100644 --- a/crates/bevy_gltf/src/lib.rs +++ b/crates/bevy_gltf/src/lib.rs @@ -1,7 +1,7 @@ mod loader; pub use loader::*; -use bevy_app::{AppBuilder, AppPlugin}; +use bevy_app::prelude::*; use bevy_asset::AddAsset; use bevy_render::mesh::Mesh; diff --git a/crates/bevy_input/src/keyboard.rs b/crates/bevy_input/src/keyboard.rs index 1139fcb09f..22639b2e23 100644 --- a/crates/bevy_input/src/keyboard.rs +++ b/crates/bevy_input/src/keyboard.rs @@ -1,6 +1,6 @@ use crate::Input; -use bevy_app::{EventReader, Events}; use bevy_ecs::{Res, ResMut}; +use bevy_app::prelude::*; #[derive(Debug, Clone)] pub struct KeyboardInput { diff --git a/crates/bevy_input/src/lib.rs b/crates/bevy_input/src/lib.rs index e4567e29bc..ad0ed7cb19 100644 --- a/crates/bevy_input/src/lib.rs +++ b/crates/bevy_input/src/lib.rs @@ -5,7 +5,7 @@ pub mod system; pub use input::*; -use bevy_app::{AppBuilder, AppPlugin}; +use bevy_app::prelude::*; use keyboard::{keyboard_input_system, KeyCode, KeyboardInput, KeyboardInputState}; use mouse::{ mouse_button_input_system, MouseButton, MouseButtonInput, MouseButtonInputState, MouseMotion, diff --git a/crates/bevy_input/src/mouse.rs b/crates/bevy_input/src/mouse.rs index ff9b18fe8e..1d3b7396eb 100644 --- a/crates/bevy_input/src/mouse.rs +++ b/crates/bevy_input/src/mouse.rs @@ -1,6 +1,6 @@ use super::keyboard::ElementState; use crate::Input; -use bevy_app::{EventReader, Events}; +use bevy_app::prelude::{EventReader, Events}; use bevy_ecs::{Res, ResMut}; use bevy_math::Vec2; diff --git a/crates/bevy_input/src/system.rs b/crates/bevy_input/src/system.rs index 9118be21ff..668397e5c9 100644 --- a/crates/bevy_input/src/system.rs +++ b/crates/bevy_input/src/system.rs @@ -1,5 +1,8 @@ use crate::keyboard::{ElementState, KeyCode, KeyboardInput}; -use bevy_app::{AppExit, EventReader, Events}; +use bevy_app::{ + prelude::{EventReader, Events}, + AppExit, +}; use bevy_ecs::{Local, Res, ResMut}; #[derive(Default)] diff --git a/crates/bevy_pbr/src/lib.rs b/crates/bevy_pbr/src/lib.rs index 8a3b7d9e46..b2bf3800c1 100644 --- a/crates/bevy_pbr/src/lib.rs +++ b/crates/bevy_pbr/src/lib.rs @@ -7,7 +7,7 @@ pub mod pipelines; mod forward_pbr_render_graph; pub use forward_pbr_render_graph::*; -use bevy_app::{stage, AppBuilder, AppPlugin}; +use bevy_app::prelude::*; use bevy_asset::AddAsset; use bevy_ecs::IntoQuerySystem; use bevy_render::{render_graph::RenderGraph, shader}; diff --git a/crates/bevy_render/src/camera/camera.rs b/crates/bevy_render/src/camera/camera.rs index 697f466dea..b1be75fec1 100644 --- a/crates/bevy_render/src/camera/camera.rs +++ b/crates/bevy_render/src/camera/camera.rs @@ -1,9 +1,9 @@ use super::CameraProjection; -use bevy_app::{EventReader, Events}; use bevy_ecs::{Component, Local, Query, Res}; use bevy_math::Mat4; use bevy_property::Properties; use bevy_window::{WindowCreated, WindowReference, WindowResized, Windows}; +use bevy_app::prelude::{Events, EventReader}; #[derive(Default, Debug, Properties)] pub struct Camera { diff --git a/crates/bevy_render/src/lib.rs b/crates/bevy_render/src/lib.rs index 784044bc7b..be0506d45d 100644 --- a/crates/bevy_render/src/lib.rs +++ b/crates/bevy_render/src/lib.rs @@ -9,7 +9,6 @@ pub mod render_graph; pub mod renderer; pub mod shader; pub mod texture; -pub mod vertex; mod entity; pub use once_cell; @@ -22,7 +21,7 @@ pub mod prelude { } use crate::prelude::*; -use bevy_app::{AppBuilder, AppPlugin}; +use bevy_app::prelude::*; use bevy_asset::AddAsset; use bevy_ecs::{IntoQuerySystem, IntoThreadLocalSystem}; use bevy_type_registry::RegisterType; diff --git a/crates/bevy_render/src/mesh.rs b/crates/bevy_render/src/mesh/mesh.rs similarity index 99% rename from crates/bevy_render/src/mesh.rs rename to crates/bevy_render/src/mesh/mesh.rs index cfd13a3851..b0255135db 100644 --- a/crates/bevy_render/src/mesh.rs +++ b/crates/bevy_render/src/mesh/mesh.rs @@ -1,12 +1,12 @@ +use super::Vertex; use crate::{ pipeline::{ AsVertexBufferDescriptor, IndexFormat, PrimitiveTopology, RenderPipelines, VertexBufferDescriptor, VertexBufferDescriptors, VertexFormat, }, renderer::{BufferInfo, BufferUsage, RenderResourceContext, RenderResourceId}, - vertex::Vertex, }; -use bevy_app::{EventReader, Events}; +use bevy_app::prelude::{EventReader, Events}; use bevy_asset::{AssetEvent, Assets, Handle}; use bevy_core::AsBytes; use bevy_ecs::{Local, Query, Res, ResMut}; @@ -509,7 +509,7 @@ pub fn mesh_resource_provider_system( #[cfg(test)] mod tests { use super::{AsVertexBufferDescriptor, Mesh, VertexAttribute}; - use crate::{pipeline::PrimitiveTopology, vertex::Vertex}; + use crate::{mesh::Vertex, pipeline::PrimitiveTopology}; use bevy_core::AsBytes; #[test] diff --git a/crates/bevy_render/src/mesh/mod.rs b/crates/bevy_render/src/mesh/mod.rs new file mode 100644 index 0000000000..0ee49efd90 --- /dev/null +++ b/crates/bevy_render/src/mesh/mod.rs @@ -0,0 +1,5 @@ +mod mesh; +mod vertex; + +pub use mesh::*; +pub use vertex::*; \ No newline at end of file diff --git a/crates/bevy_render/src/vertex.rs b/crates/bevy_render/src/mesh/vertex.rs similarity index 100% rename from crates/bevy_render/src/vertex.rs rename to crates/bevy_render/src/mesh/vertex.rs diff --git a/crates/bevy_render/src/render_graph/nodes/texture_copy_node.rs b/crates/bevy_render/src/render_graph/nodes/texture_copy_node.rs index 024af325f2..4164cc047f 100644 --- a/crates/bevy_render/src/render_graph/nodes/texture_copy_node.rs +++ b/crates/bevy_render/src/render_graph/nodes/texture_copy_node.rs @@ -3,7 +3,7 @@ use crate::{ renderer::{BufferInfo, BufferUsage, RenderContext}, texture::{Texture, TextureDescriptor, TEXTURE_ASSET_INDEX}, }; -use bevy_app::{EventReader, Events}; +use bevy_app::prelude::{EventReader, Events}; use bevy_asset::{AssetEvent, Assets}; use bevy_ecs::{Resources, World}; diff --git a/crates/bevy_render/src/render_graph/nodes/window_swapchain_node.rs b/crates/bevy_render/src/render_graph/nodes/window_swapchain_node.rs index 97e11fb65c..f0c557fea1 100644 --- a/crates/bevy_render/src/render_graph/nodes/window_swapchain_node.rs +++ b/crates/bevy_render/src/render_graph/nodes/window_swapchain_node.rs @@ -2,7 +2,7 @@ use crate::{ render_graph::{Node, ResourceSlotInfo, ResourceSlots}, renderer::{RenderContext, RenderResourceId, RenderResourceType}, }; -use bevy_app::{EventReader, Events}; +use bevy_app::prelude::{EventReader, Events}; use bevy_ecs::{Resources, World}; use bevy_window::{WindowCreated, WindowReference, WindowResized, Windows}; use std::borrow::Cow; diff --git a/crates/bevy_render/src/render_graph/nodes/window_texture_node.rs b/crates/bevy_render/src/render_graph/nodes/window_texture_node.rs index a1335ca688..185df88edc 100644 --- a/crates/bevy_render/src/render_graph/nodes/window_texture_node.rs +++ b/crates/bevy_render/src/render_graph/nodes/window_texture_node.rs @@ -3,7 +3,7 @@ use crate::{ renderer::{RenderContext, RenderResourceId, RenderResourceType}, texture::TextureDescriptor, }; -use bevy_app::{EventReader, Events}; +use bevy_app::prelude::{EventReader, Events}; use bevy_ecs::{Resources, World}; use bevy_window::{WindowCreated, WindowReference, WindowResized, Windows}; use std::borrow::Cow; diff --git a/crates/bevy_render/src/texture/texture.rs b/crates/bevy_render/src/texture/texture.rs index 3b4dddb714..7148c5030f 100644 --- a/crates/bevy_render/src/texture/texture.rs +++ b/crates/bevy_render/src/texture/texture.rs @@ -2,7 +2,7 @@ use super::{SamplerDescriptor, TextureDescriptor}; use crate::renderer::{ RenderResource, RenderResourceContext, RenderResourceId, RenderResourceType, }; -use bevy_app::{EventReader, Events}; +use bevy_app::prelude::{EventReader, Events}; use bevy_asset::{AssetEvent, Assets, Handle}; use bevy_ecs::{Res, ResMut}; use bevy_math::Vec2; diff --git a/crates/bevy_scene/src/lib.rs b/crates/bevy_scene/src/lib.rs index 5335708464..332c7c9f3f 100644 --- a/crates/bevy_scene/src/lib.rs +++ b/crates/bevy_scene/src/lib.rs @@ -7,7 +7,7 @@ pub use loaded_scenes::*; pub use scene::*; pub use scene_spawner::*; -use bevy_app::{stage, AppBuilder, AppPlugin}; +use bevy_app::prelude::*; use bevy_asset::AddAsset; use bevy_ecs::IntoThreadLocalSystem; diff --git a/crates/bevy_scene/src/scene_spawner.rs b/crates/bevy_scene/src/scene_spawner.rs index 800a76eb12..37bbd72ea1 100644 --- a/crates/bevy_scene/src/scene_spawner.rs +++ b/crates/bevy_scene/src/scene_spawner.rs @@ -1,5 +1,5 @@ use crate::Scene; -use bevy_app::{EventReader, Events}; +use bevy_app::prelude::*; use bevy_asset::{AssetEvent, Assets, Handle}; use bevy_ecs::{Resources, World}; use bevy_type_registry::TypeRegistry; diff --git a/crates/bevy_sprite/src/lib.rs b/crates/bevy_sprite/src/lib.rs index 3759826acd..027fb57d9e 100644 --- a/crates/bevy_sprite/src/lib.rs +++ b/crates/bevy_sprite/src/lib.rs @@ -16,7 +16,7 @@ pub use sprite::*; pub use texture_atlas::*; pub use texture_atlas_builder::*; -use bevy_app::{stage, AppBuilder, AppPlugin}; +use bevy_app::prelude::*; use bevy_asset::{AddAsset, Assets, Handle}; use bevy_ecs::IntoQuerySystem; use bevy_math::Vec2; diff --git a/crates/bevy_text/src/lib.rs b/crates/bevy_text/src/lib.rs index 4757612378..73ff9c9e05 100644 --- a/crates/bevy_text/src/lib.rs +++ b/crates/bevy_text/src/lib.rs @@ -10,7 +10,7 @@ pub use font_atlas::*; pub use font_atlas_set::*; pub use font_loader::*; -use bevy_app::{AppBuilder, AppPlugin}; +use bevy_app::prelude::*; use bevy_asset::AddAsset; #[derive(Default)] diff --git a/crates/bevy_transform/src/lib.rs b/crates/bevy_transform/src/lib.rs index 10062fe3ce..83a03093f8 100644 --- a/crates/bevy_transform/src/lib.rs +++ b/crates/bevy_transform/src/lib.rs @@ -8,7 +8,7 @@ pub mod prelude { pub use crate::{components::*, hierarchy::*, TransformPlugin}; } -use bevy_app::{AppBuilder, AppPlugin}; +use bevy_app::prelude::*; use bevy_ecs::{IntoQuerySystem, System}; use bevy_type_registry::RegisterType; use prelude::{Children, LocalTransform, NonUniformScale, Rotation, Scale, Transform, Translation}; diff --git a/crates/bevy_type_registry/src/lib.rs b/crates/bevy_type_registry/src/lib.rs index 581b245d7f..8bba852d99 100644 --- a/crates/bevy_type_registry/src/lib.rs +++ b/crates/bevy_type_registry/src/lib.rs @@ -4,7 +4,7 @@ mod type_registry; pub use register_type::*; pub use type_registry::*; -use bevy_app::{AppBuilder, AppPlugin}; +use bevy_app::prelude::*; use bevy_property::DynamicProperties; #[derive(Default)] diff --git a/crates/bevy_ui/src/lib.rs b/crates/bevy_ui/src/lib.rs index 28cdbf13a1..536a5ca71d 100644 --- a/crates/bevy_ui/src/lib.rs +++ b/crates/bevy_ui/src/lib.rs @@ -12,7 +12,7 @@ pub use node::*; pub use render::*; pub use ui_update_system::*; -use bevy_app::{stage, AppBuilder, AppPlugin}; +use bevy_app::prelude::*; use bevy_ecs::IntoQuerySystem; use bevy_render::render_graph::RenderGraph; use widget::Label; diff --git a/crates/bevy_wgpu/src/diagnostic/wgpu_resource_diagnostics_plugin.rs b/crates/bevy_wgpu/src/diagnostic/wgpu_resource_diagnostics_plugin.rs index 0e4abc8ff8..ebb67096f3 100644 --- a/crates/bevy_wgpu/src/diagnostic/wgpu_resource_diagnostics_plugin.rs +++ b/crates/bevy_wgpu/src/diagnostic/wgpu_resource_diagnostics_plugin.rs @@ -1,5 +1,5 @@ use crate::renderer::WgpuRenderResourceContext; -use bevy_app::{AppBuilder, AppPlugin}; +use bevy_app::prelude::*; use bevy_diagnostic::{Diagnostic, DiagnosticId, Diagnostics}; use bevy_ecs::{IntoQuerySystem, Res, ResMut}; use bevy_render::renderer::RenderResourceContext; diff --git a/crates/bevy_wgpu/src/lib.rs b/crates/bevy_wgpu/src/lib.rs index 0a308fc88c..ccc71246c1 100644 --- a/crates/bevy_wgpu/src/lib.rs +++ b/crates/bevy_wgpu/src/lib.rs @@ -9,7 +9,7 @@ pub use wgpu_render_pass::*; pub use wgpu_renderer::*; pub use wgpu_resources::*; -use bevy_app::{AppBuilder, AppPlugin}; +use bevy_app::prelude::*; use bevy_ecs::{IntoQuerySystem, IntoThreadLocalSystem, Resources, World}; use bevy_render::renderer::{free_shared_buffers_system, RenderResourceContext, SharedBuffers}; use renderer::WgpuRenderResourceContext; diff --git a/crates/bevy_wgpu/src/wgpu_renderer.rs b/crates/bevy_wgpu/src/wgpu_renderer.rs index a953d1735c..cd7979f3af 100644 --- a/crates/bevy_wgpu/src/wgpu_renderer.rs +++ b/crates/bevy_wgpu/src/wgpu_renderer.rs @@ -1,5 +1,5 @@ use crate::renderer::{WgpuRenderGraphExecutor, WgpuRenderResourceContext}; -use bevy_app::{EventReader, Events}; +use bevy_app::prelude::*; use bevy_ecs::{Resources, World}; use bevy_render::{ render_graph::{DependentNodeStager, RenderGraph, RenderGraphStager}, diff --git a/crates/bevy_window/src/lib.rs b/crates/bevy_window/src/lib.rs index 84af0dd92c..854c0dd6d9 100644 --- a/crates/bevy_window/src/lib.rs +++ b/crates/bevy_window/src/lib.rs @@ -8,7 +8,7 @@ pub use system::*; pub use window::*; pub use windows::*; -use bevy_app::{AppBuilder, AppPlugin, Events}; +use bevy_app::prelude::*; use bevy_ecs::IntoQuerySystem; pub struct WindowPlugin { diff --git a/crates/bevy_window/src/system.rs b/crates/bevy_window/src/system.rs index 78a01bec20..19669fbb33 100644 --- a/crates/bevy_window/src/system.rs +++ b/crates/bevy_window/src/system.rs @@ -1,5 +1,8 @@ use crate::WindowCloseRequested; -use bevy_app::{AppExit, EventReader, Events}; +use bevy_app::{ + prelude::{EventReader, Events}, + AppExit, +}; use bevy_ecs::{Local, Res, ResMut}; #[derive(Default)] diff --git a/crates/bevy_winit/src/lib.rs b/crates/bevy_winit/src/lib.rs index 7caf626a6d..18042efdb5 100644 --- a/crates/bevy_winit/src/lib.rs +++ b/crates/bevy_winit/src/lib.rs @@ -7,7 +7,7 @@ use bevy_input::{ mouse::{MouseButtonInput, MouseMotion}, }; -use bevy_app::{App, AppBuilder, AppExit, AppPlugin, EventReader, Events}; +use bevy_app::{prelude::*, AppExit}; use bevy_ecs::Resources; use bevy_math::Vec2; use bevy_window::{ diff --git a/examples/app/headless.rs b/examples/app/headless.rs index 49508f1c0a..72bc607818 100644 --- a/examples/app/headless.rs +++ b/examples/app/headless.rs @@ -1,4 +1,4 @@ -use bevy::prelude::*; +use bevy::{app::ScheduleRunnerPlugin, prelude::*}; use std::time::Duration; // This example disables the default plugins by not registering them during setup. diff --git a/examples/ecs/ecs_guide.rs b/examples/ecs/ecs_guide.rs index c7c2d5efe9..c96c3e4935 100644 --- a/examples/ecs/ecs_guide.rs +++ b/examples/ecs/ecs_guide.rs @@ -1,4 +1,7 @@ -use bevy::{app::AppExit, prelude::*}; +use bevy::{ + app::{AppExit, ScheduleRunnerPlugin}, + prelude::*, +}; use rand::random; use std::time::Duration; diff --git a/examples/ecs/startup_system.rs b/examples/ecs/startup_system.rs index 10a2408c98..29e7f7da1d 100644 --- a/examples/ecs/startup_system.rs +++ b/examples/ecs/startup_system.rs @@ -1,4 +1,4 @@ -use bevy::{app::schedule_runner::ScheduleRunnerPlugin, prelude::*}; +use bevy::{app::ScheduleRunnerPlugin, prelude::*}; fn main() { App::build() diff --git a/src/prelude.rs b/src/prelude.rs index 7d04322495..514051cc9a 100644 --- a/src/prelude.rs +++ b/src/prelude.rs @@ -1,8 +1,5 @@ pub use crate::{ - app::{ - schedule_runner::ScheduleRunnerPlugin, stage, App, AppBuilder, AppPlugin, DynamicAppPlugin, - EventReader, Events, - }, + app::prelude::*, asset::{AddAsset, AssetEvent, AssetServer, Assets, Handle}, audio::{AudioOutput, AudioSource}, core::{Time, Timer},