From 180c94cc13bf0d6c9635104edfe1005d160fa217 Mon Sep 17 00:00:00 2001 From: Martin Lysell Date: Tue, 27 Sep 2022 17:51:12 +0000 Subject: [PATCH] Fix some outdated file reference comments in bevy_pbr (#6111) # Objective Simple docs/comments only PR that just fixes some outdated file references left over from the render rewrite. ## Solution - Change the references to point to the correct files --- crates/bevy_pbr/src/render/light.rs | 4 ++-- crates/bevy_pbr/src/render/mesh.rs | 2 +- crates/bevy_pbr/src/render/mesh_view_types.wgsl | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crates/bevy_pbr/src/render/light.rs b/crates/bevy_pbr/src/render/light.rs index 908f4981cb..8c40a31561 100644 --- a/crates/bevy_pbr/src/render/light.rs +++ b/crates/bevy_pbr/src/render/light.rs @@ -163,7 +163,7 @@ impl GpuPointLights { } } -// NOTE: These must match the bit flags in bevy_pbr2/src/render/pbr.frag! +// NOTE: These must match the bit flags in bevy_pbr/src/render/mesh_view_types.wgsl! bitflags::bitflags! { #[repr(transparent)] struct PointLightFlags: u32 { @@ -184,7 +184,7 @@ pub struct GpuDirectionalLight { shadow_normal_bias: f32, } -// NOTE: These must match the bit flags in bevy_pbr2/src/render/pbr.frag! +// NOTE: These must match the bit flags in bevy_pbr/src/render/mesh_view_types.wgsl! bitflags::bitflags! { #[repr(transparent)] struct DirectionalLightFlags: u32 { diff --git a/crates/bevy_pbr/src/render/mesh.rs b/crates/bevy_pbr/src/render/mesh.rs index 539af6393b..fb6aad812b 100644 --- a/crates/bevy_pbr/src/render/mesh.rs +++ b/crates/bevy_pbr/src/render/mesh.rs @@ -112,7 +112,7 @@ pub struct MeshUniform { pub flags: u32, } -// NOTE: These must match the bit flags in bevy_pbr2/src/render/mesh.wgsl! +// NOTE: These must match the bit flags in bevy_pbr/src/render/mesh_types.wgsl! bitflags::bitflags! { #[repr(transparent)] struct MeshFlags: u32 { diff --git a/crates/bevy_pbr/src/render/mesh_view_types.wgsl b/crates/bevy_pbr/src/render/mesh_view_types.wgsl index 4abef78cfc..92e665d2e0 100644 --- a/crates/bevy_pbr/src/render/mesh_view_types.wgsl +++ b/crates/bevy_pbr/src/render/mesh_view_types.wgsl @@ -41,7 +41,7 @@ struct DirectionalLight { let DIRECTIONAL_LIGHT_FLAGS_SHADOWS_ENABLED_BIT: u32 = 1u; struct Lights { - // NOTE: this array size must be kept in sync with the constants defined bevy_pbr2/src/render/light.rs + // NOTE: this array size must be kept in sync with the constants defined in bevy_pbr/src/render/light.rs directional_lights: array, ambient_color: vec4, // x/y/z dimensions and n_clusters in w