Merge branch 'main' into radio_button_improvement

Author: alice-i-cecile

.github/workflows/ci.yml

@@ -336,7 +336,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5
       - name: Check for typos
-        uses: crate-ci/typos@v1.37.2
+        uses: crate-ci/typos@v1.38.1
       - name: Typos info
         if: failure()
         run: |

.github/workflows/codeql.yml

@@ -40,7 +40,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v4
         with:
           languages: ${{ matrix.language }}
           build-mode: ${{ matrix.build-mode }}
@@ -68,6 +68,6 @@ jobs:
           exit 1
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v4
         with:
           category: "/language:${{matrix.language}}"

Cargo.toml

@@ -125,65 +125,149 @@ unsafe_op_in_unsafe_fn = "warn"
 unused_qualifications = "warn"
 
 [features]
-default = [
-  "std",
+default = ["2d", "3d", "ui"]
+
+# PROFILE: The default 2D Bevy experience. This includes the core Bevy framework, 2D functionality, Bevy UI, scenes, audio, and picking.
+2d = [
+  "default_app",
+  "default_platform",
+  "2d_api",
+  "2d_bevy_render",
+  "ui",
+  "scene",
+  "audio",
+  "picking",
+]
+
+# PROFILE: The default 3D Bevy experience. This includes the core Bevy framework, 3D functionality, Bevy UI, scenes, audio, and picking.
+3d = [
+  "default_app",
+  "default_platform",
+  "3d_api",
+  "3d_bevy_render",
+  "ui",
+  "scene",
+  "audio",
+  "picking",
+]
+
+# PROFILE: The default Bevy UI experience.  This includes the core Bevy framework, Bevy UI, scenes, audio, and picking.
+ui = [
+  "default_app",
+  "default_platform",
+  "ui_api",
+  "ui_bevy_render",
+  "scene",
+  "audio",
+  "picking",
+]
+
+# COLLECTION: Enable this feature during development to improve the development experience. This adds features like asset hot-reloading and debugging tools. This should not be enabled for published apps!
+dev = [
+  "debug",          # TODO: rename this to something more specific ... this is a "debug ECS names" feature
+  "bevy_dev_tools",
+  "file_watcher",
+]
+
+# COLLECTION: Features used to build audio Bevy apps.
+audio = ["bevy_audio", "vorbis"]
+
+# COLLECTION: Features used to compose Bevy scenes.
+scene = ["bevy_scene"]
+
+# COLLECTION: Enables picking functionality
+picking = ["bevy_picking", "mesh_picking", "sprite_picking", "ui_picking"]
+
+# COLLECTION: The core pieces that most apps need. This serves as a baseline feature set for other higher level feature collections (such as "2d" and "3d"). It is also useful as a baseline feature set for scenarios like headless apps that require no rendering (ex: command line tools, servers, etc).
+default_app = [
   "async_executor",
+  "bevy_asset",
+  "bevy_input_focus",
+  "bevy_log",
+  "bevy_state",
+  "bevy_window",
+  "custom_cursor",
+  "reflect_auto_register",
+]
+
+# COLLECTION: These are platform support features, such as OS support/features, windowing and input backends, etc.
+default_platform = [
+  "std",
   "android-game-activity",
   "android_shared_stdcxx",
-  "gltf_animation",
-  "bevy_asset",
-  "bevy_audio",
-  "bevy_color",
-  "bevy_core_pipeline",
-  "bevy_post_process",
-  "bevy_anti_alias",
   "bevy_gilrs",
+  "bevy_winit",
+  "default_font",
+  "multi_threaded",
+  "webgl2",
+  "x11",
+  "wayland",
+  "sysinfo_plugin",
+]
+
+# COLLECTION: Default scene definition features. Note that this does not include an actual renderer, such as bevy_render (Bevy's default render backend).
+common_api = [
+  "bevy_animation",
+  "bevy_camera",
+  "bevy_color",
   "bevy_gizmos",
-  "bevy_gltf",
-  "bevy_input_focus",
-  "bevy_log",
-  "bevy_pbr",
-  "bevy_picking",
-  "bevy_render",
-  "bevy_scene",
   "bevy_image",
   "bevy_mesh",
-  "bevy_mikktspace",
-  "bevy_camera",
-  "bevy_light",
   "bevy_shader",
-  "bevy_sprite",
-  "bevy_sprite_render",
-  "bevy_state",
   "bevy_text",
-  "bevy_ui",
-  "bevy_ui_render",
-  "bevy_window",
-  "bevy_winit",
-  "custom_cursor",
-  "default_font",
   "hdr",
+  "png",
+]
+
+# COLLECTION: Features used to build 2D Bevy apps (does not include a render backend). You generally don't need to worry about this unless you are using a custom renderer.
+2d_api = ["common_api", "bevy_sprite"]
+
+# COLLECTION: Bevy's built-in 2D renderer, built on top of `bevy_render` 
+2d_bevy_render = [
+  "2d_api",
+  "bevy_render",
+  "bevy_core_pipeline",
+  "bevy_post_process",
+  "bevy_sprite_render",
+]
+
+# COLLECTION: Features used to build 3D Bevy apps (does not include a render backend). You generally don't need to worry about this unless you are using a custom renderer.
+3d_api = [
+  "common_api",
+  "bevy_light",
+  "bevy_mikktspace",
   "ktx2",
-  "mesh_picking",
-  "morph",
   "morph_animation",
-  "multi_threaded",
-  "png",
-  "reflect_auto_register",
+  "morph",
   "smaa_luts",
-  "sprite_picking",
-  "sysinfo_plugin",
   "tonemapping_luts",
-  "ui_picking",
-  "vorbis",
-  "webgl2",
-  "x11",
-  "wayland",
-  "debug",
   "zstd_rust",
 ]
 
-# Recommended defaults for no_std applications
+# COLLECTION: Bevy's built-in 3D renderer, built on top of `bevy_render` 
+3d_bevy_render = [
+  "3d_api",
+  "bevy_render",
+  "bevy_core_pipeline",
+  "bevy_anti_alias",
+  "bevy_gltf",
+  "bevy_pbr",
+  "bevy_post_process",
+  "gltf_animation",
+]
+
+# COLLECTION: Features used to build UI Bevy apps (does not include a render backend). You generally don't need to worry about this unless you are using a custom renderer.
+ui_api = ["default_app", "common_api", "bevy_ui"]
+
+# COLLECTION: Bevy's built-in UI renderer, built on top of `bevy_render` 
+ui_bevy_render = [
+  "ui_api",
+  "bevy_render",
+  "bevy_core_pipeline",
+  "bevy_ui_render",
+]
+
+# COLLECTION: Recommended defaults for no_std applications
 default_no_std = ["libm", "critical-section", "bevy_color", "bevy_state"]
 
 # Provides an implementation for picking meshes
@@ -4127,6 +4211,18 @@ description = "A first-person camera that uses a world model and a view model wi
 category = "Camera"
 wasm = true
 
+[[example]]
+name = "free_cam_controller"
+path = "examples/camera/free_cam_controller.rs"
+doc-scrape-examples = true
+required-features = ["free_cam"]
+
+[package.metadata.example.free_cam_controller]
+name = "Free cam camera controller"
+description = "Shows the default free cam camera controller."
+category = "Camera"
+wasm = true
+
 [[example]]
 name = "projection_zoom"
 path = "examples/camera/projection_zoom.rs"

crates/bevy_asset/src/lib.rs

@@ -716,6 +716,9 @@ mod tests {
             AssetWatcher, Reader,
         },
         loader::{AssetLoader, LoadContext},
+        processor::{
+            AssetProcessor, LogEntry, ProcessorTransactionLog, ProcessorTransactionLogFactory,
+        },
         saver::AssetSaver,
         transformer::{AssetTransformer, TransformedAsset},
         Asset, AssetApp, AssetEvent, AssetId, AssetLoadError, AssetLoadFailedEvent, AssetMode,
@@ -741,6 +744,7 @@ mod tests {
         sync::Mutex,
     };
     use bevy_reflect::TypePath;
+    use bevy_tasks::BoxedFuture;
     use core::{marker::PhantomData, time::Duration};
     use crossbeam_channel::Sender;
     use futures_lite::AsyncWriteExt;
@@ -2289,6 +2293,52 @@ mod tests {
             },
         ));
 
+        /// A dummy transaction log factory that just creates [`FakeTransactionLog`].
+        struct FakeTransactionLogFactory;
+
+        impl ProcessorTransactionLogFactory for FakeTransactionLogFactory {
+            fn read(&self) -> BoxedFuture<'_, Result<Vec<LogEntry>, BevyError>> {
+                Box::pin(async move { Ok(vec![]) })
+            }
+
+            fn create_new_log(
+                &self,
+            ) -> BoxedFuture<'_, Result<Box<dyn ProcessorTransactionLog>, BevyError>> {
+                Box::pin(async move { Ok(Box::new(FakeTransactionLog) as _) })
+            }
+        }
+
+        /// A dummy transaction log that just drops every log.
+        // TODO: In the future it's possible for us to have a test of the transaction log, so making
+        // this more complex may be necessary.
+        struct FakeTransactionLog;
+
+        impl ProcessorTransactionLog for FakeTransactionLog {
+            fn begin_processing<'a>(
+                &'a mut self,
+                asset: &'a AssetPath<'_>,
+            ) -> BoxedFuture<'a, Result<(), BevyError>> {
+                Box::pin(async move { Ok(()) })
+            }
+
+            fn end_processing<'a>(
+                &'a mut self,
+                asset: &'a AssetPath<'_>,
+            ) -> BoxedFuture<'a, Result<(), BevyError>> {
+                Box::pin(async move { Ok(()) })
+            }
+
+            fn unrecoverable(&mut self) -> BoxedFuture<'_, Result<(), BevyError>> {
+                Box::pin(async move { Ok(()) })
+            }
+        }
+
+        app.world()
+            .resource::<AssetProcessor>()
+            .data()
+            .set_log_factory(Box::new(FakeTransactionLogFactory))
+            .unwrap();
+
         AppWithProcessor {
             app,
             source_dir,
@@ -2379,7 +2429,7 @@ mod tests {
     }
 
     #[cfg(feature = "multi_threaded")]
-    use crate::processor::{AssetProcessor, LoadTransformAndSave};
+    use crate::processor::LoadTransformAndSave;
 
     // The asset processor currently requires multi_threaded.
     #[cfg(feature = "multi_threaded")]