GLTFLoader: Set RGBFormat for jpg with no mimeType. (#21892)

* GLTFLoader: Set RGBFormat for jpg with no mimeType. * GLTFLoader: Handle data:image/jpeg uris.
mrdoob · May 27, 2021 · 370504b · 370504b
1 parent 2b34172
commit 370504b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/examples/js/loaders/GLTFLoader.js b/examples/js/loaders/GLTFLoader.js
@@ -2291,10 +2291,11 @@
 			}
 
 			const URL = self.URL || self.webkitURL;
-			let sourceURI = source.uri;
+			let sourceURI = source.uri || '';
 			let isObjectURL = false;
 			let hasAlpha = true;
-			if ( source.mimeType === 'image/jpeg' ) hasAlpha = false;
+			const isJPEG = sourceURI.search( /\.jpe?g($|\?)/i ) > 0 || sourceURI.search( /^data\:image\/jpeg/ ) === 0;
+			if ( source.mimeType === 'image/jpeg' || isJPEG ) hasAlpha = false;
 
 			if ( source.bufferView !== undefined ) {
 

diff --git a/examples/jsm/loaders/GLTFLoader.js b/examples/jsm/loaders/GLTFLoader.js
@@ -2548,11 +2548,13 @@ class GLTFParser {
 
 		const URL = self.URL || self.webkitURL;
 
-		let sourceURI = source.uri;
+		let sourceURI = source.uri || '';
 		let isObjectURL = false;
 		let hasAlpha = true;
 
-		if ( source.mimeType === 'image/jpeg' ) hasAlpha = false;
+		const isJPEG = sourceURI.search( /\.jpe?g($|\?)/i ) > 0 || sourceURI.search( /^data\:image\/jpeg/ ) === 0;
+
+		if ( source.mimeType === 'image/jpeg' || isJPEG ) hasAlpha = false;
 
 		if ( source.bufferView !== undefined ) {