super-three 0.136.1 → 0.144.0

package/examples/js/renderers/Projector.js

@@ -135,27 +135,6 @@
 				_spritePool = []; //
 
 
-			this.projectVector = function ( vector, camera ) {
-
-				console.warn( 'THREE.Projector: .projectVector() is now vector.project().' );
-				vector.project( camera );
-
-			};
-
-			this.unprojectVector = function ( vector, camera ) {
-
-				console.warn( 'THREE.Projector: .unprojectVector() is now vector.unproject().' );
-				vector.unproject( camera );
-
-			};
-
-			this.pickingRay = function () {
-
-				console.error( 'THREE.Projector: .pickingRay() is now raycaster.setFromCamera().' );
-
-			}; //
-
-
 			function RenderList() {
 
 				const normals = [];
@@ -399,8 +378,8 @@
 				_lineCount = 0;
 				_spriteCount = 0;
 				_renderData.elements.length = 0;
-				if ( scene.autoUpdate === true ) scene.updateMatrixWorld();
-				if ( camera.parent === null ) camera.updateMatrixWorld();
+				if ( scene.matrixWorldAutoUpdate === true ) scene.updateMatrixWorld();
+				if ( camera.parent === null && camera.matrixWorldAutoUpdate === true ) camera.updateMatrixWorld();
 
 				_viewMatrix.copy( camera.matrixWorldInverse );
 
@@ -433,114 +412,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 ) {
 
-							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;
 
-								let x = positions[ i ];
-								let y = positions[ i + 1 ];
-								let z = positions[ i + 2 ];
-								const morphTargets = geometry.morphAttributes.position;
+							if ( morphTargets !== undefined ) {
 
-								if ( morphTargets !== undefined ) {
+								const morphTargetsRelative = geometry.morphTargetsRelative;
+								const morphInfluences = object.morphTargetInfluences;
 
-									const morphTargetsRelative = geometry.morphTargetsRelative;
-									const morphInfluences = object.morphTargetInfluences;
+								for ( let t = 0, tl = morphTargets.length; t < tl; t ++ ) {
 
-									for ( let t = 0, tl = morphTargets.length; t < tl; t ++ ) {
+									const influence = morphInfluences[ t ];
+									if ( influence === 0 ) continue;
+									const target = morphTargets[ t ];
 
-										const influence = morphInfluences[ t ];
-										if ( influence === 0 ) continue;
-										const target = morphTargets[ t ];
+									if ( morphTargetsRelative ) {
 
-										if ( morphTargetsRelative ) {
+										x += target.getX( i / 3 ) * influence;
+										y += target.getY( i / 3 ) * influence;
+										z += target.getZ( i / 3 ) * influence;
 
-											x += target.getX( i / 3 ) * influence;
-											y += target.getY( i / 3 ) * influence;
-											z += target.getZ( i / 3 ) * influence;
+									} else {
 
-										} 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;
-
-										}
+										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;
+						}
 
-										for ( let i = group.start, l = group.start + group.count; i < l; i += 3 ) {
+						if ( geometry.index !== null ) {
 
-											renderList.pushTriangle( indices[ i ], indices[ i + 1 ], indices[ i + 2 ], material );
+							const indices = geometry.index.array;
 
-										}
+							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 = 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 +517,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 +543,15 @@
 
 								}
 
-							}
+							} else {
 
-						} else if ( geometry.isGeometry ) {
+								for ( let i = 0, l = positions.length / 3; i < l; i += 3 ) {
 
-							console.error( 'THREE.Projector no longer supports Geometry. Use THREE.BufferGeometry instead.' );
-							return;
+									renderList.pushTriangle( i, i + 1, i + 2, material );
+
+								}
+
+							}
 
 						}
 
@@ -589,89 +559,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 ) {
-
-							console.error( 'THREE.Projector no longer supports Geometry. Use THREE.BufferGeometry instead.' );
-							return;
-
-						} else 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;
 
-									_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;
+
 
 		}`
 	};