Use bevy::light in examples instead of bevy::pbr::light re-export (#20487)

atlv24 · web-flow · commit ce416c37a2a5 · 2025-08-10T05:25:03.000Z
# Objective

- Prepare for removing re-exports

## Solution

- title

## Testing

- cargo check --examples --all-features
diff --git a/examples/3d/anti_aliasing.rs b/examples/3d/anti_aliasing.rs
@@ -11,7 +11,7 @@ use bevy::{
     },
     core_pipeline::prepass::{DepthPrepass, MotionVectorPrepass},
     image::{ImageSampler, ImageSamplerDescriptor},
-    pbr::CascadeShadowConfigBuilder,
+    light::CascadeShadowConfigBuilder,
     prelude::*,
     render::{
         camera::{MipBias, TemporalJitter},
diff --git a/examples/3d/atmosphere.rs b/examples/3d/atmosphere.rs
@@ -5,7 +5,8 @@ use std::f32::consts::PI;
 use bevy::{
     camera::Exposure,
     core_pipeline::{bloom::Bloom, tonemapping::Tonemapping},
-    pbr::{light_consts::lux, Atmosphere, AtmosphereSettings, CascadeShadowConfigBuilder},
+    light::{light_consts::lux, CascadeShadowConfigBuilder},
+    pbr::{Atmosphere, AtmosphereSettings},
     prelude::*,
 };
 
diff --git a/examples/3d/atmospheric_fog.rs b/examples/3d/atmospheric_fog.rs
@@ -8,7 +8,7 @@
 //! | `S`                | Toggle Directional Light Fog Influence |
 
 use bevy::{
-    pbr::{CascadeShadowConfigBuilder, NotShadowCaster},
+    light::{CascadeShadowConfigBuilder, NotShadowCaster},
     prelude::*,
 };
 
diff --git a/examples/3d/color_grading.rs b/examples/3d/color_grading.rs
@@ -7,7 +7,7 @@ use std::{
 
 use bevy::{
     ecs::system::EntityCommands,
-    pbr::CascadeShadowConfigBuilder,
+    light::CascadeShadowConfigBuilder,
     prelude::*,
     render::view::{ColorGrading, ColorGradingGlobal, ColorGradingSection, Hdr},
 };
diff --git a/examples/3d/deferred_rendering.rs b/examples/3d/deferred_rendering.rs
@@ -6,11 +6,11 @@ use bevy::{
     anti_aliasing::fxaa::Fxaa,
     core_pipeline::prepass::{DeferredPrepass, DepthPrepass, MotionVectorPrepass, NormalPrepass},
     image::ImageLoaderSettings,
-    math::ops,
-    pbr::{
-        CascadeShadowConfigBuilder, DefaultOpaqueRendererMethod, DirectionalLightShadowMap,
-        NotShadowCaster, NotShadowReceiver, OpaqueRendererMethod,
+    light::{
+        CascadeShadowConfigBuilder, DirectionalLightShadowMap, NotShadowCaster, NotShadowReceiver,
     },
+    math::ops,
+    pbr::{DefaultOpaqueRendererMethod, OpaqueRendererMethod},
     prelude::*,
 };
 
diff --git a/examples/3d/edit_material_on_gltf.rs b/examples/3d/edit_material_on_gltf.rs
@@ -6,8 +6,9 @@ use bevy::{
     audio::AudioPlugin,
     color::{palettes, Color},
     gltf::GltfAssetLabel,
+    light::DirectionalLight,
     math::{Dir3, Vec3},
-    pbr::{DirectionalLight, MeshMaterial3d, StandardMaterial},
+    pbr::{MeshMaterial3d, StandardMaterial},
     prelude::{Camera3d, Children, Commands, Component, On, Query, Res, ResMut, Transform},
     scene::{SceneInstanceReady, SceneRoot},
     DefaultPlugins,
diff --git a/examples/3d/fog.rs b/examples/3d/fog.rs
@@ -22,8 +22,8 @@
 //! | `.` / `?`          | Adjust Fog Alpha Channel            |
 
 use bevy::{
+    light::{NotShadowCaster, NotShadowReceiver},
     math::ops,
-    pbr::{NotShadowCaster, NotShadowReceiver},
     prelude::*,
 };
 
diff --git a/examples/3d/fog_volumes.rs b/examples/3d/fog_volumes.rs
@@ -6,8 +6,8 @@
 //! light.
 
 use bevy::{
+    light::{FogVolume, VolumetricFog, VolumetricLight},
     math::vec3,
-    pbr::{FogVolume, VolumetricFog, VolumetricLight},
     prelude::*,
     render::view::Hdr,
 };
diff --git a/examples/3d/irradiance_volumes.rs b/examples/3d/irradiance_volumes.rs
@@ -16,10 +16,9 @@
 use bevy::{
     color::palettes::css::*,
     core_pipeline::Skybox,
+    light::{IrradianceVolume, NotShadowCaster},
     math::{uvec3, vec3},
-    pbr::{
-        irradiance_volume::IrradianceVolume, ExtendedMaterial, MaterialExtension, NotShadowCaster,
-    },
+    pbr::{ExtendedMaterial, MaterialExtension},
     prelude::*,
     render::render_resource::{AsBindGroup, ShaderRef, ShaderType},
     window::PrimaryWindow,
diff --git a/examples/3d/light_textures.rs b/examples/3d/light_textures.rs
@@ -7,7 +7,8 @@ use bevy::{
     camera::primitives::CubemapLayout,
     color::palettes::css::{SILVER, YELLOW},
     input::mouse::AccumulatedMouseMotion,
-    pbr::{decal, DirectionalLightTexture, NotShadowCaster, PointLightTexture, SpotLightTexture},
+    light::{DirectionalLightTexture, NotShadowCaster, PointLightTexture, SpotLightTexture},
+    pbr::decal,
     prelude::*,
     render::renderer::{RenderAdapter, RenderDevice},
     window::{CursorIcon, SystemCursorIcon},
diff --git a/examples/3d/lighting.rs b/examples/3d/lighting.rs
@@ -6,7 +6,7 @@ use std::f32::consts::PI;
 use bevy::{
     camera::{Exposure, PhysicalCameraParameters},
     color::palettes::css::*,
-    pbr::CascadeShadowConfigBuilder,
+    light::CascadeShadowConfigBuilder,
     prelude::*,
 };
 
diff --git a/examples/3d/load_gltf.rs b/examples/3d/load_gltf.rs
@@ -1,7 +1,7 @@
 //! Loads and renders a glTF file as a scene.
 
 use bevy::{
-    pbr::{CascadeShadowConfigBuilder, DirectionalLightShadowMap},
+    light::{CascadeShadowConfigBuilder, DirectionalLightShadowMap},
     prelude::*,
 };
 use std::f32::consts::*;
diff --git a/examples/3d/meshlet.rs b/examples/3d/meshlet.rs
@@ -6,10 +6,8 @@
 mod camera_controller;
 
 use bevy::{
-    pbr::{
-        experimental::meshlet::{MeshletMesh3d, MeshletPlugin},
-        CascadeShadowConfigBuilder, DirectionalLightShadowMap,
-    },
+    light::{CascadeShadowConfigBuilder, DirectionalLightShadowMap},
+    pbr::experimental::meshlet::{MeshletMesh3d, MeshletPlugin},
     prelude::*,
     render::render_resource::AsBindGroup,
 };
diff --git a/examples/3d/pcss.rs b/examples/3d/pcss.rs
@@ -12,8 +12,8 @@ use bevy::{
         prepass::{DepthPrepass, MotionVectorPrepass},
         Skybox,
     },
+    light::ShadowFilteringMethod,
     math::vec3,
-    pbr::ShadowFilteringMethod,
     prelude::*,
     render::camera::TemporalJitter,
 };
diff --git a/examples/3d/post_processing.rs b/examples/3d/post_processing.rs
@@ -5,8 +5,8 @@
 use std::f32::consts::PI;
 
 use bevy::{
-    core_pipeline::post_process::ChromaticAberration, pbr::CascadeShadowConfigBuilder, prelude::*,
-    render::view::Hdr,
+    core_pipeline::post_process::ChromaticAberration, light::CascadeShadowConfigBuilder,
+    prelude::*, render::view::Hdr,
 };
 
 /// The number of units per frame to add to or subtract from intensity when the
diff --git a/examples/3d/scrolling_fog.rs b/examples/3d/scrolling_fog.rs
@@ -17,7 +17,7 @@ use bevy::{
         ImageAddressMode, ImageFilterMode, ImageLoaderSettings, ImageSampler,
         ImageSamplerDescriptor,
     },
-    pbr::{DirectionalLightShadowMap, FogVolume, VolumetricFog, VolumetricLight},
+    light::{DirectionalLightShadowMap, FogVolume, VolumetricFog, VolumetricLight},
     prelude::*,
 };
 
diff --git a/examples/3d/shadow_biases.rs b/examples/3d/shadow_biases.rs
@@ -3,7 +3,7 @@
 #[path = "../helpers/camera_controller.rs"]
 mod camera_controller;
 
-use bevy::{pbr::ShadowFilteringMethod, prelude::*};
+use bevy::{light::ShadowFilteringMethod, prelude::*};
 use camera_controller::{CameraController, CameraControllerPlugin};
 
 fn main() {
diff --git a/examples/3d/shadow_caster_receiver.rs b/examples/3d/shadow_caster_receiver.rs
@@ -4,7 +4,7 @@ use std::f32::consts::PI;
 
 use bevy::{
     color::palettes::basic::{BLUE, LIME, RED},
-    pbr::{CascadeShadowConfigBuilder, NotShadowCaster, NotShadowReceiver},
+    light::{CascadeShadowConfigBuilder, NotShadowCaster, NotShadowReceiver},
     prelude::*,
 };
 
diff --git a/examples/3d/split_screen.rs b/examples/3d/split_screen.rs
@@ -2,7 +2,9 @@
 
 use std::f32::consts::PI;
 
-use bevy::{camera::Viewport, pbr::CascadeShadowConfigBuilder, prelude::*, window::WindowResized};
+use bevy::{
+    camera::Viewport, light::CascadeShadowConfigBuilder, prelude::*, window::WindowResized,
+};
 
 fn main() {
     App::new()
diff --git a/examples/3d/spotlight.rs b/examples/3d/spotlight.rs
@@ -4,8 +4,8 @@ use std::f32::consts::*;
 
 use bevy::{
     color::palettes::basic::{MAROON, RED},
+    light::NotShadowCaster,
     math::ops,
-    pbr::NotShadowCaster,
     prelude::*,
     render::view::Hdr,
 };
diff --git a/examples/3d/tonemapping.rs b/examples/3d/tonemapping.rs
@@ -3,7 +3,7 @@
 use bevy::{
     asset::UnapprovedPathMode,
     core_pipeline::tonemapping::Tonemapping,
-    pbr::CascadeShadowConfigBuilder,
+    light::CascadeShadowConfigBuilder,
     platform::collections::HashMap,
     prelude::*,
     reflect::TypePath,
diff --git a/examples/3d/transmission.rs b/examples/3d/transmission.rs
@@ -24,8 +24,8 @@ use bevy::{
     camera::{Exposure, ScreenSpaceTransmissionQuality},
     color::palettes::css::*,
     core_pipeline::{bloom::Bloom, prepass::DepthPrepass, tonemapping::Tonemapping},
+    light::{NotShadowCaster, PointLightShadowMap, TransmittedShadowReceiver},
     math::ops,
-    pbr::{NotShadowCaster, PointLightShadowMap, TransmittedShadowReceiver},
     prelude::*,
     render::{
         camera::TemporalJitter,
diff --git a/examples/3d/update_gltf_scene.rs b/examples/3d/update_gltf_scene.rs
@@ -1,7 +1,7 @@
 //! Update a scene from a glTF file, either by spawning the scene as a child of another entity,
 //! or by accessing the entities of the scene.
 
-use bevy::{pbr::DirectionalLightShadowMap, prelude::*};
+use bevy::{light::DirectionalLightShadowMap, prelude::*};
 
 fn main() {
     App::new()
diff --git a/examples/3d/visibility_range.rs b/examples/3d/visibility_range.rs
@@ -6,8 +6,8 @@ use bevy::{
     camera::visibility::VisibilityRange,
     core_pipeline::prepass::{DepthPrepass, NormalPrepass},
     input::mouse::MouseWheel,
+    light::{light_consts::lux::FULL_DAYLIGHT, CascadeShadowConfigBuilder},
     math::vec3,
-    pbr::{light_consts::lux::FULL_DAYLIGHT, CascadeShadowConfigBuilder},
     prelude::*,
 };
 
diff --git a/examples/3d/volumetric_fog.rs b/examples/3d/volumetric_fog.rs
@@ -3,8 +3,8 @@
 use bevy::{
     color::palettes::css::RED,
     core_pipeline::{bloom::Bloom, tonemapping::Tonemapping, Skybox},
+    light::{FogVolume, VolumetricFog, VolumetricLight},
     math::vec3,
-    pbr::{FogVolume, VolumetricFog, VolumetricLight},
     prelude::*,
 };
 
diff --git a/examples/animation/animated_mesh.rs b/examples/animation/animated_mesh.rs
@@ -2,7 +2,7 @@
 
 use std::f32::consts::PI;
 
-use bevy::{pbr::CascadeShadowConfigBuilder, prelude::*, scene::SceneInstanceReady};
+use bevy::{light::CascadeShadowConfigBuilder, prelude::*, scene::SceneInstanceReady};
 
 // An example asset that contains a mesh and animation.
 const GLTF_PATH: &str = "models/animated/Fox.glb";
diff --git a/examples/animation/animated_mesh_control.rs b/examples/animation/animated_mesh_control.rs
@@ -2,7 +2,7 @@
 
 use std::{f32::consts::PI, time::Duration};
 
-use bevy::{animation::RepeatAnimation, pbr::CascadeShadowConfigBuilder, prelude::*};
+use bevy::{animation::RepeatAnimation, light::CascadeShadowConfigBuilder, prelude::*};
 
 const FOX_PATH: &str = "models/animated/Fox.glb";
 
diff --git a/examples/animation/animated_mesh_events.rs b/examples/animation/animated_mesh_events.rs
@@ -3,7 +3,7 @@
 use std::{f32::consts::PI, time::Duration};
 
 use bevy::{
-    animation::AnimationTargetId, color::palettes::css::WHITE, pbr::CascadeShadowConfigBuilder,
+    animation::AnimationTargetId, color::palettes::css::WHITE, light::CascadeShadowConfigBuilder,
     prelude::*,
 };
 use rand::{Rng, SeedableRng};
diff --git a/examples/camera/first_person_view_model.rs b/examples/camera/first_person_view_model.rs
@@ -46,7 +46,7 @@ use std::f32::consts::FRAC_PI_2;
 
 use bevy::{
     camera::visibility::RenderLayers, color::palettes::tailwind,
-    input::mouse::AccumulatedMouseMotion, pbr::NotShadowCaster, prelude::*,
+    input::mouse::AccumulatedMouseMotion, light::NotShadowCaster, prelude::*,
 };
 
 fn main() {
diff --git a/examples/shader/shader_prepass.rs b/examples/shader/shader_prepass.rs
@@ -4,7 +4,8 @@
 
 use bevy::{
     core_pipeline::prepass::{DepthPrepass, MotionVectorPrepass, NormalPrepass},
-    pbr::{NotShadowCaster, PbrPlugin},
+    light::NotShadowCaster,
+    pbr::PbrPlugin,
     prelude::*,
     reflect::TypePath,
     render::render_resource::{AsBindGroup, ShaderRef, ShaderType},
diff --git a/examples/stress_tests/many_cubes.rs b/examples/stress_tests/many_cubes.rs
@@ -14,8 +14,8 @@ use argh::FromArgs;
 use bevy::{
     camera::visibility::{NoCpuCulling, NoFrustumCulling},
     diagnostic::{FrameTimeDiagnosticsPlugin, LogDiagnosticsPlugin},
+    light::NotShadowCaster,
     math::{DVec2, DVec3},
-    pbr::NotShadowCaster,
     prelude::*,
     render::{
         batching::NoAutomaticBatching,
diff --git a/examples/stress_tests/many_foxes.rs b/examples/stress_tests/many_foxes.rs
@@ -6,7 +6,7 @@ use std::{f32::consts::PI, time::Duration};
 use argh::FromArgs;
 use bevy::{
     diagnostic::{FrameTimeDiagnosticsPlugin, LogDiagnosticsPlugin},
-    pbr::CascadeShadowConfigBuilder,
+    light::CascadeShadowConfigBuilder,
     prelude::*,
     window::{PresentMode, WindowResolution},
     winit::{UpdateMode, WinitSettings},
