Skip to content

Commit 4a1226e

Browse files
andriyDevandriyDev
committed
Make most RenderApp access in bevy_anti_aliasing, bevy_sprite, and bevy_ui panic instead of doing nothing.
1 parent a6e27d8 commit 4a1226e

File tree

12 files changed

+167
-156
lines changed

12 files changed

+167
-156
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,9 @@ impl Plugin for CasPlugin {
108108
UniformComponentPlugin::<CasUniform>::default(),
109109
));
110110

111-
let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
112-
return;
113-
};
111+
let render_app = app
112+
.get_sub_app_mut(RenderApp)
113+
.expect("RenderPlugin has not been added");
114114
render_app
115115
.init_resource::<SpecializedRenderPipelines<CasPipeline>>()
116116
.add_systems(Render, prepare_cas_pipelines.in_set(RenderSystems::Prepare));
@@ -152,9 +152,9 @@ impl Plugin for CasPlugin {
152152
}
153153

154154
fn finish(&self, app: &mut App) {
155-
let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
156-
return;
157-
};
155+
let render_app = app
156+
.get_sub_app_mut(RenderApp)
157+
.expect("RenderPlugin has not been added");
158158
render_app.init_resource::<CasPipeline>();
159159
}
160160
}

‎crates/bevy_anti_aliasing/src/fxaa/mod.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ impl Plugin for FxaaPlugin {
8989
app.register_type::<Fxaa>();
9090
app.add_plugins(ExtractComponentPlugin::<Fxaa>::default());
9191

92-
let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
93-
return;
94-
};
92+
let render_app = app
93+
.get_sub_app_mut(RenderApp)
94+
.expect("RenderPlugin has not been added");
9595
render_app
9696
.init_resource::<SpecializedRenderPipelines<FxaaPipeline>>()
9797
.add_systems(
@@ -119,9 +119,9 @@ impl Plugin for FxaaPlugin {
119119
}
120120

121121
fn finish(&self, app: &mut App) {
122-
let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
123-
return;
124-
};
122+
let render_app = app
123+
.get_sub_app_mut(RenderApp)
124+
.expect("RenderPlugin has not been added");
125125
render_app.init_resource::<FxaaPipeline>();
126126
}
127127
}

‎crates/bevy_anti_aliasing/src/smaa/mod.rs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -339,9 +339,9 @@ impl Plugin for SmaaPlugin {
339339
app.add_plugins(ExtractComponentPlugin::<Smaa>::default())
340340
.register_type::<Smaa>();
341341

342-
let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
343-
return;
344-
};
342+
let render_app = app
343+
.get_sub_app_mut(RenderApp)
344+
.expect("RenderPlugin has not been added");
345345

346346
render_app
347347
.init_resource::<SmaaSpecializedRenderPipelines>()
@@ -376,9 +376,10 @@ impl Plugin for SmaaPlugin {
376376
}
377377

378378
fn finish(&self, app: &mut App) {
379-
if let Some(render_app) = app.get_sub_app_mut(RenderApp) {
380-
render_app.init_resource::<SmaaPipelines>();
381-
}
379+
let render_app = app
380+
.get_sub_app_mut(RenderApp)
381+
.expect("RenderPlugin has not been added");
382+
render_app.init_resource::<SmaaPipelines>();
382383
}
383384
}
384385

‎crates/bevy_anti_aliasing/src/taa/mod.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ impl Plugin for TemporalAntiAliasPlugin {
5353

5454
app.add_plugins(SyncComponentPlugin::<TemporalAntiAliasing>::default());
5555

56-
let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
57-
return;
58-
};
56+
let render_app = app
57+
.get_sub_app_mut(RenderApp)
58+
.expect("RenderPlugin has not been added");
5959
render_app
6060
.init_resource::<SpecializedRenderPipelines<TaaPipeline>>()
6161
.add_systems(ExtractSchedule, extract_taa_settings)
@@ -81,9 +81,9 @@ impl Plugin for TemporalAntiAliasPlugin {
8181
}
8282

8383
fn finish(&self, app: &mut App) {
84-
let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
85-
return;
86-
};
84+
let render_app = app
85+
.get_sub_app_mut(RenderApp)
86+
.expect("RenderPlugin has not been added");
8787

8888
render_app.init_resource::<TaaPipeline>();
8989
}

‎crates/bevy_sprite/src/mesh2d/material.rs

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -276,41 +276,43 @@ where
276276
check_entities_needing_specialization::<M>.after(AssetEventSystems),
277277
);
278278

279-
if let Some(render_app) = app.get_sub_app_mut(RenderApp) {
280-
render_app
281-
.init_resource::<EntitySpecializationTicks<M>>()
282-
.init_resource::<SpecializedMaterial2dPipelineCache<M>>()
283-
.add_render_command::<Opaque2d, DrawMaterial2d<M>>()
284-
.add_render_command::<AlphaMask2d, DrawMaterial2d<M>>()
285-
.add_render_command::<Transparent2d, DrawMaterial2d<M>>()
286-
.init_resource::<RenderMaterial2dInstances<M>>()
287-
.init_resource::<SpecializedMeshPipelines<Material2dPipeline<M>>>()
288-
.add_systems(
289-
ExtractSchedule,
290-
(
291-
extract_entities_needs_specialization::<M>.after(extract_cameras),
292-
extract_mesh_materials_2d::<M>,
293-
),
294-
)
295-
.add_systems(
296-
Render,
297-
(
298-
specialize_material2d_meshes::<M>
299-
.in_set(RenderSystems::PrepareMeshes)
300-
.after(prepare_assets::<PreparedMaterial2d<M>>)
301-
.after(prepare_assets::<RenderMesh>),
302-
queue_material2d_meshes::<M>
303-
.in_set(RenderSystems::QueueMeshes)
304-
.after(prepare_assets::<PreparedMaterial2d<M>>),
305-
),
306-
);
307-
}
279+
let render_app = app
280+
.get_sub_app_mut(RenderApp)
281+
.expect("RenderPlugin has not been added");
282+
render_app
283+
.init_resource::<EntitySpecializationTicks<M>>()
284+
.init_resource::<SpecializedMaterial2dPipelineCache<M>>()
285+
.add_render_command::<Opaque2d, DrawMaterial2d<M>>()
286+
.add_render_command::<AlphaMask2d, DrawMaterial2d<M>>()
287+
.add_render_command::<Transparent2d, DrawMaterial2d<M>>()
288+
.init_resource::<RenderMaterial2dInstances<M>>()
289+
.init_resource::<SpecializedMeshPipelines<Material2dPipeline<M>>>()
290+
.add_systems(
291+
ExtractSchedule,
292+
(
293+
extract_entities_needs_specialization::<M>.after(extract_cameras),
294+
extract_mesh_materials_2d::<M>,
295+
),
296+
)
297+
.add_systems(
298+
Render,
299+
(
300+
specialize_material2d_meshes::<M>
301+
.in_set(RenderSystems::PrepareMeshes)
302+
.after(prepare_assets::<PreparedMaterial2d<M>>)
303+
.after(prepare_assets::<RenderMesh>),
304+
queue_material2d_meshes::<M>
305+
.in_set(RenderSystems::QueueMeshes)
306+
.after(prepare_assets::<PreparedMaterial2d<M>>),
307+
),
308+
);
308309
}
309310

310311
fn finish(&self, app: &mut App) {
311-
if let Some(render_app) = app.get_sub_app_mut(RenderApp) {
312-
render_app.init_resource::<Material2dPipeline<M>>();
313-
}
312+
let render_app = app
313+
.get_sub_app_mut(RenderApp)
314+
.expect("RenderPlugin has not been added");
315+
render_app.init_resource::<Material2dPipeline<M>>();
314316
}
315317
}
316318

‎crates/bevy_sprite/src/mesh2d/wireframe2d.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ impl Plugin for Wireframe2dPlugin {
109109
.run_if(resource_exists::<Wireframe2dConfig>),
110110
);
111111

112-
let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
113-
return;
114-
};
112+
let render_app = app
113+
.get_sub_app_mut(RenderApp)
114+
.expect("RenderPlugin has not been added");
115115

116116
render_app
117117
.init_resource::<WireframeEntitySpecializationTicks>()
@@ -152,9 +152,9 @@ impl Plugin for Wireframe2dPlugin {
152152
}
153153

154154
fn finish(&self, app: &mut App) {
155-
let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
156-
return;
157-
};
155+
let render_app = app
156+
.get_sub_app_mut(RenderApp)
157+
.expect("RenderPlugin has not been added");
158158
render_app.init_resource::<Wireframe2dPipeline>();
159159
}
160160
}

‎crates/bevy_ui/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -273,9 +273,9 @@ impl Plugin for UiPlugin {
273273
return;
274274
}
275275

276-
let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
277-
return;
278-
};
276+
let render_app = app
277+
.get_sub_app_mut(RenderApp)
278+
.expect("RenderPlugin has not been added");
279279

280280
render_app.init_resource::<UiPipeline>();
281281
}

‎crates/bevy_ui/src/render/box_shadow.rs

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -41,30 +41,32 @@ impl Plugin for BoxShadowPlugin {
4141
fn build(&self, app: &mut App) {
4242
embedded_asset!(app, "box_shadow.wgsl");
4343

44-
if let Some(render_app) = app.get_sub_app_mut(RenderApp) {
45-
render_app
46-
.add_render_command::<TransparentUi, DrawBoxShadows>()
47-
.init_resource::<ExtractedBoxShadows>()
48-
.init_resource::<BoxShadowMeta>()
49-
.init_resource::<SpecializedRenderPipelines<BoxShadowPipeline>>()
50-
.add_systems(
51-
ExtractSchedule,
52-
extract_shadows.in_set(RenderUiSystems::ExtractBoxShadows),
53-
)
54-
.add_systems(
55-
Render,
56-
(
57-
queue_shadows.in_set(RenderSystems::Queue),
58-
prepare_shadows.in_set(RenderSystems::PrepareBindGroups),
59-
),
60-
);
61-
}
44+
let render_app = app
45+
.get_sub_app_mut(RenderApp)
46+
.expect("RenderPlugin has not been added");
47+
render_app
48+
.add_render_command::<TransparentUi, DrawBoxShadows>()
49+
.init_resource::<ExtractedBoxShadows>()
50+
.init_resource::<BoxShadowMeta>()
51+
.init_resource::<SpecializedRenderPipelines<BoxShadowPipeline>>()
52+
.add_systems(
53+
ExtractSchedule,
54+
extract_shadows.in_set(RenderUiSystems::ExtractBoxShadows),
55+
)
56+
.add_systems(
57+
Render,
58+
(
59+
queue_shadows.in_set(RenderSystems::Queue),
60+
prepare_shadows.in_set(RenderSystems::PrepareBindGroups),
61+
),
62+
);
6263
}
6364

6465
fn finish(&self, app: &mut App) {
65-
if let Some(render_app) = app.get_sub_app_mut(RenderApp) {
66-
render_app.init_resource::<BoxShadowPipeline>();
67-
}
66+
let render_app = app
67+
.get_sub_app_mut(RenderApp)
68+
.expect("RenderPlugin has not been added");
69+
render_app.init_resource::<BoxShadowPipeline>();
6870
}
6971
}
7072

‎crates/bevy_ui/src/render/gradient.rs

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -40,33 +40,35 @@ impl Plugin for GradientPlugin {
4040
fn build(&self, app: &mut App) {
4141
embedded_asset!(app, "gradient.wgsl");
4242

43-
if let Some(render_app) = app.get_sub_app_mut(RenderApp) {
44-
render_app
45-
.add_render_command::<TransparentUi, DrawGradientFns>()
46-
.init_resource::<ExtractedGradients>()
47-
.init_resource::<ExtractedColorStops>()
48-
.init_resource::<GradientMeta>()
49-
.init_resource::<SpecializedRenderPipelines<GradientPipeline>>()
50-
.add_systems(
51-
ExtractSchedule,
52-
extract_gradients
53-
.in_set(RenderUiSystems::ExtractGradient)
54-
.after(extract_uinode_background_colors),
55-
)
56-
.add_systems(
57-
Render,
58-
(
59-
queue_gradient.in_set(RenderSystems::Queue),
60-
prepare_gradient.in_set(RenderSystems::PrepareBindGroups),
61-
),
62-
);
63-
}
43+
let render_app = app
44+
.get_sub_app_mut(RenderApp)
45+
.expect("RenderPlugin has not been added");
46+
render_app
47+
.add_render_command::<TransparentUi, DrawGradientFns>()
48+
.init_resource::<ExtractedGradients>()
49+
.init_resource::<ExtractedColorStops>()
50+
.init_resource::<GradientMeta>()
51+
.init_resource::<SpecializedRenderPipelines<GradientPipeline>>()
52+
.add_systems(
53+
ExtractSchedule,
54+
extract_gradients
55+
.in_set(RenderUiSystems::ExtractGradient)
56+
.after(extract_uinode_background_colors),
57+
)
58+
.add_systems(
59+
Render,
60+
(
61+
queue_gradient.in_set(RenderSystems::Queue),
62+
prepare_gradient.in_set(RenderSystems::PrepareBindGroups),
63+
),
64+
);
6465
}
6566

6667
fn finish(&self, app: &mut App) {
67-
if let Some(render_app) = app.get_sub_app_mut(RenderApp) {
68-
render_app.init_resource::<GradientPipeline>();
69-
}
68+
let render_app = app
69+
.get_sub_app_mut(RenderApp)
70+
.expect("RenderPlugin has not been added");
71+
render_app.init_resource::<GradientPipeline>();
7072
}
7173
}
7274

‎crates/bevy_ui/src/render/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@ pub type RenderUiSystem = RenderUiSystems;
126126
pub fn build_ui_render(app: &mut App) {
127127
load_shader_library!(app, "ui.wgsl");
128128

129-
let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
130-
return;
131-
};
129+
let render_app = app
130+
.get_sub_app_mut(RenderApp)
131+
.expect("RenderPlugin has not been added");
132132

133133
render_app
134134
.init_resource::<SpecializedRenderPipelines<UiPipeline>>()

0 commit comments

Comments
 (0)