diff --git a/docs/api/en/loaders/FileLoader.html b/docs/api/en/loaders/FileLoader.html index ab81a82539ece2..98d32654803d3d 100644 --- a/docs/api/en/loaders/FileLoader.html +++ b/docs/api/en/loaders/FileLoader.html @@ -69,9 +69,6 @@

[property:String mimeType]

See [page:.setMimeType]. Default is *undefined*.

-

[property:Object requestHeader]

-

The [link:https://developer.mozilla.org/en-US/docs/Glossary/Request_header request header] used in HTTP request. See [page:.setRequestHeader]. Default is *undefined*.

-

[property:String responseType]

The expected response type. See [page:.setResponseType]. Default is *undefined*.

@@ -102,13 +99,6 @@

[method:FileLoader setMimeType]( [param:String mimeType] )

of the file being loaded. Note that in many cases this will be determined automatically, so by default it is *undefined*.

-

[method:FileLoader setRequestHeader]( [param:Object requestHeader] )

-

- [page:object requestHeader] - key: The name of the header whose value is to be set. value: The value to set as the body of the header.

- - Set the [link:https://developer.mozilla.org/en-US/docs/Glossary/Request_header request header] used in HTTP request. -

-

[method:FileLoader setResponseType]( [param:String responseType] )

Change the response type. Valid values are:
diff --git a/docs/api/en/loaders/Loader.html b/docs/api/en/loaders/Loader.html index be58a16d6a731e..3963663976f2f5 100644 --- a/docs/api/en/loaders/Loader.html +++ b/docs/api/en/loaders/Loader.html @@ -50,6 +50,11 @@

[property:String resourcePath]

Default is the empty string.

+

[property:Object requestHeader]

+

+ The [link:https://developer.mozilla.org/en-US/docs/Glossary/Request_header request header] used in HTTP request. See [page:.setRequestHeader]. Default is empty object. +

+

Methods

[method:void load]()

@@ -89,6 +94,13 @@

[method:Loader setResourcePath]( [param:String resourcePath] )

[page:String resourcePath] — Set the base path for dependent resources like textures.

+

[method:Loader setRequestHeader]( [param:Object requestHeader] )

+

+ [page:object requestHeader] - key: The name of the header whose value is to be set. value: The value to set as the body of the header.

+ + Set the [link:https://developer.mozilla.org/en-US/docs/Glossary/Request_header request header] used in HTTP request. +

+

Source

diff --git a/examples/js/loaders/GLTFLoader.js b/examples/js/loaders/GLTFLoader.js index 1b3017ffe6b307..7c75e0afffc1e1 100644 --- a/examples/js/loaders/GLTFLoader.js +++ b/examples/js/loaders/GLTFLoader.js @@ -67,6 +67,7 @@ THREE.GLTFLoader = ( function () { loader.setPath( this.path ); loader.setResponseType( 'arraybuffer' ); + loader.setRequestHeader( this.requestHeader ); if ( scope.crossOrigin === 'use-credentials' ) { @@ -218,6 +219,7 @@ THREE.GLTFLoader = ( function () { } ); + parser.fileLoader.setRequestHeader( this.requestHeader ); parser.parse( onLoad, onError ); } diff --git a/examples/jsm/loaders/GLTFLoader.js b/examples/jsm/loaders/GLTFLoader.js index 17c50255f2150d..de47e1eb3e6942 100644 --- a/examples/jsm/loaders/GLTFLoader.js +++ b/examples/jsm/loaders/GLTFLoader.js @@ -78,7 +78,6 @@ var GLTFLoader = ( function () { this.dracoLoader = null; this.ddsLoader = null; - } GLTFLoader.prototype = Object.assign( Object.create( Loader.prototype ), { @@ -131,6 +130,7 @@ var GLTFLoader = ( function () { loader.setPath( this.path ); loader.setResponseType( 'arraybuffer' ); + loader.setRequestHeader( this.requestHeader ); if ( scope.crossOrigin === 'use-credentials' ) { @@ -282,6 +282,7 @@ var GLTFLoader = ( function () { } ); + parser.fileLoader.setRequestHeader( this.requestHeader ); parser.parse( onLoad, onError ); } diff --git a/src/loaders/FileLoader.d.ts b/src/loaders/FileLoader.d.ts index c7ec1a4963fd7f..933aec49dcaa81 100644 --- a/src/loaders/FileLoader.d.ts +++ b/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; } diff --git a/src/loaders/FileLoader.js b/src/loaders/FileLoader.js index 1cc47baa14285e..452bfd3c807411 100644 --- a/src/loaders/FileLoader.js +++ b/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; - } } ); diff --git a/src/loaders/Loader.d.ts b/src/loaders/Loader.d.ts index ef9bf7bd296104..fefe671e798f94 100644 --- a/src/loaders/Loader.d.ts +++ b/src/loaders/Loader.d.ts @@ -11,6 +11,7 @@ export class Loader { path: string; resourcePath: string; manager: LoadingManager; + requestHeader: { [header: string]: string }; /* load(): void; @@ -22,5 +23,6 @@ export class Loader { setCrossOrigin( crossOrigin: string ): this; setPath( path: string ): this; setResourcePath( resourcePath: string ): this; + setRequestHeader( requestHeader: { [header: string]: string } ): this; } diff --git a/src/loaders/Loader.js b/src/loaders/Loader.js index 0f3b8d0fe21fcc..a21ecd84a687b3 100644 --- a/src/loaders/Loader.js +++ b/src/loaders/Loader.js @@ -11,6 +11,7 @@ function Loader( manager ) { this.crossOrigin = 'anonymous'; this.path = ''; this.resourcePath = ''; + this.requestHeader = {}; } @@ -51,6 +52,13 @@ Object.assign( Loader.prototype, { this.resourcePath = resourcePath; return this; + }, + + setRequestHeader: function ( requestHeader ) { + + this.requestHeader = requestHeader; + return this; + } } );