From 6f5a4d9debb039aebc5f728705f71c0806ec08f1 Mon Sep 17 00:00:00 2001 From: Alice Cecile Date: Sat, 30 Jan 2021 15:55:13 -0500 Subject: [PATCH] Rename add_resource to insert_resource (#1356) * Renamed add_resource to insert_resource * Changed usage of add_resource to insert_resource * Renamed add_thread_local_resource --- crates/bevy_app/src/app_builder.rs | 8 ++++---- crates/bevy_asset/src/assets.rs | 2 +- crates/bevy_asset/src/lib.rs | 2 +- .../bevy_diagnostic/src/frame_time_diagnostics_plugin.rs | 2 +- crates/bevy_diagnostic/src/log_diagnostics_plugin.rs | 2 +- crates/bevy_gilrs/src/lib.rs | 2 +- crates/bevy_text/src/lib.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/update_gltf_scene.rs | 4 ++-- examples/android/android.rs | 2 +- examples/app/custom_loop.rs | 2 +- examples/app/headless.rs | 4 ++-- examples/app/logs.rs | 2 +- examples/app/plugin.rs | 2 +- examples/app/return_after_run.rs | 8 ++++---- examples/app/thread_pool_resources.rs | 2 +- examples/asset/asset_loading.rs | 2 +- examples/asset/custom_asset_io.rs | 2 +- examples/ecs/ecs_guide.rs | 4 ++-- examples/ecs/state.rs | 2 +- examples/ecs/system_chaining.rs | 2 +- examples/ecs/timers.rs | 2 +- examples/game/alien_cake_addict.rs | 4 ++-- examples/game/breakout.rs | 4 ++-- examples/ios/src/lib.rs | 4 ++-- examples/tools/bevymark.rs | 4 ++-- examples/ui/font_atlas_debug.rs | 2 +- examples/ui/text_debug.rs | 2 +- examples/wasm/assets_wasm.rs | 2 +- examples/wasm/headless_wasm.rs | 2 +- examples/wasm/winit_wasm.rs | 2 +- examples/window/clear_color.rs | 2 +- examples/window/multiple_windows.rs | 4 ++-- examples/window/scale_factor_override.rs | 2 +- examples/window/window_settings.rs | 2 +- 39 files changed, 53 insertions(+), 53 deletions(-) diff --git a/crates/bevy_app/src/app_builder.rs b/crates/bevy_app/src/app_builder.rs index e0fc4bce29..7233e94e79 100644 --- a/crates/bevy_app/src/app_builder.rs +++ b/crates/bevy_app/src/app_builder.rs @@ -210,12 +210,12 @@ impl AppBuilder { where T: Send + Sync + 'static, { - self.add_resource(Events::::default()) + self.insert_resource(Events::::default()) .add_system_to_stage(stage::EVENT, Events::::update_system.system()) } - /// Adds a resource to the current [App] and overwrites any resource previously added of the same type. - pub fn add_resource(&mut self, resource: T) -> &mut Self + /// Inserts a resource to the current [App] and overwrites any resource previously added of the same type. + pub fn insert_resource(&mut self, resource: T) -> &mut Self where T: Send + Sync + 'static, { @@ -223,7 +223,7 @@ impl AppBuilder { self } - pub fn add_thread_local_resource(&mut self, resource: T) -> &mut Self + pub fn insert_thread_local_resource(&mut self, resource: T) -> &mut Self where T: 'static, { diff --git a/crates/bevy_asset/src/assets.rs b/crates/bevy_asset/src/assets.rs index 1ae9ab5f48..a9a41117ac 100644 --- a/crates/bevy_asset/src/assets.rs +++ b/crates/bevy_asset/src/assets.rs @@ -217,7 +217,7 @@ impl AddAsset for AppBuilder { asset_server.register_asset_type::() }; - self.add_resource(assets) + self.insert_resource(assets) .add_system_to_stage( super::stage::ASSET_EVENTS, Assets::::asset_event_system.system(), diff --git a/crates/bevy_asset/src/lib.rs b/crates/bevy_asset/src/lib.rs index e65ce22bd0..b8f4adbc37 100644 --- a/crates/bevy_asset/src/lib.rs +++ b/crates/bevy_asset/src/lib.rs @@ -85,7 +85,7 @@ impl Plugin for AssetPlugin { let asset_server = AssetServer::with_boxed_io(source, task_pool); - app.add_resource(asset_server); + app.insert_resource(asset_server); } app.add_stage_before( diff --git a/crates/bevy_diagnostic/src/frame_time_diagnostics_plugin.rs b/crates/bevy_diagnostic/src/frame_time_diagnostics_plugin.rs index 9a6481b2db..5eef7c917d 100644 --- a/crates/bevy_diagnostic/src/frame_time_diagnostics_plugin.rs +++ b/crates/bevy_diagnostic/src/frame_time_diagnostics_plugin.rs @@ -14,7 +14,7 @@ pub struct FrameTimeDiagnosticsState { impl Plugin for FrameTimeDiagnosticsPlugin { fn build(&self, app: &mut bevy_app::AppBuilder) { app.add_startup_system(Self::setup_system.system()) - .add_resource(FrameTimeDiagnosticsState { frame_count: 0.0 }) + .insert_resource(FrameTimeDiagnosticsState { frame_count: 0.0 }) .add_system(Self::diagnostic_system.system()); } } diff --git a/crates/bevy_diagnostic/src/log_diagnostics_plugin.rs b/crates/bevy_diagnostic/src/log_diagnostics_plugin.rs index 6e5d2636d7..aa09229d03 100644 --- a/crates/bevy_diagnostic/src/log_diagnostics_plugin.rs +++ b/crates/bevy_diagnostic/src/log_diagnostics_plugin.rs @@ -30,7 +30,7 @@ impl Default for LogDiagnosticsPlugin { impl Plugin for LogDiagnosticsPlugin { fn build(&self, app: &mut bevy_app::AppBuilder) { - app.add_resource(LogDiagnosticsState { + app.insert_resource(LogDiagnosticsState { timer: Timer::new(self.wait_duration, true), filter: self.filter.clone(), }); diff --git a/crates/bevy_gilrs/src/lib.rs b/crates/bevy_gilrs/src/lib.rs index 0149a16fd9..b1b2cde54c 100644 --- a/crates/bevy_gilrs/src/lib.rs +++ b/crates/bevy_gilrs/src/lib.rs @@ -18,7 +18,7 @@ impl Plugin for GilrsPlugin { .build() { Ok(gilrs) => { - app.add_thread_local_resource(gilrs) + app.insert_thread_local_resource(gilrs) .add_startup_system_to_stage(PRE_STARTUP, gilrs_event_startup_system.system()) .add_system_to_stage(stage::PRE_EVENT, gilrs_event_system.system()); } diff --git a/crates/bevy_text/src/lib.rs b/crates/bevy_text/src/lib.rs index d642e56143..6a9f2e09a2 100644 --- a/crates/bevy_text/src/lib.rs +++ b/crates/bevy_text/src/lib.rs @@ -39,7 +39,7 @@ impl Plugin for TextPlugin { app.add_asset::() .add_asset::() .init_asset_loader::() - .add_resource(DefaultTextPipeline::default()) + .insert_resource(DefaultTextPipeline::default()) .add_system_to_stage(bevy_app::stage::POST_UPDATE, text2d_system.system()) .add_system_to_stage( bevy_render::stage::DRAW, diff --git a/examples/2d/texture_atlas.rs b/examples/2d/texture_atlas.rs index f1267be164..826f90a451 100644 --- a/examples/2d/texture_atlas.rs +++ b/examples/2d/texture_atlas.rs @@ -5,7 +5,7 @@ fn main() { App::build() .init_resource::() .add_plugins(DefaultPlugins) - .add_resource(State::new(AppState::Setup)) + .insert_resource(State::new(AppState::Setup)) .add_stage_after(stage::UPDATE, STAGE, StateStage::::default()) .on_state_enter(STAGE, AppState::Setup, load_textures.system()) .on_state_update(STAGE, AppState::Setup, check_textures.system()) diff --git a/examples/3d/3d_scene.rs b/examples/3d/3d_scene.rs index a66db90191..0d90a55ada 100644 --- a/examples/3d/3d_scene.rs +++ b/examples/3d/3d_scene.rs @@ -2,7 +2,7 @@ use bevy::prelude::*; fn main() { App::build() - .add_resource(Msaa { samples: 4 }) + .insert_resource(Msaa { samples: 4 }) .add_plugins(DefaultPlugins) .add_startup_system(setup.system()) .run(); diff --git a/examples/3d/load_gltf.rs b/examples/3d/load_gltf.rs index 02005a727a..de2539c49e 100644 --- a/examples/3d/load_gltf.rs +++ b/examples/3d/load_gltf.rs @@ -2,7 +2,7 @@ use bevy::prelude::*; fn main() { App::build() - .add_resource(Msaa { samples: 4 }) + .insert_resource(Msaa { samples: 4 }) .add_plugins(DefaultPlugins) .add_startup_system(setup.system()) .run(); diff --git a/examples/3d/msaa.rs b/examples/3d/msaa.rs index ed5a920737..3df110f66c 100644 --- a/examples/3d/msaa.rs +++ b/examples/3d/msaa.rs @@ -5,7 +5,7 @@ use bevy::prelude::*; /// but cheap) to 8 (crisp but expensive) fn main() { App::build() - .add_resource(Msaa { samples: 4 }) + .insert_resource(Msaa { samples: 4 }) .add_plugins(DefaultPlugins) .add_startup_system(setup.system()) .run(); diff --git a/examples/3d/parenting.rs b/examples/3d/parenting.rs index 81e4b3d9d4..76bc9ec918 100644 --- a/examples/3d/parenting.rs +++ b/examples/3d/parenting.rs @@ -4,7 +4,7 @@ use bevy::prelude::*; /// are propagated to their descendants fn main() { App::build() - .add_resource(Msaa { samples: 4 }) + .insert_resource(Msaa { samples: 4 }) .add_plugins(DefaultPlugins) .add_startup_system(setup.system()) .add_system(rotator_system.system()) diff --git a/examples/3d/update_gltf_scene.rs b/examples/3d/update_gltf_scene.rs index e5b2d5eedc..e8d37707fc 100644 --- a/examples/3d/update_gltf_scene.rs +++ b/examples/3d/update_gltf_scene.rs @@ -2,9 +2,9 @@ use bevy::{prelude::*, scene::InstanceId}; fn main() { App::build() - .add_resource(Msaa { samples: 4 }) + .insert_resource(Msaa { samples: 4 }) .add_plugins(DefaultPlugins) - .add_resource(SceneInstance::default()) + .insert_resource(SceneInstance::default()) .add_startup_system(setup.system()) .add_system(scene_update.system()) .add_system(move_scene_entities.system()) diff --git a/examples/android/android.rs b/examples/android/android.rs index 1a2f25116d..51af3e855b 100644 --- a/examples/android/android.rs +++ b/examples/android/android.rs @@ -4,7 +4,7 @@ use bevy::prelude::*; #[bevy_main] fn main() { App::build() - .add_resource(Msaa { samples: 2 }) + .insert_resource(Msaa { samples: 2 }) .add_plugins(DefaultPlugins) .add_startup_system(setup.system()) .run(); diff --git a/examples/app/custom_loop.rs b/examples/app/custom_loop.rs index dd67bd583a..008e0933c2 100644 --- a/examples/app/custom_loop.rs +++ b/examples/app/custom_loop.rs @@ -22,7 +22,7 @@ fn print_system(input: Res) { fn main() { App::build() - .add_resource(Input(String::new())) + .insert_resource(Input(String::new())) .set_runner(my_runner) .add_system(print_system.system()) .run(); diff --git a/examples/app/headless.rs b/examples/app/headless.rs index b90de71b3c..e3e740dbbd 100644 --- a/examples/app/headless.rs +++ b/examples/app/headless.rs @@ -11,14 +11,14 @@ use bevy::{app::ScheduleRunnerSettings, prelude::*, utils::Duration}; fn main() { // this app runs once App::build() - .add_resource(ScheduleRunnerSettings::run_once()) + .insert_resource(ScheduleRunnerSettings::run_once()) .add_plugins(MinimalPlugins) .add_system(hello_world_system.system()) .run(); // this app loops forever at 60 fps App::build() - .add_resource(ScheduleRunnerSettings::run_loop(Duration::from_secs_f64( + .insert_resource(ScheduleRunnerSettings::run_loop(Duration::from_secs_f64( 1.0 / 60.0, ))) .add_plugins(MinimalPlugins) diff --git a/examples/app/logs.rs b/examples/app/logs.rs index 532e6932eb..5b68265a6b 100644 --- a/examples/app/logs.rs +++ b/examples/app/logs.rs @@ -4,7 +4,7 @@ use bevy::prelude::*; fn main() { App::build() // Uncomment this to override the default log settings: - // .add_resource(bevy::log::LogSettings { + // .insert_resource(bevy::log::LogSettings { // level: bevy::log::Level::TRACE, // filter: "wgpu=warn,bevy_ecs=info".to_string(), // }) diff --git a/examples/app/plugin.rs b/examples/app/plugin.rs index dee94567d5..7a5aa6d261 100644 --- a/examples/app/plugin.rs +++ b/examples/app/plugin.rs @@ -28,7 +28,7 @@ impl Plugin for PrintMessagePlugin { message: self.message.clone(), timer: Timer::new(self.wait_duration, true), }; - app.add_resource(state) + app.insert_resource(state) .add_system(print_message_system.system()); } } diff --git a/examples/app/return_after_run.rs b/examples/app/return_after_run.rs index f35c29ba72..983112c699 100644 --- a/examples/app/return_after_run.rs +++ b/examples/app/return_after_run.rs @@ -3,19 +3,19 @@ use bevy::{prelude::*, render::pass::ClearColor, winit::WinitConfig}; fn main() { println!("Running first App."); App::build() - .add_resource(WinitConfig { + .insert_resource(WinitConfig { return_from_run: true, }) - .add_resource(ClearColor(Color::rgb(0.2, 0.2, 0.8))) + .insert_resource(ClearColor(Color::rgb(0.2, 0.2, 0.8))) .add_plugins(DefaultPlugins) .add_system(system1.system()) .run(); println!("Running another App."); App::build() - .add_resource(WinitConfig { + .insert_resource(WinitConfig { return_from_run: true, }) - .add_resource(ClearColor(Color::rgb(0.2, 0.8, 0.2))) + .insert_resource(ClearColor(Color::rgb(0.2, 0.8, 0.2))) .add_plugins_with(DefaultPlugins, |group| { group.disable::() }) diff --git a/examples/app/thread_pool_resources.rs b/examples/app/thread_pool_resources.rs index 52427d4e00..354739fb30 100644 --- a/examples/app/thread_pool_resources.rs +++ b/examples/app/thread_pool_resources.rs @@ -4,7 +4,7 @@ use bevy::prelude::*; /// certain number of threads). fn main() { App::build() - .add_resource(DefaultTaskPoolOptions::with_num_threads(4)) + .insert_resource(DefaultTaskPoolOptions::with_num_threads(4)) .add_plugins(DefaultPlugins) .run(); } diff --git a/examples/asset/asset_loading.rs b/examples/asset/asset_loading.rs index bf4d17863c..3f8407ca6a 100644 --- a/examples/asset/asset_loading.rs +++ b/examples/asset/asset_loading.rs @@ -3,7 +3,7 @@ use bevy::prelude::*; /// This example illustrates various ways to load assets fn main() { App::build() - .add_resource(Msaa { samples: 4 }) + .insert_resource(Msaa { samples: 4 }) .add_plugins(DefaultPlugins) .add_startup_system(setup.system()) .run(); diff --git a/examples/asset/custom_asset_io.rs b/examples/asset/custom_asset_io.rs index f669408054..bd2e472ff7 100644 --- a/examples/asset/custom_asset_io.rs +++ b/examples/asset/custom_asset_io.rs @@ -69,7 +69,7 @@ impl Plugin for CustomAssetIoPlugin { // the asset server is constructed and added the resource manager - app.add_resource(AssetServer::new(asset_io, task_pool)); + app.insert_resource(AssetServer::new(asset_io, task_pool)); } } diff --git a/examples/ecs/ecs_guide.rs b/examples/ecs/ecs_guide.rs index 8bb0d3c6c0..4697b994d7 100644 --- a/examples/ecs/ecs_guide.rs +++ b/examples/ecs/ecs_guide.rs @@ -244,9 +244,9 @@ fn main() { // Bevy apps are created using the builder pattern. We use the builder to add systems, resources, and plugins to our app App::build() // Resources can be added to our app like this - .add_resource(State { counter: 0 }) + .insert_resource(State { counter: 0 }) // Some systems are configured by adding their settings as a resource - .add_resource(ScheduleRunnerSettings::run_loop(Duration::from_secs(5))) + .insert_resource(ScheduleRunnerSettings::run_loop(Duration::from_secs(5))) // Plugins are just a grouped set of app builder calls (just like we're doing here). // We could easily turn our game into a plugin, but you can check out the plugin example for that :) // The plugin below runs our app's "system schedule" once every 5 seconds (configured above). diff --git a/examples/ecs/state.rs b/examples/ecs/state.rs index 95e8f82763..c446a60f37 100644 --- a/examples/ecs/state.rs +++ b/examples/ecs/state.rs @@ -5,7 +5,7 @@ fn main() { App::build() .add_plugins(DefaultPlugins) .init_resource::() - .add_resource(State::new(AppState::Menu)) + .insert_resource(State::new(AppState::Menu)) .add_stage_after(stage::UPDATE, STAGE, StateStage::::default()) .on_state_enter(STAGE, AppState::Menu, setup_menu.system()) .on_state_update(STAGE, AppState::Menu, menu.system()) diff --git a/examples/ecs/system_chaining.rs b/examples/ecs/system_chaining.rs index 4a21dec20f..4bbcd6822b 100644 --- a/examples/ecs/system_chaining.rs +++ b/examples/ecs/system_chaining.rs @@ -3,7 +3,7 @@ use bevy::prelude::*; fn main() { App::build() - .add_resource(Message("42".to_string())) + .insert_resource(Message("42".to_string())) .add_system(parse_message_system.system().chain(handler_system.system())) .run(); } diff --git a/examples/ecs/timers.rs b/examples/ecs/timers.rs index 0a2bee125a..11bba57db9 100644 --- a/examples/ecs/timers.rs +++ b/examples/ecs/timers.rs @@ -3,7 +3,7 @@ use bevy::{log::info, prelude::*}; fn main() { App::build() .add_plugins(DefaultPlugins) - .add_resource(Countdown::default()) + .insert_resource(Countdown::default()) .add_startup_system(setup_system.system()) .add_system(countdown_system.system()) .add_system(timer_system.system()) diff --git a/examples/game/alien_cake_addict.rs b/examples/game/alien_cake_addict.rs index bc0d7ac238..a9077f1b77 100644 --- a/examples/game/alien_cake_addict.rs +++ b/examples/game/alien_cake_addict.rs @@ -15,10 +15,10 @@ enum GameState { fn main() { App::build() - .add_resource(Msaa { samples: 4 }) + .insert_resource(Msaa { samples: 4 }) .init_resource::() .add_plugins(DefaultPlugins) - .add_resource(State::new(GameState::Playing)) + .insert_resource(State::new(GameState::Playing)) .add_startup_system(setup_cameras.system()) .add_stage_after(stage::UPDATE, STAGE, StateStage::::default()) .on_state_enter(STAGE, GameState::Playing, setup.system()) diff --git a/examples/game/breakout.rs b/examples/game/breakout.rs index 750635024a..0ca195d602 100644 --- a/examples/game/breakout.rs +++ b/examples/game/breakout.rs @@ -8,8 +8,8 @@ use bevy::{ fn main() { App::build() .add_plugins(DefaultPlugins) - .add_resource(Scoreboard { score: 0 }) - .add_resource(ClearColor(Color::rgb(0.9, 0.9, 0.9))) + .insert_resource(Scoreboard { score: 0 }) + .insert_resource(ClearColor(Color::rgb(0.9, 0.9, 0.9))) .add_startup_system(setup.system()) .add_system(paddle_movement_system.system()) .add_system(ball_collision_system.system()) diff --git a/examples/ios/src/lib.rs b/examples/ios/src/lib.rs index 04a713a982..cbc8fe9b2c 100644 --- a/examples/ios/src/lib.rs +++ b/examples/ios/src/lib.rs @@ -4,13 +4,13 @@ use bevy::{prelude::*, window::WindowMode}; #[bevy_main] fn main() { App::build() - .add_resource(WindowDescriptor { + .insert_resource(WindowDescriptor { vsync: true, resizable: false, mode: WindowMode::BorderlessFullscreen, ..Default::default() }) - .add_resource(Msaa { samples: 4 }) + .insert_resource(Msaa { samples: 4 }) .add_plugins(DefaultPlugins) .add_startup_system(setup.system()) .run(); diff --git a/examples/tools/bevymark.rs b/examples/tools/bevymark.rs index a24203a211..563409fa45 100644 --- a/examples/tools/bevymark.rs +++ b/examples/tools/bevymark.rs @@ -28,7 +28,7 @@ impl FromResources for BirdMaterial { fn main() { App::build() - .add_resource(WindowDescriptor { + .insert_resource(WindowDescriptor { title: "BevyMark".to_string(), width: 800., height: 600., @@ -38,7 +38,7 @@ fn main() { }) .add_plugins(DefaultPlugins) .add_plugin(FrameTimeDiagnosticsPlugin::default()) - .add_resource(BevyCounter { count: 0 }) + .insert_resource(BevyCounter { count: 0 }) .init_resource::() .add_startup_system(setup.system()) .add_system(mouse_handler.system()) diff --git a/examples/ui/font_atlas_debug.rs b/examples/ui/font_atlas_debug.rs index bbd3884305..63fc3aa355 100644 --- a/examples/ui/font_atlas_debug.rs +++ b/examples/ui/font_atlas_debug.rs @@ -5,7 +5,7 @@ use bevy::{prelude::*, text::FontAtlasSet}; fn main() { App::build() .init_resource::() - .add_resource(ClearColor(Color::BLACK)) + .insert_resource(ClearColor(Color::BLACK)) .add_plugins(DefaultPlugins) .add_startup_system(setup.system()) .add_system(text_update_system.system()) diff --git a/examples/ui/text_debug.rs b/examples/ui/text_debug.rs index 536b6bdbd6..770496942a 100644 --- a/examples/ui/text_debug.rs +++ b/examples/ui/text_debug.rs @@ -6,7 +6,7 @@ use bevy::{ /// This example is for debugging text layout fn main() { App::build() - .add_resource(WindowDescriptor { + .insert_resource(WindowDescriptor { vsync: false, ..Default::default() }) diff --git a/examples/wasm/assets_wasm.rs b/examples/wasm/assets_wasm.rs index 803f3d64ff..d5f988838d 100644 --- a/examples/wasm/assets_wasm.rs +++ b/examples/wasm/assets_wasm.rs @@ -7,7 +7,7 @@ use bevy::{ fn main() { App::build() - .add_resource(AssetServerSettings { + .insert_resource(AssetServerSettings { asset_folder: "/".to_string(), }) .add_plugins(DefaultPlugins) diff --git a/examples/wasm/headless_wasm.rs b/examples/wasm/headless_wasm.rs index df4a381636..ce8db7a906 100644 --- a/examples/wasm/headless_wasm.rs +++ b/examples/wasm/headless_wasm.rs @@ -7,7 +7,7 @@ use bevy::{ fn main() { App::build() - .add_resource(ScheduleRunnerSettings::run_loop(Duration::from_secs_f64( + .insert_resource(ScheduleRunnerSettings::run_loop(Duration::from_secs_f64( 1.0 / 60.0, ))) .add_plugin(ScheduleRunnerPlugin::default()) diff --git a/examples/wasm/winit_wasm.rs b/examples/wasm/winit_wasm.rs index 9959333b88..6cd8c4dde4 100644 --- a/examples/wasm/winit_wasm.rs +++ b/examples/wasm/winit_wasm.rs @@ -8,7 +8,7 @@ use bevy::{ fn main() { App::build() - .add_resource(WindowDescriptor { + .insert_resource(WindowDescriptor { width: 300., height: 300., ..Default::default() diff --git a/examples/window/clear_color.rs b/examples/window/clear_color.rs index 5c0083faab..75891e984d 100644 --- a/examples/window/clear_color.rs +++ b/examples/window/clear_color.rs @@ -2,7 +2,7 @@ use bevy::{prelude::*, render::pass::ClearColor}; fn main() { App::build() - .add_resource(ClearColor(Color::rgb(0.5, 0.5, 0.9))) + .insert_resource(ClearColor(Color::rgb(0.5, 0.5, 0.9))) .add_plugins(DefaultPlugins) .run(); } diff --git a/examples/window/multiple_windows.rs b/examples/window/multiple_windows.rs index 44db637e0a..6ea12ceab4 100644 --- a/examples/window/multiple_windows.rs +++ b/examples/window/multiple_windows.rs @@ -15,8 +15,8 @@ use bevy::{ /// This example creates a second window and draws a mesh from two different cameras. fn main() { App::build() - .add_resource(Msaa { samples: 4 }) - .add_resource(State::new(AppState::CreateWindow)) + .insert_resource(Msaa { samples: 4 }) + .insert_resource(State::new(AppState::CreateWindow)) .add_plugins(DefaultPlugins) .add_stage_after( stage::UPDATE, diff --git a/examples/window/scale_factor_override.rs b/examples/window/scale_factor_override.rs index 222231ce7e..06f4a0ce86 100644 --- a/examples/window/scale_factor_override.rs +++ b/examples/window/scale_factor_override.rs @@ -3,7 +3,7 @@ use bevy::prelude::*; /// This example illustrates how to customize the default window settings fn main() { App::build() - .add_resource(WindowDescriptor { + .insert_resource(WindowDescriptor { width: 500., height: 300., ..Default::default() diff --git a/examples/window/window_settings.rs b/examples/window/window_settings.rs index d39a84b621..3c7719916a 100644 --- a/examples/window/window_settings.rs +++ b/examples/window/window_settings.rs @@ -3,7 +3,7 @@ use bevy::prelude::*; /// This example illustrates how to customize the default window settings fn main() { App::build() - .add_resource(WindowDescriptor { + .insert_resource(WindowDescriptor { title: "I am a window!".to_string(), width: 500., height: 300.,