Browse Source

ImageLoader: Use XHRLoader internally.

Mr.doob 9 years ago
parent
commit
a2a8589afc
1 changed files with 10 additions and 58 deletions
  1. 10 58
      src/loaders/ImageLoader.js

+ 10 - 58
src/loaders/ImageLoader.js

@@ -14,71 +14,23 @@ THREE.ImageLoader.prototype = {
 
 	load: function ( url, onLoad, onProgress, onError ) {
 
-		if ( this.path !== undefined ) url = this.path + url;
-
-		var scope = this;
-
-		var cached = THREE.Cache.get( url );
-
-		if ( cached !== undefined ) {
-
-			scope.manager.itemStart( url );
-
-			if ( onLoad ) {
-
-				setTimeout( function () {
-
-					onLoad( cached );
-
-					scope.manager.itemEnd( url );
-
-				}, 0 );
-
-			} else {
-
-				scope.manager.itemEnd( url );
-
-			}
-
-			return cached;
-
-		}
-
 		var image = document.createElement( 'img' );
 
-		image.addEventListener( 'load', function ( event ) {
-
-			THREE.Cache.add( url, this );
-
-			if ( onLoad ) onLoad( this );
-
-			scope.manager.itemEnd( url );
-
-		}, false );
-
-		if ( onProgress !== undefined ) {
-
-			image.addEventListener( 'progress', function ( event ) {
-
-				onProgress( event );
-
-			}, false );
-
-		}
-
-		image.addEventListener( 'error', function ( event ) {
-
-			if ( onError ) onError( event );
+		var loader = new THREE.XHRLoader( this.manager );
+		loader.setPath( this.path );
+		loader.setResponseType( 'blob' );
+		loader.load( url, function ( blob ) {
 
-			scope.manager.itemError( url );
+			image.onload = function () {
 
-		}, false );
+				URL.revokeObjectURL( image.src );
+				if ( onLoad ) onLoad( image );
 
-		if ( this.crossOrigin !== undefined ) image.crossOrigin = this.crossOrigin;
+			};
 
-		scope.manager.itemStart( url );
+			image.src = URL.createObjectURL( blob );
 
-		image.src = url;
+		}, onProgress, onError );
 
 		return image;