super-three 0.136.0 → 0.141.0

package/examples/jsm/postprocessing/TAARenderPass.js

@@ -28,7 +28,7 @@ class TAARenderPass extends SSAARenderPass {
 
 	render( renderer, writeBuffer, readBuffer, deltaTime ) {
 
-		if ( ! this.accumulate ) {
+		if ( this.accumulate === false ) {
 
 			super.render( renderer, writeBuffer, readBuffer, deltaTime );
 
@@ -39,21 +39,21 @@ class TAARenderPass extends SSAARenderPass {
 
 		const jitterOffsets = _JitterVectors[ 5 ];
 
-		if ( ! this.sampleRenderTarget ) {
+		if ( this.sampleRenderTarget === undefined ) {
 
 			this.sampleRenderTarget = new WebGLRenderTarget( readBuffer.width, readBuffer.height, this.params );
 			this.sampleRenderTarget.texture.name = 'TAARenderPass.sample';
 
 		}
 
-		if ( ! this.holdRenderTarget ) {
+		if ( this.holdRenderTarget === undefined ) {
 
 			this.holdRenderTarget = new WebGLRenderTarget( readBuffer.width, readBuffer.height, this.params );
 			this.holdRenderTarget.texture.name = 'TAARenderPass.hold';
 
 		}
 
-		if ( this.accumulate && this.accumulateIndex === - 1 ) {
+		if ( this.accumulateIndex === - 1 ) {
 
 			super.render( renderer, this.holdRenderTarget, readBuffer, deltaTime );
 

package/examples/jsm/postprocessing/UnrealBloomPass.js

@@ -1,9 +1,7 @@
 import {
 	AdditiveBlending,
 	Color,
-	LinearFilter,
 	MeshBasicMaterial,
-	RGBAFormat,
 	ShaderMaterial,
 	UniformsUtils,
 	Vector2,
@@ -38,27 +36,26 @@ class UnrealBloomPass extends Pass {
 		this.clearColor = new Color( 0, 0, 0 );
 
 		// render targets
-		const pars = { minFilter: LinearFilter, magFilter: LinearFilter, format: RGBAFormat };
 		this.renderTargetsHorizontal = [];
 		this.renderTargetsVertical = [];
 		this.nMips = 5;
 		let resx = Math.round( this.resolution.x / 2 );
 		let resy = Math.round( this.resolution.y / 2 );
 
-		this.renderTargetBright = new WebGLRenderTarget( resx, resy, pars );
+		this.renderTargetBright = new WebGLRenderTarget( resx, resy );
 		this.renderTargetBright.texture.name = 'UnrealBloomPass.bright';
 		this.renderTargetBright.texture.generateMipmaps = false;
 
 		for ( let i = 0; i < this.nMips; i ++ ) {
 
-			const renderTargetHorizonal = new WebGLRenderTarget( resx, resy, pars );
+			const renderTargetHorizonal = new WebGLRenderTarget( resx, resy );
 
 			renderTargetHorizonal.texture.name = 'UnrealBloomPass.h' + i;
 			renderTargetHorizonal.texture.generateMipmaps = false;
 
 			this.renderTargetsHorizontal.push( renderTargetHorizonal );
 
-			const renderTargetVertical = new WebGLRenderTarget( resx, resy, pars );
+			const renderTargetVertical = new WebGLRenderTarget( resx, resy );
 
 			renderTargetVertical.texture.name = 'UnrealBloomPass.v' + i;
 			renderTargetVertical.texture.generateMipmaps = false;
@@ -357,7 +354,6 @@ class UnrealBloomPass extends Pass {
 				'blurTexture3': { value: null },
 				'blurTexture4': { value: null },
 				'blurTexture5': { value: null },
-				'dirtTexture': { value: null },
 				'bloomStrength': { value: 1.0 },
 				'bloomFactors': { value: null },
 				'bloomTintColors': { value: null },
@@ -378,7 +374,6 @@ class UnrealBloomPass extends Pass {
 				uniform sampler2D blurTexture3;
 				uniform sampler2D blurTexture4;
 				uniform sampler2D blurTexture5;
-				uniform sampler2D dirtTexture;
 				uniform float bloomStrength;
 				uniform float bloomRadius;
 				uniform float bloomFactors[NUM_MIPS];

package/examples/jsm/renderers/CSS2DRenderer.js

@@ -10,6 +10,8 @@ class CSS2DObject extends Object3D {
 
 		super();
 
+		this.isCSS2DObject = true;
+
 		this.element = element;
 
 		this.element.style.position = 'absolute';
@@ -45,8 +47,6 @@ class CSS2DObject extends Object3D {
 
 }
 
-CSS2DObject.prototype.isCSS2DObject = true;
-
 //
 
 const _vector = new Vector3();
@@ -113,25 +113,29 @@ class CSS2DRenderer {
 
 			if ( object.isCSS2DObject ) {
 
-				object.onBeforeRender( _this, scene, camera );
-
 				_vector.setFromMatrixPosition( object.matrixWorld );
 				_vector.applyMatrix4( _viewProjectionMatrix );
 
-				const element = object.element;
+				const visible = ( object.visible === true ) && ( _vector.z >= - 1 && _vector.z <= 1 ) && ( object.layers.test( camera.layers ) === true );
+				object.element.style.display = ( visible === true ) ? '' : 'none';
 
-				if ( /apple/i.test( navigator.vendor ) ) {
+				if ( visible === true ) {
 
-					// https://github.com/mrdoob/three.js/issues/21415
-					element.style.transform = 'translate(-50%,-50%) translate(' + Math.round( _vector.x * _widthHalf + _widthHalf ) + 'px,' + Math.round( - _vector.y * _heightHalf + _heightHalf ) + 'px)';
+					object.onBeforeRender( _this, scene, camera );
 
-				} else {
+					const element = object.element;
 
 					element.style.transform = 'translate(-50%,-50%) translate(' + ( _vector.x * _widthHalf + _widthHalf ) + 'px,' + ( - _vector.y * _heightHalf + _heightHalf ) + 'px)';
 
-				}
+					if ( element.parentNode !== domElement ) {
+
+						domElement.appendChild( element );
 
-				element.style.display = ( object.visible && _vector.z >= - 1 && _vector.z <= 1 ) ? '' : 'none';
+					}
+
+					object.onAfterRender( _this, scene, camera );
+
+				}
 
 				const objectData = {
 					distanceToCameraSquared: getDistanceToSquared( camera, object )
@@ -139,14 +143,6 @@ class CSS2DRenderer {
 
 				cache.objects.set( object, objectData );
 
-				if ( element.parentNode !== domElement ) {
-
-					domElement.appendChild( element );
-
-				}
-
-				object.onAfterRender( _this, scene, camera );
-
 			}
 
 			for ( let i = 0, l = object.children.length; i < l; i ++ ) {
@@ -184,6 +180,12 @@ class CSS2DRenderer {
 
 			const sorted = filterAndFlatten( scene ).sort( function ( a, b ) {
 
+				if ( a.renderOrder !== b.renderOrder ) {
+
+					return b.renderOrder - a.renderOrder;
+
+				}
+
 				const distanceA = cache.objects.get( a ).distanceToCameraSquared;
 				const distanceB = cache.objects.get( b ).distanceToCameraSquared;
 

package/examples/jsm/renderers/CSS3DRenderer.js

@@ -19,6 +19,8 @@ class CSS3DObject extends Object3D {
 
 		super();
 
+		this.isCSS3DObject = true;
+
 		this.element = element;
 		this.element.style.position = 'absolute';
 		this.element.style.pointerEvents = 'auto';
@@ -54,14 +56,14 @@ class CSS3DObject extends Object3D {
 
 }
 
-CSS3DObject.prototype.isCSS3DObject = true;
-
 class CSS3DSprite extends CSS3DObject {
 
 	constructor( element ) {
 
 		super( element );
 
+		this.isCSS3DSprite = true;
+
 		this.rotation2D = 0;
 
 	}
@@ -78,8 +80,6 @@ class CSS3DSprite extends CSS3DObject {
 
 }
 
-CSS3DSprite.prototype.isCSS3DSprite = true;
-
 //
 
 const _matrix = new Matrix4();
@@ -239,57 +239,62 @@ class CSS3DRenderer {
 
 			if ( object.isCSS3DObject ) {
 
-				object.onBeforeRender( _this, scene, camera );
+				const visible = ( object.visible === true ) && ( object.layers.test( camera.layers ) === true );
+				object.element.style.display = ( visible === true ) ? '' : 'none';
 
-				let style;
+				if ( visible === true ) {
 
-				if ( object.isCSS3DSprite ) {
+					object.onBeforeRender( _this, scene, camera );
 
-					// http://swiftcoder.wordpress.com/2008/11/25/constructing-a-billboard-matrix/
+					let style;
 
-					_matrix.copy( camera.matrixWorldInverse );
-					_matrix.transpose();
+					if ( object.isCSS3DSprite ) {
 
-					if ( object.rotation2D !== 0 ) _matrix.multiply( _matrix2.makeRotationZ( object.rotation2D ) );
+						// http://swiftcoder.wordpress.com/2008/11/25/constructing-a-billboard-matrix/
 
-					object.matrixWorld.decompose( _position, _quaternion, _scale );
-					_matrix.setPosition( _position );
-					_matrix.scale( _scale );
+						_matrix.copy( camera.matrixWorldInverse );
+						_matrix.transpose();
 
-					_matrix.elements[ 3 ] = 0;
-					_matrix.elements[ 7 ] = 0;
-					_matrix.elements[ 11 ] = 0;
-					_matrix.elements[ 15 ] = 1;
+						if ( object.rotation2D !== 0 ) _matrix.multiply( _matrix2.makeRotationZ( object.rotation2D ) );
 
-					style = getObjectCSSMatrix( _matrix );
+						object.matrixWorld.decompose( _position, _quaternion, _scale );
+						_matrix.setPosition( _position );
+						_matrix.scale( _scale );
 
-				} else {
+						_matrix.elements[ 3 ] = 0;
+						_matrix.elements[ 7 ] = 0;
+						_matrix.elements[ 11 ] = 0;
+						_matrix.elements[ 15 ] = 1;
 
-					style = getObjectCSSMatrix( object.matrixWorld );
+						style = getObjectCSSMatrix( _matrix );
 
-				}
+					} else {
 
-				const element = object.element;
-				const cachedObject = cache.objects.get( object );
+						style = getObjectCSSMatrix( object.matrixWorld );
 
-				if ( cachedObject === undefined || cachedObject.style !== style ) {
+					}
 
-					element.style.transform = style;
+					const element = object.element;
+					const cachedObject = cache.objects.get( object );
 
-					const objectData = { style: style };
-					cache.objects.set( object, objectData );
+					if ( cachedObject === undefined || cachedObject.style !== style ) {
 
-				}
+						element.style.transform = style;
 
-				element.style.display = object.visible ? '' : 'none';
+						const objectData = { style: style };
+						cache.objects.set( object, objectData );
 
-				if ( element.parentNode !== cameraElement ) {
+					}
 
-					cameraElement.appendChild( element );
+					if ( element.parentNode !== cameraElement ) {
 
-				}
+						cameraElement.appendChild( element );
+
+					}
 
-				object.onAfterRender( _this, scene, camera );
+					object.onAfterRender( _this, scene, camera );
+
+				}
 
 			}
 

package/examples/jsm/renderers/Projector.js

@@ -473,125 +473,113 @@ class Projector {
 
 				if ( object.isMesh ) {
 
-					if ( geometry.isBufferGeometry ) {
+					let material = object.material;
 
-						let material = object.material;
+					const isMultiMaterial = Array.isArray( material );
 
-						const isMultiMaterial = Array.isArray( material );
+					const attributes = geometry.attributes;
+					const groups = geometry.groups;
 
-						const attributes = geometry.attributes;
-						const groups = geometry.groups;
+					if ( attributes.position === undefined ) continue;
 
-						if ( attributes.position === undefined ) continue;
+					const positions = attributes.position.array;
 
-						const positions = attributes.position.array;
-
-						for ( let i = 0, l = positions.length; i < l; i += 3 ) {
-
-							let x = positions[ i ];
-							let y = positions[ i + 1 ];
-							let z = positions[ i + 2 ];
+					for ( let i = 0, l = positions.length; i < l; i += 3 ) {
 
-							const morphTargets = geometry.morphAttributes.position;
+						let x = positions[ i ];
+						let y = positions[ i + 1 ];
+						let z = positions[ i + 2 ];
 
-							if ( morphTargets !== undefined ) {
+						const morphTargets = geometry.morphAttributes.position;
 
-								const morphTargetsRelative = geometry.morphTargetsRelative;
-								const morphInfluences = object.morphTargetInfluences;
+						if ( morphTargets !== undefined ) {
 
-								for ( let t = 0, tl = morphTargets.length; t < tl; t ++ ) {
+							const morphTargetsRelative = geometry.morphTargetsRelative;
+							const morphInfluences = object.morphTargetInfluences;
 
-									const influence = morphInfluences[ t ];
+							for ( let t = 0, tl = morphTargets.length; t < tl; t ++ ) {
 
-									if ( influence === 0 ) continue;
+								const influence = morphInfluences[ t ];
 
-									const target = morphTargets[ t ];
+								if ( influence === 0 ) continue;
 
-									if ( morphTargetsRelative ) {
+								const target = morphTargets[ t ];
 
-										x += target.getX( i / 3 ) * influence;
-										y += target.getY( i / 3 ) * influence;
-										z += target.getZ( i / 3 ) * influence;
+								if ( morphTargetsRelative ) {
 
-									} else {
+									x += target.getX( i / 3 ) * influence;
+									y += target.getY( i / 3 ) * influence;
+									z += target.getZ( i / 3 ) * influence;
 
-										x += ( target.getX( i / 3 ) - positions[ i ] ) * influence;
-										y += ( target.getY( i / 3 ) - positions[ i + 1 ] ) * influence;
-										z += ( target.getZ( i / 3 ) - positions[ i + 2 ] ) * influence;
+								} else {
 
-									}
+									x += ( target.getX( i / 3 ) - positions[ i ] ) * influence;
+									y += ( target.getY( i / 3 ) - positions[ i + 1 ] ) * influence;
+									z += ( target.getZ( i / 3 ) - positions[ i + 2 ] ) * influence;
 
 								}
 
 							}
 
-							renderList.pushVertex( x, y, z );
-
 						}
 
-						if ( attributes.normal !== undefined ) {
+						renderList.pushVertex( x, y, z );
+
+					}
 
-							const normals = attributes.normal.array;
+					if ( attributes.normal !== undefined ) {
 
-							for ( let i = 0, l = normals.length; i < l; i += 3 ) {
+						const normals = attributes.normal.array;
 
-								renderList.pushNormal( normals[ i ], normals[ i + 1 ], normals[ i + 2 ] );
+						for ( let i = 0, l = normals.length; i < l; i += 3 ) {
 
-							}
+							renderList.pushNormal( normals[ i ], normals[ i + 1 ], normals[ i + 2 ] );
 
 						}
 
-						if ( attributes.color !== undefined ) {
+					}
 
-							const colors = attributes.color.array;
+					if ( attributes.color !== undefined ) {
 
-							for ( let i = 0, l = colors.length; i < l; i += 3 ) {
+						const colors = attributes.color.array;
 
-								renderList.pushColor( colors[ i ], colors[ i + 1 ], colors[ i + 2 ] );
+						for ( let i = 0, l = colors.length; i < l; i += 3 ) {
 
-							}
+							renderList.pushColor( colors[ i ], colors[ i + 1 ], colors[ i + 2 ] );
 
 						}
 
-						if ( attributes.uv !== undefined ) {
+					}
 
-							const uvs = attributes.uv.array;
+					if ( attributes.uv !== undefined ) {
 
-							for ( let i = 0, l = uvs.length; i < l; i += 2 ) {
+						const uvs = attributes.uv.array;
 
-								renderList.pushUv( uvs[ i ], uvs[ i + 1 ] );
+						for ( let i = 0, l = uvs.length; i < l; i += 2 ) {
 
-							}
+							renderList.pushUv( uvs[ i ], uvs[ i + 1 ] );
 
 						}
 
-						if ( geometry.index !== null ) {
-
-							const indices = geometry.index.array;
-
-							if ( groups.length > 0 ) {
-
-								for ( let g = 0; g < groups.length; g ++ ) {
+					}
 
-									const group = groups[ g ];
+					if ( geometry.index !== null ) {
 
-									material = isMultiMaterial === true
-										 ? object.material[ group.materialIndex ]
-										 : object.material;
+						const indices = geometry.index.array;
 
-									if ( material === undefined ) continue;
+						if ( groups.length > 0 ) {
 
-									for ( let i = group.start, l = group.start + group.count; i < l; i += 3 ) {
+							for ( let g = 0; g < groups.length; g ++ ) {
 
-										renderList.pushTriangle( indices[ i ], indices[ i + 1 ], indices[ i + 2 ], material );
+								const group = groups[ g ];
 
-									}
+								material = isMultiMaterial === true
+									 ? object.material[ group.materialIndex ]
+									 : object.material;
 
-								}
+								if ( material === undefined ) continue;
 
-							} else {
-
-								for ( let i = 0, l = indices.length; i < l; i += 3 ) {
+								for ( let i = group.start, l = group.start + group.count; i < l; i += 3 ) {
 
 									renderList.pushTriangle( indices[ i ], indices[ i + 1 ], indices[ i + 2 ], material );
 
@@ -601,29 +589,29 @@ class Projector {
 
 						} else {
 
-							if ( groups.length > 0 ) {
+							for ( let i = 0, l = indices.length; i < l; i += 3 ) {
 
-								for ( let g = 0; g < groups.length; g ++ ) {
+								renderList.pushTriangle( indices[ i ], indices[ i + 1 ], indices[ i + 2 ], material );
 
-									const group = groups[ g ];
+							}
 
-									material = isMultiMaterial === true
-										 ? object.material[ group.materialIndex ]
-										 : object.material;
+						}
 
-									if ( material === undefined ) continue;
+					} else {
 
-									for ( let i = group.start, l = group.start + group.count; i < l; i += 3 ) {
+						if ( groups.length > 0 ) {
 
-										renderList.pushTriangle( i, i + 1, i + 2, material );
+							for ( let g = 0; g < groups.length; g ++ ) {
 
-									}
+								const group = groups[ g ];
 
-								}
+								material = isMultiMaterial === true
+									 ? object.material[ group.materialIndex ]
+									 : object.material;
 
-							} else {
+								if ( material === undefined ) continue;
 
-								for ( let i = 0, l = positions.length / 3; i < l; i += 3 ) {
+								for ( let i = group.start, l = group.start + group.count; i < l; i += 3 ) {
 
 									renderList.pushTriangle( i, i + 1, i + 2, material );
 
@@ -631,12 +619,15 @@ class Projector {
 
 							}
 
-						}
+						} else {
+
+							for ( let i = 0, l = positions.length / 3; i < l; i += 3 ) {
 
-					} else if ( geometry.isGeometry ) {
+								renderList.pushTriangle( i, i + 1, i + 2, material );
 
-						console.error( 'THREE.Projector no longer supports Geometry. Use THREE.BufferGeometry instead.' );
-						return;
+							}
+
+						}
 
 					}
 
@@ -644,88 +635,70 @@ class Projector {
 
 					_modelViewProjectionMatrix.multiplyMatrices( _viewProjectionMatrix, _modelMatrix );
 
-					if ( geometry.isBufferGeometry ) {
-
-						const attributes = geometry.attributes;
+					const attributes = geometry.attributes;
 
-						if ( attributes.position !== undefined ) {
+					if ( attributes.position !== undefined ) {
 
-							const positions = attributes.position.array;
-
-							for ( let i = 0, l = positions.length; i < l; i += 3 ) {
+						const positions = attributes.position.array;
 
-								renderList.pushVertex( positions[ i ], positions[ i + 1 ], positions[ i + 2 ] );
+						for ( let i = 0, l = positions.length; i < l; i += 3 ) {
 
-							}
+							renderList.pushVertex( positions[ i ], positions[ i + 1 ], positions[ i + 2 ] );
 
-							if ( attributes.color !== undefined ) {
+						}
 
-								const colors = attributes.color.array;
+						if ( attributes.color !== undefined ) {
 
-								for ( let i = 0, l = colors.length; i < l; i += 3 ) {
+							const colors = attributes.color.array;
 
-									renderList.pushColor( colors[ i ], colors[ i + 1 ], colors[ i + 2 ] );
+							for ( let i = 0, l = colors.length; i < l; i += 3 ) {
 
-								}
+								renderList.pushColor( colors[ i ], colors[ i + 1 ], colors[ i + 2 ] );
 
 							}
 
-							if ( geometry.index !== null ) {
+						}
 
-								const indices = geometry.index.array;
+						if ( geometry.index !== null ) {
 
-								for ( let i = 0, l = indices.length; i < l; i += 2 ) {
+							const indices = geometry.index.array;
 
-									renderList.pushLine( indices[ i ], indices[ i + 1 ] );
+							for ( let i = 0, l = indices.length; i < l; i += 2 ) {
 
-								}
+								renderList.pushLine( indices[ i ], indices[ i + 1 ] );
 
-							} else {
+							}
 
-								const step = object.isLineSegments ? 2 : 1;
+						} else {
 
-								for ( let i = 0, l = ( positions.length / 3 ) - 1; i < l; i += step ) {
+							const step = object.isLineSegments ? 2 : 1;
 
-									renderList.pushLine( i, i + 1 );
+							for ( let i = 0, l = ( positions.length / 3 ) - 1; i < l; i += step ) {
 
-								}
+								renderList.pushLine( i, i + 1 );
 
 							}
 
 						}
 
-					} else if ( geometry.isGeometry ) {
-
-						console.error( 'THREE.Projector no longer supports Geometry. Use THREE.BufferGeometry instead.' );
-						return;
-
 					}
 
 				} else if ( object.isPoints ) {
 
 					_modelViewProjectionMatrix.multiplyMatrices( _viewProjectionMatrix, _modelMatrix );
 
-					if ( geometry.isGeometry ) {
+					const attributes = geometry.attributes;
 
-						console.error( 'THREE.Projector no longer supports Geometry. Use THREE.BufferGeometry instead.' );
-						return;
+					if ( attributes.position !== undefined ) {
 
-					} else if ( geometry.isBufferGeometry ) {
-
-						const attributes = geometry.attributes;
-
-						if ( attributes.position !== undefined ) {
-
-							const positions = attributes.position.array;
-
-							for ( let i = 0, l = positions.length; i < l; i += 3 ) {
+						const positions = attributes.position.array;
 
-								_vector4.set( positions[ i ], positions[ i + 1 ], positions[ i + 2 ], 1 );
-								_vector4.applyMatrix4( _modelViewProjectionMatrix );
+						for ( let i = 0, l = positions.length; i < l; i += 3 ) {
 
-								pushPoint( _vector4, object, camera );
+							_vector4.set( positions[ i ], positions[ i + 1 ], positions[ i + 2 ], 1 );
+							_vector4.applyMatrix4( _modelViewProjectionMatrix );
 
-							}
+							pushPoint( _vector4, object, camera );
 
 						}