forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compiler error post rebase

Browse Source
This commit is contained in:
Máté Homolya 2025-06-02 14:55:00 -07:00
parent ab33914573
commit 152360f2da
No known key found for this signature in database
3 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crates/bevy_pbr/src/lib.rs
View File

@ -75,7 +75,10 @@ pub mod prelude {
pub use crate::{ pub use crate::{
fog::{DistanceFog, FogFalloff}, fog::{DistanceFog, FogFalloff},
light::{light_consts, AmbientLight, DirectionalLight, PointLight, SpotLight}, light::{light_consts, AmbientLight, DirectionalLight, PointLight, SpotLight},
light_probe::{environment_map::EnvironmentMapLight, LightProbe}, light_probe::{
environment_map::EnvironmentMapLight, generate::GeneratedEnvironmentMapLight,
LightProbe,
},
material::{Material, MaterialPlugin}, material::{Material, MaterialPlugin},
mesh_material::MeshMaterial3d, mesh_material::MeshMaterial3d,
parallax::ParallaxMappingMethod, parallax::ParallaxMappingMethod,

18
crates/bevy_pbr/src/light_probe/mod.rs
View File

@ -1,8 +1,8 @@
//! Light probes for baked global illumination. //! Light probes for baked global illumination.
use bevy_app::{App, Plugin}; use bevy_app::{App, Plugin, Update};
use bevy_asset::AssetId; 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_derive::{Deref, DerefMut};
use bevy_ecs::{ use bevy_ecs::{
component::Component, component::Component,
@ -18,17 +18,7 @@ use bevy_math::{Affine3A, FloatOrd, Mat4, Vec3A, Vec4};
use bevy_platform::collections::HashMap; use bevy_platform::collections::HashMap;
use bevy_reflect::{std_traits::ReflectDefault, Reflect}; use bevy_reflect::{std_traits::ReflectDefault, Reflect};
use bevy_render::{ use bevy_render::{
extract_instances::ExtractInstancesPlugin, 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
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,
}; };
use bevy_transform::{components::Transform, prelude::GlobalTransform}; use bevy_transform::{components::Transform, prelude::GlobalTransform};
use generate::{ use generate::{
@ -40,7 +30,7 @@ use tracing::error;
use core::{hash::Hash, ops::Deref}; 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; use self::irradiance_volume::IrradianceVolume;

4
examples/3d/reflection_probes.rs
View File

@ -6,7 +6,9 @@
//! //!
//! Reflection probes don't work on WebGL 2 or WebGPU. //! 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::{ use std::{
f32::consts::PI, f32::consts::PI,