Fix up all the dependents and examples to add the default source in the AssetPlugin.

Author: andriyDev

crates/bevy_gltf/src/loader/mod.rs

@@ -1901,16 +1901,17 @@ struct MorphTargetNames {
 
 #[cfg(test)]
 mod test {
-    use std::path::Path;
+    use std::{path::Path, sync::Mutex};
 
     use crate::{Gltf, GltfAssetLabel, GltfNode, GltfSkin};
     use bevy_app::{App, TaskPoolPlugin};
     use bevy_asset::{
         io::{
             memory::{Dir, MemoryAssetReader},
-            AssetSourceBuilder, AssetSourceId,
+            AssetSourceBuilder,
         },
-        AssetApp, AssetLoader, AssetPlugin, AssetServer, Assets, Handle, LoadState,
+        AssetApp, AssetLoader, AssetPlugin, AssetServer, Assets, DefaultAssetSource, Handle,
+        LoadState,
     };
     use bevy_ecs::{resource::Resource, world::World};
     use bevy_image::{Image, ImageLoaderSettings};
@@ -1923,14 +1924,15 @@ mod test {
     fn test_app(dir: Dir) -> App {
         let mut app = App::new();
         let reader = MemoryAssetReader { root: dir };
-        app.register_asset_source(
-            AssetSourceId::Default,
-            AssetSourceBuilder::new(move || Box::new(reader.clone())),
-        )
-        .add_plugins((
+        app.add_plugins((
             LogPlugin::default(),
             TaskPoolPlugin::default(),
-            AssetPlugin::default(),
+            AssetPlugin {
+                default_source: DefaultAssetSource::FromBuilder(Mutex::new(
+                    AssetSourceBuilder::new(move || Box::new(reader.clone())),
+                )),
+                ..Default::default()
+            },
             ScenePlugin,
             MeshPlugin,
             crate::GltfPlugin::default(),
@@ -2341,27 +2343,27 @@ mod test {
 
         let mut app = App::new();
         let custom_reader = MemoryAssetReader { root: dir.clone() };
-        // Create a default asset source so we definitely don't try to read from disk.
-        app.register_asset_source(
-            AssetSourceId::Default,
-            AssetSourceBuilder::new(move || {
-                Box::new(MemoryAssetReader {
-                    root: Dir::default(),
-                })
-            }),
-        )
-        .register_asset_source(
-            "custom",
-            AssetSourceBuilder::new(move || Box::new(custom_reader.clone())),
-        )
-        .add_plugins((
+        app.add_plugins((
             LogPlugin::default(),
             TaskPoolPlugin::default(),
-            AssetPlugin::default(),
+            AssetPlugin {
+                default_source: DefaultAssetSource::FromBuilder(Mutex::new(
+                    AssetSourceBuilder::new(move || {
+                        Box::new(MemoryAssetReader {
+                            root: Dir::default(),
+                        })
+                    }),
+                )),
+                ..Default::default()
+            },
             ScenePlugin,
             MeshPlugin,
             crate::GltfPlugin::default(),
-        ));
+        ))
+        .register_asset_source(
+            "custom",
+            AssetSourceBuilder::new(move || Box::new(custom_reader.clone())),
+        );
 
         app.finish();
         app.cleanup();

examples/asset/asset_settings.rs

@@ -1,6 +1,7 @@
 //! This example demonstrates the usage of '.meta' files and [`AssetServer::load_with_settings`] to override the default settings for loading an asset
 
 use bevy::{
+    asset::DefaultAssetSource,
     image::{ImageLoaderSettings, ImageSampler},
     prelude::*,
 };
@@ -10,7 +11,10 @@ fn main() {
         .add_plugins(
             // This just tells the asset server to look in the right examples folder
             DefaultPlugins.set(AssetPlugin {
-                file_path: "examples/asset/files".to_string(),
+                default_source: DefaultAssetSource::FromPaths {
+                    file_path: "examples/asset/files".to_string(),
+                    processed_file_path: None,
+                },
                 ..Default::default()
             }),
         )

examples/asset/custom_asset_reader.rs

@@ -3,13 +3,16 @@
 //! It does not know anything about the asset formats, only how to talk to the underlying storage.
 
 use bevy::{
-    asset::io::{
-        AssetReader, AssetReaderError, AssetSource, AssetSourceBuilder, AssetSourceId,
-        ErasedAssetReader, PathStream, Reader,
+    asset::{
+        io::{
+            AssetReader, AssetReaderError, AssetSource, AssetSourceBuilder, ErasedAssetReader,
+            PathStream, Reader,
+        },
+        DefaultAssetSource,
     },
     prelude::*,
 };
-use std::path::Path;
+use std::{path::Path, sync::Mutex};
 
 /// A custom asset reader implementation that wraps a given asset reader implementation
 struct CustomAssetReader(Box<dyn ErasedAssetReader>);
@@ -35,26 +38,20 @@ impl AssetReader for CustomAssetReader {
     }
 }
 
-/// A plugins that registers our new asset reader
-struct CustomAssetReaderPlugin;
-
-impl Plugin for CustomAssetReaderPlugin {
-    fn build(&self, app: &mut App) {
-        app.register_asset_source(
-            AssetSourceId::Default,
-            AssetSourceBuilder::new(|| {
-                Box::new(CustomAssetReader(
-                    // This is the default reader for the current platform
-                    AssetSource::get_default_reader("assets".to_string())(),
-                ))
-            }),
-        );
-    }
-}
-
 fn main() {
     App::new()
-        .add_plugins((CustomAssetReaderPlugin, DefaultPlugins))
+        .add_plugins(DefaultPlugins.set(AssetPlugin {
+            // The default source must be registered in the `AssetPlugin`.
+            default_source: DefaultAssetSource::FromBuilder(Mutex::new(AssetSourceBuilder::new(
+                || {
+                    Box::new(CustomAssetReader(
+                        // This is the default reader for the current platform
+                        AssetSource::get_default_reader("assets".to_string())(),
+                    ))
+                },
+            ))),
+            ..Default::default()
+        }))
         .add_systems(Startup, setup)
         .run();
 }

examples/asset/extra_source.rs

@@ -12,17 +12,15 @@ use std::path::Path;
 
 fn main() {
     App::new()
+        // DefaultPlugins contains AssetPlugin so it must be added to our App
+        // before inserting our new asset source.
+        .add_plugins(DefaultPlugins)
         // Add an extra asset source with the name "example_files" to
         // AssetSourceBuilders.
-        //
-        // This must be done before AssetPlugin finalizes building assets.
         .register_asset_source(
             "example_files",
             AssetSourceBuilder::platform_default("examples/asset/files", None),
         )
-        // DefaultPlugins contains AssetPlugin so it must be added to our App
-        // after inserting our new asset source.
-        .add_plugins(DefaultPlugins)
         .add_systems(Startup, setup)
         .run();
 }

examples/asset/processing/asset_processing.rs

@@ -7,7 +7,7 @@ use bevy::{
         processor::LoadTransformAndSave,
         saver::{AssetSaver, SavedAsset},
         transformer::{AssetTransformer, TransformedAsset},
-        AssetLoader, AsyncWriteExt, LoadContext,
+        AssetLoader, AsyncWriteExt, DefaultAssetSource, LoadContext,
     },
     prelude::*,
     reflect::TypePath,
@@ -31,9 +31,12 @@ fn main() {
                 mode: AssetMode::Processed,
                 // This is just overriding the default paths to scope this to the correct example folder
                 // You can generally skip this in your own projects
-                file_path: "examples/asset/processing/assets".to_string(),
-                processed_file_path: "examples/asset/processing/imported_assets/Default"
-                    .to_string(),
+                default_source: DefaultAssetSource::FromPaths {
+                    file_path: "examples/asset/processing/assets".to_string(),
+                    processed_file_path: Some(
+                        "examples/asset/processing/imported_assets/Default".to_string(),
+                    ),
+                },
                 ..default()
             }),
             TextPlugin,

examples/tools/scene_viewer/main.rs

@@ -10,7 +10,7 @@
 
 use argh::FromArgs;
 use bevy::{
-    asset::UnapprovedPathMode,
+    asset::{DefaultAssetSource, UnapprovedPathMode},
     camera::primitives::{Aabb, Sphere},
     camera_controller::free_camera::{FreeCamera, FreeCameraPlugin},
     core_pipeline::prepass::{DeferredPrepass, DepthPrepass},
@@ -86,7 +86,11 @@ fn main() {
                 ..default()
             })
             .set(AssetPlugin {
-                file_path: std::env::var("CARGO_MANIFEST_DIR").unwrap_or_else(|_| ".".to_string()),
+                default_source: DefaultAssetSource::FromPaths {
+                    file_path: std::env::var("CARGO_MANIFEST_DIR")
+                        .unwrap_or_else(|_| ".".to_string()),
+                    processed_file_path: None,
+                },
                 // Allow scenes to be loaded from anywhere on disk
                 unapproved_path_mode: UnapprovedPathMode::Allow,
                 ..default()