Skip to content

Commit 3b0424e

Browse files
committed
Merge remote-tracking branch 'origin/main' into no-undo
2 parents f0a8596 + 1dfcde6 commit 3b0424e

File tree

102 files changed

+862
-529
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+862
-529
lines changed

Cargo.toml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,9 @@ default = [
135135
"bevy_audio",
136136
"bevy_color",
137137
"bevy_core_pipeline",
138+
"bevy_post_process",
138139
"bevy_core_widgets",
139-
"bevy_anti_aliasing",
140+
"bevy_anti_alias",
140141
"bevy_gilrs",
141142
"bevy_gizmos",
142143
"bevy_gltf",
@@ -216,8 +217,11 @@ bevy_color = ["bevy_internal/bevy_color"]
216217
# Provides cameras and other basic render pipeline features
217218
bevy_core_pipeline = ["bevy_internal/bevy_core_pipeline"]
218219

220+
# Provides post process effects such as depth of field, bloom, chromatic aberration.
221+
bevy_post_process = ["bevy_internal/bevy_post_process"]
222+
219223
# Provides various anti aliasing solutions
220-
bevy_anti_aliasing = ["bevy_internal/bevy_anti_aliasing"]
224+
bevy_anti_alias = ["bevy_internal/bevy_anti_alias"]
221225

222226
# Adds gamepad support
223227
bevy_gilrs = ["bevy_internal/bevy_gilrs"]

crates/bevy_anti_aliasing/Cargo.toml renamed to crates/bevy_anti_alias/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "bevy_anti_aliasing"
2+
name = "bevy_anti_alias"
33
version = "0.17.0-dev"
44
edition = "2024"
55
description = "Provides various anti aliasing implementations for Bevy Engine"

crates/bevy_anti_aliasing/README.md renamed to crates/bevy_anti_alias/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Bevy Anti Aliasing
1+
# Bevy Anti Alias
22

33
[![License](https://img.shields.io/badge/license-MIT%2FApache-blue.svg)](https://github.com/bevyengine/bevy#license)
44
[![Crates.io](https://img.shields.io/crates/v/bevy_core_pipeline.svg)](https://crates.io/crates/bevy_core_pipeline)

crates/bevy_anti_aliasing/src/contrast_adaptive_sharpening/mod.rs renamed to crates/bevy_anti_alias/src/contrast_adaptive_sharpening/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ impl ExtractComponent for ContrastAdaptiveSharpening {
9898
}
9999

100100
/// Adds Support for Contrast Adaptive Sharpening (CAS).
101+
#[derive(Default)]
101102
pub struct CasPlugin;
102103

103104
impl Plugin for CasPlugin {

crates/bevy_anti_aliasing/src/dlss/extract.rs renamed to crates/bevy_anti_alias/src/dlss/extract.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@ pub fn extract_dlss<F: DlssFeature>(
1515
.query_filtered::<(RenderEntity, &Camera, &Projection, Option<&mut Dlss<F>>), With<Hdr>>();
1616

1717
for (entity, camera, camera_projection, mut dlss) in cameras_3d.iter_mut(&mut main_world) {
18-
let has_perspective_projection = matches!(camera_projection, Projection::Perspective(_));
1918
let mut entity_commands = commands
2019
.get_entity(entity)
2120
.expect("Camera entity wasn't synced.");
22-
if dlss.is_some() && camera.is_active && has_perspective_projection {
21+
if dlss.is_some() && camera.is_active && camera_projection.is_perspective() {
2322
entity_commands.insert(dlss.as_deref().unwrap().clone());
2423
dlss.as_mut().unwrap().reset = false;
2524
} else if cleanup_query.get(entity) == Ok(true) {

0 commit comments

Comments
 (0)