浏览代码

Merge pull request #11522 from spite/fix-imagebitmap-example-cors

Fix imagebitmap example CORS
Mr.doob 8 年之前
父节点
当前提交
d81f53bb9a
共有 1 个文件被更改,包括 7 次插入2 次删除
  1. 7 2
      examples/webgl_loader_imagebitmap.html

+ 7 - 2
examples/webgl_loader_imagebitmap.html

@@ -84,7 +84,7 @@
 
 
 				new THREE.ImageBitmapLoader()
 				new THREE.ImageBitmapLoader()
 					.setOptions( { imageOrientation: 'none' } )
 					.setOptions( { imageOrientation: 'none' } )
-					.load( 'textures/planets/earth_atmos_2048.jpg', function( imageBitmap ) {
+					.load( 'textures/planets/earth_atmos_2048.jpg?' + performance.now(), function( imageBitmap ) {
 
 
 						var tex = new THREE.CanvasTexture( imageBitmap );
 						var tex = new THREE.CanvasTexture( imageBitmap );
 
 
@@ -106,6 +106,7 @@
 			function addImage () {
 			function addImage () {
 
 
 				new THREE.ImageLoader()
 				new THREE.ImageLoader()
+					.setCrossOrigin( '*' )
 					.load( 'textures/planets/earth_atmos_2048.jpg?' + performance.now(), function( image ) {
 					.load( 'textures/planets/earth_atmos_2048.jpg?' + performance.now(), function( image ) {
 							var tex = new THREE.CanvasTexture( image );
 							var tex = new THREE.CanvasTexture( image );
 							addCube( tex );
 							addCube( tex );
@@ -169,9 +170,13 @@
 				var clearBtn = document.getElementById( 'clear_btn' );
 				var clearBtn = document.getElementById( 'clear_btn' );
 				clearBtn.addEventListener( 'click', function( e ) {
 				clearBtn.addEventListener( 'click', function( e ) {
 					while( cubes.children.length ) {
 					while( cubes.children.length ) {
-						cubes.remove( cubes.children[ 0 ] );
+						var cube = cubes.children[ 0 ]
+						cubes.remove( cube );
+						cube.geometry.dispose();
+						cube.material.map.dispose();
 					}
 					}
 				})
 				})
+
 				// RENDERER
 				// RENDERER
 
 
 				renderer = new THREE.WebGLRenderer( { antialias: true } );
 				renderer = new THREE.WebGLRenderer( { antialias: true } );