Skip to content

Commit 4823a8c

Browse files
maniwanimaniwani
committed
update plugins
1 parent 9502a56 commit 4823a8c

File tree

63 files changed

+328
-341
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+328
-341
lines changed

‎crates/bevy_asset/src/asset_server.rs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -886,41 +886,41 @@ mod test {
886886
let path: AssetPath = "fake.png".into();
887887
assert_eq!(
888888
LoadState::NotLoaded,
889-
get_load_state(path.get_id(), &app.world)
889+
get_load_state(path.get_id(), app.world())
890890
);
891891

892892
// load the asset
893-
let handle = load_asset(path.clone(), &app.world).typed();
893+
let handle = load_asset(path.clone(), app.world()).typed();
894894
let weak_handle = handle.clone_weak();
895895

896896
// asset is loading
897-
assert_eq!(LoadState::Loading, get_load_state(&handle, &app.world));
897+
assert_eq!(LoadState::Loading, get_load_state(&handle, app.world()));
898898

899899
app.update();
900900
// asset should exist and be loaded at this point
901-
assert_eq!(LoadState::Loaded, get_load_state(&handle, &app.world));
902-
assert!(get_asset(&handle, &app.world).is_some());
901+
assert_eq!(LoadState::Loaded, get_load_state(&handle, app.world()));
902+
assert!(get_asset(&handle, app.world()).is_some());
903903

904904
// after dropping the handle, next call to `tick` will prepare the assets for removal.
905905
drop(handle);
906906
app.update();
907-
assert_eq!(LoadState::Loaded, get_load_state(&weak_handle, &app.world));
908-
assert!(get_asset(&weak_handle, &app.world).is_some());
907+
assert_eq!(LoadState::Loaded, get_load_state(&weak_handle, app.world()));
908+
assert!(get_asset(&weak_handle, app.world()).is_some());
909909

910910
// second call to tick will actually remove the asset.
911911
app.update();
912912
assert_eq!(
913913
LoadState::Unloaded,
914-
get_load_state(&weak_handle, &app.world)
914+
get_load_state(&weak_handle, app.world())
915915
);
916-
assert!(get_asset(&weak_handle, &app.world).is_none());
916+
assert!(get_asset(&weak_handle, app.world()).is_none());
917917

918918
// finally, reload the asset
919-
let handle = load_asset(path.clone(), &app.world).typed();
920-
assert_eq!(LoadState::Loading, get_load_state(&handle, &app.world));
919+
let handle = load_asset(path.clone(), app.world()).typed();
920+
assert_eq!(LoadState::Loading, get_load_state(&handle, app.world()));
921921
app.update();
922-
assert_eq!(LoadState::Loaded, get_load_state(&handle, &app.world));
923-
assert!(get_asset(&handle, &app.world).is_some());
922+
assert_eq!(LoadState::Loaded, get_load_state(&handle, app.world()));
923+
assert!(get_asset(&handle, app.world()).is_some());
924924
}
925925

926926
#[test]

‎crates/bevy_asset/src/assets.rs‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -324,11 +324,11 @@ impl AddAsset for App {
324324
where
325325
T: Asset,
326326
{
327-
if self.world.contains_resource::<Assets<T>>() {
327+
if self.world().contains_resource::<Assets<T>>() {
328328
return self;
329329
}
330330
let assets = {
331-
let asset_server = self.world.resource::<AssetServer>();
331+
let asset_server = self.world().resource::<AssetServer>();
332332
asset_server.register_asset_type::<T>()
333333
};
334334

@@ -343,7 +343,7 @@ impl AddAsset for App {
343343
where
344344
T: Asset + Reflect + FromReflect + GetTypeRegistration,
345345
{
346-
let type_registry = self.world.resource::<AppTypeRegistry>();
346+
let type_registry = self.world().resource::<AppTypeRegistry>();
347347
{
348348
let mut type_registry = type_registry.write();
349349

@@ -367,7 +367,7 @@ impl AddAsset for App {
367367
crate::debug_asset_server::sync_debug_assets::<T>,
368368
);
369369
let mut app = self
370-
.world
370+
.world_mut()
371371
.non_send_resource_mut::<crate::debug_asset_server::DebugAssetApp>();
372372
app.add_asset::<T>()
373373
.init_resource::<crate::debug_asset_server::HandleMap<T>>();
@@ -379,7 +379,7 @@ impl AddAsset for App {
379379
where
380380
T: AssetLoader + FromWorld,
381381
{
382-
let result = T::from_world(&mut self.world);
382+
let result = T::from_world(self.world_mut());
383383
self.add_asset_loader(result)
384384
}
385385

@@ -390,7 +390,7 @@ impl AddAsset for App {
390390
#[cfg(feature = "debug_asset_server")]
391391
{
392392
let mut app = self
393-
.world
393+
.world_mut()
394394
.non_send_resource_mut::<crate::debug_asset_server::DebugAssetApp>();
395395
app.init_asset_loader::<T>();
396396
}
@@ -401,7 +401,9 @@ impl AddAsset for App {
401401
where
402402
T: AssetLoader,
403403
{
404-
self.world.resource_mut::<AssetServer>().add_loader(loader);
404+
self.world_mut()
405+
.resource_mut::<AssetServer>()
406+
.add_loader(loader);
405407
self
406408
}
407409
}
@@ -418,7 +420,7 @@ macro_rules! load_internal_asset {
418420
($app: ident, $handle: ident, $path_str: expr, $loader: expr) => {{
419421
{
420422
let mut debug_app = $app
421-
.world
423+
.world_mut()
422424
.non_send_resource_mut::<$crate::debug_asset_server::DebugAssetApp>();
423425
$crate::debug_asset_server::register_handle_with_loader::<_, &'static str>(
424426
$loader,
@@ -428,7 +430,7 @@ macro_rules! load_internal_asset {
428430
$path_str,
429431
);
430432
}
431-
let mut assets = $app.world.resource_mut::<$crate::Assets<_>>();
433+
let mut assets = $app.world_mut().resource_mut::<$crate::Assets<_>>();
432434
assets.set_untracked(
433435
$handle,
434436
($loader)(
@@ -443,7 +445,7 @@ macro_rules! load_internal_asset {
443445
}};
444446
// we can't support params without variadic arguments, so internal assets with additional params can't be hot-reloaded
445447
($app: ident, $handle: ident, $path_str: expr, $loader: expr $(, $param:expr)+) => {{
446-
let mut assets = $app.world.resource_mut::<$crate::Assets<_>>();
448+
let mut assets = $app.world_mut().resource_mut::<$crate::Assets<_>>();
447449
assets.set_untracked(
448450
$handle,
449451
($loader)(
@@ -469,7 +471,7 @@ macro_rules! load_internal_asset {
469471
#[macro_export]
470472
macro_rules! load_internal_asset {
471473
($app: ident, $handle: ident, $path_str: expr, $loader: expr $(, $param:expr)*) => {{
472-
let mut assets = $app.world.resource_mut::<$crate::Assets<_>>();
474+
let mut assets = $app.world_mut().resource_mut::<$crate::Assets<_>>();
473475
assets.set_untracked(
474476
$handle,
475477
($loader)(
@@ -495,7 +497,7 @@ macro_rules! load_internal_binary_asset {
495497
($app: ident, $handle: ident, $path_str: expr, $loader: expr) => {{
496498
{
497499
let mut debug_app = $app
498-
.world
500+
.world_mut()
499501
.non_send_resource_mut::<$crate::debug_asset_server::DebugAssetApp>();
500502
$crate::debug_asset_server::register_handle_with_loader::<_, &'static [u8]>(
501503
$loader,
@@ -505,7 +507,7 @@ macro_rules! load_internal_binary_asset {
505507
$path_str,
506508
);
507509
}
508-
let mut assets = $app.world.resource_mut::<$crate::Assets<_>>();
510+
let mut assets = $app.world_mut().resource_mut::<$crate::Assets<_>>();
509511
assets.set_untracked(
510512
$handle,
511513
($loader)(
@@ -529,7 +531,7 @@ macro_rules! load_internal_binary_asset {
529531
#[macro_export]
530532
macro_rules! load_internal_binary_asset {
531533
($app: ident, $handle: ident, $path_str: expr, $loader: expr) => {{
532-
let mut assets = $app.world.resource_mut::<$crate::Assets<_>>();
534+
let mut assets = $app.world_mut().resource_mut::<$crate::Assets<_>>();
533535
assets.set_untracked(
534536
$handle,
535537
($loader)(
@@ -563,10 +565,10 @@ mod tests {
563565
crate::AssetPlugin::default(),
564566
));
565567
app.add_asset::<MyAsset>();
566-
let mut assets_before = app.world.resource_mut::<Assets<MyAsset>>();
568+
let mut assets_before = app.world_mut().resource_mut::<Assets<MyAsset>>();
567569
let handle = assets_before.add(MyAsset);
568570
app.add_asset::<MyAsset>(); // Ensure this doesn't overwrite the Asset
569-
let assets_after = app.world.resource_mut::<Assets<MyAsset>>();
571+
let assets_after = app.world_mut().resource_mut::<Assets<MyAsset>>();
570572
assert!(assets_after.get(&handle).is_some());
571573
}
572574
}

‎crates/bevy_asset/src/debug_asset_server.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ pub(crate) fn sync_debug_assets<T: Asset + Clone>(
8888
mut debug_asset_app: NonSendMut<DebugAssetApp>,
8989
mut assets: ResMut<Assets<T>>,
9090
) {
91-
let world = &mut debug_asset_app.0.world;
91+
let world = debug_asset_app.0.world_mut();
9292
let mut state = SystemState::<(
9393
Res<Events<AssetEvent<T>>>,
9494
Res<HandleMap<T>>,
@@ -120,10 +120,10 @@ pub fn register_handle_with_loader<A: Asset, T>(
120120
file_path: &str,
121121
path: &'static str,
122122
) {
123-
let mut state = SystemState::<(ResMut<HandleMap<A>>, Res<AssetServer>)>::new(&mut app.world);
123+
let mut state = SystemState::<(ResMut<HandleMap<A>>, Res<AssetServer>)>::new(app.world_mut());
124124
let manifest_dir = std::env::var("CARGO_MANIFEST_DIR").unwrap();
125125
let manifest_dir_path = Path::new(&manifest_dir);
126-
let (mut handle_map, asset_server) = state.get_mut(&mut app.world);
126+
let (mut handle_map, asset_server) = state.get_mut(app.world_mut());
127127
let asset_io = asset_server
128128
.asset_io()
129129
.downcast_ref::<FileAssetIo>()

‎crates/bevy_asset/src/lib.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ impl AssetPlugin {
123123

124124
impl Plugin for AssetPlugin {
125125
fn build(&self, app: &mut App) {
126-
if !app.world.contains_resource::<AssetServer>() {
126+
if !app.world().contains_resource::<AssetServer>() {
127127
let source = self.create_platform_default_asset_io();
128128
let asset_server = AssetServer::with_boxed_io(source);
129129
app.insert_resource(asset_server);
@@ -142,7 +142,7 @@ impl Plugin for AssetPlugin {
142142
))]
143143
app.add_systems(LoadAssets, io::filesystem_watcher_system);
144144

145-
let mut order = app.world.resource_mut::<MainScheduleOrder>();
145+
let mut order = app.world_mut().resource_mut::<MainScheduleOrder>();
146146
order.insert_after(First, LoadAssets);
147147
order.insert_after(PostUpdate, AssetEvents);
148148
}

‎crates/bevy_asset/src/reflect.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ mod tests {
273273
.register_asset_reflect::<AssetType>();
274274

275275
let reflect_asset = {
276-
let type_registry = app.world.resource::<AppTypeRegistry>();
276+
let type_registry = app.world().resource::<AppTypeRegistry>();
277277
let type_registry = type_registry.read();
278278

279279
type_registry
@@ -286,9 +286,9 @@ mod tests {
286286
field: "test".into(),
287287
};
288288

289-
let handle = reflect_asset.add(&mut app.world, &value);
289+
let handle = reflect_asset.add(app.world_mut(), &value);
290290
let strukt = match reflect_asset
291-
.get_mut(&mut app.world, handle)
291+
.get_mut(app.world_mut(), handle)
292292
.unwrap()
293293
.reflect_mut()
294294
{
@@ -300,19 +300,19 @@ mod tests {
300300
.unwrap()
301301
.apply(&String::from("edited"));
302302

303-
assert_eq!(reflect_asset.len(&app.world), 1);
304-
let ids: Vec<_> = reflect_asset.ids(&app.world).collect();
303+
assert_eq!(reflect_asset.len(app.world()), 1);
304+
let ids: Vec<_> = reflect_asset.ids(app.world()).collect();
305305
assert_eq!(ids.len(), 1);
306306

307307
let fetched_handle = HandleUntyped::weak(ids[0]);
308308
let asset = reflect_asset
309-
.get(&app.world, fetched_handle.clone_weak())
309+
.get(app.world(), fetched_handle.clone_weak())
310310
.unwrap();
311311
assert_eq!(asset.downcast_ref::<AssetType>().unwrap().field, "edited");
312312

313313
reflect_asset
314-
.remove(&mut app.world, fetched_handle)
314+
.remove(app.world_mut(), fetched_handle)
315315
.unwrap();
316-
assert_eq!(reflect_asset.len(&app.world), 0);
316+
assert_eq!(reflect_asset.len(app.world()), 0);
317317
}
318318
}

‎crates/bevy_core/src/lib.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ use std::marker::PhantomData;
3030
use std::ops::Range;
3131
use std::path::{Path, PathBuf};
3232

33-
#[cfg(not(target_arch = "wasm32"))]
3433
#[cfg(not(target_arch = "wasm32"))]
3534
use bevy_tasks::tick_global_task_pools_on_main_thread;
3635

@@ -205,7 +204,7 @@ mod tests {
205204
));
206205
app.update();
207206

208-
let frame_count = app.world.resource::<FrameCount>();
207+
let frame_count = app.world().resource::<FrameCount>();
209208
assert_eq!(1, frame_count.0);
210209
}
211210
}

‎crates/bevy_core_pipeline/src/blit/mod.rs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@ impl Plugin for BlitPlugin {
1818
}
1919

2020
fn finish(&self, app: &mut App) {
21-
let Ok(render_app) = app.get_sub_app_mut(RenderApp) else {
22-
return
23-
};
24-
21+
let Some(render_app) = app.get_sub_app_mut(RenderApp) else { return };
2522
render_app
2623
.init_resource::<BlitPipeline>()
2724
.init_resource::<SpecializedRenderPipelines<BlitPipeline>>();

‎crates/bevy_core_pipeline/src/bloom/mod.rs‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,7 @@ impl Plugin for BloomPlugin {
5757
UniformComponentPlugin::<BloomUniforms>::default(),
5858
));
5959

60-
let render_app = match app.get_sub_app_mut(RenderApp) {
61-
Ok(render_app) => render_app,
62-
Err(_) => return,
63-
};
64-
60+
let Some(render_app) = app.get_sub_app_mut(RenderApp) else { return };
6561
render_app
6662
.init_resource::<SpecializedRenderPipelines<BloomDownsamplingPipeline>>()
6763
.init_resource::<SpecializedRenderPipelines<BloomUpsamplingPipeline>>()
@@ -103,11 +99,7 @@ impl Plugin for BloomPlugin {
10399
}
104100

105101
fn finish(&self, app: &mut App) {
106-
let render_app = match app.get_sub_app_mut(RenderApp) {
107-
Ok(render_app) => render_app,
108-
Err(_) => return,
109-
};
110-
102+
let Some(render_app) = app.get_sub_app_mut(RenderApp) else { return };
111103
render_app
112104
.init_resource::<BloomDownsamplingPipeline>()
113105
.init_resource::<BloomUpsamplingPipeline>();

‎crates/bevy_core_pipeline/src/contrast_adaptive_sharpening/mod.rs‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,7 @@ impl Plugin for CASPlugin {
113113
UniformComponentPlugin::<CASUniform>::default(),
114114
));
115115

116-
let render_app = match app.get_sub_app_mut(RenderApp) {
117-
Ok(render_app) => render_app,
118-
Err(_) => return,
119-
};
116+
let Some(render_app) = app.get_sub_app_mut(RenderApp) else { return };
120117
render_app
121118
.init_resource::<SpecializedRenderPipelines<CASPipeline>>()
122119
.add_systems(Render, prepare_cas_pipelines.in_set(RenderSet::Prepare));
@@ -152,10 +149,7 @@ impl Plugin for CASPlugin {
152149
}
153150

154151
fn finish(&self, app: &mut App) {
155-
let render_app = match app.get_sub_app_mut(RenderApp) {
156-
Ok(render_app) => render_app,
157-
Err(_) => return,
158-
};
152+
let Some(render_app) = app.get_sub_app_mut(RenderApp) else { return };
159153
render_app.init_resource::<CASPipeline>();
160154
}
161155
}

‎crates/bevy_core_pipeline/src/core_2d/mod.rs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,7 @@ impl Plugin for Core2dPlugin {
4747
app.register_type::<Camera2d>()
4848
.add_plugins(ExtractComponentPlugin::<Camera2d>::default());
4949

50-
let render_app = match app.get_sub_app_mut(RenderApp) {
51-
Ok(render_app) => render_app,
52-
Err(_) => return,
53-
};
54-
50+
let Some(render_app) = app.get_sub_app_mut(RenderApp) else { return };
5551
render_app
5652
.init_resource::<DrawFunctions<Transparent2d>>()
5753
.add_systems(ExtractSchedule, extract_core_2d_camera_phases)

0 commit comments

Comments
 (0)