CR: setRequestHeader in the base class Loader

examples/js/loaders/GLTFLoader.js

@@ -14,7 +14,6 @@ THREE.GLTFLoader = ( function () {
 
 		this.dracoLoader = null;
 		this.ddsLoader = null;
-		this.requestHeader = null;
 
 	}
 
@@ -68,12 +67,7 @@ THREE.GLTFLoader = ( function () {
 
 			loader.setPath( this.path );
 			loader.setResponseType( 'arraybuffer' );
-
-			if ( this.requestHeader !== null ) {
-
-				loader.setRequestHeader( this.requestHeader );
-
-			}
+			loader.setRequestHeader( this.requestHeader );
 
 			if ( scope.crossOrigin === 'use-credentials' ) {
 
@@ -103,13 +97,6 @@ THREE.GLTFLoader = ( function () {
 
 		},
 
-		setRequestHeader: function ( header ) {
-
-			this.requestHeader = header;
-			return this;
-
-		},
-
 		setDRACOLoader: function ( dracoLoader ) {
 
 			this.dracoLoader = dracoLoader;
@@ -228,12 +215,7 @@ THREE.GLTFLoader = ( function () {
 
 			} );
 
-			if ( this.requestHeader !== null ) {
-
-				parser.fileLoader.setRequestHeader( this.requestHeader );
-
-			}
-
+			parser.fileLoader.setRequestHeader( this.requestHeader );
 			parser.parse( onLoad, onError );
 
 		}

examples/jsm/loaders/GLTFLoader.d.ts

@@ -33,7 +33,6 @@ export class GLTFLoader extends Loader {
 	ddsLoader: DDSLoader | null;
 
 	load( url: string, onLoad: ( gltf: GLTF ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ) : void;
-	setRequestHeader( value: { [header: string]: string } ): GLTFLoader;
 	setDRACOLoader( dracoLoader: DRACOLoader ): GLTFLoader;
 	setDDSLoader( ddsLoader: DDSLoader ): GLTFLoader;
 	parse( data: ArrayBuffer | string, path: string, onLoad: ( gltf: GLTF ) => void, onError?: ( event: ErrorEvent ) => void ) : void;

examples/jsm/loaders/GLTFLoader.js

@@ -77,8 +77,6 @@ var GLTFLoader = ( function () {
 
 		this.dracoLoader = null;
 		this.ddsLoader = null;
-		this.requestHeader = null;
-
 	}
 
 	GLTFLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
@@ -131,12 +129,7 @@ var GLTFLoader = ( function () {
 
 			loader.setPath( this.path );
 			loader.setResponseType( 'arraybuffer' );
-
-			if ( this.requestHeader !== null ) {
-
-				loader.setRequestHeader( this.requestHeader );
-
-			}
+			loader.setRequestHeader( this.requestHeader );
 
 			if ( scope.crossOrigin === 'use-credentials' ) {
 
@@ -166,13 +159,6 @@ var GLTFLoader = ( function () {
 
 		},
 
-		setRequestHeader: function ( header ) {
-
-			this.requestHeader = header;
-			return this;
-
-		},
-
 		setDRACOLoader: function ( dracoLoader ) {
 
 			this.dracoLoader = dracoLoader;
@@ -291,12 +277,7 @@ var GLTFLoader = ( function () {
 
 			} );
 
-			if ( this.requestHeader !== null ) {
-
-				parser.fileLoader.setRequestHeader( this.requestHeader );
-
-			}
-
+			parser.fileLoader.setRequestHeader( this.requestHeader );
 			parser.parse( onLoad, onError );
 
 		}

src/loaders/FileLoader.d.ts

@@ -8,7 +8,6 @@ export class FileLoader extends Loader {
 	mimeType: undefined | MimeType;
 	responseType: undefined |string;
 	withCredentials: undefined |string;
-	requestHeader: undefined | { [header: string]: string };
 
 	load(
 		url: string,
@@ -19,6 +18,5 @@ export class FileLoader extends Loader {
 	setMimeType( mimeType: MimeType ): FileLoader;
 	setResponseType( responseType: string ): FileLoader;
 	setWithCredentials( value: boolean ): FileLoader;
-	setRequestHeader( value: { [header: string]: string } ): FileLoader;
 
 }

src/loaders/FileLoader.js

@@ -301,13 +301,6 @@ FileLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
 		this.mimeType = value;
 		return this;
 
-	},
-
-	setRequestHeader: function ( value ) {
-
-		this.requestHeader = value;
-		return this;
-
 	}
 
 } );

src/loaders/Loader.d.ts

@@ -11,6 +11,7 @@ export class Loader {
 	path: string;
 	resourcePath: string;
 	manager: LoadingManager;
+	requestHeader: { [header: string]: string };
 
 	/*
 	load(): void;
@@ -20,5 +21,6 @@ export class Loader {
 	setCrossOrigin( crossOrigin: string ): this;
 	setPath( path: string ): this;
 	setResourcePath( resourcePath: string ): this;
+	setRequestHeader( requestHeader: { [header: string]: string } ): this;
 
 }

src/loaders/Loader.js

@@ -11,6 +11,7 @@ function Loader( manager ) {
 	this.crossOrigin = 'anonymous';
 	this.path = '';
 	this.resourcePath = '';
+	this.requestHeader = {};
 
 }
 
@@ -39,6 +40,13 @@ Object.assign( Loader.prototype, {
 		this.resourcePath = resourcePath;
 		return this;
 
+	},
+
+	setRequestHeader: function ( requestHeader ) {
+
+		this.requestHeader = requestHeader;
+		return this;
+
 	}
 
 } );