asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #69181 from fire/gltf-runtime-image-fallback

Browse source 
Fixes cases where the runtime ResourceLoader cannot load gltf images.
This commit is contained in:
Rémi Verschelde 2023-01-20 08:48:32 +01:00
commit 7b84b133ee
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/gltf/gltf_document.cpp
View file

@ -3124,10 +3124,11 @@ Error GLTFDocument::_parse_images(Ref<GLTFState> p_state, const String &p_base_p
// API for that in Godot, so we'd have to load as a buffer (i.e. embedded in // API for that in Godot, so we'd have to load as a buffer (i.e. embedded in
// the material), so we do this only as fallback. // the material), so we do this only as fallback.
Ref<Texture2D> texture = ResourceLoader::load(uri); Ref<Texture2D> texture = ResourceLoader::load(uri);
String extension = uri.get_extension().to_lower();
if (texture.is_valid()) { if (texture.is_valid()) {
p_state->images.push_back(texture); p_state->images.push_back(texture);
continue; continue;
} else if (mimetype == "image/png" || mimetype == "image/jpeg") { } else if (mimetype == "image/png" || mimetype == "image/jpeg" || extension == "png" || extension == "jpg" || extension == "jpeg") {
// Fallback to loading as byte array. // Fallback to loading as byte array.
// This enables us to support the spec's requirement that we honor mimetype // This enables us to support the spec's requirement that we honor mimetype
// regardless of file URI. // regardless of file URI.