diff options
| -rw-r--r-- | engine/src/asset.rs | 42 |
1 files changed, 8 insertions, 34 deletions
diff --git a/engine/src/asset.rs b/engine/src/asset.rs index eefda8d..dd8aa37 100644 --- a/engine/src/asset.rs +++ b/engine/src/asset.rs @@ -174,7 +174,10 @@ impl Assets })); } - #[tracing::instrument(skip_all, fields(asset_type=type_name::<Asset>()))] + #[tracing::instrument( + skip_all, + fields(asset_label, asset_type = type_name::<Asset>()) + )] pub fn get<Asset: 'static + Send + Sync>( &self, handle: &Handle<Asset>, @@ -182,12 +185,15 @@ impl Assets { let asset_lookup = self.asset_lookup.borrow(); - let LookupEntry::Occupied(asset_index, _) = + let LookupEntry::Occupied(asset_index, asset_label) = asset_lookup.get(&handle.id.label_hash)? else { return None; }; + tracing::Span::current() + .record("asset_label", tracing::field::display(&asset_label)); + let stored_asset = self.assets.get(*asset_index).expect("Not possible"); let Some(asset) = stored_asset.strong.downcast_ref::<Asset>() else { @@ -422,38 +428,6 @@ impl Assets .get_mut() .insert(label_hash, LookupEntry::Occupied(index, label.to_owned())); - if label.name.is_some() { - let parent_asset_label = Label { - path: label.path.as_ref().into(), - name: None, - }; - - let parent_asset_label_hash = LabelHash::new(&parent_asset_label); - - if matches!( - self.asset_lookup.get_mut().get(&parent_asset_label_hash), - Some(LookupEntry::Pending) - ) { - self.asset_lookup.get_mut().remove(&parent_asset_label_hash); - } else if self - .asset_lookup - .get_mut() - .get(&parent_asset_label_hash) - .is_none() - { - self.assets - .push(StoredAsset::new::<Option<Infallible>>(None)); - - self.asset_lookup.get_mut().insert( - parent_asset_label_hash, - LookupEntry::Occupied( - self.assets.len() - 1, - parent_asset_label.to_owned(), - ), - ); - } - } - self.events .curr_tick_events .push(Event::Stored(Id { label_hash }, label.to_owned())); |