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

feat: remove restriction that root assets must be metadata assets. #236

Merged
merged 1 commit into from
Oct 15, 2023
Merged

feat: remove restriction that root assets must be metadata assets. #236

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 0 additions & 14 deletions framework_crates/bones_asset/src/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,13 +328,6 @@ impl AssetServer {
);
}

if !path_is_metadata(&meta.root) {
anyhow::bail!(
"Root asset must be a JSON or YAML file with a name in the form: \
[filename].[asset_kind].[yaml|json]"
);
}

// Load the asset and produce a handle
let root_loc = AssetLocRef {
path: &meta.root,
Expand Down Expand Up @@ -372,13 +365,6 @@ impl AssetServer {
.context("Could not load pack file")?;
let meta: CorePackfileMeta = serde_yaml::from_slice(&packfile_contents)?;

if !path_is_metadata(&meta.root) {
anyhow::bail!(
"Root asset must be a JSON or YAML file with a name in the form: \
[filename].[asset_kind].[yaml|json]"
);
}

// Load the asset and produce a handle
let root_loc = AssetLocRef {
path: &meta.root,
Expand Down
Loading