godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #43640 from akien-mga/gltf-workaround-bogus-images

Browse Source 
glTF: Workaround import failure with invalid embedded images
This commit is contained in:
Rémi Verschelde 2020-11-18 13:22:28 +01:00 committed by GitHub
commit 48a760da55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
editor/import/editor_scene_importer_gltf.cpp
View File

@ -1304,12 +1304,14 @@ Error EditorSceneImporterGLTF::_parse_images(GLTFState &state, const String &p_b
String uri = d["uri"]; String uri = d["uri"];
if (uri.begins_with("data:")) { // Embedded data using base64. if (uri.begins_with("data:")) { // Embedded data using base64.
// Validate data MIME types and throw an error if it's one we don't know/support. // Validate data MIME types and throw a warning if it's one we don't know/support.
if (!uri.begins_with("data:application/octet-stream;base64") && if (!uri.begins_with("data:application/octet-stream;base64") &&
!uri.begins_with("data:application/gltf-buffer;base64") && !uri.begins_with("data:application/gltf-buffer;base64") &&
!uri.begins_with("data:image/png;base64") && !uri.begins_with("data:image/png;base64") &&
!uri.begins_with("data:image/jpeg;base64")) { !uri.begins_with("data:image/jpeg;base64")) {
ERR_PRINT("glTF: Got image data with an unknown URI data type: " + uri); WARN_PRINT(vformat("glTF: Image index '%d' uses an unsupported URI data type: %s. Skipping it.", i, uri));
state.images.push_back(Ref<Texture2D>()); // Placeholder to keep count.
continue;
} }
data = _parse_base64_uri(uri); data = _parse_base64_uri(uri);
data_ptr = data.ptr(); data_ptr = data.ptr();
@ -1344,7 +1346,8 @@ Error EditorSceneImporterGLTF::_parse_images(GLTFState &state, const String &p_b
} }
} else if (d.has("bufferView")) { } else if (d.has("bufferView")) {
// Handles the third bullet point from the spec (bufferView). // Handles the third bullet point from the spec (bufferView).
ERR_FAIL_COND_V_MSG(mimetype.empty(), ERR_FILE_CORRUPT, "glTF: Image specifies 'bufferView' but no 'mimeType', which is invalid."); ERR_FAIL_COND_V_MSG(mimetype.empty(), ERR_FILE_CORRUPT,
vformat("glTF: Image index '%d' specifies 'bufferView' but no 'mimeType', which is invalid.", i));
const GLTFBufferViewIndex bvi = d["bufferView"]; const GLTFBufferViewIndex bvi = d["bufferView"];
@ -1381,7 +1384,8 @@ Error EditorSceneImporterGLTF::_parse_images(GLTFState &state, const String &p_b
} }
} }
ERR_FAIL_COND_V_MSG(img.is_null(), ERR_FILE_CORRUPT, "glTF: Couldn't load image with its given mimetype: " + mimetype); ERR_FAIL_COND_V_MSG(img.is_null(), ERR_FILE_CORRUPT,
vformat("glTF: Couldn't load image index '%d' with its given mimetype: %s.", i, mimetype));
Ref<ImageTexture> t; Ref<ImageTexture> t;
t.instance(); t.instance();