From 152360f2daf61ccbbfce7215085bc8f8ef83060f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=CC=81te=CC=81=20Homolya?= Date: Mon, 2 Jun 2025 14:55:00 -0700 Subject: [PATCH] Fix compiler error post rebase --- crates/bevy_pbr/src/lib.rs | 5 ++++- crates/bevy_pbr/src/light_probe/mod.rs | 18 ++++-------------- examples/3d/reflection_probes.rs | 4 +++- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/crates/bevy_pbr/src/lib.rs b/crates/bevy_pbr/src/lib.rs index 12785f3e78..cc6a21cbf2 100644 --- a/crates/bevy_pbr/src/lib.rs +++ b/crates/bevy_pbr/src/lib.rs @@ -75,7 +75,10 @@ pub mod prelude { pub use crate::{ fog::{DistanceFog, FogFalloff}, light::{light_consts, AmbientLight, DirectionalLight, PointLight, SpotLight}, - light_probe::{environment_map::EnvironmentMapLight, LightProbe}, + light_probe::{ + environment_map::EnvironmentMapLight, generate::GeneratedEnvironmentMapLight, + LightProbe, + }, material::{Material, MaterialPlugin}, mesh_material::MeshMaterial3d, parallax::ParallaxMappingMethod, diff --git a/crates/bevy_pbr/src/light_probe/mod.rs b/crates/bevy_pbr/src/light_probe/mod.rs index ac692fa3b7..f564f34e30 100644 --- a/crates/bevy_pbr/src/light_probe/mod.rs +++ b/crates/bevy_pbr/src/light_probe/mod.rs @@ -1,8 +1,8 @@ //! Light probes for baked global illumination. -use bevy_app::{App, Plugin}; +use bevy_app::{App, Plugin, Update}; use bevy_asset::AssetId; -use bevy_core_pipeline::core_3d::Camera3d; +use bevy_core_pipeline::core_3d::{graph::{Core3d, Node3d}, Camera3d}; use bevy_derive::{Deref, DerefMut}; use bevy_ecs::{ component::Component, @@ -18,17 +18,7 @@ use bevy_math::{Affine3A, FloatOrd, Mat4, Vec3A, Vec4}; use bevy_platform::collections::HashMap; use bevy_reflect::{std_traits::ReflectDefault, Reflect}; use bevy_render::{ - extract_instances::ExtractInstancesPlugin, - load_shader_library, - primitives::{Aabb, Frustum}, - render_asset::RenderAssets, - render_resource::{DynamicUniformBuffer, Sampler, ShaderType, TextureView}, - renderer::{RenderAdapter, RenderDevice, RenderQueue}, - settings::WgpuFeatures, - sync_world::RenderEntity, - texture::{FallbackImage, GpuImage}, - view::{ExtractedView, Visibility}, - Extract, ExtractSchedule, Render, RenderApp, RenderSystems, + extract_component::ExtractComponentPlugin, extract_instances::ExtractInstancesPlugin, load_shader_library, primitives::{Aabb, Frustum}, render_asset::RenderAssets, render_graph::RenderGraphApp, render_resource::{DynamicUniformBuffer, Sampler, ShaderType, TextureView}, renderer::{RenderAdapter, RenderDevice, RenderQueue}, settings::WgpuFeatures, sync_world::RenderEntity, texture::{FallbackImage, GpuImage}, view::{ExtractedView, Visibility}, Extract, ExtractSchedule, Render, RenderApp, RenderSystems }; use bevy_transform::{components::Transform, prelude::GlobalTransform}; use generate::{ @@ -40,7 +30,7 @@ use tracing::error; use core::{hash::Hash, ops::Deref}; -use crate::light_probe::environment_map::{EnvironmentMapIds, EnvironmentMapLight}; +use crate::{generate::{GeneratorBindGroupLayouts, GeneratorNode, GeneratorSamplers, IrradianceMapNode, RadianceMapNode}, light_probe::environment_map::{EnvironmentMapIds, EnvironmentMapLight}}; use self::irradiance_volume::IrradianceVolume; diff --git a/examples/3d/reflection_probes.rs b/examples/3d/reflection_probes.rs index 33e73e19dd..ebbfba3fc7 100644 --- a/examples/3d/reflection_probes.rs +++ b/examples/3d/reflection_probes.rs @@ -6,7 +6,9 @@ //! //! Reflection probes don't work on WebGL 2 or WebGPU. -use bevy::{core_pipeline::Skybox, prelude::*, render::view::Hdr}; +use bevy::{ + core_pipeline::Skybox, prelude::*, render::render_resource::TextureUsages, render::view::Hdr, +}; use std::{ f32::consts::PI,