Selaa lähdekoodia

Allow GLTF to use the ImageBitmapLoader with Firefox. (#23742)

* Update GLTFLoader.js

Use createImageBitmap for firefox now options are implemented as of FF 98

* Update GLTFLoader.js

Allow Firefox to use ImageBitmapLoader - createImageBitmap options supported as of FF98
aardgoose 3 vuotta sitten
vanhempi
commit
b5244a838f
2 muutettua tiedostoa jossa 2 lisäystä ja 2 poistoa
  1. 1 1
      examples/js/loaders/GLTFLoader.js
  2. 1 1
      examples/jsm/loaders/GLTFLoader.js

+ 1 - 1
examples/js/loaders/GLTFLoader.js

@@ -2021,7 +2021,7 @@
 			this.nodeNamesUsed = {}; // Use an THREE.ImageBitmapLoader if imageBitmaps are supported. Moves much of the
 			this.nodeNamesUsed = {}; // Use an THREE.ImageBitmapLoader if imageBitmaps are supported. Moves much of the
 			// expensive work of uploading a texture to the GPU off the main thread.
 			// expensive work of uploading a texture to the GPU off the main thread.
 
 
-			if ( typeof createImageBitmap !== 'undefined' && /Firefox|^((?!chrome|android).)*safari/i.test( navigator.userAgent ) === false ) {
+			if ( typeof createImageBitmap !== 'undefined' && /^((?!chrome|android).)*safari/i.test( navigator.userAgent ) === false ) {
 
 
 				this.textureLoader = new THREE.ImageBitmapLoader( this.options.manager );
 				this.textureLoader = new THREE.ImageBitmapLoader( this.options.manager );
 
 

+ 1 - 1
examples/jsm/loaders/GLTFLoader.js

@@ -2269,7 +2269,7 @@ class GLTFParser {
 
 
 		// Use an ImageBitmapLoader if imageBitmaps are supported. Moves much of the
 		// Use an ImageBitmapLoader if imageBitmaps are supported. Moves much of the
 		// expensive work of uploading a texture to the GPU off the main thread.
 		// expensive work of uploading a texture to the GPU off the main thread.
-		if ( typeof createImageBitmap !== 'undefined' && /Firefox|^((?!chrome|android).)*safari/i.test( navigator.userAgent ) === false ) {
+		if ( typeof createImageBitmap !== 'undefined' && /^((?!chrome|android).)*safari/i.test( navigator.userAgent ) === false ) {
 
 
 			this.textureLoader = new ImageBitmapLoader( this.options.manager );
 			this.textureLoader = new ImageBitmapLoader( this.options.manager );