super-three 0.141.0 → 0.147.0

package/examples/js/loaders/GLTFLoader.js

@@ -69,14 +69,17 @@
 				return new GLTFMeshoptCompression( parser );
 
 			} );
+			this.register( function ( parser ) {
 
-		}
+				return new GLTFMeshGpuInstancing( parser );
+
+			} );
 
+		}
 		load( url, onLoad, onProgress, onError ) {
 
 			const scope = this;
 			let resourcePath;
-
 			if ( this.resourcePath !== '' ) {
 
 				resourcePath = this.resourcePath;
@@ -89,13 +92,12 @@
 
 				resourcePath = THREE.LoaderUtils.extractUrlBase( url );
 
-			} // Tells the LoadingManager to track an extra item, which resolves after
+			}
+
+			// Tells the LoadingManager to track an extra item, which resolves after
 			// the model is fully loaded. This means the count of items loaded will
 			// be incorrect, but ensures manager.onLoad() does not fire early.
-
-
 			this.manager.itemStart( url );
-
 			const _onError = function ( e ) {
 
 				if ( onError ) {
@@ -138,34 +140,29 @@
 			}, onProgress, _onError );
 
 		}
-
 		setDRACOLoader( dracoLoader ) {
 
 			this.dracoLoader = dracoLoader;
 			return this;
 
 		}
-
 		setDDSLoader() {
 
 			throw new Error( 'THREE.GLTFLoader: "MSFT_texture_dds" no longer supported. Please update to "KHR_texture_basisu".' );
 
 		}
-
 		setKTX2Loader( ktx2Loader ) {
 
 			this.ktx2Loader = ktx2Loader;
 			return this;
 
 		}
-
 		setMeshoptDecoder( meshoptDecoder ) {
 
 			this.meshoptDecoder = meshoptDecoder;
 			return this;
 
 		}
-
 		register( callback ) {
 
 			if ( this.pluginCallbacks.indexOf( callback ) === - 1 ) {
@@ -177,7 +174,6 @@
 			return this;
 
 		}
-
 		unregister( callback ) {
 
 			if ( this.pluginCallbacks.indexOf( callback ) !== - 1 ) {
@@ -189,21 +185,18 @@
 			return this;
 
 		}
-
 		parse( data, path, onLoad, onError ) {
 
-			let content;
+			let json;
 			const extensions = {};
 			const plugins = {};
-
 			if ( typeof data === 'string' ) {
 
-				content = data;
+				json = JSON.parse( data );
 
-			} else {
+			} else if ( data instanceof ArrayBuffer ) {
 
 				const magic = THREE.LoaderUtils.decodeText( new Uint8Array( data, 0, 4 ) );
-
 				if ( magic === BINARY_EXTENSION_HEADER_MAGIC ) {
 
 					try {
@@ -217,17 +210,19 @@
 
 					}
 
-					content = extensions[ EXTENSIONS.KHR_BINARY_GLTF ].content;
+					json = JSON.parse( extensions[ EXTENSIONS.KHR_BINARY_GLTF ].content );
 
 				} else {
 
-					content = THREE.LoaderUtils.decodeText( new Uint8Array( data ) );
+					json = JSON.parse( THREE.LoaderUtils.decodeText( new Uint8Array( data ) ) );
 
 				}
 
-			}
+			} else {
 
-			const json = JSON.parse( content );
+				json = data;
+
+			}
 
 			if ( json.asset === undefined || json.asset.version[ 0 ] < 2 ) {
 
@@ -245,15 +240,15 @@
 				meshoptDecoder: this.meshoptDecoder
 			} );
 			parser.fileLoader.setRequestHeader( this.requestHeader );
-
 			for ( let i = 0; i < this.pluginCallbacks.length; i ++ ) {
 
 				const plugin = this.pluginCallbacks[ i ]( parser );
-				plugins[ plugin.name ] = plugin; // Workaround to avoid determining as unknown extension
+				plugins[ plugin.name ] = plugin;
+
+				// Workaround to avoid determining as unknown extension
 				// in addUnknownExtensionsToUserData().
 				// Remove this workaround if we move all the existing
 				// extension handlers to plugin system
-
 				extensions[ plugin.name ] = true;
 
 			}
@@ -264,29 +259,20 @@
 
 					const extensionName = json.extensionsUsed[ i ];
 					const extensionsRequired = json.extensionsRequired || [];
-
 					switch ( extensionName ) {
 
 						case EXTENSIONS.KHR_MATERIALS_UNLIT:
 							extensions[ extensionName ] = new GLTFMaterialsUnlitExtension();
 							break;
-
-						case EXTENSIONS.KHR_MATERIALS_PBR_SPECULAR_GLOSSINESS:
-							extensions[ extensionName ] = new GLTFMaterialsPbrSpecularGlossinessExtension();
-							break;
-
 						case EXTENSIONS.KHR_DRACO_MESH_COMPRESSION:
 							extensions[ extensionName ] = new GLTFDracoMeshCompressionExtension( json, this.dracoLoader );
 							break;
-
 						case EXTENSIONS.KHR_TEXTURE_TRANSFORM:
 							extensions[ extensionName ] = new GLTFTextureTransformExtension();
 							break;
-
 						case EXTENSIONS.KHR_MESH_QUANTIZATION:
 							extensions[ extensionName ] = new GLTFMeshQuantizationExtension();
 							break;
-
 						default:
 							if ( extensionsRequired.indexOf( extensionName ) >= 0 && plugins[ extensionName ] === undefined ) {
 
@@ -305,7 +291,6 @@
 			parser.parse( onLoad, onError );
 
 		}
-
 		parseAsync( data, path ) {
 
 			const scope = this;
@@ -318,8 +303,8 @@
 		}
 
 	}
-	/* GLTFREGISTRY */
 
+	/* GLTFREGISTRY */
 
 	function GLTFRegistry() {
 
@@ -348,20 +333,17 @@
 		};
 
 	}
-	/*********************************/
 
+	/*********************************/
 	/********** EXTENSIONS ***********/
-
 	/*********************************/
 
-
 	const EXTENSIONS = {
 		KHR_BINARY_GLTF: 'KHR_binary_glTF',
 		KHR_DRACO_MESH_COMPRESSION: 'KHR_draco_mesh_compression',
 		KHR_LIGHTS_PUNCTUAL: 'KHR_lights_punctual',
 		KHR_MATERIALS_CLEARCOAT: 'KHR_materials_clearcoat',
 		KHR_MATERIALS_IOR: 'KHR_materials_ior',
-		KHR_MATERIALS_PBR_SPECULAR_GLOSSINESS: 'KHR_materials_pbrSpecularGlossiness',
 		KHR_MATERIALS_SHEEN: 'KHR_materials_sheen',
 		KHR_MATERIALS_SPECULAR: 'KHR_materials_specular',
 		KHR_MATERIALS_TRANSMISSION: 'KHR_materials_transmission',
@@ -373,37 +355,36 @@
 		KHR_MESH_QUANTIZATION: 'KHR_mesh_quantization',
 		KHR_MATERIALS_EMISSIVE_STRENGTH: 'KHR_materials_emissive_strength',
 		EXT_TEXTURE_WEBP: 'EXT_texture_webp',
-		EXT_MESHOPT_COMPRESSION: 'EXT_meshopt_compression'
+		EXT_MESHOPT_COMPRESSION: 'EXT_meshopt_compression',
+		EXT_MESH_GPU_INSTANCING: 'EXT_mesh_gpu_instancing'
 	};
+
 	/**
  * Punctual Lights Extension
  *
  * Specification: https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_lights_punctual
  */
-
 	class GLTFLightsExtension {
 
 		constructor( parser ) {
 
 			this.parser = parser;
-			this.name = EXTENSIONS.KHR_LIGHTS_PUNCTUAL; // THREE.Object3D instance caches
+			this.name = EXTENSIONS.KHR_LIGHTS_PUNCTUAL;
 
+			// THREE.Object3D instance caches
 			this.cache = {
 				refs: {},
 				uses: {}
 			};
 
 		}
-
 		_markDefs() {
 
 			const parser = this.parser;
 			const nodeDefs = this.parser.json.nodes || [];
-
 			for ( let nodeIndex = 0, nodeLength = nodeDefs.length; nodeIndex < nodeLength; nodeIndex ++ ) {
 
 				const nodeDef = nodeDefs[ nodeIndex ];
-
 				if ( nodeDef.extensions && nodeDef.extensions[ this.name ] && nodeDef.extensions[ this.name ].light !== undefined ) {
 
 					parser._addNodeRef( this.cache, nodeDef.extensions[ this.name ].light );
@@ -413,7 +394,6 @@
 			}
 
 		}
-
 		_loadLight( lightIndex ) {
 
 			const parser = this.parser;
@@ -428,7 +408,6 @@
 			const color = new THREE.Color( 0xffffff );
 			if ( lightDef.color !== undefined ) color.fromArray( lightDef.color );
 			const range = lightDef.range !== undefined ? lightDef.range : 0;
-
 			switch ( lightDef.type ) {
 
 				case 'directional':
@@ -436,16 +415,14 @@
 					lightNode.target.position.set( 0, 0, - 1 );
 					lightNode.add( lightNode.target );
 					break;
-
 				case 'point':
 					lightNode = new THREE.PointLight( color );
 					lightNode.distance = range;
 					break;
-
 				case 'spot':
 					lightNode = new THREE.SpotLight( color );
-					lightNode.distance = range; // Handle spotlight properties.
-
+					lightNode.distance = range;
+					// Handle spotlight properties.
 					lightDef.spot = lightDef.spot || {};
 					lightDef.spot.innerConeAngle = lightDef.spot.innerConeAngle !== undefined ? lightDef.spot.innerConeAngle : 0;
 					lightDef.spot.outerConeAngle = lightDef.spot.outerConeAngle !== undefined ? lightDef.spot.outerConeAngle : Math.PI / 4.0;
@@ -454,16 +431,16 @@
 					lightNode.target.position.set( 0, 0, - 1 );
 					lightNode.add( lightNode.target );
 					break;
-
 				default:
 					throw new Error( 'THREE.GLTFLoader: Unexpected light type: ' + lightDef.type );
 
-			} // Some lights (e.g. spot) default to a position other than the origin. Reset the position
-			// here, because node-level parsing will only override position if explicitly specified.
-
+			}
 
+			// Some lights (e.g. spot) default to a position other than the origin. Reset the position
+			// here, because node-level parsing will only override position if explicitly specified.
 			lightNode.position.set( 0, 0, 0 );
 			lightNode.decay = 2;
+			assignExtrasToUserData( lightNode, lightDef );
 			if ( lightDef.intensity !== undefined ) lightNode.intensity = lightDef.intensity;
 			lightNode.name = parser.createUniqueName( lightDef.name || 'light_' + lightIndex );
 			dependency = Promise.resolve( lightNode );
@@ -471,7 +448,12 @@
 			return dependency;
 
 		}
+		getDependency( type, index ) {
+
+			if ( type !== 'light' ) return;
+			return this._loadLight( index );
 
+		}
 		createNodeAttachment( nodeIndex ) {
 
 			const self = this;
@@ -490,13 +472,12 @@
 		}
 
 	}
+
 	/**
  * Unlit Materials Extension
  *
  * Specification: https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_materials_unlit
  */
-
-
 	class GLTFMaterialsUnlitExtension {
 
 		constructor() {
@@ -504,20 +485,17 @@
 			this.name = EXTENSIONS.KHR_MATERIALS_UNLIT;
 
 		}
-
 		getMaterialType() {
 
 			return THREE.MeshBasicMaterial;
 
 		}
-
 		extendParams( materialParams, materialDef, parser ) {
 
 			const pending = [];
 			materialParams.color = new THREE.Color( 1.0, 1.0, 1.0 );
 			materialParams.opacity = 1.0;
 			const metallicRoughness = materialDef.pbrMetallicRoughness;
-
 			if ( metallicRoughness ) {
 
 				if ( Array.isArray( metallicRoughness.baseColorFactor ) ) {
@@ -541,13 +519,12 @@
 		}
 
 	}
+
 	/**
  * Materials Emissive Strength Extension
  *
  * Specification: https://github.com/KhronosGroup/glTF/blob/5768b3ce0ef32bc39cdf1bef10b948586635ead3/extensions/2.0/Khronos/KHR_materials_emissive_strength/README.md
  */
-
-
 	class GLTFMaterialsEmissiveStrengthExtension {
 
 		constructor( parser ) {
@@ -556,12 +533,10 @@
 			this.name = EXTENSIONS.KHR_MATERIALS_EMISSIVE_STRENGTH;
 
 		}
-
 		extendMaterialParams( materialIndex, materialParams ) {
 
 			const parser = this.parser;
 			const materialDef = parser.json.materials[ materialIndex ];
-
 			if ( ! materialDef.extensions || ! materialDef.extensions[ this.name ] ) {
 
 				return Promise.resolve();
@@ -569,7 +544,6 @@
 			}
 
 			const emissiveStrength = materialDef.extensions[ this.name ].emissiveStrength;
-
 			if ( emissiveStrength !== undefined ) {
 
 				materialParams.emissiveIntensity = emissiveStrength;
@@ -581,13 +555,12 @@
 		}
 
 	}
+
 	/**
  * Clearcoat Materials Extension
  *
  * Specification: https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_materials_clearcoat
  */
-
-
 	class GLTFMaterialsClearcoatExtension {
 
 		constructor( parser ) {
@@ -596,7 +569,6 @@
 			this.name = EXTENSIONS.KHR_MATERIALS_CLEARCOAT;
 
 		}
-
 		getMaterialType( materialIndex ) {
 
 			const parser = this.parser;
@@ -605,12 +577,10 @@
 			return THREE.MeshPhysicalMaterial;
 
 		}
-
 		extendMaterialParams( materialIndex, materialParams ) {
 
 			const parser = this.parser;
 			const materialDef = parser.json.materials[ materialIndex ];
-
 			if ( ! materialDef.extensions || ! materialDef.extensions[ this.name ] ) {
 
 				return Promise.resolve();
@@ -619,7 +589,6 @@
 
 			const pending = [];
 			const extension = materialDef.extensions[ this.name ];
-
 			if ( extension.clearcoatFactor !== undefined ) {
 
 				materialParams.clearcoat = extension.clearcoatFactor;
@@ -647,7 +616,6 @@
 			if ( extension.clearcoatNormalTexture !== undefined ) {
 
 				pending.push( parser.assignTexture( materialParams, 'clearcoatNormalMap', extension.clearcoatNormalTexture ) );
-
 				if ( extension.clearcoatNormalTexture.scale !== undefined ) {
 
 					const scale = extension.clearcoatNormalTexture.scale;
@@ -662,13 +630,12 @@
 		}
 
 	}
+
 	/**
  * Iridescence Materials Extension
  *
  * Specification: https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_materials_iridescence
  */
-
-
 	class GLTFMaterialsIridescenceExtension {
 
 		constructor( parser ) {
@@ -677,7 +644,6 @@
 			this.name = EXTENSIONS.KHR_MATERIALS_IRIDESCENCE;
 
 		}
-
 		getMaterialType( materialIndex ) {
 
 			const parser = this.parser;
@@ -686,12 +652,10 @@
 			return THREE.MeshPhysicalMaterial;
 
 		}
-
 		extendMaterialParams( materialIndex, materialParams ) {
 
 			const parser = this.parser;
 			const materialDef = parser.json.materials[ materialIndex ];
-
 			if ( ! materialDef.extensions || ! materialDef.extensions[ this.name ] ) {
 
 				return Promise.resolve();
@@ -700,7 +664,6 @@
 
 			const pending = [];
 			const extension = materialDef.extensions[ this.name ];
-
 			if ( extension.iridescenceFactor !== undefined ) {
 
 				materialParams.iridescence = extension.iridescenceFactor;
@@ -748,13 +711,12 @@
 		}
 
 	}
+
 	/**
  * Sheen Materials Extension
  *
  * Specification: https://github.com/KhronosGroup/glTF/tree/main/extensions/2.0/Khronos/KHR_materials_sheen
  */
-
-
 	class GLTFMaterialsSheenExtension {
 
 		constructor( parser ) {
@@ -763,7 +725,6 @@
 			this.name = EXTENSIONS.KHR_MATERIALS_SHEEN;
 
 		}
-
 		getMaterialType( materialIndex ) {
 
 			const parser = this.parser;
@@ -772,12 +733,10 @@
 			return THREE.MeshPhysicalMaterial;
 
 		}
-
 		extendMaterialParams( materialIndex, materialParams ) {
 
 			const parser = this.parser;
 			const materialDef = parser.json.materials[ materialIndex ];
-
 			if ( ! materialDef.extensions || ! materialDef.extensions[ this.name ] ) {
 
 				return Promise.resolve();
@@ -789,7 +748,6 @@
 			materialParams.sheenRoughness = 0;
 			materialParams.sheen = 1;
 			const extension = materialDef.extensions[ this.name ];
-
 			if ( extension.sheenColorFactor !== undefined ) {
 
 				materialParams.sheenColor.fromArray( extension.sheenColorFactor );
@@ -819,14 +777,13 @@
 		}
 
 	}
+
 	/**
  * Transmission Materials Extension
  *
  * Specification: https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_materials_transmission
  * Draft: https://github.com/KhronosGroup/glTF/pull/1698
  */
-
-
 	class GLTFMaterialsTransmissionExtension {
 
 		constructor( parser ) {
@@ -835,7 +792,6 @@
 			this.name = EXTENSIONS.KHR_MATERIALS_TRANSMISSION;
 
 		}
-
 		getMaterialType( materialIndex ) {
 
 			const parser = this.parser;
@@ -844,12 +800,10 @@
 			return THREE.MeshPhysicalMaterial;
 
 		}
-
 		extendMaterialParams( materialIndex, materialParams ) {
 
 			const parser = this.parser;
 			const materialDef = parser.json.materials[ materialIndex ];
-
 			if ( ! materialDef.extensions || ! materialDef.extensions[ this.name ] ) {
 
 				return Promise.resolve();
@@ -858,7 +812,6 @@
 
 			const pending = [];
 			const extension = materialDef.extensions[ this.name ];
-
 			if ( extension.transmissionFactor !== undefined ) {
 
 				materialParams.transmission = extension.transmissionFactor;
@@ -876,13 +829,12 @@
 		}
 
 	}
+
 	/**
  * Materials Volume Extension
  *
  * Specification: https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_materials_volume
  */
-
-
 	class GLTFMaterialsVolumeExtension {
 
 		constructor( parser ) {
@@ -891,7 +843,6 @@
 			this.name = EXTENSIONS.KHR_MATERIALS_VOLUME;
 
 		}
-
 		getMaterialType( materialIndex ) {
 
 			const parser = this.parser;
@@ -900,12 +851,10 @@
 			return THREE.MeshPhysicalMaterial;
 
 		}
-
 		extendMaterialParams( materialIndex, materialParams ) {
 
 			const parser = this.parser;
 			const materialDef = parser.json.materials[ materialIndex ];
-
 			if ( ! materialDef.extensions || ! materialDef.extensions[ this.name ] ) {
 
 				return Promise.resolve();
@@ -915,14 +864,13 @@
 			const pending = [];
 			const extension = materialDef.extensions[ this.name ];
 			materialParams.thickness = extension.thicknessFactor !== undefined ? extension.thicknessFactor : 0;
-
 			if ( extension.thicknessTexture !== undefined ) {
 
 				pending.push( parser.assignTexture( materialParams, 'thicknessMap', extension.thicknessTexture ) );
 
 			}
 
-			materialParams.attenuationDistance = extension.attenuationDistance || 0;
+			materialParams.attenuationDistance = extension.attenuationDistance || Infinity;
 			const colorArray = extension.attenuationColor || [ 1, 1, 1 ];
 			materialParams.attenuationColor = new THREE.Color( colorArray[ 0 ], colorArray[ 1 ], colorArray[ 2 ] );
 			return Promise.all( pending );
@@ -930,13 +878,12 @@
 		}
 
 	}
+
 	/**
  * Materials ior Extension
  *
  * Specification: https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_materials_ior
  */
-
-
 	class GLTFMaterialsIorExtension {
 
 		constructor( parser ) {
@@ -945,7 +892,6 @@
 			this.name = EXTENSIONS.KHR_MATERIALS_IOR;
 
 		}
-
 		getMaterialType( materialIndex ) {
 
 			const parser = this.parser;
@@ -954,12 +900,10 @@
 			return THREE.MeshPhysicalMaterial;
 
 		}
-
 		extendMaterialParams( materialIndex, materialParams ) {
 
 			const parser = this.parser;
 			const materialDef = parser.json.materials[ materialIndex ];
-
 			if ( ! materialDef.extensions || ! materialDef.extensions[ this.name ] ) {
 
 				return Promise.resolve();
@@ -973,13 +917,12 @@
 		}
 
 	}
+
 	/**
  * Materials specular Extension
  *
  * Specification: https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_materials_specular
  */
-
-
 	class GLTFMaterialsSpecularExtension {
 
 		constructor( parser ) {
@@ -988,7 +931,6 @@
 			this.name = EXTENSIONS.KHR_MATERIALS_SPECULAR;
 
 		}
-
 		getMaterialType( materialIndex ) {
 
 			const parser = this.parser;
@@ -997,12 +939,10 @@
 			return THREE.MeshPhysicalMaterial;
 
 		}
-
 		extendMaterialParams( materialIndex, materialParams ) {
 
 			const parser = this.parser;
 			const materialDef = parser.json.materials[ materialIndex ];
-
 			if ( ! materialDef.extensions || ! materialDef.extensions[ this.name ] ) {
 
 				return Promise.resolve();
@@ -1012,7 +952,6 @@
 			const pending = [];
 			const extension = materialDef.extensions[ this.name ];
 			materialParams.specularIntensity = extension.specularFactor !== undefined ? extension.specularFactor : 1.0;
-
 			if ( extension.specularTexture !== undefined ) {
 
 				pending.push( parser.assignTexture( materialParams, 'specularIntensityMap', extension.specularTexture ) );
@@ -1021,7 +960,6 @@
 
 			const colorArray = extension.specularColorFactor || [ 1, 1, 1 ];
 			materialParams.specularColor = new THREE.Color( colorArray[ 0 ], colorArray[ 1 ], colorArray[ 2 ] );
-
 			if ( extension.specularColorTexture !== undefined ) {
 
 				pending.push( parser.assignTexture( materialParams, 'specularColorMap', extension.specularColorTexture, THREE.sRGBEncoding ) );
@@ -1033,13 +971,12 @@
 		}
 
 	}
+
 	/**
  * BasisU THREE.Texture Extension
  *
  * Specification: https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_texture_basisu
  */
-
-
 	class GLTFTextureBasisUExtension {
 
 		constructor( parser ) {
@@ -1048,13 +985,11 @@
 			this.name = EXTENSIONS.KHR_TEXTURE_BASISU;
 
 		}
-
 		loadTexture( textureIndex ) {
 
 			const parser = this.parser;
 			const json = parser.json;
 			const textureDef = json.textures[ textureIndex ];
-
 			if ( ! textureDef.extensions || ! textureDef.extensions[ this.name ] ) {
 
 				return null;
@@ -1063,7 +998,6 @@
 
 			const extension = textureDef.extensions[ this.name ];
 			const loader = parser.options.ktx2Loader;
-
 			if ( ! loader ) {
 
 				if ( json.extensionsRequired && json.extensionsRequired.indexOf( this.name ) >= 0 ) {
@@ -1084,13 +1018,12 @@
 		}
 
 	}
+
 	/**
  * WebP THREE.Texture Extension
  *
  * Specification: https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Vendor/EXT_texture_webp
  */
-
-
 	class GLTFTextureWebPExtension {
 
 		constructor( parser ) {
@@ -1100,14 +1033,12 @@
 			this.isSupported = null;
 
 		}
-
 		loadTexture( textureIndex ) {
 
 			const name = this.name;
 			const parser = this.parser;
 			const json = parser.json;
 			const textureDef = json.textures[ textureIndex ];
-
 			if ( ! textureDef.extensions || ! textureDef.extensions[ name ] ) {
 
 				return null;
@@ -1117,7 +1048,6 @@
 			const extension = textureDef.extensions[ name ];
 			const source = json.images[ extension.source ];
 			let loader = parser.textureLoader;
-
 			if ( source.uri ) {
 
 				const handler = parser.options.manager.getHandler( source.uri );
@@ -1128,31 +1058,29 @@
 			return this.detectSupport().then( function ( isSupported ) {
 
 				if ( isSupported ) return parser.loadTextureImage( textureIndex, extension.source, loader );
-
 				if ( json.extensionsRequired && json.extensionsRequired.indexOf( name ) >= 0 ) {
 
 					throw new Error( 'THREE.GLTFLoader: WebP required by asset but unsupported.' );
 
-				} // Fall back to PNG or JPEG.
-
+				}
 
+				// Fall back to PNG or JPEG.
 				return parser.loadTexture( textureIndex );
 
 			} );
 
 		}
-
 		detectSupport() {
 
 			if ( ! this.isSupported ) {
 
 				this.isSupported = new Promise( function ( resolve ) {
 
-					const image = new Image(); // Lossy test image. Support for lossy images doesn't guarantee support for all
-					// WebP images, unfortunately.
+					const image = new Image();
 
+					// Lossy test image. Support for lossy images doesn't guarantee support for all
+					// WebP images, unfortunately.
 					image.src = 'data:image/webp;base64,UklGRiIAAABXRUJQVlA4IBYAAAAwAQCdASoBAAEADsD+JaQAA3AAAAAA';
-
 					image.onload = image.onerror = function () {
 
 						resolve( image.height === 1 );
@@ -1168,13 +1096,12 @@
 		}
 
 	}
+
 	/**
  * meshopt BufferView Compression Extension
  *
  * Specification: https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Vendor/EXT_meshopt_compression
  */
-
-
 	class GLTFMeshoptCompression {
 
 		constructor( parser ) {
@@ -1183,18 +1110,15 @@
 			this.parser = parser;
 
 		}
-
 		loadBufferView( index ) {
 
 			const json = this.parser.json;
 			const bufferView = json.bufferViews[ index ];
-
 			if ( bufferView.extensions && bufferView.extensions[ this.name ] ) {
 
 				const extensionDef = bufferView.extensions[ this.name ];
 				const buffer = this.parser.getDependency( 'buffer', extensionDef.buffer );
 				const decoder = this.parser.options.meshoptDecoder;
-
 				if ( ! decoder || ! decoder.supported ) {
 
 					if ( json.extensionsRequired && json.extensionsRequired.indexOf( this.name ) >= 0 ) {
@@ -1210,16 +1134,33 @@
 
 				}
 
-				return Promise.all( [ buffer, decoder.ready ] ).then( function ( res ) {
+				return buffer.then( function ( res ) {
 
 					const byteOffset = extensionDef.byteOffset || 0;
 					const byteLength = extensionDef.byteLength || 0;
 					const count = extensionDef.count;
 					const stride = extensionDef.byteStride;
-					const result = new ArrayBuffer( count * stride );
-					const source = new Uint8Array( res[ 0 ], byteOffset, byteLength );
-					decoder.decodeGltfBuffer( new Uint8Array( result ), count, stride, source, extensionDef.mode, extensionDef.filter );
-					return result;
+					const source = new Uint8Array( res, byteOffset, byteLength );
+					if ( decoder.decodeGltfBufferAsync ) {
+
+						return decoder.decodeGltfBufferAsync( count, stride, source, extensionDef.mode, extensionDef.filter ).then( function ( res ) {
+
+							return res.buffer;
+
+						} );
+
+					} else {
+
+						// Support for MeshoptDecoder 0.18 or earlier, without decodeGltfBufferAsync
+						return decoder.ready.then( function () {
+
+							const result = new ArrayBuffer( count * stride );
+							decoder.decodeGltfBuffer( new Uint8Array( result ), count, stride, source, extensionDef.mode, extensionDef.filter );
+							return result;
+
+						} );
+
+					}
 
 				} );
 
@@ -1232,16 +1173,152 @@
 		}
 
 	}
-	/* BINARY EXTENSION */
 
+	/**
+ * GPU Instancing Extension
+ *
+ * Specification: https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Vendor/EXT_mesh_gpu_instancing
+ *
+ */
+	class GLTFMeshGpuInstancing {
+
+		constructor( parser ) {
+
+			this.name = EXTENSIONS.EXT_MESH_GPU_INSTANCING;
+			this.parser = parser;
+
+		}
+		createNodeMesh( nodeIndex ) {
+
+			const json = this.parser.json;
+			const nodeDef = json.nodes[ nodeIndex ];
+			if ( ! nodeDef.extensions || ! nodeDef.extensions[ this.name ] || nodeDef.mesh === undefined ) {
+
+				return null;
+
+			}
+
+			const meshDef = json.meshes[ nodeDef.mesh ];
+
+			// No THREE.Points or Lines + Instancing support yet
+
+			for ( const primitive of meshDef.primitives ) {
+
+				if ( primitive.mode !== WEBGL_CONSTANTS.TRIANGLES && primitive.mode !== WEBGL_CONSTANTS.TRIANGLE_STRIP && primitive.mode !== WEBGL_CONSTANTS.TRIANGLE_FAN && primitive.mode !== undefined ) {
+
+					return null;
+
+				}
+
+			}
+
+			const extensionDef = nodeDef.extensions[ this.name ];
+			const attributesDef = extensionDef.attributes;
+
+			// @TODO: Can we support THREE.InstancedMesh + THREE.SkinnedMesh?
+
+			const pending = [];
+			const attributes = {};
+			for ( const key in attributesDef ) {
+
+				pending.push( this.parser.getDependency( 'accessor', attributesDef[ key ] ).then( accessor => {
+
+					attributes[ key ] = accessor;
+					return attributes[ key ];
+
+				} ) );
+
+			}
+
+			if ( pending.length < 1 ) {
+
+				return null;
+
+			}
+
+			pending.push( this.parser.createNodeMesh( nodeIndex ) );
+			return Promise.all( pending ).then( results => {
+
+				const nodeObject = results.pop();
+				const meshes = nodeObject.isGroup ? nodeObject.children : [ nodeObject ];
+				const count = results[ 0 ].count; // All attribute counts should be same
+				const instancedMeshes = [];
+				for ( const mesh of meshes ) {
+
+					// Temporal variables
+					const m = new THREE.Matrix4();
+					const p = new THREE.Vector3();
+					const q = new THREE.Quaternion();
+					const s = new THREE.Vector3( 1, 1, 1 );
+					const instancedMesh = new THREE.InstancedMesh( mesh.geometry, mesh.material, count );
+					for ( let i = 0; i < count; i ++ ) {
+
+						if ( attributes.TRANSLATION ) {
+
+							p.fromBufferAttribute( attributes.TRANSLATION, i );
+
+						}
+
+						if ( attributes.ROTATION ) {
+
+							q.fromBufferAttribute( attributes.ROTATION, i );
+
+						}
+
+						if ( attributes.SCALE ) {
+
+							s.fromBufferAttribute( attributes.SCALE, i );
+
+						}
+
+						instancedMesh.setMatrixAt( i, m.compose( p, q, s ) );
+
+					}
+
+					// Add instance attributes to the geometry, excluding TRS.
+					for ( const attributeName in attributes ) {
+
+						if ( attributeName !== 'TRANSLATION' && attributeName !== 'ROTATION' && attributeName !== 'SCALE' ) {
 
+							mesh.geometry.setAttribute( attributeName, attributes[ attributeName ] );
+
+						}
+
+					}
+
+					// Just in case
+					THREE.Object3D.prototype.copy.call( instancedMesh, mesh );
+
+					// https://github.com/mrdoob/three.js/issues/18334
+					instancedMesh.frustumCulled = false;
+					this.parser.assignFinalMaterial( instancedMesh );
+					instancedMeshes.push( instancedMesh );
+
+				}
+
+				if ( nodeObject.isGroup ) {
+
+					nodeObject.clear();
+					nodeObject.add( ...instancedMeshes );
+					return nodeObject;
+
+				}
+
+				return instancedMeshes[ 0 ];
+
+			} );
+
+		}
+
+	}
+
+	/* BINARY EXTENSION */
 	const BINARY_EXTENSION_HEADER_MAGIC = 'glTF';
 	const BINARY_EXTENSION_HEADER_LENGTH = 12;
 	const BINARY_EXTENSION_CHUNK_TYPES = {
 		JSON: 0x4E4F534A,
 		BIN: 0x004E4942
 	};
-
 	class GLTFBinaryExtension {
 
 		constructor( data ) {
@@ -1255,7 +1332,6 @@
 				version: headerView.getUint32( 4, true ),
 				length: headerView.getUint32( 8, true )
 			};
-
 			if ( this.header.magic !== BINARY_EXTENSION_HEADER_MAGIC ) {
 
 				throw new Error( 'THREE.GLTFLoader: Unsupported glTF-Binary header.' );
@@ -1269,14 +1345,12 @@
 			const chunkContentsLength = this.header.length - BINARY_EXTENSION_HEADER_LENGTH;
 			const chunkView = new DataView( data, BINARY_EXTENSION_HEADER_LENGTH );
 			let chunkIndex = 0;
-
 			while ( chunkIndex < chunkContentsLength ) {
 
 				const chunkLength = chunkView.getUint32( chunkIndex, true );
 				chunkIndex += 4;
 				const chunkType = chunkView.getUint32( chunkIndex, true );
 				chunkIndex += 4;
-
 				if ( chunkType === BINARY_EXTENSION_CHUNK_TYPES.JSON ) {
 
 					const contentArray = new Uint8Array( data, BINARY_EXTENSION_HEADER_LENGTH + chunkIndex, chunkLength );
@@ -1287,8 +1361,9 @@
 					const byteOffset = BINARY_EXTENSION_HEADER_LENGTH + chunkIndex;
 					this.body = data.slice( byteOffset, byteOffset + chunkLength );
 
-				} // Clients must ignore chunks with unknown types.
+				}
 
+				// Clients must ignore chunks with unknown types.
 
 				chunkIndex += chunkLength;
 
@@ -1303,13 +1378,12 @@
 		}
 
 	}
+
 	/**
  * DRACO THREE.Mesh Compression Extension
  *
  * Specification: https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_draco_mesh_compression
  */
-
-
 	class GLTFDracoMeshCompressionExtension {
 
 		constructor( json, dracoLoader ) {
@@ -1326,7 +1400,6 @@
 			this.dracoLoader.preload();
 
 		}
-
 		decodePrimitive( primitive, parser ) {
 
 			const json = this.json;
@@ -1336,7 +1409,6 @@
 			const threeAttributeMap = {};
 			const attributeNormalizedMap = {};
 			const attributeTypeMap = {};
-
 			for ( const attributeName in gltfAttributeMap ) {
 
 				const threeAttributeName = ATTRIBUTES[ attributeName ] || attributeName.toLowerCase();
@@ -1347,12 +1419,11 @@
 			for ( const attributeName in primitive.attributes ) {
 
 				const threeAttributeName = ATTRIBUTES[ attributeName ] || attributeName.toLowerCase();
-
 				if ( gltfAttributeMap[ attributeName ] !== undefined ) {
 
 					const accessorDef = json.accessors[ primitive.attributes[ attributeName ] ];
 					const componentType = WEBGL_COMPONENT_TYPES[ accessorDef.componentType ];
-					attributeTypeMap[ threeAttributeName ] = componentType;
+					attributeTypeMap[ threeAttributeName ] = componentType.name;
 					attributeNormalizedMap[ threeAttributeName ] = accessorDef.normalized === true;
 
 				}
@@ -1384,13 +1455,12 @@
 		}
 
 	}
+
 	/**
  * THREE.Texture Transform Extension
  *
  * Specification: https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_texture_transform
  */
-
-
 	class GLTFTextureTransformExtension {
 
 		constructor() {
@@ -1398,7 +1468,6 @@
 			this.name = EXTENSIONS.KHR_TEXTURE_TRANSFORM;
 
 		}
-
 		extendTexture( texture, transform ) {
 
 			if ( transform.texCoord !== undefined ) {
@@ -1415,7 +1484,6 @@
 			}
 
 			texture = texture.clone();
-
 			if ( transform.offset !== undefined ) {
 
 				texture.offset.fromArray( transform.offset );
@@ -1440,254 +1508,12 @@
 		}
 
 	}
-	/**
- * Specular-Glossiness Extension
- *
- * Specification: https://github.com/KhronosGroup/glTF/tree/main/extensions/2.0/Archived/KHR_materials_pbrSpecularGlossiness
- */
 
-	/**
- * A sub class of StandardMaterial with some of the functionality
- * changed via the `onBeforeCompile` callback
- * @pailhead
- */
-
-
-	class GLTFMeshStandardSGMaterial extends THREE.MeshStandardMaterial {
-
-		constructor( params ) {
-
-			super();
-			this.isGLTFSpecularGlossinessMaterial = true; //various chunks that need replacing
-
-			const specularMapParsFragmentChunk = [ '#ifdef USE_SPECULARMAP', '	uniform sampler2D specularMap;', '#endif' ].join( '\n' );
-			const glossinessMapParsFragmentChunk = [ '#ifdef USE_GLOSSINESSMAP', '	uniform sampler2D glossinessMap;', '#endif' ].join( '\n' );
-			const specularMapFragmentChunk = [ 'vec3 specularFactor = specular;', '#ifdef USE_SPECULARMAP', '	vec4 texelSpecular = texture2D( specularMap, vUv );', '	// reads channel RGB, compatible with a glTF Specular-Glossiness (RGBA) texture', '	specularFactor *= texelSpecular.rgb;', '#endif' ].join( '\n' );
-			const glossinessMapFragmentChunk = [ 'float glossinessFactor = glossiness;', '#ifdef USE_GLOSSINESSMAP', '	vec4 texelGlossiness = texture2D( glossinessMap, vUv );', '	// reads channel A, compatible with a glTF Specular-Glossiness (RGBA) texture', '	glossinessFactor *= texelGlossiness.a;', '#endif' ].join( '\n' );
-			const lightPhysicalFragmentChunk = [ 'PhysicalMaterial material;', 'material.diffuseColor = diffuseColor.rgb * ( 1. - max( specularFactor.r, max( specularFactor.g, specularFactor.b ) ) );', 'vec3 dxy = max( abs( dFdx( geometryNormal ) ), abs( dFdy( geometryNormal ) ) );', 'float geometryRoughness = max( max( dxy.x, dxy.y ), dxy.z );', 'material.roughness = max( 1.0 - glossinessFactor, 0.0525 ); // 0.0525 corresponds to the base mip of a 256 cubemap.', 'material.roughness += geometryRoughness;', 'material.roughness = min( material.roughness, 1.0 );', 'material.specularColor = specularFactor;' ].join( '\n' );
-			const uniforms = {
-				specular: {
-					value: new THREE.Color().setHex( 0xffffff )
-				},
-				glossiness: {
-					value: 1
-				},
-				specularMap: {
-					value: null
-				},
-				glossinessMap: {
-					value: null
-				}
-			};
-			this._extraUniforms = uniforms;
-
-			this.onBeforeCompile = function ( shader ) {
-
-				for ( const uniformName in uniforms ) {
-
-					shader.uniforms[ uniformName ] = uniforms[ uniformName ];
-
-				}
-
-				shader.fragmentShader = shader.fragmentShader.replace( 'uniform float roughness;', 'uniform vec3 specular;' ).replace( 'uniform float metalness;', 'uniform float glossiness;' ).replace( '#include <roughnessmap_pars_fragment>', specularMapParsFragmentChunk ).replace( '#include <metalnessmap_pars_fragment>', glossinessMapParsFragmentChunk ).replace( '#include <roughnessmap_fragment>', specularMapFragmentChunk ).replace( '#include <metalnessmap_fragment>', glossinessMapFragmentChunk ).replace( '#include <lights_physical_fragment>', lightPhysicalFragmentChunk );
-
-			};
-
-			Object.defineProperties( this, {
-				specular: {
-					get: function () {
-
-						return uniforms.specular.value;
-
-					},
-					set: function ( v ) {
-
-						uniforms.specular.value = v;
-
-					}
-				},
-				specularMap: {
-					get: function () {
-
-						return uniforms.specularMap.value;
-
-					},
-					set: function ( v ) {
-
-						uniforms.specularMap.value = v;
-
-						if ( v ) {
-
-							this.defines.USE_SPECULARMAP = ''; // USE_UV is set by the renderer for specular maps
-
-						} else {
-
-							delete this.defines.USE_SPECULARMAP;
-
-						}
-
-					}
-				},
-				glossiness: {
-					get: function () {
-
-						return uniforms.glossiness.value;
-
-					},
-					set: function ( v ) {
-
-						uniforms.glossiness.value = v;
-
-					}
-				},
-				glossinessMap: {
-					get: function () {
-
-						return uniforms.glossinessMap.value;
-
-					},
-					set: function ( v ) {
-
-						uniforms.glossinessMap.value = v;
-
-						if ( v ) {
-
-							this.defines.USE_GLOSSINESSMAP = '';
-							this.defines.USE_UV = '';
-
-						} else {
-
-							delete this.defines.USE_GLOSSINESSMAP;
-							delete this.defines.USE_UV;
-
-						}
-
-					}
-				}
-			} );
-			delete this.metalness;
-			delete this.roughness;
-			delete this.metalnessMap;
-			delete this.roughnessMap;
-			this.setValues( params );
-
-		}
-
-		copy( source ) {
-
-			super.copy( source );
-			this.specularMap = source.specularMap;
-			this.specular.copy( source.specular );
-			this.glossinessMap = source.glossinessMap;
-			this.glossiness = source.glossiness;
-			delete this.metalness;
-			delete this.roughness;
-			delete this.metalnessMap;
-			delete this.roughnessMap;
-			return this;
-
-		}
-
-	}
-
-	class GLTFMaterialsPbrSpecularGlossinessExtension {
-
-		constructor() {
-
-			this.name = EXTENSIONS.KHR_MATERIALS_PBR_SPECULAR_GLOSSINESS;
-			this.specularGlossinessParams = [ 'color', 'map', 'lightMap', 'lightMapIntensity', 'aoMap', 'aoMapIntensity', 'emissive', 'emissiveIntensity', 'emissiveMap', 'bumpMap', 'bumpScale', 'normalMap', 'normalMapType', 'displacementMap', 'displacementScale', 'displacementBias', 'specularMap', 'specular', 'glossinessMap', 'glossiness', 'alphaMap', 'envMap', 'envMapIntensity' ];
-
-		}
-
-		getMaterialType() {
-
-			return GLTFMeshStandardSGMaterial;
-
-		}
-
-		extendParams( materialParams, materialDef, parser ) {
-
-			const pbrSpecularGlossiness = materialDef.extensions[ this.name ];
-			materialParams.color = new THREE.Color( 1.0, 1.0, 1.0 );
-			materialParams.opacity = 1.0;
-			const pending = [];
-
-			if ( Array.isArray( pbrSpecularGlossiness.diffuseFactor ) ) {
-
-				const array = pbrSpecularGlossiness.diffuseFactor;
-				materialParams.color.fromArray( array );
-				materialParams.opacity = array[ 3 ];
-
-			}
-
-			if ( pbrSpecularGlossiness.diffuseTexture !== undefined ) {
-
-				pending.push( parser.assignTexture( materialParams, 'map', pbrSpecularGlossiness.diffuseTexture, THREE.sRGBEncoding ) );
-
-			}
-
-			materialParams.emissive = new THREE.Color( 0.0, 0.0, 0.0 );
-			materialParams.glossiness = pbrSpecularGlossiness.glossinessFactor !== undefined ? pbrSpecularGlossiness.glossinessFactor : 1.0;
-			materialParams.specular = new THREE.Color( 1.0, 1.0, 1.0 );
-
-			if ( Array.isArray( pbrSpecularGlossiness.specularFactor ) ) {
-
-				materialParams.specular.fromArray( pbrSpecularGlossiness.specularFactor );
-
-			}
-
-			if ( pbrSpecularGlossiness.specularGlossinessTexture !== undefined ) {
-
-				const specGlossMapDef = pbrSpecularGlossiness.specularGlossinessTexture;
-				pending.push( parser.assignTexture( materialParams, 'glossinessMap', specGlossMapDef ) );
-				pending.push( parser.assignTexture( materialParams, 'specularMap', specGlossMapDef, THREE.sRGBEncoding ) );
-
-			}
-
-			return Promise.all( pending );
-
-		}
-
-		createMaterial( materialParams ) {
-
-			const material = new GLTFMeshStandardSGMaterial( materialParams );
-			material.fog = true;
-			material.color = materialParams.color;
-			material.map = materialParams.map === undefined ? null : materialParams.map;
-			material.lightMap = null;
-			material.lightMapIntensity = 1.0;
-			material.aoMap = materialParams.aoMap === undefined ? null : materialParams.aoMap;
-			material.aoMapIntensity = 1.0;
-			material.emissive = materialParams.emissive;
-			material.emissiveIntensity = materialParams.emissiveIntensity === undefined ? 1.0 : materialParams.emissiveIntensity;
-			material.emissiveMap = materialParams.emissiveMap === undefined ? null : materialParams.emissiveMap;
-			material.bumpMap = materialParams.bumpMap === undefined ? null : materialParams.bumpMap;
-			material.bumpScale = 1;
-			material.normalMap = materialParams.normalMap === undefined ? null : materialParams.normalMap;
-			material.normalMapType = THREE.TangentSpaceNormalMap;
-			if ( materialParams.normalScale ) material.normalScale = materialParams.normalScale;
-			material.displacementMap = null;
-			material.displacementScale = 1;
-			material.displacementBias = 0;
-			material.specularMap = materialParams.specularMap === undefined ? null : materialParams.specularMap;
-			material.specular = materialParams.specular;
-			material.glossinessMap = materialParams.glossinessMap === undefined ? null : materialParams.glossinessMap;
-			material.glossiness = materialParams.glossiness;
-			material.alphaMap = null;
-			material.envMap = materialParams.envMap === undefined ? null : materialParams.envMap;
-			material.envMapIntensity = 1.0;
-			return material;
-
-		}
-
-	}
 	/**
  * THREE.Mesh Quantization Extension
  *
  * Specification: https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_mesh_quantization
  */
-
-
 	class GLTFMeshQuantizationExtension {
 
 		constructor() {
@@ -1697,15 +1523,13 @@
 		}
 
 	}
-	/*********************************/
 
+	/*********************************/
 	/********** INTERPOLATION ********/
-
 	/*********************************/
+
 	// Spline Interpolation
 	// Specification: https://github.com/KhronosGroup/glTF/blob/master/specification/2.0/README.md#appendix-c-spline-interpolation
-
-
 	class GLTFCubicSplineInterpolant extends THREE.Interpolant {
 
 		constructor( parameterPositions, sampleValues, sampleSize, resultBuffer ) {
@@ -1713,16 +1537,15 @@
 			super( parameterPositions, sampleValues, sampleSize, resultBuffer );
 
 		}
-
 		copySampleValue_( index ) {
 
 			// Copies a sample value to the result buffer. See description of glTF
 			// CUBICSPLINE values layout in interpolate_() function below.
+
 			const result = this.resultBuffer,
 				values = this.sampleValues,
 				valueSize = this.valueSize,
 				offset = index * valueSize * 3 + valueSize;
-
 			for ( let i = 0; i !== valueSize; i ++ ) {
 
 				result[ i ] = values[ offset + i ];
@@ -1732,70 +1555,61 @@
 			return result;
 
 		}
+		interpolate_( i1, t0, t, t1 ) {
 
-	}
-
-	GLTFCubicSplineInterpolant.prototype.interpolate_ = function ( i1, t0, t, t1 ) {
-
-		const result = this.resultBuffer;
-		const values = this.sampleValues;
-		const stride = this.valueSize;
-		const stride2 = stride * 2;
-		const stride3 = stride * 3;
-		const td = t1 - t0;
-		const p = ( t - t0 ) / td;
-		const pp = p * p;
-		const ppp = pp * p;
-		const offset1 = i1 * stride3;
-		const offset0 = offset1 - stride3;
-		const s2 = - 2 * ppp + 3 * pp;
-		const s3 = ppp - pp;
-		const s0 = 1 - s2;
-		const s1 = s3 - pp + p; // Layout of keyframe output values for CUBICSPLINE animations:
-		//   [ inTangent_1, splineVertex_1, outTangent_1, inTangent_2, splineVertex_2, ... ]
-
-		for ( let i = 0; i !== stride; i ++ ) {
+			const result = this.resultBuffer;
+			const values = this.sampleValues;
+			const stride = this.valueSize;
+			const stride2 = stride * 2;
+			const stride3 = stride * 3;
+			const td = t1 - t0;
+			const p = ( t - t0 ) / td;
+			const pp = p * p;
+			const ppp = pp * p;
+			const offset1 = i1 * stride3;
+			const offset0 = offset1 - stride3;
+			const s2 = - 2 * ppp + 3 * pp;
+			const s3 = ppp - pp;
+			const s0 = 1 - s2;
+			const s1 = s3 - pp + p;
 
-			const p0 = values[ offset0 + i + stride ]; // splineVertex_k
+			// Layout of keyframe output values for CUBICSPLINE animations:
+			//   [ inTangent_1, splineVertex_1, outTangent_1, inTangent_2, splineVertex_2, ... ]
+			for ( let i = 0; i !== stride; i ++ ) {
 
-			const m0 = values[ offset0 + i + stride2 ] * td; // outTangent_k * (t_k+1 - t_k)
+				const p0 = values[ offset0 + i + stride ]; // splineVertex_k
+				const m0 = values[ offset0 + i + stride2 ] * td; // outTangent_k * (t_k+1 - t_k)
+				const p1 = values[ offset1 + i + stride ]; // splineVertex_k+1
+				const m1 = values[ offset1 + i ] * td; // inTangent_k+1 * (t_k+1 - t_k)
 
-			const p1 = values[ offset1 + i + stride ]; // splineVertex_k+1
+				result[ i ] = s0 * p0 + s1 * m0 + s2 * p1 + s3 * m1;
 
-			const m1 = values[ offset1 + i ] * td; // inTangent_k+1 * (t_k+1 - t_k)
+			}
 
-			result[ i ] = s0 * p0 + s1 * m0 + s2 * p1 + s3 * m1;
+			return result;
 
 		}
 
-		return result;
-
-	};
-
+	}
 	const _q = new THREE.Quaternion();
-
 	class GLTFCubicSplineQuaternionInterpolant extends GLTFCubicSplineInterpolant {
 
 		interpolate_( i1, t0, t, t1 ) {
 
 			const result = super.interpolate_( i1, t0, t, t1 );
-
 			_q.fromArray( result ).normalize().toArray( result );
-
 			return result;
 
 		}
 
 	}
-	/*********************************/
 
+	/*********************************/
 	/********** INTERNALS ************/
-
 	/*********************************/
 
 	/* CONSTANTS */
 
-
 	const WEBGL_CONSTANTS = {
 		FLOAT: 5126,
 		//FLOAT_MAT2: 35674,
@@ -1875,10 +1689,10 @@
 		MASK: 'MASK',
 		BLEND: 'BLEND'
 	};
+
 	/**
  * Specification: https://github.com/KhronosGroup/glTF/blob/master/specification/2.0/README.md#default-material
  */
-
 	function createDefaultMaterial( cache ) {
 
 		if ( cache[ 'DefaultMaterial' ] === undefined ) {
@@ -1902,6 +1716,7 @@
 	function addUnknownExtensionsToUserData( knownExtensions, object, objectDef ) {
 
 		// Add unknown glTF extensions to an object's userData.
+
 		for ( const name in objectDef.extensions ) {
 
 			if ( knownExtensions[ name ] === undefined ) {
@@ -1914,12 +1729,11 @@
 		}
 
 	}
+
 	/**
  * @param {Object3D|Material|BufferGeometry} object
  * @param {GLTF.definition} gltfDef
  */
-
-
 	function assignExtrasToUserData( object, gltfDef ) {
 
 		if ( gltfDef.extras !== undefined ) {
@@ -1937,6 +1751,7 @@
 		}
 
 	}
+
 	/**
  * Specification: https://github.com/KhronosGroup/glTF/blob/master/specification/2.0/README.md#morph-targets
  *
@@ -1945,14 +1760,11 @@
  * @param {GLTFParser} parser
  * @return {Promise<BufferGeometry>}
  */
-
-
 	function addMorphTargets( geometry, targets, parser ) {
 
 		let hasMorphPosition = false;
 		let hasMorphNormal = false;
 		let hasMorphColor = false;
-
 		for ( let i = 0, il = targets.length; i < il; i ++ ) {
 
 			const target = targets[ i ];
@@ -1967,11 +1779,9 @@
 		const pendingPositionAccessors = [];
 		const pendingNormalAccessors = [];
 		const pendingColorAccessors = [];
-
 		for ( let i = 0, il = targets.length; i < il; i ++ ) {
 
 			const target = targets[ i ];
-
 			if ( hasMorphPosition ) {
 
 				const pendingAccessor = target.POSITION !== undefined ? parser.getDependency( 'accessor', target.POSITION ) : geometry.attributes.position;
@@ -2009,16 +1819,14 @@
 		} );
 
 	}
+
 	/**
  * @param {Mesh} mesh
  * @param {GLTF.Mesh} meshDef
  */
-
-
 	function updateMorphTargets( mesh, meshDef ) {
 
 		mesh.updateMorphTargets();
-
 		if ( meshDef.weights !== undefined ) {
 
 			for ( let i = 0, il = meshDef.weights.length; i < il; i ++ ) {
@@ -2027,17 +1835,15 @@
 
 			}
 
-		} // .extras has user-defined data, so check that .extras.targetNames is an array.
-
+		}
 
+		// .extras has user-defined data, so check that .extras.targetNames is an array.
 		if ( meshDef.extras && Array.isArray( meshDef.extras.targetNames ) ) {
 
 			const targetNames = meshDef.extras.targetNames;
-
 			if ( mesh.morphTargetInfluences.length === targetNames.length ) {
 
 				mesh.morphTargetDictionary = {};
-
 				for ( let i = 0, il = targetNames.length; i < il; i ++ ) {
 
 					mesh.morphTargetDictionary[ targetNames[ i ] ] = i;
@@ -2058,7 +1864,6 @@
 
 		const dracoExtension = primitiveDef.extensions && primitiveDef.extensions[ EXTENSIONS.KHR_DRACO_MESH_COMPRESSION ];
 		let geometryKey;
-
 		if ( dracoExtension ) {
 
 			geometryKey = 'draco:' + dracoExtension.bufferView + ':' + dracoExtension.indices + ':' + createAttributesKey( dracoExtension.attributes );
@@ -2077,7 +1882,6 @@
 
 		let attributesKey = '';
 		const keys = Object.keys( attributes ).sort();
-
 		for ( let i = 0, il = keys.length; i < il; i ++ ) {
 
 			attributesKey += keys[ i ] + ':' + attributes[ keys[ i ] ] + ';';
@@ -2092,20 +1896,17 @@
 
 		// Reference:
 		// https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_mesh_quantization#encoding-quantized-data
+
 		switch ( constructor ) {
 
 			case Int8Array:
 				return 1 / 127;
-
 			case Uint8Array:
 				return 1 / 255;
-
 			case Int16Array:
 				return 1 / 32767;
-
 			case Uint16Array:
 				return 1 / 65535;
-
 			default:
 				throw new Error( 'THREE.GLTFLoader: Unsupported normalized accessor component type.' );
 
@@ -2120,8 +1921,8 @@
 		return 'image/png';
 
 	}
-	/* GLTF PARSER */
 
+	/* GLTF PARSER */
 
 	class GLTFParser {
 
@@ -2130,14 +1931,18 @@
 			this.json = json;
 			this.extensions = {};
 			this.plugins = {};
-			this.options = options; // loader object cache
+			this.options = options;
 
-			this.cache = new GLTFRegistry(); // associations between Three.js objects and glTF elements
+			// loader object cache
+			this.cache = new GLTFRegistry();
 
-			this.associations = new Map(); // THREE.BufferGeometry caching
+			// associations between Three.js objects and glTF elements
+			this.associations = new Map();
 
-			this.primitiveCache = {}; // THREE.Object3D instance caches
+			// THREE.BufferGeometry caching
+			this.primitiveCache = {};
 
+			// THREE.Object3D instance caches
 			this.meshCache = {
 				refs: {},
 				uses: {}
@@ -2151,14 +1956,24 @@
 				uses: {}
 			};
 			this.sourceCache = {};
-			this.textureCache = {}; // Track node names, to ensure no duplicates
+			this.textureCache = {};
 
-			this.nodeNamesUsed = {}; // Use an THREE.ImageBitmapLoader if imageBitmaps are supported. Moves much of the
+			// Track node names, to ensure no duplicates
+			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.
 
-			const isSafari = /^((?!chrome|android).)*safari/i.test( navigator.userAgent ) === true;
-			const isFirefox = navigator.userAgent.indexOf( 'Firefox' ) > - 1;
-			const firefoxVersion = isFirefox ? navigator.userAgent.match( /Firefox\/([0-9]+)\./ )[ 1 ] : - 1;
+			let isSafari = false;
+			let isFirefox = false;
+			let firefoxVersion = - 1;
+			if ( typeof navigator !== 'undefined' ) {
+
+				isSafari = /^((?!chrome|android).)*safari/i.test( navigator.userAgent ) === true;
+				isFirefox = navigator.userAgent.indexOf( 'Firefox' ) > - 1;
+				firefoxVersion = isFirefox ? navigator.userAgent.match( /Firefox\/([0-9]+)\./ )[ 1 ] : - 1;
+
+			}
 
 			if ( typeof createImageBitmap === 'undefined' || isSafari || isFirefox && firefoxVersion < 98 ) {
 
@@ -2174,7 +1989,6 @@
 			this.textureLoader.setRequestHeader( this.options.requestHeader );
 			this.fileLoader = new THREE.FileLoader( this.options.manager );
 			this.fileLoader.setResponseType( 'arraybuffer' );
-
 			if ( this.options.crossOrigin === 'use-credentials' ) {
 
 				this.fileLoader.setWithCredentials( true );
@@ -2182,33 +1996,31 @@
 			}
 
 		}
-
 		setExtensions( extensions ) {
 
 			this.extensions = extensions;
 
 		}
-
 		setPlugins( plugins ) {
 
 			this.plugins = plugins;
 
 		}
-
 		parse( onLoad, onError ) {
 
 			const parser = this;
 			const json = this.json;
-			const extensions = this.extensions; // Clear the loader cache
+			const extensions = this.extensions;
 
-			this.cache.removeAll(); // Mark the special nodes/meshes in json for efficient parse
+			// Clear the loader cache
+			this.cache.removeAll();
 
+			// Mark the special nodes/meshes in json for efficient parse
 			this._invokeAll( function ( ext ) {
 
 				return ext._markDefs && ext._markDefs();
 
 			} );
-
 			Promise.all( this._invokeAll( function ( ext ) {
 
 				return ext.beforeRoot && ext.beforeRoot();
@@ -2243,43 +2055,41 @@
 			} ).catch( onError );
 
 		}
+
 		/**
    * Marks the special nodes/meshes in json for efficient parse.
    */
-
-
 		_markDefs() {
 
 			const nodeDefs = this.json.nodes || [];
 			const skinDefs = this.json.skins || [];
-			const meshDefs = this.json.meshes || []; // Nothing in the node definition indicates whether it is a THREE.Bone or an
-			// THREE.Object3D. Use the skins' joint references to mark bones.
+			const meshDefs = this.json.meshes || [];
 
+			// Nothing in the node definition indicates whether it is a THREE.Bone or an
+			// THREE.Object3D. Use the skins' joint references to mark bones.
 			for ( let skinIndex = 0, skinLength = skinDefs.length; skinIndex < skinLength; skinIndex ++ ) {
 
 				const joints = skinDefs[ skinIndex ].joints;
-
 				for ( let i = 0, il = joints.length; i < il; i ++ ) {
 
 					nodeDefs[ joints[ i ] ].isBone = true;
 
 				}
 
-			} // Iterate over all nodes, marking references to shared resources,
-			// as well as skeleton joints.
-
+			}
 
+			// Iterate over all nodes, marking references to shared resources,
+			// as well as skeleton joints.
 			for ( let nodeIndex = 0, nodeLength = nodeDefs.length; nodeIndex < nodeLength; nodeIndex ++ ) {
 
 				const nodeDef = nodeDefs[ nodeIndex ];
-
 				if ( nodeDef.mesh !== undefined ) {
 
-					this._addNodeRef( this.meshCache, nodeDef.mesh ); // Nothing in the mesh definition indicates whether it is
-					// a THREE.SkinnedMesh or THREE.Mesh. Use the node's mesh reference
-					// to mark THREE.SkinnedMesh if node has skin.
-
+					this._addNodeRef( this.meshCache, nodeDef.mesh );
 
+					// Nothing in the mesh definition indicates whether it is
+					// a THREE.SkinnedMesh or THREE.Mesh. Use the node's mesh reference
+					// to mark THREE.SkinnedMesh if node has skin.
 					if ( nodeDef.skin !== undefined ) {
 
 						meshDefs[ nodeDef.mesh ].isSkinnedMesh = true;
@@ -2297,6 +2107,7 @@
 			}
 
 		}
+
 		/**
    * Counts references to shared node / THREE.Object3D resources. These resources
    * can be reused, or "instantiated", at multiple nodes in the scene
@@ -2306,12 +2117,9 @@
    *
    * Example: CesiumMilkTruck sample model reuses "Wheel" meshes.
    */
-
-
 		_addNodeRef( cache, index ) {
 
 			if ( index === undefined ) return;
-
 			if ( cache.refs[ index ] === undefined ) {
 
 				cache.refs[ index ] = cache.uses[ index ] = 0;
@@ -2321,19 +2129,18 @@
 			cache.refs[ index ] ++;
 
 		}
-		/** Returns a reference to a shared resource, cloning it if necessary. */
-
 
+		/** Returns a reference to a shared resource, cloning it if necessary. */
 		_getNodeRef( cache, index, object ) {
 
 			if ( cache.refs[ index ] <= 1 ) return object;
-			const ref = object.clone(); // Propagates mappings to the cloned object, prevents mappings on the
-			// original object from being lost.
+			const ref = object.clone();
 
+			// Propagates mappings to the cloned object, prevents mappings on the
+			// original object from being lost.
 			const updateMappings = ( original, clone ) => {
 
 				const mappings = this.associations.get( original );
-
 				if ( mappings != null ) {
 
 					this.associations.set( clone, mappings );
@@ -2353,12 +2160,10 @@
 			return ref;
 
 		}
-
 		_invokeOne( func ) {
 
 			const extensions = Object.values( this.plugins );
 			extensions.push( this );
-
 			for ( let i = 0; i < extensions.length; i ++ ) {
 
 				const result = func( extensions[ i ] );
@@ -2369,13 +2174,11 @@
 			return null;
 
 		}
-
 		_invokeAll( func ) {
 
 			const extensions = Object.values( this.plugins );
 			extensions.unshift( this );
 			const pending = [];
-
 			for ( let i = 0; i < extensions.length; i ++ ) {
 
 				const result = func( extensions[ i ] );
@@ -2386,19 +2189,17 @@
 			return pending;
 
 		}
+
 		/**
    * Requests the specified dependency asynchronously, with caching.
    * @param {string} type
    * @param {number} index
    * @return {Promise<Object3D|Material|THREE.Texture|AnimationClip|ArrayBuffer|Object>}
    */
-
-
 		getDependency( type, index ) {
 
 			const cacheKey = type + ':' + index;
 			let dependency = this.cache.get( cacheKey );
-
 			if ( ! dependency ) {
 
 				switch ( type ) {
@@ -2406,11 +2207,9 @@
 					case 'scene':
 						dependency = this.loadScene( index );
 						break;
-
 					case 'node':
 						dependency = this.loadNode( index );
 						break;
-
 					case 'mesh':
 						dependency = this._invokeOne( function ( ext ) {
 
@@ -2418,11 +2217,9 @@
 
 						} );
 						break;
-
 					case 'accessor':
 						dependency = this.loadAccessor( index );
 						break;
-
 					case 'bufferView':
 						dependency = this._invokeOne( function ( ext ) {
 
@@ -2430,11 +2227,9 @@
 
 						} );
 						break;
-
 					case 'buffer':
 						dependency = this.loadBuffer( index );
 						break;
-
 					case 'material':
 						dependency = this._invokeOne( function ( ext ) {
 
@@ -2442,7 +2237,6 @@
 
 						} );
 						break;
-
 					case 'texture':
 						dependency = this._invokeOne( function ( ext ) {
 
@@ -2450,11 +2244,9 @@
 
 						} );
 						break;
-
 					case 'skin':
 						dependency = this.loadSkin( index );
 						break;
-
 					case 'animation':
 						dependency = this._invokeOne( function ( ext ) {
 
@@ -2462,13 +2254,22 @@
 
 						} );
 						break;
-
 					case 'camera':
 						dependency = this.loadCamera( index );
 						break;
-
 					default:
-						throw new Error( 'Unknown type: ' + type );
+						dependency = this._invokeOne( function ( ext ) {
+
+							return ext != this && ext.getDependency && ext.getDependency( type, index );
+
+						} );
+						if ( ! dependency ) {
+
+							throw new Error( 'Unknown type: ' + type );
+
+						}
+
+						break;
 
 				}
 
@@ -2479,17 +2280,15 @@
 			return dependency;
 
 		}
+
 		/**
    * Requests all dependencies of the specified type asynchronously, with caching.
    * @param {string} type
    * @return {Promise<Array<Object>>}
    */
-
-
 		getDependencies( type ) {
 
 			let dependencies = this.cache.get( type );
-
 			if ( ! dependencies ) {
 
 				const parser = this;
@@ -2506,25 +2305,23 @@
 			return dependencies;
 
 		}
+
 		/**
    * Specification: https://github.com/KhronosGroup/glTF/blob/master/specification/2.0/README.md#buffers-and-buffer-views
    * @param {number} bufferIndex
    * @return {Promise<ArrayBuffer>}
    */
-
-
 		loadBuffer( bufferIndex ) {
 
 			const bufferDef = this.json.buffers[ bufferIndex ];
 			const loader = this.fileLoader;
-
 			if ( bufferDef.type && bufferDef.type !== 'arraybuffer' ) {
 
 				throw new Error( 'THREE.GLTFLoader: ' + bufferDef.type + ' buffer type is not supported.' );
 
-			} // If present, GLB container is required to be the first buffer.
-
+			}
 
+			// If present, GLB container is required to be the first buffer.
 			if ( bufferDef.uri === undefined && bufferIndex === 0 ) {
 
 				return Promise.resolve( this.extensions[ EXTENSIONS.KHR_BINARY_GLTF ].body );
@@ -2543,13 +2340,12 @@
 			} );
 
 		}
+
 		/**
    * Specification: https://github.com/KhronosGroup/glTF/blob/master/specification/2.0/README.md#buffers-and-buffer-views
    * @param {number} bufferViewIndex
    * @return {Promise<ArrayBuffer>}
    */
-
-
 		loadBufferView( bufferViewIndex ) {
 
 			const bufferViewDef = this.json.bufferViews[ bufferViewIndex ];
@@ -2562,30 +2358,28 @@
 			} );
 
 		}
+
 		/**
    * Specification: https://github.com/KhronosGroup/glTF/blob/master/specification/2.0/README.md#accessors
    * @param {number} accessorIndex
    * @return {Promise<BufferAttribute|InterleavedBufferAttribute>}
    */
-
-
 		loadAccessor( accessorIndex ) {
 
 			const parser = this;
 			const json = this.json;
 			const accessorDef = this.json.accessors[ accessorIndex ];
-
 			if ( accessorDef.bufferView === undefined && accessorDef.sparse === undefined ) {
 
-				// Ignore empty accessors, which may be used to declare runtime
-				// information about attributes coming from another source (e.g. Draco
-				// compression extension).
-				return Promise.resolve( null );
+				const itemSize = WEBGL_TYPE_SIZES[ accessorDef.type ];
+				const TypedArray = WEBGL_COMPONENT_TYPES[ accessorDef.componentType ];
+				const normalized = accessorDef.normalized === true;
+				const array = new TypedArray( accessorDef.count * itemSize );
+				return Promise.resolve( new THREE.BufferAttribute( array, itemSize, normalized ) );
 
 			}
 
 			const pendingBufferViews = [];
-
 			if ( accessorDef.bufferView !== undefined ) {
 
 				pendingBufferViews.push( this.getDependency( 'bufferView', accessorDef.bufferView ) );
@@ -2607,15 +2401,17 @@
 
 				const bufferView = bufferViews[ 0 ];
 				const itemSize = WEBGL_TYPE_SIZES[ accessorDef.type ];
-				const TypedArray = WEBGL_COMPONENT_TYPES[ accessorDef.componentType ]; // For VEC3: itemSize is 3, elementBytes is 4, itemBytes is 12.
+				const TypedArray = WEBGL_COMPONENT_TYPES[ accessorDef.componentType ];
 
+				// For VEC3: itemSize is 3, elementBytes is 4, itemBytes is 12.
 				const elementBytes = TypedArray.BYTES_PER_ELEMENT;
 				const itemBytes = elementBytes * itemSize;
 				const byteOffset = accessorDef.byteOffset || 0;
 				const byteStride = accessorDef.bufferView !== undefined ? json.bufferViews[ accessorDef.bufferView ].byteStride : undefined;
 				const normalized = accessorDef.normalized === true;
-				let array, bufferAttribute; // The buffer is not interleaved if the stride is the item size in bytes.
+				let array, bufferAttribute;
 
+				// The buffer is not interleaved if the stride is the item size in bytes.
 				if ( byteStride && byteStride !== itemBytes ) {
 
 					// Each "slice" of the buffer, as defined by 'count' elements of 'byteStride' bytes, gets its own THREE.InterleavedBuffer
@@ -2623,11 +2419,11 @@
 					const ibSlice = Math.floor( byteOffset / byteStride );
 					const ibCacheKey = 'InterleavedBuffer:' + accessorDef.bufferView + ':' + accessorDef.componentType + ':' + ibSlice + ':' + accessorDef.count;
 					let ib = parser.cache.get( ibCacheKey );
-
 					if ( ! ib ) {
 
-						array = new TypedArray( bufferView, ibSlice * byteStride, accessorDef.count * byteStride / elementBytes ); // Integer parameters to IB/IBA are in array elements, not bytes.
+						array = new TypedArray( bufferView, ibSlice * byteStride, accessorDef.count * byteStride / elementBytes );
 
+						// Integer parameters to IB/IBA are in array elements, not bytes.
 						ib = new THREE.InterleavedBuffer( array, byteStride / elementBytes );
 						parser.cache.add( ibCacheKey, ib );
 
@@ -2649,9 +2445,9 @@
 
 					bufferAttribute = new THREE.BufferAttribute( array, itemSize, normalized );
 
-				} // https://github.com/KhronosGroup/glTF/blob/master/specification/2.0/README.md#sparse-accessors
-
+				}
 
+				// https://github.com/KhronosGroup/glTF/blob/master/specification/2.0/README.md#sparse-accessors
 				if ( accessorDef.sparse !== undefined ) {
 
 					const itemSizeIndices = WEBGL_TYPE_SIZES.SCALAR;
@@ -2660,7 +2456,6 @@
 					const byteOffsetValues = accessorDef.sparse.values.byteOffset || 0;
 					const sparseIndices = new TypedArrayIndices( bufferViews[ 1 ], byteOffsetIndices, accessorDef.sparse.count * itemSizeIndices );
 					const sparseValues = new TypedArray( bufferViews[ 2 ], byteOffsetValues, accessorDef.sparse.count * itemSize );
-
 					if ( bufferView !== null ) {
 
 						// Avoid modifying the original ArrayBuffer, if the bufferView wasn't initialized with zeroes.
@@ -2686,13 +2481,12 @@
 			} );
 
 		}
+
 		/**
    * Specification: https://github.com/KhronosGroup/glTF/tree/master/specification/2.0#textures
    * @param {number} textureIndex
-   * @return {Promise<THREE.Texture>}
+   * @return {Promise<THREE.Texture|null>}
    */
-
-
 		loadTexture( textureIndex ) {
 
 			const json = this.json;
@@ -2701,7 +2495,6 @@
 			const sourceIndex = textureDef.source;
 			const sourceDef = json.images[ sourceIndex ];
 			let loader = this.textureLoader;
-
 			if ( sourceDef.uri ) {
 
 				const handler = options.manager.getHandler( sourceDef.uri );
@@ -2712,7 +2505,6 @@
 			return this.loadTextureImage( textureIndex, sourceIndex, loader );
 
 		}
-
 		loadTextureImage( textureIndex, sourceIndex, loader ) {
 
 			const parser = this;
@@ -2720,7 +2512,6 @@
 			const textureDef = json.textures[ textureIndex ];
 			const sourceDef = json.images[ sourceIndex ];
 			const cacheKey = ( sourceDef.uri || sourceDef.bufferView ) + ':' + textureDef.sampler;
-
 			if ( this.textureCache[ cacheKey ] ) {
 
 				// See https://github.com/mrdoob/three.js/issues/21559.
@@ -2731,7 +2522,7 @@
 			const promise = this.loadImageSource( sourceIndex, loader ).then( function ( texture ) {
 
 				texture.flipY = false;
-				if ( textureDef.name ) texture.name = textureDef.name;
+				texture.name = textureDef.name || sourceDef.name || '';
 				const samplers = json.samplers || {};
 				const sampler = samplers[ textureDef.sampler ] || {};
 				texture.magFilter = WEBGL_FILTERS[ sampler.magFilter ] || THREE.LinearFilter;
@@ -2752,13 +2543,11 @@
 			return promise;
 
 		}
-
 		loadImageSource( sourceIndex, loader ) {
 
 			const parser = this;
 			const json = this.json;
 			const options = this.options;
-
 			if ( this.sourceCache[ sourceIndex ] !== undefined ) {
 
 				return this.sourceCache[ sourceIndex ].then( texture => texture.clone() );
@@ -2769,10 +2558,10 @@
 			const URL = self.URL || self.webkitURL;
 			let sourceURI = sourceDef.uri || '';
 			let isObjectURL = false;
-
 			if ( sourceDef.bufferView !== undefined ) {
 
 				// Load binary image data from bufferView, if provided.
+
 				sourceURI = parser.getDependency( 'bufferView', sourceDef.bufferView ).then( function ( bufferView ) {
 
 					isObjectURL = true;
@@ -2795,7 +2584,6 @@
 				return new Promise( function ( resolve, reject ) {
 
 					let onLoad = resolve;
-
 					if ( loader.isImageBitmapLoader === true ) {
 
 						onLoad = function ( imageBitmap ) {
@@ -2815,6 +2603,7 @@
 			} ).then( function ( texture ) {
 
 				// Clean up resources and configure THREE.Texture.
+
 				if ( isObjectURL === true ) {
 
 					URL.revokeObjectURL( sourceURI );
@@ -2834,6 +2623,7 @@
 			return promise;
 
 		}
+
 		/**
    * Asynchronously assigns a texture to the given material parameters.
    * @param {Object} materialParams
@@ -2841,13 +2631,13 @@
    * @param {Object} mapDef
    * @return {Promise<Texture>}
    */
-
-
 		assignTexture( materialParams, mapName, mapDef, encoding ) {
 
 			const parser = this;
 			return this.getDependency( 'texture', mapDef.index ).then( function ( texture ) {
 
+				if ( ! texture ) return null;
+
 				// Materials sample aoMap from UV set 1 and other maps from UV set 0 - this can't be configured
 				// However, we will copy UV set 0 to UV set 1 on demand for aoMap
 				if ( mapDef.texCoord !== undefined && mapDef.texCoord != 0 && ! ( mapName === 'aoMap' && mapDef.texCoord == 1 ) ) {
@@ -2859,7 +2649,6 @@
 				if ( parser.extensions[ EXTENSIONS.KHR_TEXTURE_TRANSFORM ] ) {
 
 					const transform = mapDef.extensions !== undefined ? mapDef.extensions[ EXTENSIONS.KHR_TEXTURE_TRANSFORM ] : undefined;
-
 					if ( transform ) {
 
 						const gltfReference = parser.associations.get( texture );
@@ -2882,6 +2671,7 @@
 			} );
 
 		}
+
 		/**
    * Assigns final material to a THREE.Mesh, THREE.Line, or THREE.Points instance. The instance
    * already has a material (generated from the glTF material options alone)
@@ -2890,8 +2680,6 @@
    * be created if necessary, and reused from a cache.
    * @param  {Object3D} mesh THREE.Mesh, THREE.Line, or THREE.Points instance.
    */
-
-
 		assignFinalMaterial( mesh ) {
 
 			const geometry = mesh.geometry;
@@ -2899,12 +2687,10 @@
 			const useDerivativeTangents = geometry.attributes.tangent === undefined;
 			const useVertexColors = geometry.attributes.color !== undefined;
 			const useFlatShading = geometry.attributes.normal === undefined;
-
 			if ( mesh.isPoints ) {
 
 				const cacheKey = 'PointsMaterial:' + material.uuid;
 				let pointsMaterial = this.cache.get( cacheKey );
-
 				if ( ! pointsMaterial ) {
 
 					pointsMaterial = new THREE.PointsMaterial();
@@ -2923,7 +2709,6 @@
 
 				const cacheKey = 'LineBasicMaterial:' + material.uuid;
 				let lineMaterial = this.cache.get( cacheKey );
-
 				if ( ! lineMaterial ) {
 
 					lineMaterial = new THREE.LineBasicMaterial();
@@ -2935,24 +2720,21 @@
 
 				material = lineMaterial;
 
-			} // Clone the material if it will be modified
-
+			}
 
+			// Clone the material if it will be modified
 			if ( useDerivativeTangents || useVertexColors || useFlatShading ) {
 
 				let cacheKey = 'ClonedMaterial:' + material.uuid + ':';
-				if ( material.isGLTFSpecularGlossinessMaterial ) cacheKey += 'specular-glossiness:';
 				if ( useDerivativeTangents ) cacheKey += 'derivative-tangents:';
 				if ( useVertexColors ) cacheKey += 'vertex-colors:';
 				if ( useFlatShading ) cacheKey += 'flat-shading:';
 				let cachedMaterial = this.cache.get( cacheKey );
-
 				if ( ! cachedMaterial ) {
 
 					cachedMaterial = material.clone();
 					if ( useVertexColors ) cachedMaterial.vertexColors = true;
 					if ( useFlatShading ) cachedMaterial.flatShading = true;
-
 					if ( useDerivativeTangents ) {
 
 						// https://github.com/mrdoob/three.js/issues/11438#issuecomment-507003995
@@ -2968,8 +2750,9 @@
 
 				material = cachedMaterial;
 
-			} // workarounds for mesh and geometry
+			}
 
+			// workarounds for mesh and geometry
 
 			if ( material.aoMap && geometry.attributes.uv2 === undefined && geometry.attributes.uv !== undefined ) {
 
@@ -2980,19 +2763,17 @@
 			mesh.material = material;
 
 		}
-
 		getMaterialType() {
 
 			return THREE.MeshStandardMaterial;
 
 		}
+
 		/**
    * Specification: https://github.com/KhronosGroup/glTF/blob/master/specification/2.0/README.md#materials
    * @param {number} materialIndex
    * @return {Promise<Material>}
    */
-
-
 		loadMaterial( materialIndex ) {
 
 			const parser = this;
@@ -3003,14 +2784,7 @@
 			const materialParams = {};
 			const materialExtensions = materialDef.extensions || {};
 			const pending = [];
-
-			if ( materialExtensions[ EXTENSIONS.KHR_MATERIALS_PBR_SPECULAR_GLOSSINESS ] ) {
-
-				const sgExtension = extensions[ EXTENSIONS.KHR_MATERIALS_PBR_SPECULAR_GLOSSINESS ];
-				materialType = sgExtension.getMaterialType();
-				pending.push( sgExtension.extendParams( materialParams, materialDef, parser ) );
-
-			} else if ( materialExtensions[ EXTENSIONS.KHR_MATERIALS_UNLIT ] ) {
+			if ( materialExtensions[ EXTENSIONS.KHR_MATERIALS_UNLIT ] ) {
 
 				const kmuExtension = extensions[ EXTENSIONS.KHR_MATERIALS_UNLIT ];
 				materialType = kmuExtension.getMaterialType();
@@ -3020,10 +2794,10 @@
 
 				// Specification:
 				// https://github.com/KhronosGroup/glTF/tree/master/specification/2.0#metallic-roughness-material
+
 				const metallicRoughness = materialDef.pbrMetallicRoughness || {};
 				materialParams.color = new THREE.Color( 1.0, 1.0, 1.0 );
 				materialParams.opacity = 1.0;
-
 				if ( Array.isArray( metallicRoughness.baseColorFactor ) ) {
 
 					const array = metallicRoughness.baseColorFactor;
@@ -3040,7 +2814,6 @@
 
 				materialParams.metalness = metallicRoughness.metallicFactor !== undefined ? metallicRoughness.metallicFactor : 1.0;
 				materialParams.roughness = metallicRoughness.roughnessFactor !== undefined ? metallicRoughness.roughnessFactor : 1.0;
-
 				if ( metallicRoughness.metallicRoughnessTexture !== undefined ) {
 
 					pending.push( parser.assignTexture( materialParams, 'metalnessMap', metallicRoughness.metallicRoughnessTexture ) );
@@ -3068,17 +2841,16 @@
 			}
 
 			const alphaMode = materialDef.alphaMode || ALPHA_MODES.OPAQUE;
-
 			if ( alphaMode === ALPHA_MODES.BLEND ) {
 
-				materialParams.transparent = true; // See: https://github.com/mrdoob/three.js/issues/17706
+				materialParams.transparent = true;
 
+				// See: https://github.com/mrdoob/three.js/issues/17706
 				materialParams.depthWrite = false;
 
 			} else {
 
 				materialParams.transparent = false;
-
 				if ( alphaMode === ALPHA_MODES.MASK ) {
 
 					materialParams.alphaTest = materialDef.alphaCutoff !== undefined ? materialDef.alphaCutoff : 0.5;
@@ -3091,7 +2863,6 @@
 
 				pending.push( parser.assignTexture( materialParams, 'normalMap', materialDef.normalTexture ) );
 				materialParams.normalScale = new THREE.Vector2( 1, 1 );
-
 				if ( materialDef.normalTexture.scale !== undefined ) {
 
 					const scale = materialDef.normalTexture.scale;
@@ -3104,7 +2875,6 @@
 			if ( materialDef.occlusionTexture !== undefined && materialType !== THREE.MeshBasicMaterial ) {
 
 				pending.push( parser.assignTexture( materialParams, 'aoMap', materialDef.occlusionTexture ) );
-
 				if ( materialDef.occlusionTexture.strength !== undefined ) {
 
 					materialParams.aoMapIntensity = materialDef.occlusionTexture.strength;
@@ -3127,18 +2897,7 @@
 
 			return Promise.all( pending ).then( function () {
 
-				let material;
-
-				if ( materialType === GLTFMeshStandardSGMaterial ) {
-
-					material = extensions[ EXTENSIONS.KHR_MATERIALS_PBR_SPECULAR_GLOSSINESS ].createMaterial( materialParams );
-
-				} else {
-
-					material = new materialType( materialParams );
-
-				}
-
+				const material = new materialType( materialParams );
 				if ( materialDef.name ) material.name = materialDef.name;
 				assignExtrasToUserData( material, materialDef );
 				parser.associations.set( material, {
@@ -3150,14 +2909,12 @@
 			} );
 
 		}
-		/** When THREE.Object3D instances are targeted by animation, they need unique names. */
-
 
+		/** When THREE.Object3D instances are targeted by animation, they need unique names. */
 		createUniqueName( originalName ) {
 
 			const sanitizedName = THREE.PropertyBinding.sanitizeNodeName( originalName || '' );
 			let name = sanitizedName;
-
 			for ( let i = 1; this.nodeNamesUsed[ name ]; ++ i ) {
 
 				name = sanitizedName + '_' + i;
@@ -3168,6 +2925,7 @@
 			return name;
 
 		}
+
 		/**
    * Specification: https://github.com/KhronosGroup/glTF/blob/master/specification/2.0/README.md#geometry
    *
@@ -3176,14 +2934,11 @@
    * @param {Array<GLTF.Primitive>} primitives
    * @return {Promise<Array<BufferGeometry>>}
    */
-
-
 		loadGeometries( primitives ) {
 
 			const parser = this;
 			const extensions = this.extensions;
 			const cache = this.primitiveCache;
-
 			function createDracoPrimitive( primitive ) {
 
 				return extensions[ EXTENSIONS.KHR_DRACO_MESH_COMPRESSION ].decodePrimitive( primitive, parser ).then( function ( geometry ) {
@@ -3195,14 +2950,13 @@
 			}
 
 			const pending = [];
-
 			for ( let i = 0, il = primitives.length; i < il; i ++ ) {
 
 				const primitive = primitives[ i ];
-				const cacheKey = createPrimitiveKey( primitive ); // See if we've already created this geometry
+				const cacheKey = createPrimitiveKey( primitive );
 
+				// See if we've already created this geometry
 				const cached = cache[ cacheKey ];
-
 				if ( cached ) {
 
 					// Use the cached geometry if it exists
@@ -3211,7 +2965,6 @@
 				} else {
 
 					let geometryPromise;
-
 					if ( primitive.extensions && primitive.extensions[ EXTENSIONS.KHR_DRACO_MESH_COMPRESSION ] ) {
 
 						// Use DRACO geometry if available
@@ -3222,9 +2975,9 @@
 						// Otherwise create a new geometry
 						geometryPromise = addPrimitiveAttributes( new THREE.BufferGeometry(), primitive, parser );
 
-					} // Cache this geometry
-
+					}
 
+					// Cache this geometry
 					cache[ cacheKey ] = {
 						primitive: primitive,
 						promise: geometryPromise
@@ -3238,13 +2991,12 @@
 			return Promise.all( pending );
 
 		}
+
 		/**
    * Specification: https://github.com/KhronosGroup/glTF/blob/master/specification/2.0/README.md#meshes
    * @param {number} meshIndex
    * @return {Promise<Group|Mesh|SkinnedMesh>}
    */
-
-
 		loadMesh( meshIndex ) {
 
 			const parser = this;
@@ -3253,7 +3005,6 @@
 			const meshDef = json.meshes[ meshIndex ];
 			const primitives = meshDef.primitives;
 			const pending = [];
-
 			for ( let i = 0, il = primitives.length; i < il; i ++ ) {
 
 				const material = primitives[ i ].material === undefined ? createDefaultMaterial( this.cache ) : this.getDependency( 'material', primitives[ i ].material );
@@ -3267,20 +3018,19 @@
 				const materials = results.slice( 0, results.length - 1 );
 				const geometries = results[ results.length - 1 ];
 				const meshes = [];
-
 				for ( let i = 0, il = geometries.length; i < il; i ++ ) {
 
 					const geometry = geometries[ i ];
-					const primitive = primitives[ i ]; // 1. create THREE.Mesh
+					const primitive = primitives[ i ];
+
+					// 1. create THREE.Mesh
 
 					let mesh;
 					const material = materials[ i ];
-
 					if ( primitive.mode === WEBGL_CONSTANTS.TRIANGLES || primitive.mode === WEBGL_CONSTANTS.TRIANGLE_STRIP || primitive.mode === WEBGL_CONSTANTS.TRIANGLE_FAN || primitive.mode === undefined ) {
 
 						// .isSkinnedMesh isn't in glTF spec. See ._markDefs()
 						mesh = meshDef.isSkinnedMesh === true ? new THREE.SkinnedMesh( geometry, material ) : new THREE.Mesh( geometry, material );
-
 						if ( mesh.isSkinnedMesh === true && ! mesh.geometry.attributes.skinWeight.normalized ) {
 
 							// we normalize floating point skin weight array to fix malformed assets (see #15319)
@@ -3354,7 +3104,6 @@
 				parser.associations.set( group, {
 					meshes: meshIndex
 				} );
-
 				for ( let i = 0, il = meshes.length; i < il; i ++ ) {
 
 					group.add( meshes[ i ] );
@@ -3366,19 +3115,17 @@
 			} );
 
 		}
+
 		/**
    * Specification: https://github.com/KhronosGroup/glTF/tree/master/specification/2.0#cameras
    * @param {number} cameraIndex
    * @return {Promise<THREE.Camera>}
    */
-
-
 		loadCamera( cameraIndex ) {
 
 			let camera;
 			const cameraDef = this.json.cameras[ cameraIndex ];
 			const params = cameraDef[ cameraDef.type ];
-
 			if ( ! params ) {
 
 				console.warn( 'THREE.GLTFLoader: Missing camera parameters.' );
@@ -3401,41 +3148,72 @@
 			return Promise.resolve( camera );
 
 		}
+
 		/**
    * Specification: https://github.com/KhronosGroup/glTF/tree/master/specification/2.0#skins
    * @param {number} skinIndex
-   * @return {Promise<Object>}
+   * @return {Promise<Skeleton>}
    */
-
-
 		loadSkin( skinIndex ) {
 
 			const skinDef = this.json.skins[ skinIndex ];
-			const skinEntry = {
-				joints: skinDef.joints
-			};
+			const pending = [];
+			for ( let i = 0, il = skinDef.joints.length; i < il; i ++ ) {
 
-			if ( skinDef.inverseBindMatrices === undefined ) {
+				pending.push( this.getDependency( 'node', skinDef.joints[ i ] ) );
 
-				return Promise.resolve( skinEntry );
+			}
+
+			if ( skinDef.inverseBindMatrices !== undefined ) {
+
+				pending.push( this.getDependency( 'accessor', skinDef.inverseBindMatrices ) );
+
+			} else {
+
+				pending.push( null );
 
 			}
 
-			return this.getDependency( 'accessor', skinDef.inverseBindMatrices ).then( function ( accessor ) {
+			return Promise.all( pending ).then( function ( results ) {
+
+				const inverseBindMatrices = results.pop();
+				const jointNodes = results;
+				const bones = [];
+				const boneInverses = [];
+				for ( let i = 0, il = jointNodes.length; i < il; i ++ ) {
+
+					const jointNode = jointNodes[ i ];
+					if ( jointNode ) {
+
+						bones.push( jointNode );
+						const mat = new THREE.Matrix4();
+						if ( inverseBindMatrices !== null ) {
+
+							mat.fromArray( inverseBindMatrices.array, i * 16 );
+
+						}
+
+						boneInverses.push( mat );
+
+					} else {
+
+						console.warn( 'THREE.GLTFLoader: Joint "%s" could not be found.', skinDef.joints[ i ] );
+
+					}
+
+				}
 
-				skinEntry.inverseBindMatrices = accessor;
-				return skinEntry;
+				return new THREE.Skeleton( bones, boneInverses );
 
 			} );
 
 		}
+
 		/**
    * Specification: https://github.com/KhronosGroup/glTF/tree/master/specification/2.0#animations
    * @param {number} animationIndex
    * @return {Promise<AnimationClip>}
    */
-
-
 		loadAnimation( animationIndex ) {
 
 			const json = this.json;
@@ -3445,14 +3223,12 @@
 			const pendingOutputAccessors = [];
 			const pendingSamplers = [];
 			const pendingTargets = [];
-
 			for ( let i = 0, il = animationDef.channels.length; i < il; i ++ ) {
 
 				const channel = animationDef.channels[ i ];
 				const sampler = animationDef.samplers[ channel.sampler ];
 				const target = channel.target;
-				const name = target.node !== undefined ? target.node : target.id; // NOTE: target.id is deprecated.
-
+				const name = target.node;
 				const input = animationDef.parameters !== undefined ? animationDef.parameters[ sampler.input ] : sampler.input;
 				const output = animationDef.parameters !== undefined ? animationDef.parameters[ sampler.output ] : sampler.output;
 				pendingNodes.push( this.getDependency( 'node', name ) );
@@ -3471,7 +3247,6 @@
 				const samplers = dependencies[ 3 ];
 				const targets = dependencies[ 4 ];
 				const tracks = [];
-
 				for ( let i = 0, il = nodes.length; i < il; i ++ ) {
 
 					const node = nodes[ i ];
@@ -3481,19 +3256,15 @@
 					const target = targets[ i ];
 					if ( node === undefined ) continue;
 					node.updateMatrix();
-					node.matrixAutoUpdate = true;
 					let TypedKeyframeTrack;
-
 					switch ( PATH_PROPERTIES[ target.path ] ) {
 
 						case PATH_PROPERTIES.weights:
 							TypedKeyframeTrack = THREE.NumberKeyframeTrack;
 							break;
-
 						case PATH_PROPERTIES.rotation:
 							TypedKeyframeTrack = THREE.QuaternionKeyframeTrack;
 							break;
-
 						case PATH_PROPERTIES.position:
 						case PATH_PROPERTIES.scale:
 						default:
@@ -3505,7 +3276,6 @@
 					const targetName = node.name ? node.name : node.uuid;
 					const interpolation = sampler.interpolation !== undefined ? INTERPOLATION[ sampler.interpolation ] : THREE.InterpolateLinear;
 					const targetNames = [];
-
 					if ( PATH_PROPERTIES[ target.path ] === PATH_PROPERTIES.weights ) {
 
 						node.traverse( function ( object ) {
@@ -3525,12 +3295,10 @@
 					}
 
 					let outputArray = outputAccessor.array;
-
 					if ( outputAccessor.normalized ) {
 
 						const scale = getNormalizedComponentScale( outputArray.constructor );
 						const scaled = new Float32Array( outputArray.length );
-
 						for ( let j = 0, jl = outputArray.length; j < jl; j ++ ) {
 
 							scaled[ j ] = outputArray[ j ] * scale;
@@ -3543,8 +3311,9 @@
 
 					for ( let j = 0, jl = targetNames.length; j < jl; j ++ ) {
 
-						const track = new TypedKeyframeTrack( targetNames[ j ] + '.' + PATH_PROPERTIES[ target.path ], inputAccessor.array, outputArray, interpolation ); // Override interpolation with custom factory method.
+						const track = new TypedKeyframeTrack( targetNames[ j ] + '.' + PATH_PROPERTIES[ target.path ], inputAccessor.array, outputArray, interpolation );
 
+						// Override interpolation with custom factory method.
 						if ( sampler.interpolation === 'CUBICSPLINE' ) {
 
 							track.createInterpolant = function InterpolantFactoryMethodGLTFCubicSpline( result ) {
@@ -3552,12 +3321,13 @@
 								// A CUBICSPLINE keyframe in glTF has three output values for each input value,
 								// representing inTangent, splineVertex, and outTangent. As a result, track.getValueSize()
 								// must be divided by three to get the interpolant's sampleSize argument.
+
 								const interpolantType = this instanceof THREE.QuaternionKeyframeTrack ? GLTFCubicSplineQuaternionInterpolant : GLTFCubicSplineInterpolant;
 								return new interpolantType( this.times, this.values, this.getValueSize() / 3, result );
 
-							}; // Mark as CUBICSPLINE. `track.getInterpolation()` doesn't support custom interpolants.
-
+							};
 
+							// Mark as CUBICSPLINE. `track.getInterpolation()` doesn't support custom interpolants.
 							track.createInterpolant.isInterpolantFactoryMethodGLTFCubicSpline = true;
 
 						}
@@ -3574,7 +3344,6 @@
 			} );
 
 		}
-
 		createNodeMesh( nodeIndex ) {
 
 			const json = this.json;
@@ -3583,15 +3352,14 @@
 			if ( nodeDef.mesh === undefined ) return null;
 			return parser.getDependency( 'mesh', nodeDef.mesh ).then( function ( mesh ) {
 
-				const node = parser._getNodeRef( parser.meshCache, nodeDef.mesh, mesh ); // if weights are provided on the node, override weights on the mesh.
-
+				const node = parser._getNodeRef( parser.meshCache, nodeDef.mesh, mesh );
 
+				// if weights are provided on the node, override weights on the mesh.
 				if ( nodeDef.weights !== undefined ) {
 
 					node.traverse( function ( o ) {
 
 						if ( ! o.isMesh ) return;
-
 						for ( let i = 0, il = nodeDef.weights.length; i < il; i ++ ) {
 
 							o.morphTargetInfluences[ i ] = nodeDef.weights[ i ];
@@ -3607,31 +3375,29 @@
 			} );
 
 		}
+
 		/**
    * Specification: https://github.com/KhronosGroup/glTF/tree/master/specification/2.0#nodes-and-hierarchy
    * @param {number} nodeIndex
    * @return {Promise<Object3D>}
    */
-
-
 		loadNode( nodeIndex ) {
 
 			const json = this.json;
 			const extensions = this.extensions;
 			const parser = this;
-			const nodeDef = json.nodes[ nodeIndex ]; // reserve node's name before its dependencies, so the root has the intended name.
+			const nodeDef = json.nodes[ nodeIndex ];
 
+			// reserve node's name before its dependencies, so the root has the intended name.
 			const nodeName = nodeDef.name ? parser.createUniqueName( nodeDef.name ) : '';
 			return function () {
 
 				const pending = [];
-
 				const meshPromise = parser._invokeOne( function ( ext ) {
 
 					return ext.createNodeMesh && ext.createNodeMesh( nodeIndex );
 
 				} );
-
 				if ( meshPromise ) {
 
 					pending.push( meshPromise );
@@ -3657,13 +3423,13 @@
 					pending.push( promise );
 
 				} );
-
 				return Promise.all( pending );
 
 			}().then( function ( objects ) {
 
-				let node; // .isBone isn't in glTF spec. See ._markDefs
+				let node;
 
+				// .isBone isn't in glTF spec. See ._markDefs
 				if ( nodeDef.isBone === true ) {
 
 					node = new THREE.Bone();
@@ -3701,7 +3467,6 @@
 
 				assignExtrasToUserData( node, nodeDef );
 				if ( nodeDef.extensions ) addUnknownExtensionsToUserData( extensions, node, nodeDef );
-
 				if ( nodeDef.matrix !== undefined ) {
 
 					const matrix = new THREE.Matrix4();
@@ -3742,28 +3507,27 @@
 			} );
 
 		}
+
 		/**
    * Specification: https://github.com/KhronosGroup/glTF/tree/master/specification/2.0#scenes
    * @param {number} sceneIndex
    * @return {Promise<Group>}
    */
-
-
 		loadScene( sceneIndex ) {
 
 			const json = this.json;
 			const extensions = this.extensions;
 			const sceneDef = this.json.scenes[ sceneIndex ];
-			const parser = this; // THREE.Loader returns THREE.Group, not Scene.
-			// See: https://github.com/mrdoob/three.js/issues/18342#issuecomment-578981172
+			const parser = this;
 
+			// THREE.Loader returns THREE.Group, not Scene.
+			// See: https://github.com/mrdoob/three.js/issues/18342#issuecomment-578981172
 			const scene = new THREE.Group();
 			if ( sceneDef.name ) scene.name = parser.createUniqueName( sceneDef.name );
 			assignExtrasToUserData( scene, sceneDef );
 			if ( sceneDef.extensions ) addUnknownExtensionsToUserData( extensions, scene, sceneDef );
 			const nodeIds = sceneDef.nodes || [];
 			const pending = [];
-
 			for ( let i = 0, il = nodeIds.length; i < il; i ++ ) {
 
 				pending.push( buildNodeHierarchy( nodeIds[ i ], scene, json, parser ) );
@@ -3777,7 +3541,6 @@
 				const reduceAssociations = node => {
 
 					const reducedAssociations = new Map();
-
 					for ( const [ key, value ] of parser.associations ) {
 
 						if ( key instanceof THREE.Material || key instanceof THREE.Texture ) {
@@ -3791,7 +3554,6 @@
 					node.traverse( node => {
 
 						const mappings = parser.associations.get( node );
-
 						if ( mappings != null ) {
 
 							reducedAssociations.set( node, mappings );
@@ -3811,62 +3573,21 @@
 		}
 
 	}
-
 	function buildNodeHierarchy( nodeId, parentObject, json, parser ) {
 
 		const nodeDef = json.nodes[ nodeId ];
 		return parser.getDependency( 'node', nodeId ).then( function ( node ) {
 
-			if ( nodeDef.skin === undefined ) return node; // build skeleton here as well
+			if ( nodeDef.skin === undefined ) return node;
 
-			let skinEntry;
-			return parser.getDependency( 'skin', nodeDef.skin ).then( function ( skin ) {
+			// build skeleton here as well
 
-				skinEntry = skin;
-				const pendingJoints = [];
-
-				for ( let i = 0, il = skinEntry.joints.length; i < il; i ++ ) {
-
-					pendingJoints.push( parser.getDependency( 'node', skinEntry.joints[ i ] ) );
-
-				}
-
-				return Promise.all( pendingJoints );
-
-			} ).then( function ( jointNodes ) {
+			return parser.getDependency( 'skin', nodeDef.skin ).then( function ( skeleton ) {
 
 				node.traverse( function ( mesh ) {
 
-					if ( ! mesh.isMesh ) return;
-					const bones = [];
-					const boneInverses = [];
-
-					for ( let j = 0, jl = jointNodes.length; j < jl; j ++ ) {
-
-						const jointNode = jointNodes[ j ];
-
-						if ( jointNode ) {
-
-							bones.push( jointNode );
-							const mat = new THREE.Matrix4();
-
-							if ( skinEntry.inverseBindMatrices !== undefined ) {
-
-								mat.fromArray( skinEntry.inverseBindMatrices.array, j * 16 );
-
-							}
-
-							boneInverses.push( mat );
-
-						} else {
-
-							console.warn( 'THREE.GLTFLoader: Joint "%s" could not be found.', skinEntry.joints[ j ] );
-
-						}
-
-					}
-
-					mesh.bind( new THREE.Skeleton( bones, boneInverses ), mesh.matrixWorld );
+					if ( ! mesh.isSkinnedMesh ) return;
+					mesh.bind( skeleton, mesh.matrixWorld );
 
 				} );
 				return node;
@@ -3876,13 +3597,12 @@
 		} ).then( function ( node ) {
 
 			// build node hierachy
+
 			parentObject.add( node );
 			const pending = [];
-
 			if ( nodeDef.children ) {
 
 				const children = nodeDef.children;
-
 				for ( let i = 0, il = children.length; i < il; i ++ ) {
 
 					const child = children[ i ];
@@ -3897,28 +3617,27 @@
 		} );
 
 	}
+
 	/**
  * @param {BufferGeometry} geometry
  * @param {GLTF.Primitive} primitiveDef
  * @param {GLTFParser} parser
  */
-
-
 	function computeBounds( geometry, primitiveDef, parser ) {
 
 		const attributes = primitiveDef.attributes;
 		const box = new THREE.Box3();
-
 		if ( attributes.POSITION !== undefined ) {
 
 			const accessor = parser.json.accessors[ attributes.POSITION ];
 			const min = accessor.min;
-			const max = accessor.max; // glTF requires 'min' and 'max', but VRM (which extends glTF) currently ignores that requirement.
+			const max = accessor.max;
+
+			// glTF requires 'min' and 'max', but VRM (which extends glTF) currently ignores that requirement.
 
 			if ( min !== undefined && max !== undefined ) {
 
 				box.set( new THREE.Vector3( min[ 0 ], min[ 1 ], min[ 2 ] ), new THREE.Vector3( max[ 0 ], max[ 1 ], max[ 2 ] ) );
-
 				if ( accessor.normalized ) {
 
 					const boxScale = getNormalizedComponentScale( WEBGL_COMPONENT_TYPES[ accessor.componentType ] );
@@ -3941,21 +3660,20 @@
 		}
 
 		const targets = primitiveDef.targets;
-
 		if ( targets !== undefined ) {
 
 			const maxDisplacement = new THREE.Vector3();
 			const vector = new THREE.Vector3();
-
 			for ( let i = 0, il = targets.length; i < il; i ++ ) {
 
 				const target = targets[ i ];
-
 				if ( target.POSITION !== undefined ) {
 
 					const accessor = parser.json.accessors[ target.POSITION ];
 					const min = accessor.min;
-					const max = accessor.max; // glTF requires 'min' and 'max', but VRM (which extends glTF) currently ignores that requirement.
+					const max = accessor.max;
+
+					// glTF requires 'min' and 'max', but VRM (which extends glTF) currently ignores that requirement.
 
 					if ( min !== undefined && max !== undefined ) {
 
@@ -3963,18 +3681,17 @@
 						vector.setX( Math.max( Math.abs( min[ 0 ] ), Math.abs( max[ 0 ] ) ) );
 						vector.setY( Math.max( Math.abs( min[ 1 ] ), Math.abs( max[ 1 ] ) ) );
 						vector.setZ( Math.max( Math.abs( min[ 2 ] ), Math.abs( max[ 2 ] ) ) );
-
 						if ( accessor.normalized ) {
 
 							const boxScale = getNormalizedComponentScale( WEBGL_COMPONENT_TYPES[ accessor.componentType ] );
 							vector.multiplyScalar( boxScale );
 
-						} // Note: this assumes that the sum of all weights is at most 1. This isn't quite correct - it's more conservative
+						}
+
+						// Note: this assumes that the sum of all weights is at most 1. This isn't quite correct - it's more conservative
 						// to assume that each target can have a max weight of 1. However, for some use cases - notably, when morph targets
 						// are used to implement key-frame animations and as such only two are active at a time - this results in very large
 						// boxes. So for now we make a box that's sometimes a touch too small but is hopefully mostly of reasonable size.
-
-
 						maxDisplacement.max( vector );
 
 					} else {
@@ -3985,9 +3702,9 @@
 
 				}
 
-			} // As per comment above this box isn't conservative, but has a reasonable size for a very large number of morph targets.
-
+			}
 
+			// As per comment above this box isn't conservative, but has a reasonable size for a very large number of morph targets.
 			box.expandByVector( maxDisplacement );
 
 		}
@@ -3999,19 +3716,17 @@
 		geometry.boundingSphere = sphere;
 
 	}
+
 	/**
  * @param {BufferGeometry} geometry
  * @param {GLTF.Primitive} primitiveDef
  * @param {GLTFParser} parser
  * @return {Promise<BufferGeometry>}
  */
-
-
 	function addPrimitiveAttributes( geometry, primitiveDef, parser ) {
 
 		const attributes = primitiveDef.attributes;
 		const pending = [];
-
 		function assignAttributeAccessor( accessorIndex, attributeName ) {
 
 			return parser.getDependency( 'accessor', accessorIndex ).then( function ( accessor ) {
@@ -4024,8 +3739,9 @@
 
 		for ( const gltfAttributeName in attributes ) {
 
-			const threeAttributeName = ATTRIBUTES[ gltfAttributeName ] || gltfAttributeName.toLowerCase(); // Skip attributes already provided by e.g. Draco extension.
+			const threeAttributeName = ATTRIBUTES[ gltfAttributeName ] || gltfAttributeName.toLowerCase();
 
+			// Skip attributes already provided by e.g. Draco extension.
 			if ( threeAttributeName in geometry.attributes ) continue;
 			pending.push( assignAttributeAccessor( attributes[ gltfAttributeName ], threeAttributeName ) );
 
@@ -4051,22 +3767,22 @@
 		} );
 
 	}
+
 	/**
  * @param {BufferGeometry} geometry
  * @param {Number} drawMode
  * @return {BufferGeometry}
  */
-
-
 	function toTrianglesDrawMode( geometry, drawMode ) {
 
-		let index = geometry.getIndex(); // generate index if not present
+		let index = geometry.getIndex();
+
+		// generate index if not present
 
 		if ( index === null ) {
 
 			const indices = [];
 			const position = geometry.getAttribute( 'position' );
-
 			if ( position !== undefined ) {
 
 				for ( let i = 0; i < position.count; i ++ ) {
@@ -4085,15 +3801,16 @@
 
 			}
 
-		} //
+		}
 
+		//
 
 		const numberOfTriangles = index.count - 2;
 		const newIndices = [];
-
 		if ( drawMode === THREE.TriangleFanDrawMode ) {
 
 			// gl.TRIANGLE_FAN
+
 			for ( let i = 1; i <= numberOfTriangles; i ++ ) {
 
 				newIndices.push( index.getX( 0 ) );
@@ -4105,6 +3822,7 @@
 		} else {
 
 			// gl.TRIANGLE_STRIP
+
 			for ( let i = 0; i < numberOfTriangles; i ++ ) {
 
 				if ( i % 2 === 0 ) {
@@ -4129,8 +3847,9 @@
 
 			console.error( 'THREE.GLTFLoader.toTrianglesDrawMode(): Unable to generate correct amount of triangles.' );
 
-		} // build final geometry
+		}
 
+		// build final geometry
 
 		const newGeometry = geometry.clone();
 		newGeometry.setIndex( newIndices );