Bevy Asset V2

.gitignore

@@ -12,3 +12,6 @@ dxil.dll
 
 # Generated by "examples/scene/scene.rs"
 assets/scenes/load_scene_example-new.scn.ron
+
+crates/bevy_asset/imported_assets
+imported_assets

Cargo.toml

@@ -44,14 +44,14 @@ default = [
   "bevy_sprite",
   "bevy_text",
   "bevy_ui",
+  "filesystem_watcher",
   "multi-threaded",
   "png",
   "hdr",
   "ktx2",
   "zstd",
   "vorbis",
   "x11",
-  "filesystem_watcher",
   "bevy_gizmos",
   "android_shared_stdcxx",
   "tonemapping_luts",
@@ -194,9 +194,6 @@ symphonia-vorbis = ["bevy_internal/symphonia-vorbis"]
 # WAV audio format support (through symphonia)
 symphonia-wav = ["bevy_internal/symphonia-wav"]
 
-# Enable watching file system for asset hot reload
-filesystem_watcher = ["bevy_internal/filesystem_watcher"]
-
 # Enable serialization support through serde
 serialize = ["bevy_internal/serialize"]
 
@@ -215,9 +212,6 @@ subpixel_glyph_atlas = ["bevy_internal/subpixel_glyph_atlas"]
 # Enable systems that allow for automated testing on CI
 bevy_ci_testing = ["bevy_internal/bevy_ci_testing"]
 
-# Enable the "debug asset server" for hot reloading internal assets
-debug_asset_server = ["bevy_internal/debug_asset_server"]
-
 # Enable animation support, and glTF animation loading
 animation = ["bevy_internal/animation", "bevy_animation"]
 
@@ -248,6 +242,9 @@ shader_format_spirv = ["bevy_internal/shader_format_spirv"]
 # Enable some limitations to be able to use WebGL2. If not enabled, it will default to WebGPU in Wasm
 webgl2 = ["bevy_internal/webgl"]
 
+# Enables watching the filesystem for Bevy Asset hot-reloading
+filesystem_watcher = ["bevy_internal/filesystem_watcher"]
+
 [dependencies]
 bevy_dylib = { path = "crates/bevy_dylib", version = "0.12.0-dev", default-features = false, optional = true }
 bevy_internal = { path = "crates/bevy_internal", version = "0.12.0-dev", default-features = false }
@@ -952,12 +949,12 @@ category = "Assets"
 wasm = true
 
 [[example]]
-name = "custom_asset_io"
-path = "examples/asset/custom_asset_io.rs"
+name = "custom_asset_reader"
+path = "examples/asset/custom_asset_reader.rs"
 
-[package.metadata.example.custom_asset_io]
+[package.metadata.example.custom_asset_reader]
 name = "Custom Asset IO"
-description = "Implements a custom asset io loader"
+description = "Implements a custom AssetReader"
 category = "Assets"
 wasm = true
 

crates/bevy_animation/src/lib.rs

@@ -7,12 +7,12 @@ use std::ops::Deref;
 use std::time::Duration;
 
 use bevy_app::{App, Plugin, PostUpdate};
-use bevy_asset::{AddAsset, Assets, Handle};
+use bevy_asset::{Asset, AssetApp, Assets, Handle};
 use bevy_core::Name;
 use bevy_ecs::prelude::*;
 use bevy_hierarchy::{Children, Parent};
 use bevy_math::{Quat, Vec3};
-use bevy_reflect::{Reflect, TypeUuid};
+use bevy_reflect::Reflect;
 use bevy_render::mesh::morph::MorphWeights;
 use bevy_time::Time;
 use bevy_transform::{prelude::Transform, TransformSystem};
@@ -65,8 +65,7 @@ pub struct EntityPath {
 }
 
 /// A list of [`VariableCurve`], and the [`EntityPath`] to which they apply.
-#[derive(Reflect, Clone, TypeUuid, Debug, Default)]
-#[uuid = "d81b7179-0448-4eb0-89fe-c067222725bf"]
+#[derive(Asset, Reflect, Clone, Debug, Default)]
 pub struct AnimationClip {
     curves: Vec<Vec<VariableCurve>>,
     paths: HashMap<EntityPath, usize>,
@@ -603,7 +602,7 @@ pub struct AnimationPlugin;
 
 impl Plugin for AnimationPlugin {
     fn build(&self, app: &mut App) {
-        app.add_asset::<AnimationClip>()
+        app.init_asset::<AnimationClip>()
             .register_asset_reflect::<AnimationClip>()
             .register_type::<AnimationPlayer>()
             .register_type::<PlayingAnimation>()

crates/bevy_asset/Cargo.toml

@@ -2,36 +2,35 @@
 name = "bevy_asset"
 version = "0.12.0-dev"
 edition = "2021"
-description = "Provides asset functionality for Bevy Engine"
-homepage = "https://bevyengine.org"
-repository = "https://github.com/bevyengine/bevy"
-license = "MIT OR Apache-2.0"
-keywords = ["bevy"]
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [features]
-default = []
-filesystem_watcher = ["notify"]
-debug_asset_server = ["filesystem_watcher"]
+filesystem_watcher = ["notify-debouncer-full"]
 
 [dependencies]
-# bevy
 bevy_app = { path = "../bevy_app", version = "0.12.0-dev" }
-bevy_diagnostic = { path = "../bevy_diagnostic", version = "0.12.0-dev" }
+bevy_asset_macros = { path = "macros", version = "0.12.0-dev" }
 bevy_ecs = { path = "../bevy_ecs", version = "0.12.0-dev" }
 bevy_log = { path = "../bevy_log", version = "0.12.0-dev" }
-bevy_reflect = { path = "../bevy_reflect", version = "0.12.0-dev", features = ["bevy"] }
+bevy_reflect = { path = "../bevy_reflect", version = "0.12.0-dev" }
 bevy_tasks = { path = "../bevy_tasks", version = "0.12.0-dev" }
 bevy_utils = { path = "../bevy_utils", version = "0.12.0-dev" }
 
-# other
+anyhow = "1.0"
+async-broadcast = "0.5"
+async-fs = "1.5"
+async-lock = "2.7"
+crossbeam-channel = "0.5"
+downcast-rs = "1.2"
+futures-io = "0.3"
+futures-lite = "1.12"
+md5 = "0.7"
+parking_lot = { version = "0.12", features = ["arc_lock", "send_guard"] }
+ron = "0.8"
 serde = { version = "1", features = ["derive"] }
-crossbeam-channel = "0.5.0"
-anyhow = "1.0.4"
 thiserror = "1.0"
-downcast-rs = "1.2.0"
-fastrand = "1.7.0"
-notify = { version = "6.0.0", optional = true }
-parking_lot = "0.12.1"
+notify-debouncer-full = { version = "0.2.0", optional = true }
 
 [target.'cfg(target_os = "android")'.dependencies]
 bevy_winit = { path = "../bevy_winit", version = "0.12.0-dev" }
@@ -43,6 +42,4 @@ wasm-bindgen-futures = "0.4"
 js-sys = "0.3"
 
 [dev-dependencies]
-futures-lite = "1.4.0"
-tempfile = "3.2.0"
-bevy_core = { path = "../bevy_core", version = "0.12.0-dev" }
+bevy_core = {path = "../bevy_core", version = "0.12.0-dev"}

crates/bevy_asset/assets/a.cool.ron

@@ -0,0 +1,8 @@
+(
+    text: "a",
+    dependencies: [
+        "foo/b.cool.ron",
+        "foo/c.cool.ron",
+    ],
+    embedded_dependencies: [],
+)

crates/bevy_asset/assets/a.cool.ron.meta

@@ -0,0 +1,12 @@
+(
+    meta_format_version: "1.0",
+    asset: Process(
+        processor: "bevy_asset::processor::process::LoadAndSave<loader::CoolTextLoader, loader::CoolTextSaver>",
+        settings: (
+            loader_settings: (),
+            saver_settings: (
+                appended: "",
+            ),
+        ),
+    ),
+)

crates/bevy_asset/assets/d.cool.ron

@@ -0,0 +1,8 @@
+(
+    text: "d",
+    dependencies: [
+    ],
+    embedded_dependencies: [
+        "foo/c.cool.ron"
+    ],
+)

crates/bevy_asset/assets/d.cool.ron.meta

@@ -0,0 +1,12 @@
+(
+    meta_format_version: "1.0",
+    asset: Process(
+        processor: "bevy_asset::processor::process::LoadAndSave<loader::CoolTextLoader, loader::CoolTextSaver>",
+        settings: (
+            loader_settings: (),
+            saver_settings: (
+                appended: "",
+            ),
+        ),
+    ),
+)

crates/bevy_asset/assets/foo/b.cool.ron

@@ -0,0 +1,5 @@
+(
+    text: "b",
+    dependencies: [],
+    embedded_dependencies: [],
+)

crates/bevy_asset/assets/foo/b.cool.ron.meta

@@ -0,0 +1,12 @@
+(
+    meta_format_version: "1.0",
+    asset: Process(
+        processor: "bevy_asset::processor::process::LoadAndSave<loader::CoolTextLoader, loader::CoolTextSaver>",
+        settings: (
+            loader_settings: (),
+            saver_settings: (
+                appended: "",
+            ),
+        ),
+    ),
+)

crates/bevy_asset/assets/foo/c.cool.ron

@@ -0,0 +1,5 @@
+(
+    text: "c",
+    dependencies: [],
+    embedded_dependencies: ["a.cool.ron", "foo/b.cool.ron"],
+)

crates/bevy_asset/assets/foo/c.cool.ron.meta

@@ -0,0 +1,12 @@
+(
+    meta_format_version: "1.0",
+    asset: Process(
+        processor: "bevy_asset::processor::process::LoadAndSave<loader::CoolTextLoader, loader::CoolTextSaver>",
+        settings: (
+            loader_settings: (),
+            saver_settings: (
+                appended: "",
+            ),
+        ),
+    ),
+)