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

Fix system ordering, white point and fireflies

Browse Source
This commit is contained in:
Máté Homolya 2025-05-04 23:15:22 -07:00
parent ffc0613e18
commit ab8d3abcbc
No known key found for this signature in database
6 changed files with 68 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/environment_maps/ballawley_park_1k.ktx2
View File

Binary file not shown.

BIN
assets/environment_maps/goegap_road_2k.ktx2 Normal file
View File

Binary file not shown.

6
crates/bevy_pbr/src/light_probe/environment_filter.wgsl
View File

@ -15,13 +15,15 @@ struct PrefilterConstants {
@group(0) @binding(4) var blue_noise_texture: texture_2d<f32>;
// Tonemapping functions to reduce fireflies
const white_point: f32 = 1.0;
fn rcp(x: f32) -> f32 { return 1.0 / x; }
fn max3(x: vec3f) -> f32 { return max(x.r, max(x.g, x.b)); }
fn tonemap(color: vec3f) -> vec3f {
return color / (color + vec3(5000.0));
return color / (color + vec3(white_point));
}
fn reverse_tonemap(color: vec3f) -> vec3f {
return 5000.0 * color / (vec3(1.0) - color);
return white_point * color / (vec3(1.0) - color);
}
// Predefined set of uniform directions

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

@ -32,7 +32,9 @@ use bevy_render::{
};
use bevy_transform::{components::Transform, prelude::GlobalTransform};
use prefilter::{
create_environment_map_from_prefilter, extract_prefilter_entities, prepare_prefilter_bind_groups, prepare_prefilter_textures, FilteredEnvironmentMapLight, PrefilterPipelines, SpdNode
create_environment_map_from_prefilter, extract_prefilter_entities,
prepare_prefilter_bind_groups, prepare_prefilter_textures, FilteredEnvironmentMapLight,
PrefilterPipelines, SpdNode,
};
use tracing::error;
@ -380,7 +382,10 @@ impl Plugin for LightProbePlugin {
.add_systems(ExtractSchedule, gather_environment_map_uniform)
.add_systems(ExtractSchedule, gather_light_probes::<EnvironmentMapLight>)
.add_systems(ExtractSchedule, gather_light_probes::<IrradianceVolume>)
.add_systems(ExtractSchedule, extract_prefilter_entities.after(create_environment_map_from_prefilter),)
.add_systems(
ExtractSchedule,
extract_prefilter_entities.after(create_environment_map_from_prefilter),
)
.add_systems(
Render,
(upload_light_probes, prepare_environment_uniform_buffer)

12
crates/bevy_pbr/src/light_probe/prefilter.rs
View File

@ -11,7 +11,10 @@ use bevy_image::Image;
use bevy_math::{Quat, Vec2};
use bevy_reflect::Reflect;
use bevy_render::{
extract_component::ExtractComponent, render_asset::{RenderAssetUsages, RenderAssets}, render_graph::{Node, NodeRunError, RenderGraphContext, RenderLabel}, render_resource::{
extract_component::ExtractComponent,
render_asset::{RenderAssetUsages, RenderAssets},
render_graph::{Node, NodeRunError, RenderGraphContext, RenderLabel},
render_resource::{
binding_types::*, AddressMode, BindGroup, BindGroupEntries, BindGroupLayout,
BindGroupLayoutEntries, CachedComputePipelineId, ComputePassDescriptor,
ComputePipelineDescriptor, Extent3d, FilterMode, PipelineCache, Sampler,
@ -19,7 +22,12 @@ use bevy_render::{
StorageTextureAccess, Texture, TextureAspect, TextureDescriptor, TextureDimension,
TextureFormat, TextureSampleType, TextureUsages, TextureView, TextureViewDescriptor,
TextureViewDimension, UniformBuffer,
}, renderer::{RenderContext, RenderDevice, RenderQueue}, settings::WgpuFeatures, sync_world::RenderEntity, texture::{CachedTexture, GpuImage, TextureCache}, Extract
},
renderer::{RenderContext, RenderDevice, RenderQueue},
settings::WgpuFeatures,
sync_world::RenderEntity,
texture::{CachedTexture, GpuImage, TextureCache},
Extract,
};
use crate::atmosphere;

57
examples/3d/reflection_probes.rs
View File

@ -80,6 +80,7 @@ fn main() {
.after(change_reflection_type),
)
.add_systems(Update, update_text.after(rotate_camera))
.add_systems(Update, setup_environment_map_usage)
.run();
}
@ -152,7 +153,6 @@ fn spawn_reflection_probe(commands: &mut Commands, cubemaps: &Cubemaps) {
}
fn spawn_prefiltered_environment_map(commands: &mut Commands, cubemaps: &Cubemaps) {
println!("spawn_prefiltered_environment_map");
commands.spawn((
LightProbe,
FilteredEnvironmentMapLight {
@ -160,12 +160,10 @@ fn spawn_prefiltered_environment_map(commands: &mut Commands, cubemaps: &Cubemap
intensity: 5000.0,
..default()
},
// 2.0 because the sphere's radius is 1.0 and we want to fully enclose it.
Transform::from_scale(Vec3::splat(2.0)),
));
}
// Spawns the help text.
fn spawn_text(commands: &mut Commands, app_status: &AppStatus) {
// Create the text.
@ -187,13 +185,21 @@ fn add_environment_map_to_camera(
mut commands: Commands,
query: Query<Entity, Added<Camera3d>>,
cubemaps: Res<Cubemaps>,
app_status: Res<AppStatus>,
) {
for camera_entity in query.iter() {
let image = match app_status.reflection_mode {
ReflectionMode::PrefilteredEnvironmentMap => {
cubemaps.unfiltered_environment_map.clone()
}
_ => cubemaps.skybox.clone(),
};
commands
.entity(camera_entity)
.insert(create_camera_environment_map_light(&cubemaps))
.insert(Skybox {
image: cubemaps.skybox.clone(),
image,
brightness: 5000.0,
..default()
});
@ -204,6 +210,7 @@ fn add_environment_map_to_camera(
fn change_reflection_type(
mut commands: Commands,
light_probe_query: Query<Entity, With<LightProbe>>,
sky_box_query: Query<Entity, With<Skybox>>,
camera_query: Query<Entity, With<Camera3d>>,
keyboard: Res<ButtonInput<KeyCode>>,
mut app_status: ResMut<AppStatus>,
@ -222,10 +229,15 @@ fn change_reflection_type(
for light_probe in light_probe_query.iter() {
commands.entity(light_probe).despawn();
}
for skybox in sky_box_query.iter() {
commands.entity(skybox).remove::<Skybox>();
}
match app_status.reflection_mode {
ReflectionMode::None | ReflectionMode::EnvironmentMap => {}
ReflectionMode::ReflectionProbe => spawn_reflection_probe(&mut commands, &cubemaps),
ReflectionMode::PrefilteredEnvironmentMap => spawn_prefiltered_environment_map(&mut commands, &cubemaps),
ReflectionMode::PrefilteredEnvironmentMap => {
spawn_prefiltered_environment_map(&mut commands, &cubemaps)
}
}
// Add or remove the environment map from the camera.
@ -234,10 +246,23 @@ fn change_reflection_type(
ReflectionMode::None => {
commands.entity(camera).remove::<EnvironmentMapLight>();
}
ReflectionMode::EnvironmentMap | ReflectionMode::ReflectionProbe | ReflectionMode::PrefilteredEnvironmentMap => {
ReflectionMode::EnvironmentMap
| ReflectionMode::ReflectionProbe
| ReflectionMode::PrefilteredEnvironmentMap => {
let image = match app_status.reflection_mode {
ReflectionMode::PrefilteredEnvironmentMap => {
cubemaps.unfiltered_environment_map.clone()
}
_ => cubemaps.skybox.clone(),
};
commands
.entity(camera)
.insert(create_camera_environment_map_light(&cubemaps));
.insert(create_camera_environment_map_light(&cubemaps))
.insert(Skybox {
image,
brightness: 5000.0,
..default()
});
}
}
}
@ -344,17 +369,29 @@ impl FromWorld for Cubemaps {
specular_reflection_probe: world
.load_asset("environment_maps/cubes_reflection_probe_specular_rgb9e5_zstd.ktx2"),
specular_environment_map: specular_map.clone(),
unfiltered_environment_map: world.load_asset("environment_maps/ballawley_park_1k.ktx2"),
unfiltered_environment_map: world.load_asset("environment_maps/goegap_road_2k.ktx2"),
skybox: specular_map,
}
}
}
fn setup_environment_map_usage(cubemaps: Res<Cubemaps>, mut images: ResMut<Assets<Image>>) {
if let Some(image) = images.get_mut(&cubemaps.unfiltered_environment_map) {
if !image
.texture_descriptor
.usage
.contains(TextureUsages::COPY_SRC)
{
image.texture_descriptor.usage |= TextureUsages::COPY_SRC;
}
}
}
impl Default for AppStatus {
fn default() -> Self {
Self {
reflection_mode: ReflectionMode::PrefilteredEnvironmentMap,
rotating: false,
reflection_mode: ReflectionMode::ReflectionProbe,
rotating: true,
}
}
}