Home Esplora Aiuto
Accedi
javascript
/
three.js
mirror da https://github.com/tazdij/three.js.git
2
0
Forka 0
File Problemi 0 Wiki
Sfoglia il codice sorgente

ImageBitmapLoader: Clean up

Mugen87 7 anni fa
parent
ced259e4cc
commit
1f1888653a
4 ha cambiato i file con 9 aggiunte e 86 eliminazioni
Visualizzazione unificata Mostra Diff Stats
  1. 0 83
      examples/js/loaders/ImageBitmapLoader.js
  2. 0 1
      examples/webgl_loader_imagebitmap.html
  3. 1 0
      src/Three.js
  4. 8 2
      src/loaders/ImageBitmapLoader.js

+ 0 - 83
examples/js/loaders/ImageBitmapLoader.js
Vedi File 

@@ -1,83 +0,0 @@
 
-/**
 
- * @author thespite / http://clicktorelease.com/
 
- */
 
-
 
-THREE.ImageBitmapLoader = function ( manager ) {
 
-
 
-	if ( typeof createImageBitmap === 'undefined' ) {
 
-
 
-		console.warn( 'THREE.ImageBitmapLoader: createImageBitmap() not supported.' );
 
-
 
-	}
 
-
 
-	this.manager = manager !== undefined ? manager : THREE.DefaultLoadingManager;
 
-	this.options = undefined;
 
-
 
-};
 
-
 
-THREE.ImageBitmapLoader.prototype = {
 
-
 
-	constructor: THREE.ImageBitmapLoader,
 
-
 
-	setOptions: function setOptions( options ) {
 
-
 
-		this.options = options;
 
-
 
-		return this;
 
-
 
-	},
 
-
 
-	load: function load( url, onLoad, onProgress, onError ) {
 
-
 
-		if ( url === undefined ) url = '';
 
-
 
-		if ( this.path !== undefined ) url = this.path + url;
 
-
 
-		var scope = this;
 
-
 
-		var cached = THREE.Cache.get( url );
 
-
 
-		if ( cached !== undefined ) {
 
-
 
-			scope.manager.itemStart( url );
 
-
 
-			setTimeout( function () {
 
-
 
-				if ( onLoad ) onLoad( cached );
 
-
 
-				scope.manager.itemEnd( url );
 
-
 
-			}, 0 );
 
-
 
-			return cached;
 
-
 
-		}
 
-
 
-		fetch( url ).then( function ( res ) {
 
-
 
-			return res.blob();
 
-
 
-		} ).then( function ( blob ) {
 
-
 
-			return createImageBitmap( blob, scope.options );
 
-
 
-		} ).then( function ( imageBitmap ) {
 
-
 
-			THREE.Cache.add( url, imageBitmap );
 
-
 
-			if ( onLoad ) onLoad( imageBitmap );
 
-
 
-			scope.manager.itemEnd( url );
 
-
 
-		} ).catch( function ( e ) {
 
-
 
-			if ( onError ) onError( e );
 
-
 
-			scope.manager.itemEnd( url );
 
-			scope.manager.itemError( url );
 
-
 
-		} );
 
-
 
-	}
 
-
 
-};

+ 0 - 1
examples/webgl_loader_imagebitmap.html
Vedi File 

@@ -31,7 +31,6 @@
 
 	<body>
 
 	<body>
 
 		<script src="../build/three.js"></script>
 
 		<script src="../build/three.js"></script>
 
 		<script src="js/Detector.js"></script>
 
 		<script src="js/Detector.js"></script>
 
-		<script src="js/loaders/ImageBitmapLoader.js"></script>
 
 		<div id="info">
 
 		<div id="info">
 
 			<a href="http://threejs.org" target="_blank" rel="noopener">three.js</a> - Texture loader using ImageBitmap
 
 			<a href="http://threejs.org" target="_blank" rel="noopener">three.js</a> - Texture loader using ImageBitmap
 
 		</div>
 
 		</div>

+ 1 - 0
src/Three.js
Vedi File 

@@ -42,6 +42,7 @@ export { BufferGeometryLoader } from './loaders/BufferGeometryLoader.js';
 
 export { DefaultLoadingManager, LoadingManager } from './loaders/LoadingManager.js';
 
 export { DefaultLoadingManager, LoadingManager } from './loaders/LoadingManager.js';
 
 export { JSONLoader } from './loaders/JSONLoader.js';
 
 export { JSONLoader } from './loaders/JSONLoader.js';
 
 export { ImageLoader } from './loaders/ImageLoader.js';
 
 export { ImageLoader } from './loaders/ImageLoader.js';
 
+export { ImageBitmapLoader } from './loaders/ImageBitmapLoader.js';
 
 export { FontLoader } from './loaders/FontLoader.js';
 
 export { FontLoader } from './loaders/FontLoader.js';
 
 export { FileLoader } from './loaders/FileLoader.js';
 
 export { FileLoader } from './loaders/FileLoader.js';
 
 export { Loader } from './loaders/Loader.js';
 
 export { Loader } from './loaders/Loader.js';

+ 8 - 2
src/loaders/ImageBitmapLoader.js
Vedi File 

@@ -14,10 +14,16 @@ function ImageBitmapLoader( manager ) {
 
 
 
 	}
 
 	}
 
 
 
+	if ( typeof fetch === 'undefined' ) {
 
+
 
+		console.warn( 'THREE.ImageBitmapLoader: fetch() not supported.' );
 
+
 
+	}
 
+
 
 	this.manager = manager !== undefined ? manager : DefaultLoadingManager;
 
 	this.manager = manager !== undefined ? manager : DefaultLoadingManager;
 
 	this.options = undefined;
 
 	this.options = undefined;
 
 
 
-};
 
+}
 
 
 
 ImageBitmapLoader.prototype = {
 
 ImageBitmapLoader.prototype = {
 
 
 
@@ -84,7 +90,7 @@ ImageBitmapLoader.prototype = {
 
 
 
 	},
 
 	},
 
 
 
-	setCrossOrigin: function ( value ) {
 
+	setCrossOrigin: function ( /* value */ ) {
 
 
 
 		return this;
 
 		return this;