super-three 0.137.0 → 0.141.0

package/src/textures/DataTexture.js

@@ -7,10 +7,9 @@ class DataTexture extends Texture {
 
 		super( null, mapping, wrapS, wrapT, magFilter, minFilter, format, type, anisotropy, encoding );
 
-		this.image = { data: data, width: width, height: height };
+		this.isDataTexture = true;
 
-		this.magFilter = magFilter;
-		this.minFilter = minFilter;
+		this.image = { data: data, width: width, height: height };
 
 		this.generateMipmaps = false;
 		this.flipY = false;
@@ -20,6 +19,4 @@ class DataTexture extends Texture {
 
 }
 
-DataTexture.prototype.isDataTexture = true;
-
 export { DataTexture };

package/src/textures/DepthTexture.js

@@ -1,5 +1,5 @@
 import { Texture } from './Texture.js';
-import { NearestFilter, UnsignedShortType, UnsignedInt248Type, DepthFormat, DepthStencilFormat } from '../constants.js';
+import { NearestFilter, UnsignedIntType, UnsignedInt248Type, DepthFormat, DepthStencilFormat } from '../constants.js';
 
 class DepthTexture extends Texture {
 
@@ -13,24 +13,24 @@ class DepthTexture extends Texture {
 
 		}
 
-		if ( type === undefined && format === DepthFormat ) type = UnsignedShortType;
+		if ( type === undefined && format === DepthFormat ) type = UnsignedIntType;
 		if ( type === undefined && format === DepthStencilFormat ) type = UnsignedInt248Type;
 
 		super( null, mapping, wrapS, wrapT, magFilter, minFilter, format, type, anisotropy );
 
+		this.isDepthTexture = true;
+
 		this.image = { width: width, height: height };
 
 		this.magFilter = magFilter !== undefined ? magFilter : NearestFilter;
 		this.minFilter = minFilter !== undefined ? minFilter : NearestFilter;
 
 		this.flipY = false;
-		this.generateMipmaps	= false;
+		this.generateMipmaps = false;
 
 	}
 
 
 }
 
-DepthTexture.prototype.isDepthTexture = true;
-
 export { DepthTexture };

package/src/textures/FramebufferTexture.js

@@ -7,6 +7,8 @@ class FramebufferTexture extends Texture {
 
 		super( { width, height } );
 
+		this.isFramebufferTexture = true;
+
 		this.format = format;
 
 		this.magFilter = NearestFilter;
@@ -20,6 +22,4 @@ class FramebufferTexture extends Texture {
 
 }
 
-FramebufferTexture.prototype.isFramebufferTexture = true;
-
 export { FramebufferTexture };

package/src/textures/Source.js

@@ -0,0 +1,123 @@
+import { ImageUtils } from '../extras/ImageUtils.js';
+import * as MathUtils from '../math/MathUtils.js';
+
+class Source {
+
+	constructor( data = null ) {
+
+		this.isSource = true;
+
+		this.uuid = MathUtils.generateUUID();
+
+		this.data = data;
+
+		this.version = 0;
+
+	}
+
+	set needsUpdate( value ) {
+
+		if ( value === true ) this.version ++;
+
+	}
+
+	toJSON( meta ) {
+
+		const isRootObject = ( meta === undefined || typeof meta === 'string' );
+
+		if ( ! isRootObject && meta.images[ this.uuid ] !== undefined ) {
+
+			return meta.images[ this.uuid ];
+
+		}
+
+		const output = {
+			uuid: this.uuid,
+			url: ''
+		};
+
+		const data = this.data;
+
+		if ( data !== null ) {
+
+			let url;
+
+			if ( Array.isArray( data ) ) {
+
+				// cube texture
+
+				url = [];
+
+				for ( let i = 0, l = data.length; i < l; i ++ ) {
+
+					if ( data[ i ].isDataTexture ) {
+
+						url.push( serializeImage( data[ i ].image ) );
+
+					} else {
+
+						url.push( serializeImage( data[ i ] ) );
+
+					}
+
+				}
+
+			} else {
+
+				// texture
+
+				url = serializeImage( data );
+
+			}
+
+			output.url = url;
+
+		}
+
+		if ( ! isRootObject ) {
+
+			meta.images[ this.uuid ] = output;
+
+		}
+
+		return output;
+
+	}
+
+}
+
+function serializeImage( image ) {
+
+	if ( ( typeof HTMLImageElement !== 'undefined' && image instanceof HTMLImageElement ) ||
+		( typeof HTMLCanvasElement !== 'undefined' && image instanceof HTMLCanvasElement ) ||
+		( typeof ImageBitmap !== 'undefined' && image instanceof ImageBitmap ) ) {
+
+		// default images
+
+		return ImageUtils.getDataURL( image );
+
+	} else {
+
+		if ( image.data ) {
+
+			// images of DataTexture
+
+			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 {};
+
+		}
+
+	}
+
+}
+
+export { Source };

package/src/textures/Texture.js

@@ -13,7 +13,7 @@ import {
 import * as MathUtils from '../math/MathUtils.js';
 import { Vector2 } from '../math/Vector2.js';
 import { Matrix3 } from '../math/Matrix3.js';
-import { ImageUtils } from '../extras/ImageUtils.js';
+import { Source } from './Source.js';
 
 let textureId = 0;
 
@@ -23,13 +23,15 @@ class Texture extends EventDispatcher {
 
 		super();
 
+		this.isTexture = true;
+
 		Object.defineProperty( this, 'id', { value: textureId ++ } );
 
 		this.uuid = MathUtils.generateUUID();
 
 		this.name = '';
 
-		this.image = image;
+		this.source = new Source( image );
 		this.mipmaps = [];
 
 		this.mapping = mapping;
@@ -75,6 +77,18 @@ class Texture extends EventDispatcher {
 
 	}
 
+	get image() {
+
+		return this.source.data;
+
+	}
+
+	set image( value ) {
+
+		this.source.data = value;
+
+	}
+
 	updateMatrix() {
 
 		this.matrix.setUvTransform( this.offset.x, this.offset.y, this.repeat.x, this.repeat.y, this.rotation, this.center.x, this.center.y );
@@ -91,7 +105,7 @@ class Texture extends EventDispatcher {
 
 		this.name = source.name;
 
-		this.image = source.image;
+		this.source = source.source;
 		this.mipmaps = source.mipmaps.slice( 0 );
 
 		this.mapping = source.mapping;
@@ -124,6 +138,8 @@ class Texture extends EventDispatcher {
 
 		this.userData = JSON.parse( JSON.stringify( source.userData ) );
 
+		this.needsUpdate = true;
+
 		return this;
 
 	}
@@ -149,6 +165,8 @@ class Texture extends EventDispatcher {
 			uuid: this.uuid,
 			name: this.name,
 
+			image: this.source.toJSON( meta ).uuid,
+
 			mapping: this.mapping,
 
 			repeat: [ this.repeat.x, this.repeat.y ],
@@ -173,63 +191,6 @@ class Texture extends EventDispatcher {
 
 		};
 
-		if ( this.image !== undefined ) {
-
-			// TODO: Move to THREE.Image
-
-			const image = this.image;
-
-			if ( image.uuid === undefined ) {
-
-				image.uuid = MathUtils.generateUUID(); // UGH
-
-			}
-
-			if ( ! isRootObject && meta.images[ image.uuid ] === undefined ) {
-
-				let url;
-
-				if ( Array.isArray( image ) ) {
-
-					// process array of images e.g. CubeTexture
-
-					url = [];
-
-					for ( let i = 0, l = image.length; i < l; i ++ ) {
-
-						// check cube texture with data textures
-
-						if ( image[ i ].isDataTexture ) {
-
-							url.push( serializeImage( image[ i ].image ) );
-
-						} else {
-
-							url.push( serializeImage( image[ i ] ) );
-
-						}
-
-					}
-
-				} else {
-
-					// process single image
-
-					url = serializeImage( image );
-
-				}
-
-				meta.images[ image.uuid ] = {
-					uuid: image.uuid,
-					url: url
-				};
-
-			}
-
-			output.image = image.uuid;
-
-		}
-
 		if ( JSON.stringify( this.userData ) !== '{}' ) output.userData = this.userData;
 
 		if ( ! isRootObject ) {
@@ -330,44 +291,10 @@ class Texture extends EventDispatcher {
 
 	set needsUpdate( value ) {
 
-		if ( value === true ) this.version ++;
-
-	}
-
-}
-
-Texture.DEFAULT_IMAGE = undefined;
-Texture.DEFAULT_MAPPING = UVMapping;
-
-Texture.prototype.isTexture = true;
-
-function serializeImage( image ) {
-
-	if ( ( typeof HTMLImageElement !== 'undefined' && image instanceof HTMLImageElement ) ||
-		( typeof HTMLCanvasElement !== 'undefined' && image instanceof HTMLCanvasElement ) ||
-		( typeof ImageBitmap !== 'undefined' && image instanceof ImageBitmap ) ) {
-
-		// default images
-
-		return ImageUtils.getDataURL( image );
+		if ( value === true ) {
 
-	} else {
-
-		if ( image.data ) {
-
-			// images of DataTexture
-
-			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 {};
+			this.version ++;
+			this.source.needsUpdate = true;
 
 		}
 
@@ -375,4 +302,7 @@ function serializeImage( image ) {
 
 }
 
+Texture.DEFAULT_IMAGE = null;
+Texture.DEFAULT_MAPPING = UVMapping;
+
 export { Texture };

package/src/textures/VideoTexture.js

@@ -7,6 +7,8 @@ class VideoTexture extends Texture {
 
 		super( video, mapping, wrapS, wrapT, magFilter, minFilter, format, type, anisotropy );
 
+		this.isVideoTexture = true;
+
 		this.minFilter = minFilter !== undefined ? minFilter : LinearFilter;
 		this.magFilter = magFilter !== undefined ? magFilter : LinearFilter;
 
@@ -50,6 +52,4 @@ class VideoTexture extends Texture {
 
 }
 
-VideoTexture.prototype.isVideoTexture = true;
-
 export { VideoTexture };

package/examples/js/csm/Frustum.js

@@ -1,133 +0,0 @@
-( function () {
-
-	const inverseProjectionMatrix = new THREE.Matrix4();
-
-	class Frustum {
-
-		constructor( data ) {
-
-			data = data || {};
-			this.vertices = {
-				near: [ new THREE.Vector3(), new THREE.Vector3(), new THREE.Vector3(), new THREE.Vector3() ],
-				far: [ new THREE.Vector3(), new THREE.Vector3(), new THREE.Vector3(), new THREE.Vector3() ]
-			};
-
-			if ( data.projectionMatrix !== undefined ) {
-
-				this.setFromProjectionMatrix( data.projectionMatrix, data.maxFar || 10000 );
-
-			}
-
-		}
-
-		setFromProjectionMatrix( projectionMatrix, maxFar ) {
-
-			const isOrthographic = projectionMatrix.elements[ 2 * 4 + 3 ] === 0;
-			inverseProjectionMatrix.copy( projectionMatrix ).invert(); // 3 --- 0  vertices.near/far order
-			// |     |
-			// 2 --- 1
-			// clip space spans from [-1, 1]
-
-			this.vertices.near[ 0 ].set( 1, 1, - 1 );
-			this.vertices.near[ 1 ].set( 1, - 1, - 1 );
-			this.vertices.near[ 2 ].set( - 1, - 1, - 1 );
-			this.vertices.near[ 3 ].set( - 1, 1, - 1 );
-			this.vertices.near.forEach( function ( v ) {
-
-				v.applyMatrix4( inverseProjectionMatrix );
-
-			} );
-			this.vertices.far[ 0 ].set( 1, 1, 1 );
-			this.vertices.far[ 1 ].set( 1, - 1, 1 );
-			this.vertices.far[ 2 ].set( - 1, - 1, 1 );
-			this.vertices.far[ 3 ].set( - 1, 1, 1 );
-			this.vertices.far.forEach( function ( v ) {
-
-				v.applyMatrix4( inverseProjectionMatrix );
-				const absZ = Math.abs( v.z );
-
-				if ( isOrthographic ) {
-
-					v.z *= Math.min( maxFar / absZ, 1.0 );
-
-				} else {
-
-					v.multiplyScalar( Math.min( maxFar / absZ, 1.0 ) );
-
-				}
-
-			} );
-			return this.vertices;
-
-		}
-
-		split( breaks, target ) {
-
-			while ( breaks.length > target.length ) {
-
-				target.push( new Frustum() );
-
-			}
-
-			target.length = breaks.length;
-
-			for ( let i = 0; i < breaks.length; i ++ ) {
-
-				const cascade = target[ i ];
-
-				if ( i === 0 ) {
-
-					for ( let j = 0; j < 4; j ++ ) {
-
-						cascade.vertices.near[ j ].copy( this.vertices.near[ j ] );
-
-					}
-
-				} else {
-
-					for ( let j = 0; j < 4; j ++ ) {
-
-						cascade.vertices.near[ j ].lerpVectors( this.vertices.near[ j ], this.vertices.far[ j ], breaks[ i - 1 ] );
-
-					}
-
-				}
-
-				if ( i === breaks.length - 1 ) {
-
-					for ( let j = 0; j < 4; j ++ ) {
-
-						cascade.vertices.far[ j ].copy( this.vertices.far[ j ] );
-
-					}
-
-				} else {
-
-					for ( let j = 0; j < 4; j ++ ) {
-
-						cascade.vertices.far[ j ].lerpVectors( this.vertices.near[ j ], this.vertices.far[ j ], breaks[ i ] );
-
-					}
-
-				}
-
-			}
-
-		}
-
-		toSpace( cameraMatrix, target ) {
-
-			for ( var i = 0; i < 4; i ++ ) {
-
-				target.vertices.near[ i ].copy( this.vertices.near[ i ] ).applyMatrix4( cameraMatrix );
-				target.vertices.far[ i ].copy( this.vertices.far[ i ] ).applyMatrix4( cameraMatrix );
-
-			}
-
-		}
-
-	}
-
-	THREE.Frustum = Frustum;
-
-} )();