Skip to content

Commit c2cec2e

Browse files
mrdoobmrdoob
committed
Renamed XHRLoader to FileLoader.
1 parent a6cb0b6 commit c2cec2e

13 files changed

+33
-25
lines changed

‎src/Three.Legacy.js

+8
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import { ExtrudeGeometry } from './geometries/ExtrudeGeometry.js';
1818
import { ShapeGeometry } from './geometries/ShapeGeometry.js';
1919
import { WireframeGeometry } from './geometries/WireframeGeometry.js';
2020
import { Light } from './lights/Light.js';
21+
import { FileLoader } from './loaders/FileLoader.js';
2122
import { AudioLoader } from './loaders/AudioLoader.js';
2223
import { CubeTextureLoader } from './loaders/CubeTextureLoader.js';
2324
import { TextureLoader } from './loaders/TextureLoader.js';
@@ -105,6 +106,13 @@ export function WireframeHelper( object, hex ) {
105106

106107
//
107108

109+
export function XHRLoader( manager ) {
110+
console.warn( 'THREE.XHRLoader has been renamed to THREE.FileLoader.' );
111+
return new FileLoader( manager );
112+
}
113+
114+
//
115+
108116
Object.assign( Box2.prototype, {
109117
center: function ( optionalTarget ) {
110118
console.warn( 'THREE.Box2: .center() has been renamed to .getCenter().' );

‎src/Three.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export { DefaultLoadingManager, LoadingManager } from './loaders/LoadingManager.
4242
export { JSONLoader } from './loaders/JSONLoader.js';
4343
export { ImageLoader } from './loaders/ImageLoader.js';
4444
export { FontLoader } from './loaders/FontLoader.js';
45-
export { XHRLoader } from './loaders/XHRLoader.js';
45+
export { FileLoader } from './loaders/FileLoader.js';
4646
export { Loader } from './loaders/Loader.js';
4747
export { Cache } from './loaders/Cache.js';
4848
export { AudioLoader } from './loaders/AudioLoader.js';

‎src/loaders/AnimationLoader.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { AnimationClip } from '../animation/AnimationClip';
2-
import { XHRLoader } from './XHRLoader';
2+
import { FileLoader } from './FileLoader';
33
import { DefaultLoadingManager } from './LoadingManager';
44

55
/**
@@ -18,7 +18,7 @@ Object.assign( AnimationLoader.prototype, {
1818

1919
var scope = this;
2020

21-
var loader = new XHRLoader( scope.manager );
21+
var loader = new FileLoader( scope.manager );
2222
loader.load( url, function ( text ) {
2323

2424
onLoad( scope.parse( JSON.parse( text ) ) );

‎src/loaders/AudioLoader.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { getAudioContext } from '../audio/AudioContext';
2-
import { XHRLoader } from './XHRLoader';
2+
import { FileLoader } from './FileLoader';
33
import { DefaultLoadingManager } from './LoadingManager';
44

55
/**
@@ -16,7 +16,7 @@ Object.assign( AudioLoader.prototype, {
1616

1717
load: function ( url, onLoad, onProgress, onError ) {
1818

19-
var loader = new XHRLoader( this.manager );
19+
var loader = new FileLoader( this.manager );
2020
loader.setResponseType( 'arraybuffer' );
2121
loader.load( url, function ( buffer ) {
2222

‎src/loaders/BinaryTextureLoader.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { LinearFilter, LinearMipMapLinearFilter, ClampToEdgeWrapping } from '../constants';
2-
import { XHRLoader } from './XHRLoader';
2+
import { FileLoader } from './FileLoader';
33
import { DataTexture } from '../textures/DataTexture';
44
import { DefaultLoadingManager } from './LoadingManager';
55

@@ -27,7 +27,7 @@ Object.assign( BinaryTextureLoader.prototype, {
2727

2828
var texture = new DataTexture();
2929

30-
var loader = new XHRLoader( this.manager );
30+
var loader = new FileLoader( this.manager );
3131
loader.setResponseType( 'arraybuffer' );
3232

3333
loader.load( url, function ( buffer ) {

‎src/loaders/BufferGeometryLoader.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Sphere } from '../math/Sphere';
22
import { Vector3 } from '../math/Vector3';
33
import { BufferAttribute } from '../core/BufferAttribute';
44
import { BufferGeometry } from '../core/BufferGeometry';
5-
import { XHRLoader } from './XHRLoader';
5+
import { FileLoader } from './FileLoader';
66
import { DefaultLoadingManager } from './LoadingManager';
77

88
/**
@@ -21,7 +21,7 @@ Object.assign( BufferGeometryLoader.prototype, {
2121

2222
var scope = this;
2323

24-
var loader = new XHRLoader( scope.manager );
24+
var loader = new FileLoader( scope.manager );
2525
loader.load( url, function ( text ) {
2626

2727
onLoad( scope.parse( JSON.parse( text ) ) );

‎src/loaders/CompressedTextureLoader.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { LinearFilter } from '../constants';
2-
import { XHRLoader } from './XHRLoader';
2+
import { FileLoader } from './FileLoader';
33
import { CompressedTexture } from '../textures/CompressedTexture';
44
import { DefaultLoadingManager } from './LoadingManager';
55

@@ -29,7 +29,7 @@ Object.assign( CompressedTextureLoader.prototype, {
2929
var texture = new CompressedTexture();
3030
texture.image = images;
3131

32-
var loader = new XHRLoader( this.manager );
32+
var loader = new FileLoader( this.manager );
3333
loader.setPath( this.path );
3434
loader.setResponseType( 'arraybuffer' );
3535

‎src/loaders/XHRLoader.js ‎src/loaders/FileLoader.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ import { DefaultLoadingManager } from './LoadingManager';
55
* @author mrdoob / http://mrdoob.com/
66
*/
77

8-
function XHRLoader( manager ) {
8+
function FileLoader( manager ) {
99

1010
this.manager = ( manager !== undefined ) ? manager : DefaultLoadingManager;
1111

1212
}
1313

14-
Object.assign( XHRLoader.prototype, {
14+
Object.assign( FileLoader.prototype, {
1515

1616
load: function ( url, onLoad, onProgress, onError ) {
1717

@@ -147,7 +147,7 @@ Object.assign( XHRLoader.prototype, {
147147
// Some browsers return HTTP Status 0 when using non-http protocol
148148
// e.g. 'file://' or 'data://'. Handle as success.
149149

150-
console.warn( 'THREE.XHRLoader: HTTP Status 0 received.' );
150+
console.warn( 'THREE.FileLoader: HTTP Status 0 received.' );
151151

152152
if ( onLoad ) onLoad( response );
153153

@@ -220,4 +220,4 @@ Object.assign( XHRLoader.prototype, {
220220
} );
221221

222222

223-
export { XHRLoader };
223+
export { FileLoader };

‎src/loaders/FontLoader.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Font } from '../extras/core/Font';
2-
import { XHRLoader } from './XHRLoader';
2+
import { FileLoader } from './FileLoader';
33
import { DefaultLoadingManager } from './LoadingManager';
44

55
/**
@@ -18,7 +18,7 @@ Object.assign( FontLoader.prototype, {
1818

1919
var scope = this;
2020

21-
var loader = new XHRLoader( this.manager );
21+
var loader = new FileLoader( this.manager );
2222
loader.load( url, function ( text ) {
2323

2424
var json;

‎src/loaders/ImageLoader.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { XHRLoader } from './XHRLoader';
1+
import { FileLoader } from './FileLoader';
22
import { DefaultLoadingManager } from './LoadingManager';
33

44
/**
@@ -37,7 +37,7 @@ Object.assign( ImageLoader.prototype, {
3737

3838
} else {
3939

40-
var loader = new XHRLoader();
40+
var loader = new FileLoader();
4141
loader.setPath( this.path );
4242
loader.setResponseType( 'blob' );
4343
loader.setWithCredentials( this.withCredentials );

‎src/loaders/JSONLoader.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { Color } from '../math/Color';
66
import { Vector2 } from '../math/Vector2';
77
import { Face3 } from '../core/Face3';
88
import { Geometry } from '../core/Geometry';
9-
import { XHRLoader } from './XHRLoader';
9+
import { FileLoader } from './FileLoader';
1010
import { DefaultLoadingManager } from './LoadingManager';
1111

1212
/**
@@ -37,7 +37,7 @@ Object.assign( JSONLoader.prototype, {
3737

3838
var texturePath = this.texturePath && ( typeof this.texturePath === "string" ) ? this.texturePath : Loader.prototype.extractUrlBase( url );
3939

40-
var loader = new XHRLoader( this.manager );
40+
var loader = new FileLoader( this.manager );
4141
loader.setWithCredentials( this.withCredentials );
4242
loader.load( url, function ( text ) {
4343

‎src/loaders/MaterialLoader.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Vector2 } from '../math/Vector2';
2-
import { XHRLoader } from './XHRLoader';
2+
import { FileLoader } from './FileLoader';
33
import { DefaultLoadingManager } from './LoadingManager';
44
import * as Materials from '../materials/Materials';
55

@@ -20,7 +20,7 @@ Object.assign( MaterialLoader.prototype, {
2020

2121
var scope = this;
2222

23-
var loader = new XHRLoader( scope.manager );
23+
var loader = new FileLoader( scope.manager );
2424
loader.load( url, function ( text ) {
2525

2626
onLoad( scope.parse( JSON.parse( text ) ) );

‎src/loaders/ObjectLoader.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import { AnimationClip } from '../animation/AnimationClip';
2727
import { MaterialLoader } from './MaterialLoader';
2828
import { BufferGeometryLoader } from './BufferGeometryLoader';
2929
import { JSONLoader } from './JSONLoader';
30-
import { XHRLoader } from './XHRLoader';
30+
import { FileLoader } from './FileLoader';
3131
import * as Geometries from '../geometries/Geometries';
3232

3333
/**
@@ -53,7 +53,7 @@ Object.assign( ObjectLoader.prototype, {
5353

5454
var scope = this;
5555

56-
var loader = new XHRLoader( scope.manager );
56+
var loader = new FileLoader( scope.manager );
5757
loader.load( url, function ( text ) {
5858

5959
var json = null;

0 commit comments

Comments
 (0)