Merge branch 'main' into cursor-to-world-example

Cargo.toml

@@ -49,6 +49,7 @@ default = [
   "vorbis",
   "x11",
   "filesystem_watcher",
+  "bevy_gizmos",
   "android_shared_stdcxx",
   "tonemapping_luts",
 ]
@@ -66,7 +67,7 @@ bevy_asset = ["bevy_internal/bevy_asset"]
 bevy_audio = ["bevy_internal/bevy_audio"]
 
 # Provides cameras and other basic render pipeline features
-bevy_core_pipeline = ["bevy_internal/bevy_core_pipeline"]
+bevy_core_pipeline = ["bevy_internal/bevy_core_pipeline", "bevy_asset", "bevy_render"]
 
 # Plugin for dynamic loading (using [libloading](https://crates.io/crates/libloading))
 bevy_dynamic_plugin = ["bevy_internal/bevy_dynamic_plugin"]
@@ -75,29 +76,32 @@ bevy_dynamic_plugin = ["bevy_internal/bevy_dynamic_plugin"]
 bevy_gilrs = ["bevy_internal/bevy_gilrs"]
 
 # [glTF](https://www.khronos.org/gltf/) support
-bevy_gltf = ["bevy_internal/bevy_gltf"]
+bevy_gltf = ["bevy_internal/bevy_gltf", "bevy_asset", "bevy_scene", "bevy_pbr"]
 
 # Adds PBR rendering
-bevy_pbr = ["bevy_internal/bevy_pbr"]
+bevy_pbr = ["bevy_internal/bevy_pbr", "bevy_asset", "bevy_render", "bevy_core_pipeline"]
 
 # Provides rendering functionality
 bevy_render = ["bevy_internal/bevy_render"]
 
 # Provides scene functionality
-bevy_scene = ["bevy_internal/bevy_scene"]
+bevy_scene = ["bevy_internal/bevy_scene", "bevy_asset"]
 
 # Provides sprite functionality
-bevy_sprite = ["bevy_internal/bevy_sprite"]
+bevy_sprite = ["bevy_internal/bevy_sprite", "bevy_render", "bevy_core_pipeline"]
 
 # Provides text functionality
 bevy_text = ["bevy_internal/bevy_text"]
 
 # A custom ECS-driven UI framework
-bevy_ui = ["bevy_internal/bevy_ui"]
+bevy_ui = ["bevy_internal/bevy_ui", "bevy_core_pipeline", "bevy_text", "bevy_sprite"]
 
 # winit window and input backend
 bevy_winit = ["bevy_internal/bevy_winit"]
 
+# Adds support for rendering gizmos
+bevy_gizmos = ["bevy_internal/bevy_gizmos"]
+
 # Tracing support, saving a file in Chrome Tracing format
 trace_chrome = ["trace", "bevy_internal/trace_chrome"]
 
@@ -309,6 +313,16 @@ description = "Renders a rectangle, circle, and hexagon"
 category = "2D Rendering"
 wasm = true
 
+[[example]]
+name = "2d_gizmos"
+path = "examples/2d/2d_gizmos.rs"
+
+[package.metadata.example.2d_gizmos]
+name = "2D Gizmos"
+description = "A scene showcasing 2D gizmos"
+category = "2D Rendering"
+wasm = true
+
 [[example]]
 name = "sprite"
 path = "examples/2d/sprite.rs"
@@ -410,6 +424,16 @@ description = "A scene showcasing the built-in 3D shapes"
 category = "3D Rendering"
 wasm = true
 
+[[example]]
+name = "3d_gizmos"
+path = "examples/3d/3d_gizmos.rs"
+
+[package.metadata.example.3d_gizmos]
+name = "3D Gizmos"
+description = "A scene showcasing 3D gizmos"
+category = "3D Rendering"
+wasm = true
+
 [[example]]
 name = "atmospheric_fog"
 path = "examples/3d/atmospheric_fog.rs"
@@ -1395,11 +1419,21 @@ name = "post_processing"
 path = "examples/shader/post_processing.rs"
 
 [package.metadata.example.post_processing]
-name = "Post Processing"
+name = "Post Processing - Render To Texture"
 description = "A custom post processing effect, using two cameras, with one reusing the render texture of the first one"
 category = "Shaders"
 wasm = true
 
+[[example]]
+name = "post_process_pass"
+path = "examples/shader/post_process_pass.rs"
+
+[package.metadata.example.post_process_pass]
+name = "Post Processing - Custom Render Pass"
+description = "A custom post processing effect, using a custom render pass that runs after the main pass"
+category = "Shaders"
+wasm = true
+
 [[example]]
 name = "shader_defs"
 path = "examples/shader/shader_defs.rs"
@@ -1553,6 +1587,16 @@ description = "Simple benchmark to test per-entity draw overhead. Run with the `
 category = "Stress Tests"
 wasm = true
 
+[[example]]
+name = "many_gizmos"
+path = "examples/stress_tests/many_gizmos.rs"
+
+[package.metadata.example.many_gizmos]
+name = "Many Gizmos"
+description = "Test rendering of many gizmos"
+category = "Stress Tests"
+wasm = true
+
 [[example]]
 name = "many_foxes"
 path = "examples/stress_tests/many_foxes.rs"
@@ -1563,6 +1607,16 @@ description = "Loads an animated fox model and spawns lots of them. Good for tes
 category = "Stress Tests"
 wasm = true
 
+[[example]]
+name = "many_glyphs"
+path = "examples/stress_tests/many_glyphs.rs"
+
+[package.metadata.example.many_glyphs]
+name = "Many Glyphs"
+description = "Simple benchmark to test text rendering."
+category = "Stress Tests"
+wasm = true
+
 [[example]]
 name = "many_lights"
 path = "examples/stress_tests/many_lights.rs"
@@ -1736,12 +1790,12 @@ category = "UI (User Interface)"
 wasm = true
 
 [[example]]
-name = "text_layout"
-path = "examples/ui/text_layout.rs"
+name = "flex_layout"
+path = "examples/ui/flex_layout.rs"
 
-[package.metadata.example.text_layout]
-name = "Text Layout"
-description = "Demonstrates how the AlignItems and JustifyContent properties can be composed to layout text"
+[package.metadata.example.flex_layout]
+name = "Flex Layout"
+description = "Demonstrates how the AlignItems and JustifyContent properties can be composed to layout nodes and position text"
 category = "UI (User Interface)"
 wasm = false
 

assets/scenes/load_scene_example.scn.ron

@@ -1,4 +1,9 @@
 (
+  resources: {
+    "scene::ResourceA": (
+      score: 2,
+    ),
+  },
   entities: {
     0: (
       components: {

assets/shaders/post_process_pass.wgsl

@@ -0,0 +1,48 @@
+// This shader computes the chromatic aberration effect
+
+#import bevy_pbr::utils
+
+// Since post processing is a fullscreen effect, we use the fullscreen vertex shader provided by bevy.
+// This will import a vertex shader that renders a single fullscreen triangle.
+//
+// A fullscreen triangle is a single triangle that covers the entire screen.
+// The box in the top left in that diagram is the screen. The 4 x are the corner of the screen
+//
+// Y axis
+//  1 |  x-----x......
+//  0 |  |  s  |  . ´
+// -1 |  x_____x´
+// -2 |  :  .´
+// -3 |  :´
+//    +---------------  X axis
+//      -1  0  1  2  3
+//
+// As you can see, the triangle ends up bigger than the screen.
+//
+// You don't need to worry about this too much since bevy will compute the correct UVs for you.
+#import bevy_core_pipeline::fullscreen_vertex_shader
+
+@group(0) @binding(0)
+var screen_texture: texture_2d<f32>;
+@group(0) @binding(1)
+var texture_sampler: sampler;
+struct PostProcessSettings {
+    intensity: f32,
+}
+@group(0) @binding(2)
+var<uniform> settings: PostProcessSettings;
+
+@fragment
+fn fragment(in: FullscreenVertexOutput) -> @location(0) vec4<f32> {
+    // Chromatic aberration strength
+    let offset_strength = settings.intensity;
+
+    // Sample each color channel with an arbitrary shift
+    return vec4<f32>(
+        textureSample(screen_texture, texture_sampler, in.uv + vec2<f32>(offset_strength, -offset_strength)).r,
+        textureSample(screen_texture, texture_sampler, in.uv + vec2<f32>(-offset_strength, 0.0)).g,
+        textureSample(screen_texture, texture_sampler, in.uv + vec2<f32>(0.0, offset_strength)).b,
+        1.0
+    );
+}
+

benches/benches/bevy_ecs/components/archetype_updates.rs

@@ -9,7 +9,7 @@ fn setup(system_count: usize) -> (World, Schedule) {
     fn empty() {}
     let mut schedule = Schedule::new();
     for _ in 0..system_count {
-        schedule.add_system(empty);
+        schedule.add_systems(empty);
     }
     schedule.run(&mut world);
     (world, schedule)

benches/benches/bevy_ecs/empty_archetypes.rs

@@ -154,7 +154,7 @@ fn empty_archetypes(criterion: &mut Criterion) {
     let mut group = criterion.benchmark_group("empty_archetypes");
     for archetype_count in [10, 100, 500, 1000, 2000, 5000, 10000] {
         let (mut world, mut schedule) = setup(true, |schedule| {
-            schedule.add_system(iter);
+            schedule.add_systems(iter);
         });
         add_archetypes(&mut world, archetype_count);
         world.clear_entities();
@@ -185,7 +185,7 @@ fn empty_archetypes(criterion: &mut Criterion) {
     }
     for archetype_count in [10, 100, 500, 1000, 2000, 5000, 10000] {
         let (mut world, mut schedule) = setup(true, |schedule| {
-            schedule.add_system(for_each);
+            schedule.add_systems(for_each);
         });
         add_archetypes(&mut world, archetype_count);
         world.clear_entities();
@@ -216,7 +216,7 @@ fn empty_archetypes(criterion: &mut Criterion) {
     }
     for archetype_count in [10, 100, 500, 1000, 2000, 5000, 10000] {
         let (mut world, mut schedule) = setup(true, |schedule| {
-            schedule.add_system(par_for_each);
+            schedule.add_systems(par_for_each);
         });
         add_archetypes(&mut world, archetype_count);
         world.clear_entities();

benches/benches/bevy_ecs/scheduling/run_condition.rs

@@ -19,7 +19,7 @@ pub fn run_condition_yes(criterion: &mut Criterion) {
     fn empty() {}
     for amount in 0..21 {
         let mut schedule = Schedule::new();
-        schedule.add_system(empty.run_if(yes));
+        schedule.add_systems(empty.run_if(yes));
         for _ in 0..amount {
             schedule.add_systems((empty, empty, empty, empty, empty).distributive_run_if(yes));
         }
@@ -42,7 +42,7 @@ pub fn run_condition_no(criterion: &mut Criterion) {
     fn empty() {}
     for amount in 0..21 {
         let mut schedule = Schedule::new();
-        schedule.add_system(empty.run_if(no));
+        schedule.add_systems(empty.run_if(no));
         for _ in 0..amount {
             schedule.add_systems((empty, empty, empty, empty, empty).distributive_run_if(no));
         }
@@ -72,7 +72,7 @@ pub fn run_condition_yes_with_query(criterion: &mut Criterion) {
     }
     for amount in 0..21 {
         let mut schedule = Schedule::new();
-        schedule.add_system(empty.run_if(yes_with_query));
+        schedule.add_systems(empty.run_if(yes_with_query));
         for _ in 0..amount {
             schedule.add_systems(
                 (empty, empty, empty, empty, empty).distributive_run_if(yes_with_query),
@@ -101,7 +101,7 @@ pub fn run_condition_yes_with_resource(criterion: &mut Criterion) {
     }
     for amount in 0..21 {
         let mut schedule = Schedule::new();
-        schedule.add_system(empty.run_if(yes_with_resource));
+        schedule.add_systems(empty.run_if(yes_with_resource));
         for _ in 0..amount {
             schedule.add_systems(
                 (empty, empty, empty, empty, empty).distributive_run_if(yes_with_resource),

benches/benches/bevy_ecs/scheduling/running_systems.rs

@@ -23,7 +23,7 @@ pub fn empty_systems(criterion: &mut Criterion) {
     for amount in 0..5 {
         let mut schedule = Schedule::new();
         for _ in 0..amount {
-            schedule.add_system(empty);
+            schedule.add_systems(empty);
         }
         schedule.run(&mut world);
         group.bench_function(&format!("{:03}_systems", amount), |bencher| {

benches/benches/bevy_ecs/scheduling/schedule.rs

@@ -1,4 +1,4 @@
-use bevy_app::App;
+use bevy_app::{App, Update};
 use bevy_ecs::prelude::*;
 use criterion::Criterion;
 
@@ -72,7 +72,7 @@ pub fn build_schedule(criterion: &mut Criterion) {
     group.measurement_time(std::time::Duration::from_secs(15));
 
     // Method: generate a set of `graph_size` systems which have a One True Ordering.
-    // Add system to the schedule with full constraints. Hopefully this should be maximimally
+    // Add system to the schedule with full constraints. Hopefully this should be maximally
     // difficult for bevy to figure out.
     let labels: Vec<_> = (0..1000).map(|i| NumSet(i)).collect();
 
@@ -83,7 +83,7 @@ pub fn build_schedule(criterion: &mut Criterion) {
             bencher.iter(|| {
                 let mut app = App::new();
                 for _ in 0..graph_size {
-                    app.add_system(empty_system);
+                    app.add_systems(Update, empty_system);
                 }
                 app.update();
             });
@@ -93,7 +93,7 @@ pub fn build_schedule(criterion: &mut Criterion) {
         group.bench_function(format!("{graph_size}_schedule"), |bencher| {
             bencher.iter(|| {
                 let mut app = App::new();
-                app.add_system(empty_system.in_set(DummySet));
+                app.add_systems(Update, empty_system.in_set(DummySet));
 
                 // Build a fully-connected dependency graph describing the One True Ordering.
                 // Not particularly realistic but this can be refined later.
@@ -105,7 +105,7 @@ pub fn build_schedule(criterion: &mut Criterion) {
                     for label in &labels[i + 1..graph_size] {
                         sys = sys.before(*label);
                     }
-                    app.add_system(sys);
+                    app.add_systems(Update, sys);
                 }
                 // Run the app for a single frame.
                 // This is necessary since dependency resolution does not occur until the game runs.

crates/bevy_animation/src/lib.rs

@@ -5,7 +5,7 @@
 use std::ops::Deref;
 use std::time::Duration;
 
-use bevy_app::{App, CoreSet, Plugin};
+use bevy_app::{App, Plugin, PostUpdate};
 use bevy_asset::{AddAsset, Assets, Handle};
 use bevy_core::Name;
 use bevy_ecs::prelude::*;
@@ -550,10 +550,9 @@ impl Plugin for AnimationPlugin {
         app.add_asset::<AnimationClip>()
             .register_asset_reflect::<AnimationClip>()
             .register_type::<AnimationPlayer>()
-            .add_system(
-                animation_player
-                    .in_base_set(CoreSet::PostUpdate)
-                    .before(TransformSystem::TransformPropagate),
+            .add_systems(
+                PostUpdate,
+                animation_player.before(TransformSystem::TransformPropagate),
             );
     }
 }