Browse Source

XMLHttpRequest doesn't have crossOrigin. Fixes #7568.

Mr.doob 9 years ago
parent
commit
a88a3e62d7

+ 0 - 8
docs/api/loaders/MaterialLoader.html

@@ -37,14 +37,6 @@
 		Begin loading from url and return the [page:Material] object that will contain the data.
 		</div>
 
-		<h3>[method:null setCrossOrigin]( [page:String value] )</h3>
-		<div>
-		[page:String value] — The crossOrigin string.
-		</div>
-		<div>
-		The crossOrigin string to implement CORS for loading the url from a different domain that allows CORS.
-		</div>
-
 		<h3>[method:Material parse]( [page:Object json] )</h3>
 		<div>
 		[page:Object json] — The json object containing the parameters of the Material.

+ 0 - 5
docs/api/loaders/XHRLoader.html

@@ -32,11 +32,6 @@
 		A [page:Cache cache] instance that hold the response from each request made through this loader, so each file is requested once.
 		</div>
 
-		<h3>[property:String crossOrigin]</h3>
-		<div>
-		The crossOrigin string to implement CORS for loading the url from a different domain that allows CORS.
-		</div>
-
 		<h3>[property:String responseType]</h3>
 		<div>
 		Can be set to change the response type.

+ 0 - 1
examples/js/loaders/3MFLoader.js

@@ -13,7 +13,6 @@ THREE.ThreeMFLoader.prototype = {
 
 		var scope = this;
 		var loader = new THREE.XHRLoader( scope.manager );
-		loader.setCrossOrigin( this.crossOrigin );
 		loader.setResponseType( 'arraybuffer' );
 		loader.load( url, function( text ) {
 

+ 0 - 1
examples/js/loaders/AMFLoader.js

@@ -34,7 +34,6 @@ THREE.AMFLoader.prototype = {
 		var scope = this;
 
 		var loader = new THREE.XHRLoader( scope.manager );
-		loader.setCrossOrigin( this.crossOrigin );
 		loader.setResponseType( 'arraybuffer' );
 		loader.load( url, function( text ) {
 

+ 0 - 7
examples/js/loaders/AWDLoader.js

@@ -110,7 +110,6 @@
 			this._baseDir = url.substr( 0, url.lastIndexOf( '/' ) + 1 );
 
 			var loader = new THREE.XHRLoader( this.manager );
-			loader.setCrossOrigin( this.crossOrigin );
 			loader.setResponseType( 'arraybuffer' );
 			loader.load( url, function ( text ) {
 
@@ -120,12 +119,6 @@
 
 		},
 
-		setCrossOrigin: function ( value ) {
-
-			this.crossOrigin = value;
-
-		},
-
 		parse: function ( data ) {
 
 			var blen = data.byteLength;

+ 0 - 1
examples/js/loaders/AssimpJSONLoader.js

@@ -28,7 +28,6 @@ THREE.AssimpJSONLoader.prototype = {
 		this.texturePath = this.texturePath && ( typeof this.texturePath === "string" ) ? this.texturePath : this.extractUrlBase( url );
 
 		var loader = new THREE.XHRLoader( this.manager );
-		loader.setCrossOrigin( this.crossOrigin );
 		loader.load( url, function ( text ) {
 
 			var json = JSON.parse( text ), scene, metadata;

+ 0 - 7
examples/js/loaders/BabylonLoader.js

@@ -17,7 +17,6 @@ THREE.BabylonLoader.prototype = {
 		var scope = this;
 
 		var loader = new THREE.XHRLoader( scope.manager );
-		loader.setCrossOrigin( this.crossOrigin );
 		loader.load( url, function ( text ) {
 
 			onLoad( scope.parse( JSON.parse( text ) ) );
@@ -26,12 +25,6 @@ THREE.BabylonLoader.prototype = {
 
 	},
 
-	setCrossOrigin: function ( value ) {
-
-		this.crossOrigin = value;
-
-	},
-
 	parse: function ( json ) {
 
 		var materials = this.parseMaterials( json );

+ 0 - 2
examples/js/loaders/BinaryLoader.js

@@ -53,7 +53,6 @@ THREE.BinaryLoader.prototype = {
 		var scope = this;
 
 		var jsonloader = new THREE.XHRLoader( this.manager );
-		jsonloader.setCrossOrigin( this.crossOrigin );
 		jsonloader.load( url, function ( data ) {
 
 			var json = JSON.parse( data );
@@ -61,7 +60,6 @@ THREE.BinaryLoader.prototype = {
 			var bufferUrl = binaryPath + json.buffers;
 
 			var bufferLoader = new THREE.XHRLoader( scope.manager );
-			bufferLoader.setCrossOrigin( scope.crossOrigin );
 			bufferLoader.setResponseType( 'arraybuffer' );
 			bufferLoader.load( bufferUrl, function ( bufData ) {
 

+ 0 - 1
examples/js/loaders/ColladaLoader2.js

@@ -25,7 +25,6 @@ THREE.ColladaLoader.prototype = {
 		var scope = this;
 
 		var loader = new THREE.XHRLoader( scope.manager );
-		loader.setCrossOrigin( scope.crossOrigin );
 		loader.load( url, function ( text ) {
 
 			onLoad( scope.parse( text, getBaseUrl( url ) ) );

+ 0 - 1
examples/js/loaders/KMZLoader.js

@@ -17,7 +17,6 @@ THREE.KMZLoader.prototype = {
 		var scope = this;
 
 		var loader = new THREE.XHRLoader( scope.manager );
-		loader.setCrossOrigin( this.crossOrigin );
 		loader.setResponseType( 'arraybuffer' );
 		loader.load( url, function ( text ) {
 

+ 0 - 7
examples/js/loaders/MD2Loader.js

@@ -17,7 +17,6 @@ THREE.MD2Loader.prototype = {
 		var scope = this;
 
 		var loader = new THREE.XHRLoader( scope.manager );
-		loader.setCrossOrigin( this.crossOrigin );
 		loader.setResponseType( 'arraybuffer' );
 		loader.load( url, function ( buffer ) {
 
@@ -27,12 +26,6 @@ THREE.MD2Loader.prototype = {
 
 	},
 
-	setCrossOrigin: function ( value ) {
-
-		this.crossOrigin = value;
-
-	},
-
 	parse: ( function () {
 
 		var normals = [

+ 0 - 1
examples/js/loaders/MMDLoader.js

@@ -82,7 +82,6 @@ THREE.MMDLoader.prototype.load = function ( modelUrl, vmdUrl, callback, onProgre
 THREE.MMDLoader.prototype.loadFileAsBuffer = function ( url, onLoad, onProgress, onError ) {
 
 	var loader = new THREE.XHRLoader( this.manager );
-	loader.setCrossOrigin( this.crossOrigin );
 	loader.setResponseType( 'arraybuffer' );
 	loader.load( url, function ( buffer ) {
 

+ 0 - 1
examples/js/loaders/MTLLoader.js

@@ -19,7 +19,6 @@ THREE.MTLLoader.prototype = {
 		var scope = this;
 
 		var loader = new THREE.XHRLoader( this.manager );
-		loader.setCrossOrigin( this.crossOrigin );
 		loader.setPath( this.path );
 		loader.load( url, function ( text ) {
 

+ 0 - 7
examples/js/loaders/OBJLoader.js

@@ -19,7 +19,6 @@ THREE.OBJLoader.prototype = {
 		var scope = this;
 
 		var loader = new THREE.XHRLoader( scope.manager );
-		loader.setCrossOrigin( this.crossOrigin );
 		loader.setPath( this.path );
 		loader.load( url, function ( text ) {
 
@@ -29,12 +28,6 @@ THREE.OBJLoader.prototype = {
 
 	},
 
-	setCrossOrigin: function ( value ) {
-
-		this.crossOrigin = value;
-
-	},
-
 	setPath: function ( value ) {
 
 		this.path = value;

+ 0 - 7
examples/js/loaders/PDBLoader.js

@@ -17,7 +17,6 @@ THREE.PDBLoader.prototype = {
 		var scope = this;
 
 		var loader = new THREE.XHRLoader( scope.manager );
-		loader.setCrossOrigin( this.crossOrigin );
 		loader.load( url, function ( text ) {
 
 			var json = scope.parsePDB( text );
@@ -27,12 +26,6 @@ THREE.PDBLoader.prototype = {
 
 	},
 
-	setCrossOrigin: function ( value ) {
-
-		this.crossOrigin = value;
-
-	},
-
 	// Based on CanvasMol PDB parser
 
 	parsePDB: function ( text ) {

+ 0 - 7
examples/js/loaders/PLYLoader.js

@@ -44,7 +44,6 @@ THREE.PLYLoader.prototype = {
 		var scope = this;
 
 		var loader = new THREE.XHRLoader( this.manager );
-		loader.setCrossOrigin( this.crossOrigin );
 		loader.setResponseType( 'arraybuffer' );
 		loader.load( url, function ( text ) {
 
@@ -54,12 +53,6 @@ THREE.PLYLoader.prototype = {
 
 	},
 
-	setCrossOrigin: function ( value ) {
-
-		this.crossOrigin = value;
-
-	},
-
 	setPropertyNameMapping: function ( mapping ) {
 
 		this.propertyNameMapping = mapping;

+ 0 - 7
examples/js/loaders/PlayCanvasLoader.js

@@ -17,7 +17,6 @@ THREE.PlayCanvasLoader.prototype = {
 		var scope = this;
 
 		var loader = new THREE.XHRLoader( scope.manager );
-		loader.setCrossOrigin( this.crossOrigin );
 		loader.load( url, function ( text ) {
 
 			onLoad( scope.parse( JSON.parse( text ) ) );
@@ -165,12 +164,6 @@ THREE.PlayCanvasLoader.prototype = {
 
 		return model.nodes[ 0 ]._object;
 
-	},
-
-	setCrossOrigin: function ( value ) {
-
-		this.crossOrigin = value;
-
 	}
 
 };

+ 0 - 7
examples/js/loaders/STLLoader.js

@@ -42,7 +42,6 @@ THREE.STLLoader.prototype = {
 		var scope = this;
 
 		var loader = new THREE.XHRLoader( scope.manager );
-		loader.setCrossOrigin( this.crossOrigin );
 		loader.setResponseType( 'arraybuffer' );
 		loader.load( url, function ( text ) {
 
@@ -52,12 +51,6 @@ THREE.STLLoader.prototype = {
 
 	},
 
-	setCrossOrigin: function ( value ) {
-
-		this.crossOrigin = value;
-
-	},
-
 	parse: function ( data ) {
 
 		var isBinary = function () {

+ 0 - 7
examples/js/loaders/SVGLoader.js

@@ -20,7 +20,6 @@ THREE.SVGLoader.prototype = {
 		var parser = new DOMParser();
 
 		var loader = new THREE.XHRLoader( scope.manager );
-		loader.setCrossOrigin( this.crossOrigin );
 		loader.load( url, function ( svgString ) {
 
 			var doc = parser.parseFromString( svgString, 'image/svg+xml' );  // application/xml
@@ -29,12 +28,6 @@ THREE.SVGLoader.prototype = {
 
 		}, onProgress, onError );
 
-	},
-
-	setCrossOrigin: function ( value ) {
-
-		this.crossOrigin = value;
-
 	}
 
 };

+ 0 - 1
examples/js/loaders/VRMLLoader.js

@@ -31,7 +31,6 @@ THREE.VRMLLoader.prototype = {
 		var scope = this;
 
 		var loader = new THREE.XHRLoader( this.manager );
-		loader.setCrossOrigin( this.crossOrigin );
 		loader.load( url, function ( text ) {
 
 			onLoad( scope.parse( text ) );

+ 0 - 7
examples/js/loaders/VTKLoader.js

@@ -17,7 +17,6 @@ THREE.VTKLoader.prototype = {
 		var scope = this;
 
 		var loader = new THREE.XHRLoader( scope.manager );
-		loader.setCrossOrigin( this.crossOrigin );
 		loader.load( url, function ( text ) {
 
 			onLoad( scope.parse( text ) );
@@ -26,12 +25,6 @@ THREE.VTKLoader.prototype = {
 
 	},
 
-	setCrossOrigin: function ( value ) {
-
-		this.crossOrigin = value;
-
-	},
-
 	parse: function ( data ) {
 
 		var indices = [];

+ 0 - 7
examples/js/loaders/deprecated/SceneLoader.js

@@ -29,7 +29,6 @@ THREE.SceneLoader.prototype = {
 		var scope = this;
 
 		var loader = new THREE.XHRLoader( scope.manager );
-		loader.setCrossOrigin( this.crossOrigin );
 		loader.load( url, function ( text ) {
 
 			scope.parse( JSON.parse( text ), onLoad, url );
@@ -38,12 +37,6 @@ THREE.SceneLoader.prototype = {
 
 	},
 
-	setCrossOrigin: function ( value ) {
-
-		this.crossOrigin = value;
-
-	},
-
 	addGeometryHandler: function ( typeID, loaderClass ) {
 
 		this.geometryHandlers[ typeID ] = { "loaderClass": loaderClass };

+ 0 - 7
src/loaders/AnimationLoader.js

@@ -17,7 +17,6 @@ THREE.AnimationLoader.prototype = {
 		var scope = this;
 
 		var loader = new THREE.XHRLoader( scope.manager );
-		loader.setCrossOrigin( this.crossOrigin );
 		loader.load( url, function ( text ) {
 
 			onLoad( scope.parse( JSON.parse( text ) ) );
@@ -26,12 +25,6 @@ THREE.AnimationLoader.prototype = {
 
 	},
 
-	setCrossOrigin: function ( value ) {
-
-		this.crossOrigin = value;
-
-	},
-
 	parse: function ( json, onLoad ) {
 
 		var animations = [];

+ 0 - 7
src/loaders/BinaryTextureLoader.js

@@ -24,7 +24,6 @@ THREE.BinaryTextureLoader.prototype = {
 		var texture = new THREE.DataTexture();
 
 		var loader = new THREE.XHRLoader( this.manager );
-		loader.setCrossOrigin( this.crossOrigin );
 		loader.setResponseType( 'arraybuffer' );
 
 		loader.load( url, function ( buffer ) {
@@ -85,12 +84,6 @@ THREE.BinaryTextureLoader.prototype = {
 
 		return texture;
 
-	},
-
-	setCrossOrigin: function ( value ) {
-
-		this.crossOrigin = value;
-
 	}
 
 };

+ 0 - 7
src/loaders/BufferGeometryLoader.js

@@ -17,7 +17,6 @@ THREE.BufferGeometryLoader.prototype = {
 		var scope = this;
 
 		var loader = new THREE.XHRLoader( scope.manager );
-		loader.setCrossOrigin( this.crossOrigin );
 		loader.load( url, function ( text ) {
 
 			onLoad( scope.parse( JSON.parse( text ) ) );
@@ -26,12 +25,6 @@ THREE.BufferGeometryLoader.prototype = {
 
 	},
 
-	setCrossOrigin: function ( value ) {
-
-		this.crossOrigin = value;
-
-	},
-
 	parse: function ( json ) {
 
 		var geometry = new THREE.BufferGeometry();

+ 0 - 7
src/loaders/CompressedTextureLoader.js

@@ -28,7 +28,6 @@ THREE.CompressedTextureLoader.prototype = {
 		texture.image = images;
 
 		var loader = new THREE.XHRLoader( this.manager );
-		loader.setCrossOrigin( this.crossOrigin );
 		loader.setPath( this.path );
 		loader.setResponseType( 'arraybuffer' );
 
@@ -127,12 +126,6 @@ THREE.CompressedTextureLoader.prototype = {
 
 	},
 
-	setCrossOrigin: function ( value ) {
-
-		this.crossOrigin = value;
-
-	},
-
 	setPath: function ( value ) {
 
 		this.path = value;

+ 0 - 7
src/loaders/JSONLoader.js

@@ -44,7 +44,6 @@ THREE.JSONLoader.prototype = {
 		var texturePath = this.texturePath && ( typeof this.texturePath === "string" ) ? this.texturePath : THREE.Loader.prototype.extractUrlBase( url );
 
 		var loader = new THREE.XHRLoader( this.manager );
-		loader.setCrossOrigin( this.crossOrigin );
 		loader.setWithCredentials( this.withCredentials );
 		loader.load( url, function ( text ) {
 
@@ -82,12 +81,6 @@ THREE.JSONLoader.prototype = {
 
 	},
 
-	setCrossOrigin: function ( value ) {
-
-		this.crossOrigin = value;
-
-	},
-
 	setTexturePath: function ( value ) {
 
 		this.texturePath = value;

+ 0 - 7
src/loaders/MaterialLoader.js

@@ -18,7 +18,6 @@ THREE.MaterialLoader.prototype = {
 		var scope = this;
 
 		var loader = new THREE.XHRLoader( scope.manager );
-		loader.setCrossOrigin( this.crossOrigin );
 		loader.load( url, function ( text ) {
 
 			onLoad( scope.parse( JSON.parse( text ) ) );
@@ -27,12 +26,6 @@ THREE.MaterialLoader.prototype = {
 
 	},
 
-	setCrossOrigin: function ( value ) {
-
-		this.crossOrigin = value;
-
-	},
-
 	setTextures: function ( value ) {
 
 		this.textures = value;

+ 1 - 2
src/loaders/ObjectLoader.js

@@ -24,7 +24,6 @@ THREE.ObjectLoader.prototype = {
 		var scope = this;
 
 		var loader = new THREE.XHRLoader( scope.manager );
-		loader.setCrossOrigin( this.crossOrigin );
 		loader.load( url, function ( text ) {
 
 			scope.parse( JSON.parse( text ), onLoad );
@@ -525,7 +524,7 @@ THREE.ObjectLoader.prototype = {
 
 					} else {
 
-						object = new THREE.Mesh( geometry, material );	
+						object = new THREE.Mesh( geometry, material );
 
 					}
 

+ 2 - 9
src/loaders/XHRLoader.js

@@ -80,7 +80,6 @@ THREE.XHRLoader.prototype = {
 
 		}, false );
 
-		if ( this.crossOrigin !== undefined ) request.crossOrigin = this.crossOrigin;
 		if ( this.responseType !== undefined ) request.responseType = this.responseType;
 		if ( this.withCredentials !== undefined ) request.withCredentials = this.withCredentials;
 
@@ -92,9 +91,9 @@ THREE.XHRLoader.prototype = {
 
 	},
 
-	setCrossOrigin: function ( value ) {
+	setPath: function ( value ) {
 
-		this.crossOrigin = value;
+		this.path = value;
 
 	},
 
@@ -104,12 +103,6 @@ THREE.XHRLoader.prototype = {
 
 	},
 
-	setPath: function ( value ) {
-
-		this.path = value;
-
-	},
-
 	setWithCredentials: function ( value ) {
 
 		this.withCredentials = value;