Skip to content

Commit 44fd5d2

Browse files
committed
fmt
1 parent 6f0b2df commit 44fd5d2

File tree

5 files changed

+26
-23
lines changed

5 files changed

+26
-23
lines changed

crates/bevy_pbr/src/light/mod.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ use bevy_render::{
1414
render_resource::BufferBindingType,
1515
renderer::RenderDevice,
1616
view::{
17-
CameraView, derive_render_groups, derive_render_groups_ptr, extract_camera_view, InheritedRenderGroups,
18-
InheritedVisibility, RenderGroups, RenderGroupsPtr, ViewVisibility, VisibleEntities,
17+
derive_render_groups, derive_render_groups_ptr, extract_camera_view, CameraView,
18+
InheritedRenderGroups, InheritedVisibility, RenderGroups, RenderGroupsPtr, ViewVisibility,
19+
VisibleEntities,
1920
},
2021
};
2122
use bevy_transform::components::{GlobalTransform, Transform};
@@ -1214,8 +1215,8 @@ impl PointLightAssignmentData {
12141215

12151216
/// SAFETY: PointLightAssignmentData is only used in `assign_lights_to_clusters`, where it is not reused
12161217
/// between system calls.
1217-
unsafe impl Send for PointLightAssignmentData { }
1218-
unsafe impl Sync for PointLightAssignmentData { }
1218+
unsafe impl Send for PointLightAssignmentData {}
1219+
unsafe impl Sync for PointLightAssignmentData {}
12191220

12201221
#[derive(Resource, Default)]
12211222
pub struct GlobalVisiblePointLights {

crates/bevy_pbr/src/render/light.rs

+15-8
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ use bevy_render::{
1212
render_resource::*,
1313
renderer::{RenderContext, RenderDevice, RenderQueue},
1414
texture::*,
15-
view::{extract_render_groups, ExtractedRenderGroups, ExtractedView, InheritedRenderGroups, RenderGroups, ViewVisibility, VisibleEntities,},
15+
view::{
16+
extract_render_groups, ExtractedRenderGroups, ExtractedView, InheritedRenderGroups,
17+
RenderGroups, ViewVisibility, VisibleEntities,
18+
},
1619
Extract,
1720
};
1821
use bevy_transform::{components::GlobalTransform, prelude::Transform};
@@ -684,7 +687,12 @@ pub fn prepare_lights(
684687
mut global_light_meta: ResMut<GlobalLightMeta>,
685688
mut light_meta: ResMut<LightMeta>,
686689
views: Query<
687-
(Entity, &ExtractedView, &ExtractedClusterConfig, &ExtractedRenderGroups),
690+
(
691+
Entity,
692+
&ExtractedView,
693+
&ExtractedClusterConfig,
694+
&ExtractedRenderGroups,
695+
),
688696
With<RenderPhase<Transparent3d>>,
689697
>,
690698
ambient_light: Res<AmbientLight>,
@@ -1163,12 +1171,11 @@ pub fn prepare_lights(
11631171
.zip(&light.cascade_shadow_config.bounds)
11641172
.enumerate()
11651173
{
1166-
gpu_light.cascades[cascade_index] =
1167-
GpuDirectionalCascade {
1168-
view_projection: cascade.view_projection,
1169-
texel_size: cascade.texel_size,
1170-
far_bound: *bound,
1171-
};
1174+
gpu_light.cascades[cascade_index] = GpuDirectionalCascade {
1175+
view_projection: cascade.view_projection,
1176+
texel_size: cascade.texel_size,
1177+
far_bound: *bound,
1178+
};
11721179

11731180
let depth_texture_view =
11741181
directional_light_depth_texture

crates/bevy_render/src/view/mod.rs

+1-9
Original file line numberDiff line numberDiff line change
@@ -387,15 +387,7 @@ pub fn prepare_view_uniforms(
387387
else {
388388
return;
389389
};
390-
for (
391-
entity,
392-
extracted_camera,
393-
extracted_view,
394-
frustum,
395-
temporal_jitter,
396-
mip_bias,
397-
) in &views
398-
{
390+
for (entity, extracted_camera, extracted_view, frustum, temporal_jitter, mip_bias) in &views {
399391
let viewport = extracted_view.viewport.as_vec4();
400392
let unjittered_projection = extracted_view.projection;
401393
let mut projection = unjittered_projection;

crates/bevy_render/src/view/visibility/mod.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,10 @@ pub fn check_visibility(
428428
// Check render groups.
429429
// - If there is no RenderGroups in the entity, use the *default* value because the
430430
// entity is in the DEFAULT_RENDER_LAYER.
431-
if !camera_view.entity_is_visible(camera_entity, &derive_render_groups(maybe_inherited, maybe_groups)) {
431+
if !camera_view.entity_is_visible(
432+
camera_entity,
433+
&derive_render_groups(maybe_inherited, maybe_groups),
434+
) {
432435
return;
433436
}
434437

crates/bevy_render/src/view/visibility/render_groups.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ impl<'a> RenderGroupsRef<'a> {
438438
/// Moves `self` into `other` if `self` is on the heap and `other` is not.
439439
///
440440
/// Sets self to [`Self::None`].
441-
///
441+
///
442442
/// Returns `true` if reclamation occurred.
443443
pub(crate) fn reclaim(&mut self, other: &mut RenderGroups) -> bool {
444444
match self {

0 commit comments

Comments
 (0)