Fix inline children not being stored as dependency

MrGVSV · Apr 29, 2023 · e654af9 · e654af9
1 parent e9122c2
commit e654af9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/bevy_proto_backend/src/children/builder.rs b/bevy_proto_backend/src/children/builder.rs
@@ -1,6 +1,6 @@
 use std::path::Path;
 
-use bevy::asset::{AssetIo, AssetPath, Handle, LoadedAsset};
+use bevy::asset::{AssetIo, Handle, LoadedAsset};
 
 use crate::load::ProtoLoadContext;
 use crate::path::{ProtoPath, ProtoPathContext};
@@ -11,15 +11,13 @@ use crate::proto::Prototypical;
 /// [prototype's]: Prototypical
 pub struct ProtoChildBuilder<'ctx, 'load_ctx, T: Prototypical> {
     pub(crate) context: ProtoLoadContext<'ctx, 'load_ctx, T>,
-    pub(crate) child_paths: Vec<AssetPath<'static>>,
     child_count: usize,
 }
 
 impl<'ctx, 'load_ctx, T: Prototypical> ProtoChildBuilder<'ctx, 'load_ctx, T> {
     pub(crate) fn new(context: ProtoLoadContext<'ctx, 'load_ctx, T>) -> Self {
         Self {
             context,
-            child_paths: Vec::new(),
             child_count: 0,
         }
     }
@@ -40,7 +38,9 @@ impl<'ctx, 'load_ctx, T: Prototypical> ProtoChildBuilder<'ctx, 'load_ctx, T> {
 
     /// Add the child with the given path to the parent.
     pub fn add_child_path(&mut self, child_path: ProtoPath) -> Result<Handle<T>, T::Error> {
-        self.child_paths.push(child_path.asset_path().to_owned());
+        self.context
+            .child_paths_mut()
+            .push(child_path.asset_path().to_owned());
 
         self.child_count += 1;
 

diff --git a/bevy_proto_backend/src/load/load_context.rs b/bevy_proto_backend/src/load/load_context.rs
@@ -59,7 +59,7 @@ impl<'a, 'ctx, T: Prototypical> ProtoLoadContext<'a, 'ctx, T> {
         &mut self,
         f: F,
     ) -> Result<(), E> {
-        let ctx = Self {
+        let mut ctx = Self {
             registry: self.registry,
             load_context: self.load_context.take(),
             extensions: self.extensions,
@@ -68,17 +68,16 @@ impl<'a, 'ctx, T: Prototypical> ProtoLoadContext<'a, 'ctx, T> {
             _phantom: Default::default(),
         };
 
+        std::mem::swap(&mut ctx.child_paths, &mut self.child_paths);
         self.depth += 1;
 
         let mut builder = ProtoChildBuilder::new(ctx);
         let result = f(&mut builder);
         self.load_context = builder.context.load_context;
-        let children = builder.child_paths;
+        self.child_paths = builder.context.child_paths;
 
         self.depth -= 1;
 
-        self.child_paths.extend(children);
-
         result
     }