From 66f2f76a181471075736f0e228cc1e1a4e364ba0 Mon Sep 17 00:00:00 2001 From: Carter Anderson Date: Mon, 2 Nov 2020 19:01:17 -0800 Subject: [PATCH] rename add_plugin_group to add_plugins (#773) --- crates/bevy_app/src/app_builder.rs | 4 ++-- examples/2d/sprite.rs | 2 +- examples/2d/sprite_sheet.rs | 2 +- examples/2d/texture_atlas.rs | 2 +- examples/3d/3d_scene.rs | 2 +- examples/3d/load_gltf.rs | 2 +- examples/3d/msaa.rs | 2 +- examples/3d/parenting.rs | 2 +- examples/3d/spawner.rs | 2 +- examples/3d/texture.rs | 2 +- examples/3d/z_sort_debug.rs | 2 +- examples/app/empty_defaults.rs | 2 +- examples/app/headless.rs | 4 ++-- examples/app/plugin.rs | 2 +- examples/app/plugin_group.rs | 6 +++--- examples/app/return_after_run.rs | 4 ++-- examples/app/thread_pool_resources.rs | 2 +- examples/asset/asset_loading.rs | 2 +- examples/asset/custom_asset.rs | 2 +- examples/asset/hot_asset_reloading.rs | 2 +- examples/audio/audio.rs | 2 +- examples/diagnostics/custom_diagnostic.rs | 2 +- examples/diagnostics/print_diagnostics.rs | 2 +- examples/ecs/event.rs | 2 +- examples/ecs/hierarchy.rs | 2 +- examples/ecs/parallel_query.rs | 2 +- examples/game/breakout.rs | 2 +- examples/input/gamepad_input.rs | 2 +- examples/input/gamepad_input_events.rs | 2 +- examples/input/keyboard_input.rs | 2 +- examples/input/keyboard_input_events.rs | 2 +- examples/input/mouse_input.rs | 2 +- examples/input/mouse_input_events.rs | 2 +- examples/input/touch_input.rs | 2 +- examples/input/touch_input_events.rs | 2 +- examples/ios/src/lib.rs | 2 +- examples/scene/properties.rs | 2 +- examples/scene/scene.rs | 2 +- examples/shader/mesh_custom_attribute.rs | 2 +- examples/shader/shader_custom_material.rs | 2 +- examples/shader/shader_defs.rs | 2 +- examples/ui/button.rs | 2 +- examples/ui/font_atlas_debug.rs | 2 +- examples/ui/text.rs | 2 +- examples/ui/ui.rs | 2 +- examples/wasm/assets_wasm.rs | 2 +- examples/wasm/winit_wasm.rs | 2 +- examples/window/clear_color.rs | 2 +- examples/window/multiple_windows.rs | 2 +- examples/window/window_settings.rs | 2 +- 50 files changed, 55 insertions(+), 55 deletions(-) diff --git a/crates/bevy_app/src/app_builder.rs b/crates/bevy_app/src/app_builder.rs index bff901098e..43c554dedd 100644 --- a/crates/bevy_app/src/app_builder.rs +++ b/crates/bevy_app/src/app_builder.rs @@ -272,14 +272,14 @@ impl AppBuilder { self } - pub fn add_plugin_group(&mut self, mut group: T) -> &mut Self { + pub fn add_plugins(&mut self, mut group: T) -> &mut Self { let mut plugin_group_builder = PluginGroupBuilder::default(); group.build(&mut plugin_group_builder); plugin_group_builder.finish(self); self } - pub fn add_plugin_group_with(&mut self, mut group: T, func: F) -> &mut Self + pub fn add_plugins_with(&mut self, mut group: T, func: F) -> &mut Self where T: PluginGroup, F: FnOnce(&mut PluginGroupBuilder) -> &mut PluginGroupBuilder, diff --git a/examples/2d/sprite.rs b/examples/2d/sprite.rs index 138f46584a..b4cff1721d 100644 --- a/examples/2d/sprite.rs +++ b/examples/2d/sprite.rs @@ -2,7 +2,7 @@ use bevy::prelude::*; fn main() { App::build() - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) .add_startup_system(setup.system()) .run(); } diff --git a/examples/2d/sprite_sheet.rs b/examples/2d/sprite_sheet.rs index b14efeab0b..ae774b6120 100644 --- a/examples/2d/sprite_sheet.rs +++ b/examples/2d/sprite_sheet.rs @@ -2,7 +2,7 @@ use bevy::prelude::*; fn main() { App::build() - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) .add_startup_system(setup.system()) .add_system(animate_sprite_system.system()) .run(); diff --git a/examples/2d/texture_atlas.rs b/examples/2d/texture_atlas.rs index 7f618ebd28..e6036d1d34 100644 --- a/examples/2d/texture_atlas.rs +++ b/examples/2d/texture_atlas.rs @@ -4,7 +4,7 @@ use bevy::{asset::LoadState, prelude::*, sprite::TextureAtlasBuilder}; fn main() { App::build() .init_resource::() - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) .add_startup_system(setup.system()) .add_system(load_atlas.system()) .run(); diff --git a/examples/3d/3d_scene.rs b/examples/3d/3d_scene.rs index 51fafd7eb9..e053e10fa8 100644 --- a/examples/3d/3d_scene.rs +++ b/examples/3d/3d_scene.rs @@ -3,7 +3,7 @@ use bevy::prelude::*; fn main() { App::build() .add_resource(Msaa { samples: 4 }) - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) .add_startup_system(setup.system()) .run(); } diff --git a/examples/3d/load_gltf.rs b/examples/3d/load_gltf.rs index 09a447036e..248c525a5c 100644 --- a/examples/3d/load_gltf.rs +++ b/examples/3d/load_gltf.rs @@ -3,7 +3,7 @@ use bevy::prelude::*; fn main() { App::build() .add_resource(Msaa { samples: 4 }) - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) .add_startup_system(setup.system()) .run(); } diff --git a/examples/3d/msaa.rs b/examples/3d/msaa.rs index ef9a8f95b9..264facd4db 100644 --- a/examples/3d/msaa.rs +++ b/examples/3d/msaa.rs @@ -6,7 +6,7 @@ use bevy::prelude::*; fn main() { App::build() .add_resource(Msaa { samples: 4 }) - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) .add_startup_system(setup.system()) .run(); } diff --git a/examples/3d/parenting.rs b/examples/3d/parenting.rs index 997ef5a090..f97b35c71a 100644 --- a/examples/3d/parenting.rs +++ b/examples/3d/parenting.rs @@ -5,7 +5,7 @@ use bevy::prelude::*; fn main() { App::build() .add_resource(Msaa { samples: 4 }) - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) .add_startup_system(setup.system()) .add_system(rotator_system.system()) .run(); diff --git a/examples/3d/spawner.rs b/examples/3d/spawner.rs index f3e3f2e6d4..00cd454397 100644 --- a/examples/3d/spawner.rs +++ b/examples/3d/spawner.rs @@ -10,7 +10,7 @@ use rand::{rngs::StdRng, Rng, SeedableRng}; /// NOTE: Bevy still has a number of optimizations to do in this area. Expect the performance here to go way up in the future fn main() { App::build() - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) .add_plugin(FrameTimeDiagnosticsPlugin::default()) .add_plugin(PrintDiagnosticsPlugin::default()) .add_startup_system(setup.system()) diff --git a/examples/3d/texture.rs b/examples/3d/texture.rs index 448a8be069..298e1f591a 100644 --- a/examples/3d/texture.rs +++ b/examples/3d/texture.rs @@ -3,7 +3,7 @@ use bevy::prelude::*; /// This example shows various ways to configure texture materials in 3D fn main() { App::build() - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) .add_startup_system(setup.system()) .run(); } diff --git a/examples/3d/z_sort_debug.rs b/examples/3d/z_sort_debug.rs index 59402b8142..8640d9b60f 100644 --- a/examples/3d/z_sort_debug.rs +++ b/examples/3d/z_sort_debug.rs @@ -9,7 +9,7 @@ use bevy::{ /// This example visualizes camera z-ordering by setting the material of rotating cubes to their distance from the camera fn main() { App::build() - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) .add_startup_system(setup.system()) .add_system(rotator_system.system()) .add_system(camera_order_color_system.system()) diff --git a/examples/app/empty_defaults.rs b/examples/app/empty_defaults.rs index d8b866a5de..bebb62b615 100644 --- a/examples/app/empty_defaults.rs +++ b/examples/app/empty_defaults.rs @@ -1,5 +1,5 @@ use bevy::prelude::*; fn main() { - App::build().add_plugin_group(DefaultPlugins).run(); + App::build().add_plugins(DefaultPlugins).run(); } diff --git a/examples/app/headless.rs b/examples/app/headless.rs index 85ad8f0d9b..9b13f8fe41 100644 --- a/examples/app/headless.rs +++ b/examples/app/headless.rs @@ -13,7 +13,7 @@ fn main() { // this app runs once App::build() .add_resource(ScheduleRunnerSettings::run_once()) - .add_plugin_group(MinimalPlugins) + .add_plugins(MinimalPlugins) .add_system(hello_world_system.system()) .run(); @@ -22,7 +22,7 @@ fn main() { .add_resource(ScheduleRunnerSettings::run_loop(Duration::from_secs_f64( 1.0 / 60.0, ))) - .add_plugin_group(MinimalPlugins) + .add_plugins(MinimalPlugins) .add_system(counter.system()) .run(); } diff --git a/examples/app/plugin.rs b/examples/app/plugin.rs index 884014b78e..602a3bfd92 100644 --- a/examples/app/plugin.rs +++ b/examples/app/plugin.rs @@ -6,7 +6,7 @@ use std::time::Duration; /// This example illustrates how to create a simple plugin that prints out a message. fn main() { App::build() - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) // plugins are registered as part of the "app building" process .add_plugin(PrintMessagePlugin { wait_duration: Duration::from_secs(1), diff --git a/examples/app/plugin_group.rs b/examples/app/plugin_group.rs index da66ad76b3..81cd0b2ef2 100644 --- a/examples/app/plugin_group.rs +++ b/examples/app/plugin_group.rs @@ -4,11 +4,11 @@ use bevy::{app::PluginGroupBuilder, prelude::*}; fn main() { App::build() // Two PluginGroups that are included with bevy are DefaultPlugins and MinimalPlugins - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) // Adding a plugin group adds all plugins in the group by default - .add_plugin_group(HelloWorldPlugins) + .add_plugins(HelloWorldPlugins) // You can also modify a PluginGroup (such as disabling plugins) like this: - // .add_plugin_group_with(HelloWorldPlugins, |group| { + // .add_plugins_with(HelloWorldPlugins, |group| { // group // .disable::() // .add_before::(bevy::diagnostic::PrintDiagnosticsPlugin::default()) diff --git a/examples/app/return_after_run.rs b/examples/app/return_after_run.rs index 3a604137b1..ab951341a6 100644 --- a/examples/app/return_after_run.rs +++ b/examples/app/return_after_run.rs @@ -7,7 +7,7 @@ fn main() { return_from_run: true, }) .add_resource(ClearColor(Color::rgb(0.2, 0.2, 0.8))) - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) .run(); println!("Running another App."); App::build() @@ -15,7 +15,7 @@ fn main() { return_from_run: true, }) .add_resource(ClearColor(Color::rgb(0.2, 0.8, 0.2))) - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) .run(); println!("Done."); } diff --git a/examples/app/thread_pool_resources.rs b/examples/app/thread_pool_resources.rs index 577c47242a..52427d4e00 100644 --- a/examples/app/thread_pool_resources.rs +++ b/examples/app/thread_pool_resources.rs @@ -5,6 +5,6 @@ use bevy::prelude::*; fn main() { App::build() .add_resource(DefaultTaskPoolOptions::with_num_threads(4)) - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) .run(); } diff --git a/examples/asset/asset_loading.rs b/examples/asset/asset_loading.rs index e157d493f9..e081446810 100644 --- a/examples/asset/asset_loading.rs +++ b/examples/asset/asset_loading.rs @@ -4,7 +4,7 @@ use bevy::prelude::*; fn main() { App::build() .add_resource(Msaa { samples: 4 }) - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) .add_startup_system(setup.system()) .run(); } diff --git a/examples/asset/custom_asset.rs b/examples/asset/custom_asset.rs index 4a02e528ae..1d7cd87da2 100644 --- a/examples/asset/custom_asset.rs +++ b/examples/asset/custom_asset.rs @@ -35,7 +35,7 @@ impl AssetLoader for CustomAssetLoader { fn main() { App::build() - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) .init_resource::() .add_asset::() .init_asset_loader::() diff --git a/examples/asset/hot_asset_reloading.rs b/examples/asset/hot_asset_reloading.rs index b2cbec1a43..89319e10f0 100644 --- a/examples/asset/hot_asset_reloading.rs +++ b/examples/asset/hot_asset_reloading.rs @@ -5,7 +5,7 @@ use bevy::prelude::*; /// This example illustrates hot reloading mesh changes. fn main() { App::build() - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) .add_startup_system(setup.system()) .run(); } diff --git a/examples/audio/audio.rs b/examples/audio/audio.rs index 83f841addd..a8296ad953 100644 --- a/examples/audio/audio.rs +++ b/examples/audio/audio.rs @@ -3,7 +3,7 @@ use bevy::prelude::*; /// This example illustrates how to load and play an audio file fn main() { App::build() - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) .add_startup_system(setup.system()) .run(); } diff --git a/examples/diagnostics/custom_diagnostic.rs b/examples/diagnostics/custom_diagnostic.rs index c894ca2c29..4b2e832467 100644 --- a/examples/diagnostics/custom_diagnostic.rs +++ b/examples/diagnostics/custom_diagnostic.rs @@ -6,7 +6,7 @@ use bevy::{ /// This example illustrates how to create a custom diagnostic fn main() { App::build() - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) // The "print diagnostics" plugin is optional. It just visualizes our diagnostics in the console .add_plugin(PrintDiagnosticsPlugin::default()) .add_startup_system(setup_diagnostic_system.system()) diff --git a/examples/diagnostics/print_diagnostics.rs b/examples/diagnostics/print_diagnostics.rs index ab5eea158e..5ed9a5f108 100644 --- a/examples/diagnostics/print_diagnostics.rs +++ b/examples/diagnostics/print_diagnostics.rs @@ -5,7 +5,7 @@ use bevy::{ fn main() { App::build() - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) // Adds frame time diagnostics .add_plugin(FrameTimeDiagnosticsPlugin::default()) // Adds a system that prints diagnostics to the console diff --git a/examples/ecs/event.rs b/examples/ecs/event.rs index 2ab0a74ee2..a7c10025f3 100644 --- a/examples/ecs/event.rs +++ b/examples/ecs/event.rs @@ -4,7 +4,7 @@ use bevy::prelude::*; /// and a system that prints a message whenever the event is received. fn main() { App::build() - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) .add_event::() .init_resource::() .add_system(event_trigger_system.system()) diff --git a/examples/ecs/hierarchy.rs b/examples/ecs/hierarchy.rs index 0453974f0b..cc84790bb3 100644 --- a/examples/ecs/hierarchy.rs +++ b/examples/ecs/hierarchy.rs @@ -2,7 +2,7 @@ use bevy::prelude::*; fn main() { App::build() - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) .add_startup_system(setup.system()) .add_system(rotate.system()) .run(); diff --git a/examples/ecs/parallel_query.rs b/examples/ecs/parallel_query.rs index 4f9911a0bb..e430637fc7 100644 --- a/examples/ecs/parallel_query.rs +++ b/examples/ecs/parallel_query.rs @@ -73,7 +73,7 @@ fn bounce_system( fn main() { App::build() - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) .add_startup_system(spawn_system.system()) .add_system(move_system.system()) .add_system(bounce_system.system()) diff --git a/examples/game/breakout.rs b/examples/game/breakout.rs index 9d9fbd557d..6097971e63 100644 --- a/examples/game/breakout.rs +++ b/examples/game/breakout.rs @@ -7,7 +7,7 @@ use bevy::{ /// An implementation of the classic game "Breakout" fn main() { App::build() - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) .add_resource(Scoreboard { score: 0 }) .add_resource(ClearColor(Color::rgb(0.9, 0.9, 0.9))) .add_startup_system(setup.system()) diff --git a/examples/input/gamepad_input.rs b/examples/input/gamepad_input.rs index 054c2188cf..bd920262e8 100644 --- a/examples/input/gamepad_input.rs +++ b/examples/input/gamepad_input.rs @@ -4,7 +4,7 @@ use bevy_utils::HashSet; fn main() { App::build() - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) .init_resource::() .add_system_to_stage(stage::PRE_UPDATE, connection_system.system()) .add_system(gamepad_system.system()) diff --git a/examples/input/gamepad_input_events.rs b/examples/input/gamepad_input_events.rs index cbf9591d4e..fc685b2aad 100644 --- a/examples/input/gamepad_input_events.rs +++ b/examples/input/gamepad_input_events.rs @@ -3,7 +3,7 @@ use bevy_input::gamepad::{GamepadEvent, GamepadEventType}; fn main() { App::build() - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) .add_system(gamepad_events.system()) .run(); } diff --git a/examples/input/keyboard_input.rs b/examples/input/keyboard_input.rs index b567e3c851..65a5072635 100644 --- a/examples/input/keyboard_input.rs +++ b/examples/input/keyboard_input.rs @@ -5,7 +5,7 @@ use bevy::{ fn main() { App::build() - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) .add_system(keyboard_input_system.system()) .run(); } diff --git a/examples/input/keyboard_input_events.rs b/examples/input/keyboard_input_events.rs index a8f759843b..fc0fe43c70 100644 --- a/examples/input/keyboard_input_events.rs +++ b/examples/input/keyboard_input_events.rs @@ -2,7 +2,7 @@ use bevy::{input::keyboard::KeyboardInput, prelude::*}; fn main() { App::build() - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) .add_system(print_keyboard_event_system.system()) .run(); } diff --git a/examples/input/mouse_input.rs b/examples/input/mouse_input.rs index 2668bf6299..61fcac5d75 100644 --- a/examples/input/mouse_input.rs +++ b/examples/input/mouse_input.rs @@ -2,7 +2,7 @@ use bevy::prelude::*; fn main() { App::build() - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) .add_system(mouse_click_system.system()) .run(); } diff --git a/examples/input/mouse_input_events.rs b/examples/input/mouse_input_events.rs index a79f61c9a0..f9bab2fca0 100644 --- a/examples/input/mouse_input_events.rs +++ b/examples/input/mouse_input_events.rs @@ -6,7 +6,7 @@ use bevy::{ fn main() { App::build() - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) .add_system(print_mouse_events_system.system()) .run(); } diff --git a/examples/input/touch_input.rs b/examples/input/touch_input.rs index fceb3d22fc..d517b45401 100644 --- a/examples/input/touch_input.rs +++ b/examples/input/touch_input.rs @@ -2,7 +2,7 @@ use bevy::{input::touch::*, prelude::*}; fn main() { App::build() - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) .add_system(touch_system.system()) .run(); } diff --git a/examples/input/touch_input_events.rs b/examples/input/touch_input_events.rs index ba6108d3e3..bb6b57b33b 100644 --- a/examples/input/touch_input_events.rs +++ b/examples/input/touch_input_events.rs @@ -2,7 +2,7 @@ use bevy::{input::touch::*, prelude::*}; fn main() { App::build() - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) .add_system(touch_event_system.system()) .run(); } diff --git a/examples/ios/src/lib.rs b/examples/ios/src/lib.rs index 1ff0059b04..c3a7f93808 100644 --- a/examples/ios/src/lib.rs +++ b/examples/ios/src/lib.rs @@ -17,7 +17,7 @@ extern "C" fn main_rs() { ..Default::default() }) .add_resource(Msaa { samples: 4 }) - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) .add_startup_system(setup.system()) .run(); } diff --git a/examples/scene/properties.rs b/examples/scene/properties.rs index e8a100187a..5b26e14a78 100644 --- a/examples/scene/properties.rs +++ b/examples/scene/properties.rs @@ -11,7 +11,7 @@ use serde::{Deserialize, Serialize}; /// familiar with "reflection" in other languages, Properties are very similar to that concept. fn main() { App::build() - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) // If you need to deserialize custom property types, register them like this: .register_property::() .register_property::() diff --git a/examples/scene/scene.rs b/examples/scene/scene.rs index 63b66d0243..c84fa3b7e9 100644 --- a/examples/scene/scene.rs +++ b/examples/scene/scene.rs @@ -3,7 +3,7 @@ use bevy::{prelude::*, type_registry::TypeRegistry}; /// This example illustrates loading and saving scenes from files fn main() { App::build() - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) // Registering components informs Bevy that they exist. This allows them to be used when loading scenes // This step is only required if you want to load your components from scene files. // Unregistered components can still be used in your code, but they will be ignored during scene save/load. diff --git a/examples/shader/mesh_custom_attribute.rs b/examples/shader/mesh_custom_attribute.rs index 238e7f183d..c6d3aed930 100644 --- a/examples/shader/mesh_custom_attribute.rs +++ b/examples/shader/mesh_custom_attribute.rs @@ -13,7 +13,7 @@ use bevy::{ /// This example illustrates how to add a custom attribute to a mesh and use it in a custom shader. fn main() { App::build() - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) .add_asset::() .add_startup_system(setup.system()) .run(); diff --git a/examples/shader/shader_custom_material.rs b/examples/shader/shader_custom_material.rs index 0e4abe0830..4ea52e154b 100644 --- a/examples/shader/shader_custom_material.rs +++ b/examples/shader/shader_custom_material.rs @@ -13,7 +13,7 @@ use bevy::{ /// This example illustrates how to create a custom material asset and a shader that uses that material fn main() { App::build() - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) .add_asset::() .add_startup_system(setup.system()) .run(); diff --git a/examples/shader/shader_defs.rs b/examples/shader/shader_defs.rs index cb100daeaf..2862aec94d 100644 --- a/examples/shader/shader_defs.rs +++ b/examples/shader/shader_defs.rs @@ -14,7 +14,7 @@ use bevy::{ /// In Bevy, "shader defs" are a way to selectively enable parts of a shader based on values set in a component or asset. fn main() { App::build() - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) .add_asset::() .add_startup_system(setup.system()) .add_system_to_stage( diff --git a/examples/ui/button.rs b/examples/ui/button.rs index 181be9b53c..1cbc44f222 100644 --- a/examples/ui/button.rs +++ b/examples/ui/button.rs @@ -3,7 +3,7 @@ use bevy::prelude::*; /// This example illustrates how to create a button that changes color and text based on its interaction state. fn main() { App::build() - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) .init_resource::() .add_startup_system(setup.system()) .add_system(button_system.system()) diff --git a/examples/ui/font_atlas_debug.rs b/examples/ui/font_atlas_debug.rs index 89e255242a..508bc4d80d 100644 --- a/examples/ui/font_atlas_debug.rs +++ b/examples/ui/font_atlas_debug.rs @@ -4,7 +4,7 @@ use bevy::{prelude::*, text::FontAtlasSet}; fn main() { App::build() .init_resource::() - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) .add_startup_system(setup.system()) .add_system(text_update_system.system()) .add_system(atlas_render_system.system()) diff --git a/examples/ui/text.rs b/examples/ui/text.rs index bc884f9387..5b92f1aaf1 100644 --- a/examples/ui/text.rs +++ b/examples/ui/text.rs @@ -6,7 +6,7 @@ use bevy::{ /// This example illustrates how to create text and update it in a system. It displays the current FPS in the upper left hand corner. fn main() { App::build() - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) .add_plugin(FrameTimeDiagnosticsPlugin::default()) .add_startup_system(setup.system()) .add_system(text_update_system.system()) diff --git a/examples/ui/ui.rs b/examples/ui/ui.rs index cf46bb876f..1154c44c4f 100644 --- a/examples/ui/ui.rs +++ b/examples/ui/ui.rs @@ -3,7 +3,7 @@ use bevy::prelude::*; /// This example illustrates the various features of Bevy UI. fn main() { App::build() - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) .add_startup_system(setup.system()) .run(); } diff --git a/examples/wasm/assets_wasm.rs b/examples/wasm/assets_wasm.rs index ee7ef27438..9916832cb9 100644 --- a/examples/wasm/assets_wasm.rs +++ b/examples/wasm/assets_wasm.rs @@ -19,7 +19,7 @@ fn main() { .add_resource(AssetServerSettings { asset_folder: "/".to_string(), }) - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) .add_asset::() .init_asset_loader::() .add_startup_system(load_asset.system()) diff --git a/examples/wasm/winit_wasm.rs b/examples/wasm/winit_wasm.rs index 71a1ba475d..28a532ec8a 100644 --- a/examples/wasm/winit_wasm.rs +++ b/examples/wasm/winit_wasm.rs @@ -22,7 +22,7 @@ fn main() { height: 300, ..Default::default() }) - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) // One time greet .add_startup_system(hello_wasm_system.system()) // Track ticks (sanity check, whether game loop is running) diff --git a/examples/window/clear_color.rs b/examples/window/clear_color.rs index c4f361abd5..5c0083faab 100644 --- a/examples/window/clear_color.rs +++ b/examples/window/clear_color.rs @@ -3,6 +3,6 @@ use bevy::{prelude::*, render::pass::ClearColor}; fn main() { App::build() .add_resource(ClearColor(Color::rgb(0.5, 0.5, 0.9))) - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) .run(); } diff --git a/examples/window/multiple_windows.rs b/examples/window/multiple_windows.rs index aa299e6579..7ed1812648 100644 --- a/examples/window/multiple_windows.rs +++ b/examples/window/multiple_windows.rs @@ -16,7 +16,7 @@ use bevy::{ fn main() { App::build() .add_resource(Msaa { samples: 4 }) - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) .add_startup_system(setup.system()) .run(); } diff --git a/examples/window/window_settings.rs b/examples/window/window_settings.rs index 0eb85943d2..faa5e1907c 100644 --- a/examples/window/window_settings.rs +++ b/examples/window/window_settings.rs @@ -11,7 +11,7 @@ fn main() { resizable: false, ..Default::default() }) - .add_plugin_group(DefaultPlugins) + .add_plugins(DefaultPlugins) .add_system(change_title.system()) .add_system(toggle_cursor.system()) .run();