Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

send Unused event when asset is actually unused #12459

Merged
merged 8 commits into from
Mar 17, 2024
Merged

send Unused event when asset is actually unused #12459

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
16232d2
unload renderasset on Removed
robtfm Mar 13, 2024
d2809b7
only send Unused after checking dropped handles
robtfm Mar 13, 2024
324a63b
rename a var
robtfm Mar 13, 2024
cda97df
change event order to match prior behaviour
robtfm Mar 13, 2024
56aaf2b
style
robtfm Mar 14, 2024
cd71aaf
store drop events instead of refiring
robtfm Mar 15, 2024
7330114
Revert "store drop events instead of refiring"
robtfm Mar 15, 2024
6a886c3
comment
robtfm Mar 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions crates/bevy_asset/src/assets.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,23 +549,24 @@ impl<A: Asset> Assets<A> {
while let Ok(drop_event) = assets.handle_provider.drop_receiver.try_recv() {
let id = drop_event.id.typed();

assets.queued_events.push(AssetEvent::Unused { id });

let mut remove_asset = true;

if drop_event.asset_server_managed {
let untyped_id = drop_event.id.untyped(TypeId::of::<A>());
let untyped_id = id.untyped();
if let Some(info) = infos.get(untyped_id) {
if let LoadState::Loading | LoadState::NotLoaded = info.load_state {
not_ready.push(drop_event);
continue;
}
}
remove_asset = infos.process_handle_drop(untyped_id);
}
if remove_asset {
assets.remove_dropped(id);

// the process_handle_drop call checks whether new handles have been created since the drop event was fired, before removing the asset
if !infos.process_handle_drop(untyped_id) {
// a new handle has been created, or the asset doesn't exist
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we expand this comment a bit with the context you put in your last comment to me? That this is a check to see if a new handle has been created in the same frame after the last one was dropped, meaning it's not actually unused.

Also, what does "or the asset doesn't exist" mean here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's what the comment in the process_handle_drop function says. i don't know a scenario where it would happen.

continue;
}
}

assets.queued_events.push(AssetEvent::Unused { id });
assets.remove_dropped(id);
}

// TODO: this is _extremely_ inefficient find a better fix
Expand Down