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

[Merged by Bors] - Useful error message when two assets have the save UUID #3739

Closed
wants to merge 4 commits into from
Closed

[Merged by Bors] - Useful error message when two assets have the save UUID #3739

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c8ed5bf
added check for TYPE_UUID duplication
ShadowCurse Jan 21, 2022
c8bb211
added type info to the message
ShadowCurse Feb 6, 2022
cd75a98
changed to use single read lock
ShadowCurse Feb 8, 2022
6ae5207
refactoring
ShadowCurse Feb 12, 2022
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
9 changes: 9 additions & 0 deletions crates/bevy_asset/src/asset_server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,15 @@ impl AssetServer {
}

pub(crate) fn register_asset_type<T: Asset>(&self) -> Assets<T> {
if self
Copy link
Member

Choose a reason for hiding this comment

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

rather than grab a read lock and then a write lock immediately after, I think we should just grab a single write lock and reuse it across both cases (especially given that the "read only" case is the "unexpected" / "uncommon" case).

.server
.asset_lifecycles
.read()
.contains_key(&T::TYPE_UUID)
{
panic!("Error while registering new asset type: {:?} with UUID: {:?}. Another type with the same UUID is already registered. Can not register new asset type with the same UUID",
std::any::type_name::<T>(), T::TYPE_UUID);
}
self.server.asset_lifecycles.write().insert(
T::TYPE_UUID,
Box::new(AssetLifecycleChannel::<T>::default()),
Expand Down