Upgrade to Bevy 0.19 and harden editor workflows
CI / Format, lint, test, build (push) Has been cancelled
CI / Format, lint, test, build (push) Has been cancelled
This commit is contained in:
1 parent
3f85d25cc7
commit
b5e561904c
204 files changed
+6972
-29907
No files matched your search
@@ -1,13 +1,13 @@
|
||||
//! Assembles the high-fidelity rendering stack on project cameras.
|
||||
|
||||
use bevy::anti_alias::taa::TemporalAntiAliasing;
|
||||
use bevy::camera::Exposure;
|
||||
use bevy::camera::{Exposure, Hdr};
|
||||
use bevy::core_pipeline::tonemapping::Tonemapping;
|
||||
use bevy::pbr::{Atmosphere, AtmosphereSettings, ScatteringMedium, ScreenSpaceAmbientOcclusion};
|
||||
use bevy::light::{atmosphere::ScatteringMedium, Atmosphere};
|
||||
use bevy::pbr::{AtmosphereSettings, ScreenSpaceAmbientOcclusion};
|
||||
use bevy::post_process::auto_exposure::AutoExposure;
|
||||
use bevy::post_process::bloom::Bloom;
|
||||
use bevy::prelude::*;
|
||||
use bevy::render::view::Hdr;
|
||||
use settings::{
|
||||
effective_auto_exposure, ActiveCameraRenderProfile, GiPath, ProjectRenderCamera,
|
||||
ProjectSettings, RenderingCapabilities, RenderingSettings,
|
||||
@@ -20,6 +20,10 @@ use super::fullscreen_effects::{strip_fullscreen_effects, sync_fullscreen_effect
|
||||
use super::solari::{strip_gi_path, sync_gi_path, SolariRaytracingSceneStats};
|
||||
use super::viewport_camera::effective_viewport_gi_path;
|
||||
|
||||
/// Marker for the single project-owned atmosphere entity used by Bevy 0.19 cameras.
|
||||
#[derive(Component, Debug, Clone, Copy)]
|
||||
pub struct ProjectAtmosphere;
|
||||
|
||||
/// Environment variable name for HDR override (matches game launch).
|
||||
pub const HDR_ENV_VAR: &str = "BEVY_FPS_HDR";
|
||||
|
||||
@@ -73,6 +77,10 @@ pub fn hdr_required_for_render_stack(
|
||||
|
||||
/// Applies the shared project rendering profile to all [`ProjectRenderCamera`] entities.
|
||||
#[unsafe(no_mangle)]
|
||||
#[expect(
|
||||
clippy::too_many_arguments,
|
||||
reason = "Bevy systems expose independent render resources and light queries"
|
||||
)]
|
||||
pub fn setup_project_camera_effects(
|
||||
mut commands: Commands,
|
||||
mut mediums: ResMut<Assets<ScatteringMedium>>,
|
||||
@@ -81,6 +89,7 @@ pub fn setup_project_camera_effects(
|
||||
caps: Option<Res<RenderingCapabilities>>,
|
||||
solari_stats: Option<Res<SolariRaytracingSceneStats>>,
|
||||
cameras: Query<Entity, With<ProjectRenderCamera>>,
|
||||
atmospheres: Query<Entity, With<ProjectAtmosphere>>,
|
||||
points: Query<&PointLight>,
|
||||
spots: Query<&SpotLight>,
|
||||
) {
|
||||
@@ -93,6 +102,12 @@ pub fn setup_project_camera_effects(
|
||||
)
|
||||
});
|
||||
let has_local_shadow_lights = super::viewport_camera::has_local_shadow_lights(&points, &spots);
|
||||
sync_project_atmosphere(
|
||||
&mut commands,
|
||||
&mut mediums,
|
||||
active.atmosphere,
|
||||
atmospheres.iter(),
|
||||
);
|
||||
for entity in &cameras {
|
||||
apply_camera_render_profile(
|
||||
&mut commands,
|
||||
@@ -106,6 +121,29 @@ pub fn setup_project_camera_effects(
|
||||
}
|
||||
}
|
||||
|
||||
/// Keeps the Bevy 0.19 atmosphere model stable: one world entity, camera settings per view.
|
||||
pub fn sync_project_atmosphere(
|
||||
commands: &mut Commands,
|
||||
mediums: &mut Assets<ScatteringMedium>,
|
||||
enabled: bool,
|
||||
atmospheres: impl IntoIterator<Item = Entity>,
|
||||
) {
|
||||
let existing: Vec<Entity> = atmospheres.into_iter().collect();
|
||||
if enabled {
|
||||
if existing.is_empty() {
|
||||
let medium = mediums.add(ScatteringMedium::default());
|
||||
commands.spawn((ProjectAtmosphere, Atmosphere::earth(medium)));
|
||||
}
|
||||
for entity in existing.iter().skip(1) {
|
||||
commands.entity(*entity).despawn();
|
||||
}
|
||||
} else {
|
||||
for entity in existing {
|
||||
commands.entity(entity).despawn();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Inserts or removes manual [`Exposure`] vs [`AutoExposure`] for the active profile.
|
||||
pub fn sync_exposure(
|
||||
commands: &mut Commands,
|
||||
@@ -135,7 +173,7 @@ pub fn apply_camera_render_profile(
|
||||
profile: &ActiveCameraRenderProfile,
|
||||
caps: &RenderingCapabilities,
|
||||
solari_stats: Option<&SolariRaytracingSceneStats>,
|
||||
mediums: &mut Assets<ScatteringMedium>,
|
||||
_mediums: &mut Assets<ScatteringMedium>,
|
||||
has_local_shadow_lights: bool,
|
||||
) {
|
||||
commands.entity(entity).insert(Msaa::Off);
|
||||
@@ -155,13 +193,15 @@ pub fn apply_camera_render_profile(
|
||||
});
|
||||
|
||||
if profile.atmosphere {
|
||||
let medium = mediums.add(ScatteringMedium::default());
|
||||
commands
|
||||
.entity(entity)
|
||||
.insert(Atmosphere::earthlike(medium));
|
||||
commands
|
||||
.entity(entity)
|
||||
.remove::<Atmosphere>()
|
||||
.insert(AtmosphereSettings::default());
|
||||
} else {
|
||||
commands
|
||||
.entity(entity)
|
||||
.remove::<Atmosphere>()
|
||||
.remove::<AtmosphereSettings>();
|
||||
}
|
||||
if profile.tonemapping_aces {
|
||||
commands.entity(entity).insert(Tonemapping::AcesFitted);
|
||||
@@ -245,8 +285,8 @@ pub fn sync_optional_rendering_fx(
|
||||
profile: &ActiveCameraRenderProfile,
|
||||
caps: &RenderingCapabilities,
|
||||
solari_stats: Option<&SolariRaytracingSceneStats>,
|
||||
mediums: &mut Assets<ScatteringMedium>,
|
||||
has_atmosphere: bool,
|
||||
_mediums: &mut Assets<ScatteringMedium>,
|
||||
has_atmosphere_settings: bool,
|
||||
has_tonemapping: bool,
|
||||
has_bloom: bool,
|
||||
has_ssao: bool,
|
||||
@@ -258,19 +298,18 @@ pub fn sync_optional_rendering_fx(
|
||||
let effective_gi =
|
||||
effective_viewport_gi_path(profile.gi_path, caps, solari_stats, has_local_shadow_lights);
|
||||
|
||||
if profile.atmosphere && !has_atmosphere {
|
||||
let medium = mediums.add(ScatteringMedium::default());
|
||||
commands
|
||||
.entity(entity)
|
||||
.insert(Atmosphere::earthlike(medium));
|
||||
if profile.atmosphere && !has_atmosphere_settings {
|
||||
commands
|
||||
.entity(entity)
|
||||
.remove::<Atmosphere>()
|
||||
.insert(AtmosphereSettings::default());
|
||||
} else if !profile.atmosphere && has_atmosphere {
|
||||
} else if !profile.atmosphere && has_atmosphere_settings {
|
||||
commands
|
||||
.entity(entity)
|
||||
.remove::<Atmosphere>()
|
||||
.remove::<AtmosphereSettings>();
|
||||
} else if profile.atmosphere {
|
||||
commands.entity(entity).remove::<Atmosphere>();
|
||||
}
|
||||
|
||||
if profile.tonemapping_aces && !has_tonemapping {
|
||||
@@ -365,31 +404,6 @@ pub fn patch_camera_effects(
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn solari_forces_hdr_render_target() {
|
||||
assert!(hdr_required_for_render_stack(
|
||||
false,
|
||||
false,
|
||||
GiPath::SolariDeferred
|
||||
));
|
||||
assert!(hdr_required_for_render_stack(true, false, GiPath::Forward));
|
||||
assert!(!hdr_required_for_render_stack(
|
||||
false,
|
||||
false,
|
||||
GiPath::Forward
|
||||
));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn atmosphere_forces_hdr_render_target() {
|
||||
assert!(hdr_required_for_render_stack(false, true, GiPath::Forward));
|
||||
}
|
||||
}
|
||||
|
||||
/// Re-applies player camera FX tags after a hot reload.
|
||||
pub fn refresh_player_camera_fx(world: &mut World) {
|
||||
let Some(settings) = world.get_resource::<ProjectSettings>().cloned() else {
|
||||
@@ -419,6 +433,16 @@ pub fn refresh_player_camera_fx(world: &mut World) {
|
||||
}
|
||||
|
||||
world.resource_scope(|world, mut mediums: Mut<Assets<ScatteringMedium>>| {
|
||||
let atmospheres: Vec<Entity> = world
|
||||
.query_filtered::<Entity, With<ProjectAtmosphere>>()
|
||||
.iter(world)
|
||||
.collect();
|
||||
sync_project_atmosphere(
|
||||
&mut world.commands(),
|
||||
&mut mediums,
|
||||
profile.atmosphere,
|
||||
atmospheres,
|
||||
);
|
||||
for entity in cameras {
|
||||
apply_camera_render_profile(
|
||||
&mut world.commands(),
|
||||
@@ -432,3 +456,28 @@ pub fn refresh_player_camera_fx(world: &mut World) {
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn solari_forces_hdr_render_target() {
|
||||
assert!(hdr_required_for_render_stack(
|
||||
false,
|
||||
false,
|
||||
GiPath::SolariDeferred
|
||||
));
|
||||
assert!(hdr_required_for_render_stack(true, false, GiPath::Forward));
|
||||
assert!(!hdr_required_for_render_stack(
|
||||
false,
|
||||
false,
|
||||
GiPath::Forward
|
||||
));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn atmosphere_forces_hdr_render_target() {
|
||||
assert!(hdr_required_for_render_stack(false, true, GiPath::Forward));
|
||||
}
|
||||
}
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
use bevy::prelude::*;
|
||||
use bevy::render::extract_component::ExtractComponent;
|
||||
use bevy::render::render_graph::{InternedRenderLabel, RenderLabel, RenderSubGraph};
|
||||
use bevy::render::render_resource::ShaderType;
|
||||
use bevy::shader::ShaderRef;
|
||||
use bevy_core_pipeline::core_3d::graph::{Core3d, Node3d};
|
||||
use bevy_core_pipeline::fullscreen_material::{FullscreenMaterial, FullscreenMaterialPlugin};
|
||||
use bevy_core_pipeline::tonemapping::tonemapping;
|
||||
use bevy_core_pipeline::Core3dSystems;
|
||||
use shared::{PostProcessEffectAsset, PostProcessEffectKind};
|
||||
|
||||
/// Vignette fullscreen pass.
|
||||
@@ -21,16 +21,10 @@ impl FullscreenMaterial for VignetteFx {
|
||||
"post_fx/vignette.wgsl".into()
|
||||
}
|
||||
|
||||
fn node_edges() -> Vec<InternedRenderLabel> {
|
||||
vec![
|
||||
Node3d::Tonemapping.intern(),
|
||||
Self::node_label().intern(),
|
||||
Node3d::EndMainPassPostProcessing.intern(),
|
||||
]
|
||||
}
|
||||
|
||||
fn sub_graph() -> Option<bevy::render::render_graph::InternedRenderSubGraph> {
|
||||
Some(Core3d.intern())
|
||||
fn schedule_configs(
|
||||
system: bevy::ecs::schedule::ScheduleConfigs<bevy::ecs::system::BoxedSystem>,
|
||||
) -> bevy::ecs::schedule::ScheduleConfigs<bevy::ecs::system::BoxedSystem> {
|
||||
system.in_set(Core3dSystems::PostProcess).after(tonemapping)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -46,16 +40,10 @@ impl FullscreenMaterial for ChromaticAberrationFx {
|
||||
"post_fx/chromatic_aberration.wgsl".into()
|
||||
}
|
||||
|
||||
fn node_edges() -> Vec<InternedRenderLabel> {
|
||||
vec![
|
||||
Node3d::Tonemapping.intern(),
|
||||
Self::node_label().intern(),
|
||||
Node3d::EndMainPassPostProcessing.intern(),
|
||||
]
|
||||
}
|
||||
|
||||
fn sub_graph() -> Option<bevy::render::render_graph::InternedRenderSubGraph> {
|
||||
Some(Core3d.intern())
|
||||
fn schedule_configs(
|
||||
system: bevy::ecs::schedule::ScheduleConfigs<bevy::ecs::system::BoxedSystem>,
|
||||
) -> bevy::ecs::schedule::ScheduleConfigs<bevy::ecs::system::BoxedSystem> {
|
||||
system.in_set(Core3dSystems::PostProcess).after(tonemapping)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ pub use camera_fx::{
|
||||
apply_camera_render_profile, apply_project_camera_fx, camera_auto_exposure_active,
|
||||
hdr_enabled_profile, patch_camera_effects, refresh_player_camera_fx,
|
||||
setup_project_camera_effects, strip_project_camera_fx, sync_optional_rendering_fx,
|
||||
tag_player_camera, HDR_ENV_VAR,
|
||||
sync_project_atmosphere, tag_player_camera, ProjectAtmosphere, HDR_ENV_VAR,
|
||||
};
|
||||
pub use fullscreen_effects::FullscreenEffectsPlugin;
|
||||
pub use solari::{effective_gi_path_for_camera, SolariRaytracingSceneStats, SolariRenderingPlugin};
|
||||
|
||||
@@ -204,6 +204,10 @@ fn sync_auxiliary_camera_deferred_prepass(
|
||||
}
|
||||
}
|
||||
|
||||
#[expect(
|
||||
clippy::too_many_arguments,
|
||||
reason = "Bevy systems expose independent render assets and scene queries"
|
||||
)]
|
||||
fn sync_hydrated_raytracing_meshes(
|
||||
caps: Res<RenderingCapabilities>,
|
||||
mut commands: Commands,
|
||||
@@ -510,7 +514,9 @@ mod tests {
|
||||
|
||||
let mut state: SystemState<(Query<&ChildOf>, Query<(), With<LevelObject>>)> =
|
||||
SystemState::new(&mut world);
|
||||
let (parents, level_roots) = state.get(&world);
|
||||
let (parents, level_roots) = state
|
||||
.get(&world)
|
||||
.expect("solari test system params should be valid");
|
||||
|
||||
assert!(has_level_object_ancestor(child, &parents, &level_roots));
|
||||
assert!(has_level_object_ancestor(root, &parents, &level_roots));
|
||||
@@ -523,7 +529,9 @@ mod tests {
|
||||
|
||||
let mut state: SystemState<(Query<&ChildOf>, Query<(), With<LevelObject>>)> =
|
||||
SystemState::new(&mut world);
|
||||
let (parents, level_roots) = state.get(&world);
|
||||
let (parents, level_roots) = state
|
||||
.get(&world)
|
||||
.expect("solari test system params should be valid");
|
||||
|
||||
assert!(!has_level_object_ancestor(orphan, &parents, &level_roots));
|
||||
}
|
||||
|
||||
@@ -6,13 +6,13 @@ use super::camera_fx::{
|
||||
};
|
||||
use super::solari::SolariRaytracingSceneStats;
|
||||
use bevy::anti_alias::taa::TemporalAntiAliasing;
|
||||
use bevy::camera::Exposure;
|
||||
use bevy::camera::{Exposure, Hdr};
|
||||
use bevy::core_pipeline::tonemapping::Tonemapping;
|
||||
use bevy::pbr::{Atmosphere, ScatteringMedium, ScreenSpaceAmbientOcclusion};
|
||||
use bevy::light::atmosphere::ScatteringMedium;
|
||||
use bevy::pbr::{AtmosphereSettings, ScreenSpaceAmbientOcclusion};
|
||||
use bevy::post_process::auto_exposure::AutoExposure;
|
||||
use bevy::post_process::bloom::Bloom;
|
||||
use bevy::prelude::*;
|
||||
use bevy::render::view::Hdr;
|
||||
use settings::{
|
||||
resolve_effective_render_stack, write_effective_render_stack, ActiveCameraRenderProfile,
|
||||
EffectiveRenderStack, GiPath, ProjectRenderCamera, RenderingCapabilities,
|
||||
@@ -39,18 +39,18 @@ pub fn resolve_viewport_camera_owner(
|
||||
|
||||
/// True when any point or spot light in the world casts shadows.
|
||||
pub fn has_local_shadow_lights(points: &Query<&PointLight>, spots: &Query<&SpotLight>) -> bool {
|
||||
points.iter().any(|l| l.shadows_enabled) || spots.iter().any(|l| l.shadows_enabled)
|
||||
points.iter().any(|l| l.shadow_maps_enabled) || spots.iter().any(|l| l.shadow_maps_enabled)
|
||||
}
|
||||
|
||||
/// [`has_local_shadow_lights`] for exclusive [`World`] access (hot reload, diagnostics).
|
||||
pub fn world_has_local_shadow_lights(world: &mut World) -> bool {
|
||||
for pl in world.query::<&PointLight>().iter(world) {
|
||||
if pl.shadows_enabled {
|
||||
if pl.shadow_maps_enabled {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
for sl in world.query::<&SpotLight>().iter(world) {
|
||||
if sl.shadows_enabled {
|
||||
if sl.shadow_maps_enabled {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -92,7 +92,7 @@ pub fn clear_viewport_camera_stack(commands: &mut Commands, entity: Entity) {
|
||||
#[derive(Debug, Clone, Copy, Default)]
|
||||
pub struct ViewportFxSnapshot {
|
||||
pub has_stack: bool,
|
||||
pub has_atmosphere: bool,
|
||||
pub has_atmosphere_settings: bool,
|
||||
pub has_tonemapping: bool,
|
||||
pub has_bloom: bool,
|
||||
pub has_ssao: bool,
|
||||
@@ -156,7 +156,7 @@ pub fn sync_viewport_camera_stack(
|
||||
caps,
|
||||
solari_stats,
|
||||
mediums,
|
||||
snap.has_atmosphere,
|
||||
snap.has_atmosphere_settings,
|
||||
snap.has_tonemapping,
|
||||
snap.has_bloom,
|
||||
snap.has_ssao,
|
||||
@@ -203,6 +203,19 @@ pub fn sync_viewport_camera_stack(
|
||||
}
|
||||
|
||||
/// Builds a [`ViewportFxSnapshot`] from an entity's current components.
|
||||
pub fn snapshot_viewport_fx(entity: Entity, world: &World) -> ViewportFxSnapshot {
|
||||
ViewportFxSnapshot {
|
||||
has_stack: world.get::<ProjectRenderCamera>(entity).is_some(),
|
||||
has_atmosphere_settings: world.get::<AtmosphereSettings>(entity).is_some(),
|
||||
has_tonemapping: world.get::<Tonemapping>(entity).is_some(),
|
||||
has_bloom: world.get::<Bloom>(entity).is_some(),
|
||||
has_ssao: world.get::<ScreenSpaceAmbientOcclusion>(entity).is_some(),
|
||||
has_taa: world.get::<TemporalAntiAliasing>(entity).is_some(),
|
||||
has_hdr: world.get::<Hdr>(entity).is_some(),
|
||||
has_auto_exposure: world.get::<AutoExposure>(entity).is_some(),
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
@@ -230,16 +243,3 @@ mod tests {
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
pub fn snapshot_viewport_fx(entity: Entity, world: &World) -> ViewportFxSnapshot {
|
||||
ViewportFxSnapshot {
|
||||
has_stack: world.get::<ProjectRenderCamera>(entity).is_some(),
|
||||
has_atmosphere: world.get::<Atmosphere>(entity).is_some(),
|
||||
has_tonemapping: world.get::<Tonemapping>(entity).is_some(),
|
||||
has_bloom: world.get::<Bloom>(entity).is_some(),
|
||||
has_ssao: world.get::<ScreenSpaceAmbientOcclusion>(entity).is_some(),
|
||||
has_taa: world.get::<TemporalAntiAliasing>(entity).is_some(),
|
||||
has_hdr: world.get::<Hdr>(entity).is_some(),
|
||||
has_auto_exposure: world.get::<AutoExposure>(entity).is_some(),
|
||||
}
|
||||
}
|
||||
@@ -252,6 +252,10 @@ pub fn resolve_active_camera_render_profile(
|
||||
}
|
||||
|
||||
/// Bevy system: updates [`ActiveCameraRenderProfile`] and [`ActiveVolumeContribution`].
|
||||
#[expect(
|
||||
clippy::too_many_arguments,
|
||||
reason = "Bevy systems expose independent render resources, queries, and local state"
|
||||
)]
|
||||
pub fn sync_active_camera_render_profile(
|
||||
mut commands: Commands,
|
||||
settings: Res<ProjectSettings>,
|
||||
|
||||
Reference in new issue
Block a user