Mirrors/bevy
2
0
Fork 0
mirror of https://github.com/bevyengine/bevy synced 2024-11-22 04:33:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix MIME type support for glTF buffer Data URIs (#3101)

Browse source 
# Objective

- The glTF 2.0 spec requires that Data URIs use one of two valid MIME types. `bevy_gltf` only supports one of these.
- See:
  - https://www.khronos.org/registry/glTF/specs/2.0/glTF-2.0.html#_media_type_registrations
  - https://www.khronos.org/registry/glTF/specs/2.0/glTF-2.0.html#file-extensions-and-media-types
  - https://www.khronos.org/registry/glTF/specs/2.0/glTF-2.0.html#binary-data-storage

> Buffer data **MAY** alternatively be embedded in the glTF file via `data:` URI with base64 encoding. When `data:` URI is used for buffer storage, its mediatype field **MUST** be set to `application/octet-stream` or `application/gltf-buffer`.

(Emphasis in original.)

## Solution

- Check for both MIME types.
This commit is contained in:
Jay Oster 2021-11-11 01:58:57 +00:00
parent 0db1f4cd16
commit 76cb662be1
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crates/bevy_gltf/src/loader.rs
View file

@ -647,7 +647,7 @@ async fn load_buffers(
load_context: &LoadContext<'_>, load_context: &LoadContext<'_>,
asset_path: &Path, asset_path: &Path,
) -> Result<Vec<Vec<u8>>, GltfError> { ) -> Result<Vec<Vec<u8>>, GltfError> {
const OCTET_STREAM_URI: &str = "application/octet-stream"; const VALID_MIME_TYPES: &[&str] = &["application/octet-stream", "application/gltf-buffer"];
let mut buffer_data = Vec::new(); let mut buffer_data = Vec::new();
for buffer in gltf.buffers() { for buffer in gltf.buffers() {
@ -658,7 +658,9 @@ async fn load_buffers(
.unwrap(); .unwrap();
let uri = uri.as_ref(); let uri = uri.as_ref();
let buffer_bytes = match DataUri::parse(uri) { let buffer_bytes = match DataUri::parse(uri) {
Ok(data_uri) if data_uri.mime_type == OCTET_STREAM_URI => data_uri.decode()?, Ok(data_uri) if VALID_MIME_TYPES.contains(&data_uri.mime_type) => {
data_uri.decode()?
}
Ok(_) => return Err(GltfError::BufferFormatUnsupported), Ok(_) => return Err(GltfError::BufferFormatUnsupported),
Err(()) => { Err(()) => {
// TODO: Remove this and add dep // TODO: Remove this and add dep