Browse Source

serializeImage back to internal helper function

DefinitelyMaybe 4 years ago
parent
commit
e90d0bd51a
1 changed files with 24 additions and 24 deletions
  1. 24 24
      src/textures/Texture.js

+ 24 - 24
src/textures/Texture.js

@@ -203,11 +203,11 @@ class Texture extends EventDispatcher {
 
 						if ( image[ i ].isDataTexture ) {
 
-							url.push( this.serializeImage( image[ i ].image ) );
+							url.push( serializeImage( image[ i ].image ) );
 
 						} else {
 
-							url.push( this.serializeImage( image[ i ] ) );
+							url.push( serializeImage( image[ i ] ) );
 
 						}
 
@@ -217,7 +217,7 @@ class Texture extends EventDispatcher {
 
 					// process single image
 
-					url = this.serializeImage( image );
+					url = serializeImage( image );
 
 				}
 
@@ -334,35 +334,37 @@ class Texture extends EventDispatcher {
 
 	}
 
-	serializeImage( image ) {
+}
 
-		if ( ( typeof HTMLImageElement !== 'undefined' && image instanceof HTMLImageElement ) ||
-      ( typeof HTMLCanvasElement !== 'undefined' && image instanceof HTMLCanvasElement ) ||
-      ( typeof ImageBitmap !== 'undefined' && image instanceof ImageBitmap ) ) {
+Texture.prototype.isTexture = true;
 
-			// default images
+function serializeImage( image ) {
 
-			return ImageUtils.getDataURL( image );
+	if ( ( typeof HTMLImageElement !== 'undefined' && image instanceof HTMLImageElement ) ||
+		( typeof HTMLCanvasElement !== 'undefined' && image instanceof HTMLCanvasElement ) ||
+		( typeof ImageBitmap !== 'undefined' && image instanceof ImageBitmap ) ) {
 
-		} else {
+		// default images
 
-			if ( image.data ) {
+		return ImageUtils.getDataURL( image );
 
-				// images of DataTexture
+	} else {
 
-				return {
-					data: Array.prototype.slice.call( image.data ),
-					width: image.width,
-					height: image.height,
-					type: image.data.constructor.name
-				};
+		if ( image.data ) {
 
-			} else {
+			// images of DataTexture
 
-				console.warn( 'THREE.Texture: Unable to serialize Texture.' );
-				return {};
+			return {
+				data: Array.prototype.slice.call( image.data ),
+				width: image.width,
+				height: image.height,
+				type: image.data.constructor.name
+			};
 
-			}
+		} else {
+
+			console.warn( 'THREE.Texture: Unable to serialize Texture.' );
+			return {};
 
 		}
 
@@ -370,6 +372,4 @@ class Texture extends EventDispatcher {
 
 }
 
-Texture.prototype.isTexture = true;
-
 export { Texture };