fmt

Author: Zeophlite

crates/bevy_material/src/material.rs

@@ -2,19 +2,23 @@ use crate::alpha::AlphaMode;
 use crate::opaque::OpaqueRendererMethod;
 use crate::render::MeshPipeline;
 use crate::render::MeshPipelineKey;
-use crate::render_phase::{DrawFunctionId, DrawFunctionLabel, InternedDrawFunctionLabel, InternedShaderLabel, ShaderLabel};
-use crate::render_resource::{BindGroupLayoutDescriptor, RenderPipelineDescriptor, SpecializedMeshPipelineError};
+use crate::render_phase::{
+    DrawFunctionId, DrawFunctionLabel, InternedDrawFunctionLabel, InternedShaderLabel, ShaderLabel,
+};
+use crate::render_resource::{
+    BindGroupLayoutDescriptor, RenderPipelineDescriptor, SpecializedMeshPipelineError,
+};
 use crate::*;
 use alloc::sync::Arc;
 use bevy_asset::Handle;
 use bevy_ecs::resource::Resource;
 use bevy_mesh::MeshVertexBufferLayoutRef;
 use bevy_platform::hash::FixedHasher;
 use bevy_shader::Shader;
-use smallvec::SmallVec;
 use core::any::{Any, TypeId};
-use core::hash::{BuildHasher, Hasher};
 use core::hash::Hash;
+use core::hash::{BuildHasher, Hasher};
+use smallvec::SmallVec;
 
 pub const MATERIAL_BIND_GROUP_INDEX: usize = 3;
 
@@ -197,4 +201,3 @@ pub enum RenderPhaseType {
     Transmissive,
     Transparent,
 }
-

crates/bevy_material/src/render/mesh.rs

@@ -1,13 +1,17 @@
+use crate::{
+    render::{
+        MeshLayouts, MeshPipelineViewLayout, MeshPipelineViewLayoutKey, MeshPipelineViewLayouts,
+    },
+    render_resource::*,
+};
 use bevy_asset::Handle;
 use bevy_ecs::resource::Resource;
 use bevy_image::Image;
 use bevy_mesh::BaseMeshPipelineKey;
 use bevy_shader::Shader;
-use crate::{render::{MeshLayouts, MeshPipelineViewLayout, MeshPipelineViewLayoutKey, MeshPipelineViewLayouts}, render_resource::*};
 
 use static_assertions::const_assert_eq;
 
-
 /// How many textures are allowed in the view bind group layout (`@group(0)`) before
 /// broader compatibility with WebGL and WebGPU is at risk, due to the minimum guaranteed
 /// values for `MAX_TEXTURE_IMAGE_UNITS` (in WebGL) and `maxSampledTexturesPerShaderStage` (in WebGPU),
@@ -19,7 +23,6 @@ use static_assertions::const_assert_eq;
 #[cfg(debug_assertions)]
 pub const MESH_PIPELINE_VIEW_LAYOUT_SAFE_MAX_TEXTURES: usize = 10;
 
-
 /// All data needed to construct a pipeline for rendering 3D meshes.
 #[derive(Resource, Clone)]
 pub struct MeshPipeline {
@@ -226,4 +229,3 @@ const_assert_eq!(
         & MeshPipelineKey::ALL_RESERVED_BITS.bits(),
     0
 );
-

crates/bevy_material/src/render/mesh_bindings.rs

@@ -1,7 +1,5 @@
-
 use crate::render_resource::BindGroupLayoutDescriptor;
 
-
 /// All possible [`BindGroupLayout`]s in bevy's default mesh shader (`mesh.wgsl`).
 #[derive(Clone)]
 pub struct MeshLayouts {

crates/bevy_material/src/render/mesh_view_bindings.rs

@@ -1,11 +1,7 @@
+use crate::{render::MeshPipelineKey, render_resource::*};
 use alloc::sync::Arc;
 use bevy_derive::{Deref, DerefMut};
-use bevy_ecs::{
-    resource::Resource,
-};
-use crate::{
-    render::MeshPipelineKey, render_resource::*
-};
+use bevy_ecs::resource::Resource;
 
 #[cfg(debug_assertions)]
 use {crate::render::MESH_PIPELINE_VIEW_LAYOUT_SAFE_MAX_TEXTURES, bevy_utils::once, tracing::warn};
@@ -135,4 +131,3 @@ impl MeshPipelineViewLayouts {
         layout
     }
 }
-

crates/bevy_material/src/render_phase/draw.rs

@@ -4,4 +4,3 @@ use core::{fmt::Debug, hash::Hash};
 /// An identifier for a [`Draw`] function stored in [`DrawFunctions`].
 #[derive(Copy, Clone, Debug, Eq, PartialEq, PartialOrd, Ord, Hash)]
 pub struct DrawFunctionId(pub u32);
-

crates/bevy_pbr/src/lib.rs

@@ -151,8 +151,8 @@ fn shader_ref(path: PathBuf) -> ShaderRef {
     ShaderRef::Path(AssetPath::from_path_buf(path).with_source("embedded"))
 }
 
-pub use bevy_render::mesh::util::TONEMAPPING_LUT_TEXTURE_BINDING_INDEX;
 pub use bevy_render::mesh::util::TONEMAPPING_LUT_SAMPLER_BINDING_INDEX;
+pub use bevy_render::mesh::util::TONEMAPPING_LUT_TEXTURE_BINDING_INDEX;
 
 /// Sets up the entire PBR infrastructure of bevy.
 pub struct PbrPlugin {

crates/bevy_pbr/src/lightmap/mod.rs

@@ -36,11 +36,8 @@ use bevy_ecs::{
     schedule::IntoScheduleConfigs,
     system::{Commands, Res},
 };
-use bevy_render::{
-    renderer::RenderAdapter,
-    ExtractSchedule, RenderApp, RenderStartup,
-};
 use bevy_render::renderer::RenderDevice;
+use bevy_render::{renderer::RenderAdapter, ExtractSchedule, RenderApp, RenderStartup};
 use bevy_shader::load_shader_library;
 use bevy_utils::default;
 use fixedbitset::FixedBitSet;
@@ -52,7 +49,6 @@ use crate::{binding_arrays_are_usable, MeshExtractionSystems};
 /// A plugin that provides an implementation of lightmaps.
 pub struct LightmapPlugin;
 
-
 impl Plugin for LightmapPlugin {
     fn build(&self, app: &mut App) {
         load_shader_library!(app, "lightmap.wgsl");

crates/bevy_pbr/src/material.rs

@@ -26,10 +26,7 @@ use bevy_ecs::{
         SystemParamItem,
     },
 };
-use bevy_material::{
-    prelude::*,
-    render_phase::*,
-};
+use bevy_material::{prelude::*, render_phase::*};
 use bevy_mesh::{
     mark_3d_meshes_as_changed_if_their_assets_changed, Mesh3d, MeshVertexBufferLayoutRef,
 };

crates/bevy_pbr/src/material_bind_groups.rs

@@ -11,6 +11,7 @@ use bevy_ecs::{
     system::{Commands, Res},
 };
 use bevy_platform::collections::{HashMap, HashSet};
+pub use bevy_render::mesh::material_bind_group::*;
 use bevy_render::render_resource::{BindlessSlabResourceLimit, PipelineCache};
 use bevy_render::{
     render_resource::{
@@ -30,7 +31,6 @@ use bytemuck::Pod;
 use core::hash::Hash;
 use core::{cmp::Ordering, iter, mem, ops::Range};
 use tracing::{error, trace};
-pub use bevy_render::mesh::material_bind_group::*;
 
 #[derive(Resource, Deref, DerefMut, Default)]
 pub struct MaterialBindGroupAllocators(TypeIdMap<MaterialBindGroupAllocator>);

crates/bevy_pbr/src/prepass/mod.rs

@@ -2,13 +2,13 @@ mod prepass_bindings;
 
 use crate::{
     alpha_mode_pipeline_key, binding_arrays_are_usable, buffer_layout,
-    collect_meshes_for_gpu_building, init_material_pipeline, set_mesh_motion_vector_flags,
-    skin, DeferredDrawFunction, DeferredFragmentShader,
-    DeferredVertexShader, DrawMesh, EntitySpecializationTicks, ErasedMaterialPipelineKey,
-    MaterialPipeline, MaterialProperties, MeshLayouts, MeshPipeline, MeshPipelineKey,
-    OpaqueRendererMethod, PreparedMaterial, PrepassDrawFunction, PrepassFragmentShader,
-    PrepassVertexShader, RenderLightmaps, RenderMaterialInstances, RenderMeshInstanceFlags,
-    RenderMeshInstances, RenderPhaseType, SetMaterialBindGroup, SetMeshBindGroup, ShadowView,
+    collect_meshes_for_gpu_building, init_material_pipeline, set_mesh_motion_vector_flags, skin,
+    DeferredDrawFunction, DeferredFragmentShader, DeferredVertexShader, DrawMesh,
+    EntitySpecializationTicks, ErasedMaterialPipelineKey, MaterialPipeline, MaterialProperties,
+    MeshLayouts, MeshPipeline, MeshPipelineKey, OpaqueRendererMethod, PreparedMaterial,
+    PrepassDrawFunction, PrepassFragmentShader, PrepassVertexShader, RenderLightmaps,
+    RenderMaterialInstances, RenderMeshInstanceFlags, RenderMeshInstances, RenderPhaseType,
+    SetMaterialBindGroup, SetMeshBindGroup, ShadowView,
 };
 use bevy_app::{App, Plugin, PreUpdate};
 use bevy_asset::{embedded_asset, load_embedded_asset, AssetServer, Handle};