Skip to content

Commit

Permalink
Cargo fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
Sixmorphugus committed Apr 16, 2023
1 parent ab1cb70 commit 3f5c0a0
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 31 deletions.
16 changes: 5 additions & 11 deletions crates/bevy_core_pipeline/src/core_3d/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ use bevy_utils::{FloatOrd, HashMap};

use crate::{
prepass::{
node::PrepassNode, DepthPrepass, Opaque3dPrepass, AlphaMask3dPrepass, NormalPrepass,
MotionVectorPrepass, DEPTH_PREPASS_FORMAT, NORMAL_PREPASS_FORMAT,
MOTION_VECTOR_PREPASS_FORMAT, ViewPrepassTextures
node::PrepassNode, AlphaMask3dPrepass, DepthPrepass, MotionVectorPrepass, NormalPrepass,
Opaque3dPrepass, ViewPrepassTextures, DEPTH_PREPASS_FORMAT, MOTION_VECTOR_PREPASS_FORMAT,
NORMAL_PREPASS_FORMAT,
},
skybox::SkyboxPlugin,
tonemapping::TonemappingNode,
Expand Down Expand Up @@ -279,13 +279,7 @@ pub fn extract_camera_prepass_phase(
>,
>,
) {
for (
entity,
camera,
depth_prepass,
normal_prepass,
motion_vector_prepass,
) in cameras_3d.iter()
for (entity, camera, depth_prepass, normal_prepass, motion_vector_prepass) in cameras_3d.iter()
{
if camera.is_active {
let mut entity = commands.get_or_spawn(entity);
Expand Down Expand Up @@ -479,4 +473,4 @@ pub fn prepare_prepass_textures(
size,
});
}
}
}
26 changes: 6 additions & 20 deletions crates/bevy_pbr/src/prepass/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ use bevy_render::{
prelude::{Camera, Mesh},
render_asset::RenderAssets,
render_phase::{
AddRenderCommand, DrawFunctions, PhaseItem, RenderCommand,
RenderCommandResult, RenderPhase, SetItemPipeline, TrackedRenderPass,
AddRenderCommand, DrawFunctions, PhaseItem, RenderCommand, RenderCommandResult,
RenderPhase, SetItemPipeline, TrackedRenderPass,
},
render_resource::{
BindGroup, BindGroupDescriptor, BindGroupEntry, BindGroupLayout, BindGroupLayoutDescriptor,
Expand All @@ -33,7 +33,7 @@ use bevy_render::{
DynamicUniformBuffer, FragmentState, FrontFace, MultisampleState, PipelineCache,
PolygonMode, PrimitiveState, RenderPipelineDescriptor, Shader, ShaderDefVal, ShaderRef,
ShaderStages, ShaderType, SpecializedMeshPipeline, SpecializedMeshPipelineError,
SpecializedMeshPipelines, StencilFaceState, StencilState,TextureSampleType,
SpecializedMeshPipelines, StencilFaceState, StencilState, TextureSampleType,
TextureViewDimension, VertexState,
},
renderer::{RenderDevice, RenderQueue},
Expand All @@ -42,7 +42,7 @@ use bevy_render::{
Extract, ExtractSchedule, Render, RenderApp, RenderSet,
};
use bevy_transform::prelude::GlobalTransform;
use bevy_utils::{tracing::error};
use bevy_utils::tracing::error;

use crate::{
prepare_lights, AlphaMode, DrawMesh, Material, MaterialPipeline, MaterialPipelineKey,
Expand Down Expand Up @@ -621,23 +621,9 @@ pub fn get_bindings<'a>(
// Extract the render phases for the prepass
pub fn extract_camera_previous_view_projection(
mut commands: Commands,
cameras_3d: Extract<
Query<
(
Entity,
&Camera,
Option<&PreviousViewProjection>,
),
With<Camera3d>,
>,
>,
cameras_3d: Extract<Query<(Entity, &Camera, Option<&PreviousViewProjection>), With<Camera3d>>>,
) {
for (
entity,
camera,
maybe_previous_view_proj,
) in cameras_3d.iter()
{
for (entity, camera, maybe_previous_view_proj) in cameras_3d.iter() {
if camera.is_active {
let mut entity = commands.get_or_spawn(entity);

Expand Down

0 comments on commit 3f5c0a0

Please sign in to comment.