Renamed XHRLoader to FileLoader.

src/Three.Legacy.js

@@ -18,6 +18,7 @@ import { ExtrudeGeometry } from './geometries/ExtrudeGeometry.js';
 import { ShapeGeometry } from './geometries/ShapeGeometry.js';
 import { WireframeGeometry } from './geometries/WireframeGeometry.js';
 import { Light } from './lights/Light.js';
+import { FileLoader } from './loaders/FileLoader.js';
 import { AudioLoader } from './loaders/AudioLoader.js';
 import { CubeTextureLoader } from './loaders/CubeTextureLoader.js';
 import { TextureLoader } from './loaders/TextureLoader.js';
@@ -105,6 +106,13 @@ export function WireframeHelper( object, hex ) {
 
 //
 
+export function XHRLoader( manager ) {
+	console.warn( 'THREE.XHRLoader has been renamed to THREE.FileLoader.' );
+	return new FileLoader( manager );
+}
+
+//
+
 Object.assign( Box2.prototype, {
 	center: function ( optionalTarget ) {
 		console.warn( 'THREE.Box2: .center() has been renamed to .getCenter().' );

src/Three.js

@@ -42,7 +42,7 @@ export { DefaultLoadingManager, LoadingManager } from './loaders/LoadingManager.
 export { JSONLoader } from './loaders/JSONLoader.js';
 export { ImageLoader } from './loaders/ImageLoader.js';
 export { FontLoader } from './loaders/FontLoader.js';
-export { XHRLoader } from './loaders/XHRLoader.js';
+export { FileLoader } from './loaders/FileLoader.js';
 export { Loader } from './loaders/Loader.js';
 export { Cache } from './loaders/Cache.js';
 export { AudioLoader } from './loaders/AudioLoader.js';

src/loaders/AnimationLoader.js

@@ -1,5 +1,5 @@
 import { AnimationClip } from '../animation/AnimationClip';
-import { XHRLoader } from './XHRLoader';
+import { FileLoader } from './FileLoader';
 import { DefaultLoadingManager } from './LoadingManager';
 
 /**
@@ -18,7 +18,7 @@ Object.assign( AnimationLoader.prototype, {
 
 		var scope = this;
 
-		var loader = new XHRLoader( scope.manager );
+		var loader = new FileLoader( scope.manager );
 		loader.load( url, function ( text ) {
 
 			onLoad( scope.parse( JSON.parse( text ) ) );

src/loaders/AudioLoader.js

@@ -1,5 +1,5 @@
 import { getAudioContext } from '../audio/AudioContext';
-import { XHRLoader } from './XHRLoader';
+import { FileLoader } from './FileLoader';
 import { DefaultLoadingManager } from './LoadingManager';
 
 /**
@@ -16,7 +16,7 @@ Object.assign( AudioLoader.prototype, {
 
 	load: function ( url, onLoad, onProgress, onError ) {
 
-		var loader = new XHRLoader( this.manager );
+		var loader = new FileLoader( this.manager );
 		loader.setResponseType( 'arraybuffer' );
 		loader.load( url, function ( buffer ) {
 

src/loaders/BinaryTextureLoader.js

@@ -1,5 +1,5 @@
 import { LinearFilter, LinearMipMapLinearFilter, ClampToEdgeWrapping } from '../constants';
-import { XHRLoader } from './XHRLoader';
+import { FileLoader } from './FileLoader';
 import { DataTexture } from '../textures/DataTexture';
 import { DefaultLoadingManager } from './LoadingManager';
 
@@ -27,7 +27,7 @@ Object.assign( BinaryTextureLoader.prototype, {
 
 		var texture = new DataTexture();
 
-		var loader = new XHRLoader( this.manager );
+		var loader = new FileLoader( this.manager );
 		loader.setResponseType( 'arraybuffer' );
 
 		loader.load( url, function ( buffer ) {

src/loaders/BufferGeometryLoader.js

@@ -2,7 +2,7 @@ import { Sphere } from '../math/Sphere';
 import { Vector3 } from '../math/Vector3';
 import { BufferAttribute } from '../core/BufferAttribute';
 import { BufferGeometry } from '../core/BufferGeometry';
-import { XHRLoader } from './XHRLoader';
+import { FileLoader } from './FileLoader';
 import { DefaultLoadingManager } from './LoadingManager';
 
 /**
@@ -21,7 +21,7 @@ Object.assign( BufferGeometryLoader.prototype, {
 
 		var scope = this;
 
-		var loader = new XHRLoader( scope.manager );
+		var loader = new FileLoader( scope.manager );
 		loader.load( url, function ( text ) {
 
 			onLoad( scope.parse( JSON.parse( text ) ) );

src/loaders/CompressedTextureLoader.js

@@ -1,5 +1,5 @@
 import { LinearFilter } from '../constants';
-import { XHRLoader } from './XHRLoader';
+import { FileLoader } from './FileLoader';
 import { CompressedTexture } from '../textures/CompressedTexture';
 import { DefaultLoadingManager } from './LoadingManager';
 
@@ -29,7 +29,7 @@ Object.assign( CompressedTextureLoader.prototype, {
 		var texture = new CompressedTexture();
 		texture.image = images;
 
-		var loader = new XHRLoader( this.manager );
+		var loader = new FileLoader( this.manager );
 		loader.setPath( this.path );
 		loader.setResponseType( 'arraybuffer' );
 

src/loaders/XHRLoader.js → src/loaders/FileLoader.js

@@ -5,13 +5,13 @@ import { DefaultLoadingManager } from './LoadingManager';
  * @author mrdoob / http://mrdoob.com/
  */
 
-function XHRLoader( manager ) {
+function FileLoader( manager ) {
 
 	this.manager = ( manager !== undefined ) ? manager : DefaultLoadingManager;
 
 }
 
-Object.assign( XHRLoader.prototype, {
+Object.assign( FileLoader.prototype, {
 
 	load: function ( url, onLoad, onProgress, onError ) {
 
@@ -147,7 +147,7 @@ Object.assign( XHRLoader.prototype, {
 					// Some browsers return HTTP Status 0 when using non-http protocol
 					// e.g. 'file://' or 'data://'. Handle as success.
 
-					console.warn( 'THREE.XHRLoader: HTTP Status 0 received.' );
+					console.warn( 'THREE.FileLoader: HTTP Status 0 received.' );
 
 					if ( onLoad ) onLoad( response );
 
@@ -220,4 +220,4 @@ Object.assign( XHRLoader.prototype, {
 } );
 
 
-export { XHRLoader };
+export { FileLoader };

src/loaders/FontLoader.js

@@ -1,5 +1,5 @@
 import { Font } from '../extras/core/Font';
-import { XHRLoader } from './XHRLoader';
+import { FileLoader } from './FileLoader';
 import { DefaultLoadingManager } from './LoadingManager';
 
 /**
@@ -18,7 +18,7 @@ Object.assign( FontLoader.prototype, {
 
 		var scope = this;
 
-		var loader = new XHRLoader( this.manager );
+		var loader = new FileLoader( this.manager );
 		loader.load( url, function ( text ) {
 
 			var json;

src/loaders/ImageLoader.js

@@ -1,4 +1,4 @@
-import { XHRLoader } from './XHRLoader';
+import { FileLoader } from './FileLoader';
 import { DefaultLoadingManager } from './LoadingManager';
 
 /**
@@ -37,7 +37,7 @@ Object.assign( ImageLoader.prototype, {
 
 		} else {
 
-			var loader = new XHRLoader();
+			var loader = new FileLoader();
 			loader.setPath( this.path );
 			loader.setResponseType( 'blob' );
 			loader.setWithCredentials( this.withCredentials );

src/loaders/JSONLoader.js

@@ -6,7 +6,7 @@ import { Color } from '../math/Color';
 import { Vector2 } from '../math/Vector2';
 import { Face3 } from '../core/Face3';
 import { Geometry } from '../core/Geometry';
-import { XHRLoader } from './XHRLoader';
+import { FileLoader } from './FileLoader';
 import { DefaultLoadingManager } from './LoadingManager';
 
 /**
@@ -37,7 +37,7 @@ Object.assign( JSONLoader.prototype, {
 
 		var texturePath = this.texturePath && ( typeof this.texturePath === "string" ) ? this.texturePath : Loader.prototype.extractUrlBase( url );
 
-		var loader = new XHRLoader( this.manager );
+		var loader = new FileLoader( this.manager );
 		loader.setWithCredentials( this.withCredentials );
 		loader.load( url, function ( text ) {
 

src/loaders/MaterialLoader.js

@@ -1,5 +1,5 @@
 import { Vector2 } from '../math/Vector2';
-import { XHRLoader } from './XHRLoader';
+import { FileLoader } from './FileLoader';
 import { DefaultLoadingManager } from './LoadingManager';
 import * as Materials from '../materials/Materials';
 
@@ -20,7 +20,7 @@ Object.assign( MaterialLoader.prototype, {
 
 		var scope = this;
 
-		var loader = new XHRLoader( scope.manager );
+		var loader = new FileLoader( scope.manager );
 		loader.load( url, function ( text ) {
 
 			onLoad( scope.parse( JSON.parse( text ) ) );

src/loaders/ObjectLoader.js

@@ -27,7 +27,7 @@ import { AnimationClip } from '../animation/AnimationClip';
 import { MaterialLoader } from './MaterialLoader';
 import { BufferGeometryLoader } from './BufferGeometryLoader';
 import { JSONLoader } from './JSONLoader';
-import { XHRLoader } from './XHRLoader';
+import { FileLoader } from './FileLoader';
 import * as Geometries from '../geometries/Geometries';
 
 /**
@@ -53,7 +53,7 @@ Object.assign( ObjectLoader.prototype, {
 
 		var scope = this;
 
-		var loader = new XHRLoader( scope.manager );
+		var loader = new FileLoader( scope.manager );
 		loader.load( url, function ( text ) {
 
 			var json = null;