2
0
Эх сурвалжийг харах

ImageUtils.loadTGA now using XHRLoader.

Mr.doob 11 жил өмнө
parent
commit
cd73e51035
1 өөрчлөгдсөн 16 нэмэгдсэн , 28 устгасан
  1. 16 28
      src/extras/ImageUtils.js

+ 16 - 28
src/extras/ImageUtils.js

@@ -638,41 +638,29 @@ THREE.ImageUtils = {
 
         loadTGATexture: function ( url, mapping, onLoad, onError ) {
                
-                var texture = new THREE.DataTexture();                
-                {
-                    var request = new XMLHttpRequest();
+            var texture = new THREE.DataTexture();
 
-                    request.open( 'GET', url, true );
-                    request.responseType = "arraybuffer";
-                    
-                    request.addEventListener( 'load', function ( event ) {
-
-                            var imageData = THREE.ImageUtils.decodeTGA( this.response );
+            var loader = new THREE.XHRLoader();
+            loader.setResponseType( 'arraybuffer' );
+            loader.load( url, function ( buffer ) {
 
-                            if ( imageData ) {
-                                texture.image = imageData;
-                                texture.sourceFile = url;
-                                texture.needsUpdate = true;
+                var imageData = THREE.ImageUtils.decodeTGA( buffer );
 
-                                if ( onLoad ) onLoad( texture );
+                if ( imageData ) {
+                    texture.image = imageData;
+                    texture.sourceFile = url;
+                    texture.needsUpdate = true;
 
-                            }
+                    if ( onLoad ) onLoad( texture );
+				}            	
 
-			}, false );
-                        
-                    request.addEventListener( 'error', function ( event ) {
+            } );
+	              
+			texture.sourceFile = url;
 
-                            if ( onError ) onError( event );
+			return texture;
 
-			}, false );
-                    
-                    request.send(null);
-                }
-              
-		texture.sourceFile = url;
-
-		return texture;
-        },
+	    },
 
 	loadDDSTexture: function ( url, mapping, onLoad, onError ) {