Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ use bevy::prelude::*;

fn main(){
App::new()
.add_plugins(DefaultPlugins)
.add_plugin_group(DefaultPlugins)
.run();
}
```
Expand Down
15 changes: 12 additions & 3 deletions crates/bevy_app/src/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,7 @@ impl App {
/// One of Bevy's core principles is modularity. All Bevy engine features are implemented
/// as [`Plugin`]s. This includes internal features like the renderer.
///
/// Bevy also provides a few sets of default [`Plugin`]s. See [`add_plugins`](Self::add_plugins).
/// Bevy also provides a few sets of default [`Plugin`]s. See [`add_plugin_group`](Self::add_plugin_group).
///
/// # Examples
///
Expand Down Expand Up @@ -814,6 +814,15 @@ impl App {
.collect()
}

/// This function is deprecated. Please use `add_plugin_group` instead.
#[deprecated(
since = "0.10.0",
note = "This function is deprecated in favor of add_plugin_group."
)]
pub fn add_plugins<T: PluginGroup>(&mut self, group: T) -> &mut Self {
self.add_plugin_group(group)
}

/// Adds a group of [`Plugin`]s.
///
/// [`Plugin`]s can be grouped into a set by using a [`PluginGroup`].
Expand All @@ -830,13 +839,13 @@ impl App {
/// # use bevy_app::{prelude::*, PluginGroupBuilder, NoopPluginGroup as MinimalPlugins};
/// #
/// App::new()
/// .add_plugins(MinimalPlugins);
/// .add_plugin_group(MinimalPlugins);
/// ```
///
/// # Panics
///
/// Panics if one of the plugin in the group was already added to the application.
pub fn add_plugins<T: PluginGroup>(&mut self, group: T) -> &mut Self {
pub fn add_plugin_group<T: PluginGroup>(&mut self, group: T) -> &mut Self {
let builder = group.build();
builder.finish(self);
self
Expand Down
2 changes: 1 addition & 1 deletion crates/bevy_app/src/plugin_group.rs
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ impl PluginGroupBuilder {
/// use bevy_app::NoopPluginGroup as MinimalPlugins;
///
/// fn main(){
/// App::new().add_plugins(MinimalPlugins).run();
/// App::new().add_plugin_group(MinimalPlugins).run();
/// }
/// ```
#[doc(hidden)]
Expand Down
2 changes: 1 addition & 1 deletion crates/bevy_audio/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//! # use bevy_app::{App, AppExit, NoopPluginGroup as MinimalPlugins};
//! fn main() {
//! App::new()
//! .add_plugins(MinimalPlugins)
//! .add_plugin_group(MinimalPlugins)
//! .add_plugin(AssetPlugin::default())
//! .add_plugin(AudioPlugin)
//! .add_startup_system(play_background_audio)
Expand Down
4 changes: 2 additions & 2 deletions crates/bevy_log/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ use tracing_subscriber::{prelude::*, registry::Registry, EnvFilter};
/// # use bevy_utils::tracing::Level;
/// fn main() {
/// App::new()
/// .add_plugins(DefaultPlugins.set(LogPlugin {
/// .add_plugin_group(DefaultPlugins.set(LogPlugin {
/// level: Level::DEBUG,
/// filter: "wgpu=error,bevy_render=info,bevy_ecs=trace".to_string(),
/// }))
Expand All @@ -74,7 +74,7 @@ use tracing_subscriber::{prelude::*, registry::Registry, EnvFilter};
/// # use bevy_log::LogPlugin;
/// fn main() {
/// App::new()
/// .add_plugins(DefaultPlugins.build().disable::<LogPlugin>())
/// .add_plugin_group(DefaultPlugins.build().disable::<LogPlugin>())
/// .run();
/// }
/// ```
Expand Down
6 changes: 3 additions & 3 deletions errors/B0001.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ fn move_enemies_to_player(

fn main() {
App::new()
.add_plugins(DefaultPlugins)
.add_plugin_group(DefaultPlugins)
.add_system(move_enemies_to_player)
.run();
}
Expand Down Expand Up @@ -54,7 +54,7 @@ fn move_enemies_to_player(

fn main() {
App::new()
.add_plugins(DefaultPlugins)
.add_plugin_group(DefaultPlugins)
.add_system(move_enemies_to_player)
.run();
}
Expand Down Expand Up @@ -84,7 +84,7 @@ fn move_enemies_to_player(

fn main() {
App::new()
.add_plugins(DefaultPlugins)
.add_plugin_group(DefaultPlugins)
.add_system(move_enemies_to_player)
.run();
}
Expand Down
4 changes: 2 additions & 2 deletions errors/B0002.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ fn update_materials(

fn main() {
App::new()
.add_plugins(DefaultPlugins)
.add_plugin_group(DefaultPlugins)
.add_system(update_materials)
.run();
}
Expand All @@ -37,7 +37,7 @@ fn update_materials(

fn main() {
App::new()
.add_plugins(DefaultPlugins)
.add_plugin_group(DefaultPlugins)
.add_system(update_materials)
.run();
}
Expand Down
2 changes: 1 addition & 1 deletion errors/B0003.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use bevy::prelude::*;

fn main() {
App::new()
.add_plugins(DefaultPlugins)
.add_plugin_group(DefaultPlugins)
.add_startup_system(setup)
.add_system(despawning)
.add_system(use_entity.after(despawning))
Expand Down
4 changes: 2 additions & 2 deletions errors/B0004.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ fn setup_cube(

fn main() {
App::new()
.add_plugins(DefaultPlugins)
.add_plugin_group(DefaultPlugins)
.add_startup_system(setup_cube)
.run();
}
Expand Down Expand Up @@ -96,7 +96,7 @@ fn setup_cube(

fn main() {
App::new()
.add_plugins(DefaultPlugins)
.add_plugin_group(DefaultPlugins)
.add_startup_system(setup_cube)
.run();
}
Expand Down
2 changes: 1 addition & 1 deletion examples/2d/2d_shapes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use bevy::{prelude::*, sprite::MaterialMesh2dBundle};

fn main() {
App::new()
.add_plugins(DefaultPlugins)
.add_plugin_group(DefaultPlugins)
.add_startup_system(setup)
.run();
}
Expand Down
2 changes: 1 addition & 1 deletion examples/2d/mesh2d.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use bevy::{prelude::*, sprite::MaterialMesh2dBundle};

fn main() {
App::new()
.add_plugins(DefaultPlugins)
.add_plugin_group(DefaultPlugins)
.add_startup_system(setup)
.run();
}
Expand Down
2 changes: 1 addition & 1 deletion examples/2d/mesh2d_manual.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ use bevy::{

fn main() {
App::new()
.add_plugins(DefaultPlugins)
.add_plugin_group(DefaultPlugins)
.add_plugin(ColoredMesh2dPlugin)
.add_startup_system(star)
.run();
Expand Down
2 changes: 1 addition & 1 deletion examples/2d/mesh2d_vertex_color_texture.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use bevy::{

fn main() {
App::new()
.add_plugins(DefaultPlugins)
.add_plugin_group(DefaultPlugins)
.add_startup_system(setup)
.run();
}
Expand Down
2 changes: 1 addition & 1 deletion examples/2d/move_sprite.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use bevy::prelude::*;

fn main() {
App::new()
.add_plugins(DefaultPlugins)
.add_plugin_group(DefaultPlugins)
.add_startup_system(setup)
.add_system(sprite_movement)
.run();
Expand Down
2 changes: 1 addition & 1 deletion examples/2d/pixel_perfect.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use bevy::prelude::*;

fn main() {
App::new()
.add_plugins(DefaultPlugins.set(ImagePlugin::default_nearest()))
.add_plugin_group(DefaultPlugins.set(ImagePlugin::default_nearest()))
.add_startup_system(setup)
.add_system(sprite_movement)
.run();
Expand Down
2 changes: 1 addition & 1 deletion examples/2d/rotation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const BOUNDS: Vec2 = Vec2::new(1200.0, 640.0);

fn main() {
App::new()
.add_plugins(DefaultPlugins)
.add_plugin_group(DefaultPlugins)
.add_startup_system(setup)
.add_systems_to_schedule(
CoreSchedule::FixedUpdate,
Expand Down
2 changes: 1 addition & 1 deletion examples/2d/sprite.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use bevy::prelude::*;

fn main() {
App::new()
.add_plugins(DefaultPlugins)
.add_plugin_group(DefaultPlugins)
.add_startup_system(setup)
.run();
}
Expand Down
2 changes: 1 addition & 1 deletion examples/2d/sprite_flipping.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use bevy::prelude::*;

fn main() {
App::new()
.add_plugins(DefaultPlugins)
.add_plugin_group(DefaultPlugins)
.add_startup_system(setup)
.run();
}
Expand Down
2 changes: 1 addition & 1 deletion examples/2d/sprite_sheet.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use bevy::prelude::*;

fn main() {
App::new()
.add_plugins(DefaultPlugins.set(ImagePlugin::default_nearest())) // prevents blurry sprites
.add_plugin_group(DefaultPlugins.set(ImagePlugin::default_nearest())) // prevents blurry sprites
.add_startup_system(setup)
.add_system(animate_sprite)
.run();
Expand Down
2 changes: 1 addition & 1 deletion examples/2d/text2d.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use bevy::{

fn main() {
App::new()
.add_plugins(DefaultPlugins)
.add_plugin_group(DefaultPlugins)
.add_startup_system(setup)
.add_system(animate_translation)
.add_system(animate_rotation)
Expand Down
2 changes: 1 addition & 1 deletion examples/2d/texture_atlas.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use bevy::{asset::LoadState, prelude::*};
fn main() {
App::new()
.init_resource::<RpgSpriteHandles>()
.add_plugins(DefaultPlugins.set(ImagePlugin::default_nearest())) // prevents blurry sprites
.add_plugin_group(DefaultPlugins.set(ImagePlugin::default_nearest())) // prevents blurry sprites
.add_state::<AppState>()
.add_system_to_schedule(OnEnter(AppState::Setup), load_textures)
.add_system(check_textures.on_update(AppState::Setup))
Expand Down
2 changes: 1 addition & 1 deletion examples/2d/transparency_2d.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use bevy::prelude::*;

fn main() {
App::new()
.add_plugins(DefaultPlugins)
.add_plugin_group(DefaultPlugins)
.add_startup_system(setup)
.run();
}
Expand Down
2 changes: 1 addition & 1 deletion examples/3d/3d_scene.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use bevy::prelude::*;

fn main() {
App::new()
.add_plugins(DefaultPlugins)
.add_plugin_group(DefaultPlugins)
.add_startup_system(setup)
.run();
}
Expand Down
2 changes: 1 addition & 1 deletion examples/3d/3d_shapes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use bevy::{

fn main() {
App::new()
.add_plugins(DefaultPlugins.set(ImagePlugin::default_nearest()))
.add_plugin_group(DefaultPlugins.set(ImagePlugin::default_nearest()))
.add_startup_system(setup)
.add_system(rotate)
.run();
Expand Down
2 changes: 1 addition & 1 deletion examples/3d/atmospheric_fog.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use bevy::{

fn main() {
App::new()
.add_plugins(DefaultPlugins)
.add_plugin_group(DefaultPlugins)
.add_startup_system(setup_camera_fog)
.add_startup_system(setup_terrain_scene)
.add_startup_system(setup_instructions)
Expand Down
2 changes: 1 addition & 1 deletion examples/3d/blend_modes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use rand::random;
fn main() {
let mut app = App::new();

app.add_plugins(DefaultPlugins)
app.add_plugin_group(DefaultPlugins)
.add_startup_system(setup)
.add_system(example_control_system);

Expand Down
2 changes: 1 addition & 1 deletion examples/3d/bloom.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use std::{

fn main() {
App::new()
.add_plugins(DefaultPlugins)
.add_plugin_group(DefaultPlugins)
.add_startup_system(setup_scene)
.add_system(update_bloom_settings)
.add_system(bounce_spheres)
Expand Down
2 changes: 1 addition & 1 deletion examples/3d/fog.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use bevy::{

fn main() {
App::new()
.add_plugins(DefaultPlugins)
.add_plugin_group(DefaultPlugins)
.add_startup_system(setup_camera_fog)
.add_startup_system(setup_pyramid_scene)
.add_startup_system(setup_instructions)
Expand Down
2 changes: 1 addition & 1 deletion examples/3d/fxaa.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ fn main() {
App::new()
// Disable MSAA by default
.insert_resource(Msaa::Off)
.add_plugins(DefaultPlugins)
.add_plugin_group(DefaultPlugins)
.add_startup_system(setup)
.add_system(toggle_fxaa)
.run();
Expand Down
2 changes: 1 addition & 1 deletion examples/3d/lighting.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use bevy::{pbr::CascadeShadowConfigBuilder, prelude::*};

fn main() {
App::new()
.add_plugins(DefaultPlugins)
.add_plugin_group(DefaultPlugins)
.add_startup_system(setup)
.add_system(movement)
.add_system(animate_light_direction)
Expand Down
2 changes: 1 addition & 1 deletion examples/3d/lines.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use bevy::{

fn main() {
App::new()
.add_plugins(DefaultPlugins)
.add_plugin_group(DefaultPlugins)
.add_plugin(MaterialPlugin::<LineMaterial>::default())
.add_startup_system(setup)
.run();
Expand Down
2 changes: 1 addition & 1 deletion examples/3d/load_gltf.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ fn main() {
brightness: 1.0 / 5.0f32,
})
.insert_resource(DirectionalLightShadowMap { size: 4096 })
.add_plugins(DefaultPlugins)
.add_plugin_group(DefaultPlugins)
.add_startup_system(setup)
.add_system(animate_light_direction)
.run();
Expand Down
2 changes: 1 addition & 1 deletion examples/3d/msaa.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use bevy::prelude::*;
fn main() {
App::new()
.insert_resource(Msaa::default())
.add_plugins(DefaultPlugins)
.add_plugin_group(DefaultPlugins)
.add_startup_system(setup)
.add_system(cycle_msaa)
.run();
Expand Down
2 changes: 1 addition & 1 deletion examples/3d/orthographic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use bevy::{prelude::*, render::camera::ScalingMode};

fn main() {
App::new()
.add_plugins(DefaultPlugins)
.add_plugin_group(DefaultPlugins)
.add_startup_system(setup)
.run();
}
Expand Down
2 changes: 1 addition & 1 deletion examples/3d/parenting.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use bevy::prelude::*;

fn main() {
App::new()
.add_plugins(DefaultPlugins)
.add_plugin_group(DefaultPlugins)
.add_startup_system(setup)
.add_system(rotator_system)
.run();
Expand Down
Loading