Merge branch 'main' of github.com:bevyengine/bevy into fix-wesl-embeded-path

Author: beicause

Cargo.toml

@@ -142,7 +142,6 @@ default = [
   "bevy_gltf",
   "bevy_input_focus",
   "bevy_log",
-  "bevy_mesh_picking_backend",
   "bevy_pbr",
   "bevy_picking",
   "bevy_render",
@@ -154,27 +153,28 @@ default = [
   "bevy_light",
   "bevy_shader",
   "bevy_sprite",
-  "bevy_sprite_picking_backend",
   "bevy_sprite_render",
   "bevy_state",
   "bevy_text",
   "bevy_ui",
-  "bevy_ui_picking_backend",
   "bevy_ui_render",
   "bevy_window",
   "bevy_winit",
   "custom_cursor",
   "default_font",
   "hdr",
   "ktx2",
+  "mesh_picking",
   "morph",
   "morph_animation",
   "multi_threaded",
   "png",
   "reflect_auto_register",
   "smaa_luts",
+  "sprite_picking",
   "sysinfo_plugin",
   "tonemapping_luts",
+  "ui_picking",
   "vorbis",
   "webgl2",
   "x11",
@@ -187,13 +187,13 @@ default = [
 default_no_std = ["libm", "critical-section", "bevy_color", "bevy_state"]
 
 # Provides an implementation for picking meshes
-bevy_mesh_picking_backend = ["bevy_internal/bevy_mesh_picking_backend"]
+mesh_picking = ["bevy_internal/mesh_picking"]
 
 # Provides an implementation for picking sprites
-bevy_sprite_picking_backend = ["bevy_internal/bevy_sprite_picking_backend"]
+sprite_picking = ["bevy_internal/sprite_picking"]
 
 # Provides an implementation for picking UI
-bevy_ui_picking_backend = ["bevy_internal/bevy_ui_picking_backend"]
+ui_picking = ["bevy_internal/ui_picking"]
 
 # Provides a debug overlay for bevy UI
 bevy_ui_debug = ["bevy_internal/bevy_ui_debug"]
@@ -291,6 +291,12 @@ bevy_gizmos = ["bevy_internal/bevy_gizmos"]
 # Provides a collection of developer tools
 bevy_dev_tools = ["bevy_internal/bevy_dev_tools"]
 
+# Provides a collection of prebuilt camera controllers
+bevy_camera_controller = ["bevy_internal/bevy_camera_controller"]
+
+# Enables the free cam from bevy_camera_controller
+free_cam = ["bevy_internal/free_cam"]
+
 # Enable the Bevy Remote Protocol
 bevy_remote = ["bevy_internal/bevy_remote"]
 
@@ -1160,6 +1166,7 @@ wasm = true
 name = "decal"
 path = "examples/3d/decal.rs"
 doc-scrape-examples = true
+required-features = ["free_cam"]
 
 [package.metadata.example.decal]
 name = "Decal"
@@ -1271,6 +1278,7 @@ wasm = true
 name = "shadow_biases"
 path = "examples/3d/shadow_biases.rs"
 doc-scrape-examples = true
+required-features = ["free_cam"]
 
 [package.metadata.example.shadow_biases]
 name = "Shadow Biases"
@@ -1293,6 +1301,7 @@ wasm = true
 name = "skybox"
 path = "examples/3d/skybox.rs"
 doc-scrape-examples = true
+required-features = ["free_cam"]
 
 [package.metadata.example.skybox]
 name = "Skybox"
@@ -2276,7 +2285,7 @@ wasm = false
 name = "error_handling"
 path = "examples/ecs/error_handling.rs"
 doc-scrape-examples = true
-required-features = ["bevy_mesh_picking_backend"]
+required-features = ["mesh_picking"]
 
 [package.metadata.example.error_handling]
 name = "Error handling"
@@ -3196,6 +3205,7 @@ wasm = false
 name = "scene_viewer"
 path = "examples/tools/scene_viewer/main.rs"
 doc-scrape-examples = true
+required-features = ["free_cam"]
 
 [package.metadata.example.scene_viewer]
 name = "Scene Viewer"
@@ -3971,6 +3981,7 @@ wasm = true
 name = "3d_gizmos"
 path = "examples/gizmos/3d_gizmos.rs"
 doc-scrape-examples = true
+required-features = ["free_cam"]
 
 [package.metadata.example.3d_gizmos]
 name = "3D Gizmos"
@@ -4351,7 +4362,7 @@ wasm = false
 name = "mesh_picking"
 path = "examples/picking/mesh_picking.rs"
 doc-scrape-examples = true
-required-features = ["bevy_mesh_picking_backend"]
+required-features = ["mesh_picking"]
 
 [package.metadata.example.mesh_picking]
 name = "Mesh Picking"
@@ -4375,7 +4386,7 @@ wasm = true
 name = "sprite_picking"
 path = "examples/picking/sprite_picking.rs"
 doc-scrape-examples = true
-required-features = ["bevy_sprite_picking_backend"]
+required-features = ["sprite_picking"]
 
 [package.metadata.example.sprite_picking]
 name = "Sprite Picking"
@@ -4603,18 +4614,6 @@ description = "Demonstration of Occlusion Culling"
 category = "3D Rendering"
 wasm = false
 
-[[example]]
-name = "camera_controller"
-path = "examples/helpers/camera_controller.rs"
-doc-scrape-examples = true
-crate-type = ["lib"]
-
-[package.metadata.example.camera_controller]
-name = "Camera Controller"
-description = "Example Free-Cam Styled Camera Controller"
-category = "Helpers"
-wasm = true
-
 [[example]]
 name = "widgets"
 path = "examples/helpers/widgets.rs"

benches/Cargo.toml

@@ -17,9 +17,7 @@ criterion = { version = "0.6.0", features = ["html_reports"] }
 bevy_app = { path = "../crates/bevy_app" }
 bevy_ecs = { path = "../crates/bevy_ecs", features = ["multi_threaded"] }
 bevy_math = { path = "../crates/bevy_math" }
-bevy_picking = { path = "../crates/bevy_picking", features = [
-  "bevy_mesh_picking_backend",
-] }
+bevy_picking = { path = "../crates/bevy_picking", features = ["mesh_picking"] }
 bevy_reflect = { path = "../crates/bevy_reflect", features = ["functions"] }
 bevy_camera = { path = "../crates/bevy_camera" }
 bevy_mesh = { path = "../crates/bevy_mesh" }

crates/bevy_anti_alias/src/smaa/mod.rs

@@ -296,13 +296,30 @@ impl Plugin for SmaaPlugin {
 
         #[cfg(feature = "smaa_luts")]
         let smaa_luts = {
+            use bevy_asset::RenderAssetUsages;
+            use bevy_image::ImageLoaderSettings;
+
             // Load the two lookup textures. These are compressed textures in KTX2 format.
             embedded_asset!(app, "SMAAAreaLUT.ktx2");
             embedded_asset!(app, "SMAASearchLUT.ktx2");
 
             SmaaLuts {
-                area_lut: load_embedded_asset!(app, "SMAAAreaLUT.ktx2"),
-                search_lut: load_embedded_asset!(app, "SMAASearchLUT.ktx2"),
+                area_lut: load_embedded_asset!(
+                    app,
+                    "SMAAAreaLUT.ktx2",
+                    |settings: &mut ImageLoaderSettings| {
+                        settings.is_srgb = false;
+                        settings.asset_usage = RenderAssetUsages::RENDER_WORLD;
+                    }
+                ),
+                search_lut: load_embedded_asset!(
+                    app,
+                    "SMAASearchLUT.ktx2",
+                    |settings: &mut ImageLoaderSettings| {
+                        settings.is_srgb = false;
+                        settings.asset_usage = RenderAssetUsages::RENDER_WORLD;
+                    }
+                ),
             }
         };
         #[cfg(not(feature = "smaa_luts"))]

crates/bevy_asset/src/handle.rs

@@ -268,6 +268,13 @@ impl<A: Asset> From<&mut Handle<A>> for UntypedAssetId {
     }
 }
 
+impl<A: Asset> From<Uuid> for Handle<A> {
+    #[inline]
+    fn from(uuid: Uuid) -> Self {
+        Handle::Uuid(uuid, PhantomData)
+    }
+}
+
 /// An untyped variant of [`Handle`], which internally stores the [`Asset`] type information at runtime
 /// as a [`TypeId`] instead of encoding it in the compile-time type. This allows handles across [`Asset`] types
 /// to be stored together and compared.
@@ -626,6 +633,15 @@ mod tests {
         assert_eq!(UntypedHandle::from(typed.clone()), untyped);
     }
 
+    #[test]
+    fn from_uuid() {
+        let uuid = UUID_1;
+        let handle: Handle<TestAsset> = uuid.into();
+
+        assert!(handle.is_uuid());
+        assert_eq!(handle.id(), AssetId::Uuid { uuid });
+    }
+
     /// `PartialReflect::reflect_clone`/`PartialReflect::to_dynamic` should increase the strong count of a strong handle
     #[test]
     fn strong_handle_reflect_clone() {

crates/bevy_asset/src/io/source.rs

@@ -12,7 +12,7 @@ use bevy_ecs::resource::Resource;
 use bevy_platform::collections::HashMap;
 use core::{fmt::Display, hash::Hash, time::Duration};
 use thiserror::Error;
-use tracing::{error, warn};
+use tracing::warn;
 
 use super::{ErasedAssetReader, ErasedAssetWriter};
 

crates/bevy_asset/src/server/info.rs

@@ -384,6 +384,12 @@ impl AssetInfos {
         world: &mut World,
         sender: &Sender<InternalAssetEvent>,
     ) {
+        // Process all the labeled assets first so that they don't get skipped due to the "parent"
+        // not having its handle alive.
+        for (_, asset) in loaded_asset.labeled_assets {
+            self.process_asset_load(asset.handle.id(), asset.asset, world, sender);
+        }
+
         // Check whether the handle has been dropped since the asset was loaded.
         if !self.infos.contains_key(&loaded_asset_id) {
             return;

crates/bevy_asset/src/server/mod.rs

@@ -830,7 +830,10 @@ impl AssetServer {
                     fetched_handle
                 };
 
-                self.send_loaded_asset(base_asset_id, loaded_asset);
+                self.send_asset_event(InternalAssetEvent::Loaded {
+                    id: base_asset_id,
+                    loaded_asset,
+                });
                 Ok(final_handle)
             }
             Err(err) => {
@@ -844,16 +847,6 @@ impl AssetServer {
         }
     }
 
-    /// Sends a load event for the given `loaded_asset` and does the same recursively for all
-    /// labeled assets.
-    fn send_loaded_asset(&self, id: UntypedAssetId, mut loaded_asset: ErasedLoadedAsset) {
-        for (_, labeled_asset) in loaded_asset.labeled_assets.drain() {
-            self.send_loaded_asset(labeled_asset.handle.id(), labeled_asset.asset);
-        }
-
-        self.send_asset_event(InternalAssetEvent::Loaded { id, loaded_asset });
-    }
-
     /// Kicks off a reload of the asset stored at the given path. This will only reload the asset if it currently loaded.
     pub fn reload<'a>(&self, path: impl Into<AssetPath<'a>>) {
         self.reload_internal(path, false);

crates/bevy_camera_controller/Cargo.toml

@@ -0,0 +1,39 @@
+[package]
+name = "bevy_camera_controller"
+version = "0.18.0-dev"
+edition = "2024"
+description = "Premade camera controllers for Bevy"
+homepage = "https://bevy.org"
+repository = "https://github.com/bevyengine/bevy"
+license = "MIT OR Apache-2.0"
+keywords = ["bevy", "input", "camera", "control"]
+rust-version = "1.85.0"
+
+[dependencies]
+bevy_app = { path = "../bevy_app", version = "0.18.0-dev", default-features = false }
+bevy_camera = { path = "../bevy_camera", version = "0.18.0-dev", default-features = false }
+bevy_ecs = { path = "../bevy_ecs", version = "0.18.0-dev", default-features = false }
+bevy_input = { path = "../bevy_input", version = "0.18.0-dev", default-features = false }
+bevy_log = { path = "../bevy_log", version = "0.18.0-dev", default-features = false }
+bevy_math = { path = "../bevy_math", version = "0.18.0-dev", default-features = false, features = [
+  "curve",
+] }
+bevy_reflect = { path = "../bevy_reflect", version = "0.18.0-dev", default-features = false, optional = true }
+bevy_time = { path = "../bevy_time", version = "0.18.0-dev", default-features = false }
+bevy_transform = { path = "../bevy_transform", version = "0.18.0-dev", default-features = false }
+bevy_window = { path = "../bevy_window", version = "0.18.0-dev", default-features = false }
+
+[features]
+default = ["bevy_reflect"]
+bevy_reflect = ["dep:bevy_reflect"]
+libm = ["bevy_math/libm"]
+
+# Camera controllers
+free_cam = []
+
+[lints]
+workspace = true
+
+[package.metadata.docs.rs]
+rustdoc-args = ["-Zunstable-options", "--generate-link-to-definition"]
+all-features = true