super-three 0.137.0 → 0.141.0

package/examples/js/postprocessing/UnrealBloomPass.js

@@ -22,27 +22,22 @@
 
 			this.clearColor = new THREE.Color( 0, 0, 0 ); // render targets
 
-			const pars = {
-				minFilter: THREE.LinearFilter,
-				magFilter: THREE.LinearFilter,
-				format: THREE.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 THREE.WebGLRenderTarget( resx, resy, pars );
+			this.renderTargetBright = new THREE.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 THREE.WebGLRenderTarget( resx, resy, pars );
+				const renderTargetHorizonal = new THREE.WebGLRenderTarget( resx, resy );
 				renderTargetHorizonal.texture.name = 'UnrealBloomPass.h' + i;
 				renderTargetHorizonal.texture.generateMipmaps = false;
 				this.renderTargetsHorizontal.push( renderTargetHorizonal );
-				const renderTargetVertical = new THREE.WebGLRenderTarget( resx, resy, pars );
+				const renderTargetVertical = new THREE.WebGLRenderTarget( resx, resy );
 				renderTargetVertical.texture.name = 'UnrealBloomPass.v' + i;
 				renderTargetVertical.texture.generateMipmaps = false;
 				this.renderTargetsVertical.push( renderTargetVertical );
@@ -307,9 +302,6 @@
 					'blurTexture5': {
 						value: null
 					},
-					'dirtTexture': {
-						value: null
-					},
 					'bloomStrength': {
 						value: 1.0
 					},
@@ -334,7 +326,6 @@
 				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/js/renderers/CSS2DRenderer.js

@@ -5,6 +5,7 @@
 		constructor( element = document.createElement( 'div' ) ) {
 
 			super();
+			this.isCSS2DObject = true;
 			this.element = element;
 			this.element.style.position = 'absolute';
 			this.element.style.userSelect = 'none';
@@ -33,9 +34,8 @@
 
 		}
 
-	}
+	} //
 
-	CSS2DObject.prototype.isCSS2DObject = true; //
 
 	const _vector = new THREE.Vector3();
 
@@ -102,34 +102,18 @@
 
 				if ( object.isCSS2DObject ) {
 
-					const visible = object.visible && _vector.z >= - 1 && _vector.z <= 1 && object.layers.test( camera.layers );
-					object.element.style.display = visible ? '' : 'none';
-
-					if ( visible ) {
+					_vector.setFromMatrixPosition( object.matrixWorld );
 
-						object.onBeforeRender( _this, scene, camera );
+					_vector.applyMatrix4( _viewProjectionMatrix );
 
-						_vector.setFromMatrixPosition( object.matrixWorld );
+					const visible = object.visible === true && _vector.z >= - 1 && _vector.z <= 1 && object.layers.test( camera.layers ) === true;
+					object.element.style.display = visible === true ? '' : 'none';
 
-						_vector.applyMatrix4( _viewProjectionMatrix );
+					if ( visible === true ) {
 
+						object.onBeforeRender( _this, scene, camera );
 						const element = object.element;
-
-						if ( /apple/i.test( navigator.vendor ) ) {
-
-							// 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)';
-
-						} else {
-
-							element.style.transform = 'translate(-50%,-50%) translate(' + ( _vector.x * _widthHalf + _widthHalf ) + 'px,' + ( - _vector.y * _heightHalf + _heightHalf ) + 'px)';
-
-						}
-
-						const objectData = {
-							distanceToCameraSquared: getDistanceToSquared( camera, object )
-						};
-						cache.objects.set( object, objectData );
+						element.style.transform = 'translate(-50%,-50%) translate(' + ( _vector.x * _widthHalf + _widthHalf ) + 'px,' + ( - _vector.y * _heightHalf + _heightHalf ) + 'px)';
 
 						if ( element.parentNode !== domElement ) {
 
@@ -141,6 +125,11 @@
 
 					}
 
+					const objectData = {
+						distanceToCameraSquared: getDistanceToSquared( camera, object )
+					};
+					cache.objects.set( object, objectData );
+
 				}
 
 				for ( let i = 0, l = object.children.length; i < l; i ++ ) {
@@ -177,6 +166,12 @@
 
 				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;
 					return distanceA - distanceB;

package/examples/js/renderers/CSS3DRenderer.js

@@ -15,6 +15,7 @@
 		constructor( element = document.createElement( 'div' ) ) {
 
 			super();
+			this.isCSS3DObject = true;
 			this.element = element;
 			this.element.style.position = 'absolute';
 			this.element.style.pointerEvents = 'auto';
@@ -46,13 +47,12 @@
 
 	}
 
-	CSS3DObject.prototype.isCSS3DObject = true;
-
 	class CSS3DSprite extends CSS3DObject {
 
 		constructor( element ) {
 
 			super( element );
+			this.isCSS3DSprite = true;
 			this.rotation2D = 0;
 
 		}
@@ -65,9 +65,8 @@
 
 		}
 
-	}
+	} //
 
-	CSS3DSprite.prototype.isCSS3DSprite = true; //
 
 	const _matrix = new THREE.Matrix4();
 
@@ -181,10 +180,10 @@
 
 				if ( object.isCSS3DObject ) {
 
-					const visible = object.visible && object.layers.test( camera.layers );
-					object.element.style.display = visible ? '' : 'none'; // only getObjectCSSMatrix when object.visible
+					const visible = object.visible === true && object.layers.test( camera.layers ) === true;
+					object.element.style.display = visible === true ? '' : 'none';
 
-					if ( visible ) {
+					if ( visible === true ) {
 
 						object.onBeforeRender( _this, scene, camera );
 						let style;

package/examples/js/renderers/Projector.js

@@ -433,114 +433,102 @@
 
 					if ( object.isMesh ) {
 
-						if ( geometry.isBufferGeometry ) {
+						let material = object.material;
+						const isMultiMaterial = Array.isArray( material );
+						const attributes = geometry.attributes;
+						const groups = geometry.groups;
+						if ( attributes.position === undefined ) continue;
+						const positions = attributes.position.array;
 
-							let material = object.material;
-							const isMultiMaterial = Array.isArray( material );
-							const attributes = geometry.attributes;
-							const groups = geometry.groups;
-							if ( attributes.position === undefined ) continue;
-							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 ];
-								const morphTargets = geometry.morphAttributes.position;
+						for ( let i = 0, l = positions.length; i < l; i += 3 ) {
 
-								if ( morphTargets !== undefined ) {
+							let x = positions[ i ];
+							let y = positions[ i + 1 ];
+							let z = positions[ i + 2 ];
+							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 ];
-										if ( influence === 0 ) continue;
-										const target = morphTargets[ t ];
+								for ( let t = 0, tl = morphTargets.length; t < tl; t ++ ) {
 
-										if ( morphTargetsRelative ) {
+									const influence = morphInfluences[ t ];
+									if ( influence === 0 ) continue;
+									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 ];
-										material = isMultiMaterial === true ? object.material[ group.materialIndex ] : object.material;
-										if ( material === undefined ) continue;
+						if ( geometry.index !== null ) {
 
-										for ( let i = group.start, l = group.start + group.count; i < l; i += 3 ) {
+							const indices = geometry.index.array;
 
-											renderList.pushTriangle( indices[ i ], indices[ i + 1 ], indices[ i + 2 ], material );
+							if ( groups.length > 0 ) {
 
-										}
+								for ( let g = 0; g < groups.length; g ++ ) {
 
-									}
+									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 );
 
@@ -550,25 +538,25 @@
 
 							} 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;
+								}
 
-										for ( let i = group.start, l = group.start + group.count; i < l; i += 3 ) {
+							}
 
-											renderList.pushTriangle( i, i + 1, i + 2, material );
+						} else {
 
-										}
+							if ( groups.length > 0 ) {
 
-									}
+								for ( let g = 0; g < groups.length; g ++ ) {
 
-								} else {
+									const group = groups[ g ];
+									material = isMultiMaterial === true ? object.material[ group.materialIndex ] : object.material;
+									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 );
 
@@ -576,12 +564,15 @@
 
 								}
 
-							}
+							} 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;
+								}
+
+							}
 
 						}
 
@@ -589,89 +580,71 @@
 
 						_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 );
+							for ( let i = 0, l = positions.length; i < l; i += 3 ) {
 
-									_vector4.applyMatrix4( _modelViewProjectionMatrix );
+								_vector4.set( positions[ i ], positions[ i + 1 ], positions[ i + 2 ], 1 );
 
-									pushPoint( _vector4, object, camera );
+								_vector4.applyMatrix4( _modelViewProjectionMatrix );
 
-								}
+								pushPoint( _vector4, object, camera );
 
 							}
 

package/examples/js/renderers/SVGRenderer.js

@@ -5,14 +5,13 @@
 		constructor( node ) {
 
 			super();
+			this.isSVGObject = true;
 			this.node = node;
 
 		}
 
 	}
 
-	SVGObject.prototype.isSVGObject = true;
-
 	class SVGRenderer {
 
 		constructor() {
@@ -217,7 +216,7 @@
 
 						if ( _clipBox.intersectsBox( _elemBox ) === true ) {
 
-							renderLine( _v1, _v2, element, material );
+							renderLine( _v1, _v2, material );
 
 						}
 
@@ -379,7 +378,7 @@
 
 			}
 
-			function renderLine( v1, v2, element, material ) {
+			function renderLine( v1, v2, material ) {
 
 				const path = 'M' + convert( v1.positionScreen.x ) + ',' + convert( v1.positionScreen.y ) + 'L' + convert( v2.positionScreen.x ) + ',' + convert( v2.positionScreen.y );
 

package/examples/js/shaders/BlendShader.js

@@ -46,7 +46,8 @@
 
 			vec4 texel1 = texture2D( tDiffuse1, vUv );
 			vec4 texel2 = texture2D( tDiffuse2, vUv );
-			gl_FragColor = opacity * mix( texel1, texel2, mixRatio );
+			gl_FragColor = mix( texel1, texel2, mixRatio );
+			gl_FragColor.a *= opacity;
 
 		}`
 	};

package/examples/js/shaders/CopyShader.js

@@ -3,7 +3,7 @@
 	/**
  * Full-screen textured quad shader
  */
-	var CopyShader = {
+	const CopyShader = {
 		uniforms: {
 			'tDiffuse': {
 				value: null
@@ -36,8 +36,9 @@
 
 		void main() {
 
-			vec4 texel = texture2D( tDiffuse, vUv );
-			gl_FragColor = opacity * texel;
+			gl_FragColor = texture2D( tDiffuse, vUv );
+			gl_FragColor.a *= opacity;
+
 
 		}`
 	};