super-three 0.141.0 → 0.147.0

package/examples/js/renderers/SVGRenderer.js

@@ -11,7 +11,6 @@
 		}
 
 	}
-
 	class SVGRenderer {
 
 		constructor() {
@@ -32,7 +31,6 @@
 				_quality = 1,
 				_currentPath,
 				_currentStyle;
-
 			const _this = this,
 				_clipBox = new THREE.Box2(),
 				_elemBox = new THREE.Box2(),
@@ -52,7 +50,6 @@
 				_svgPathPool = [],
 				_projector = new THREE.Projector(),
 				_svg = document.createElementNS( 'http://www.w3.org/2000/svg', 'svg' );
-
 			this.domElement = _svg;
 			this.autoClear = true;
 			this.sortObjects = true;
@@ -64,7 +61,6 @@
 					faces: 0
 				}
 			};
-
 			this.setQuality = function ( quality ) {
 
 				switch ( quality ) {
@@ -72,7 +68,6 @@
 					case 'high':
 						_quality = 1;
 						break;
-
 					case 'low':
 						_quality = 0;
 						break;
@@ -95,15 +90,10 @@
 				_svgHeight = height;
 				_svgWidthHalf = _svgWidth / 2;
 				_svgHeightHalf = _svgHeight / 2;
-
 				_svg.setAttribute( 'viewBox', - _svgWidthHalf + ' ' + - _svgHeightHalf + ' ' + _svgWidth + ' ' + _svgHeight );
-
 				_svg.setAttribute( 'width', _svgWidth );
-
 				_svg.setAttribute( 'height', _svgHeight );
-
 				_clipBox.min.set( - _svgWidthHalf, - _svgHeightHalf );
-
 				_clipBox.max.set( _svgWidthHalf, _svgHeightHalf );
 
 			};
@@ -126,7 +116,6 @@
 			function removeChildNodes() {
 
 				_pathCount = 0;
-
 				while ( _svg.childNodes.length > 0 ) {
 
 					_svg.removeChild( _svg.childNodes[ 0 ] );
@@ -158,7 +147,6 @@
 				}
 
 				const background = scene.background;
-
 				if ( background && background.isColor ) {
 
 					removeChildNodes();
@@ -172,30 +160,24 @@
 
 				_this.info.render.vertices = 0;
 				_this.info.render.faces = 0;
-
 				_viewMatrix.copy( camera.matrixWorldInverse );
-
 				_viewProjectionMatrix.multiplyMatrices( camera.projectionMatrix, _viewMatrix );
-
 				_renderData = _projector.projectScene( scene, camera, this.sortObjects, this.sortElements );
 				_elements = _renderData.elements;
 				_lights = _renderData.lights;
-
 				_normalViewMatrix.getNormalMatrix( camera.matrixWorldInverse );
+				calculateLights( _lights );
 
-				calculateLights( _lights ); // reset accumulated path
+				// reset accumulated path
 
 				_currentPath = '';
 				_currentStyle = '';
-
 				for ( let e = 0, el = _elements.length; e < el; e ++ ) {
 
 					const element = _elements[ e ];
 					const material = element.material;
 					if ( material === undefined || material.opacity === 0 ) continue;
-
 					_elemBox.makeEmpty();
-
 					if ( element instanceof THREE.RenderableSprite ) {
 
 						_v1 = element;
@@ -211,9 +193,7 @@
 						_v1.positionScreen.y *= - _svgHeightHalf;
 						_v2.positionScreen.x *= _svgWidthHalf;
 						_v2.positionScreen.y *= - _svgHeightHalf;
-
 						_elemBox.setFromPoints( [ _v1.positionScreen, _v2.positionScreen ] );
-
 						if ( _clipBox.intersectsBox( _elemBox ) === true ) {
 
 							renderLine( _v1, _v2, material );
@@ -234,7 +214,6 @@
 						_v2.positionScreen.y *= - _svgHeightHalf;
 						_v3.positionScreen.x *= _svgWidthHalf;
 						_v3.positionScreen.y *= - _svgHeightHalf;
-
 						if ( this.overdraw > 0 ) {
 
 							expand( _v1.positionScreen, _v2.positionScreen, this.overdraw );
@@ -244,7 +223,6 @@
 						}
 
 						_elemBox.setFromPoints( [ _v1.positionScreen, _v2.positionScreen, _v3.positionScreen ] );
-
 						if ( _clipBox.intersectsBox( _elemBox ) === true ) {
 
 							renderFace3( _v1, _v2, _v3, element, material );
@@ -262,15 +240,12 @@
 					if ( object.isSVGObject ) {
 
 						_vector3.setFromMatrixPosition( object.matrixWorld );
-
 						_vector3.applyMatrix4( _viewProjectionMatrix );
-
 						if ( _vector3.z < - 1 || _vector3.z > 1 ) return;
 						const x = _vector3.x * _svgWidthHalf;
 						const y = - _vector3.y * _svgHeightHalf;
 						const node = object.node;
 						node.setAttribute( 'transform', 'translate(' + x + ',' + y + ')' );
-
 						_svg.appendChild( node );
 
 					}
@@ -282,16 +257,12 @@
 			function calculateLights( lights ) {
 
 				_ambientLight.setRGB( 0, 0, 0 );
-
 				_directionalLights.setRGB( 0, 0, 0 );
-
 				_pointLights.setRGB( 0, 0, 0 );
-
 				for ( let l = 0, ll = lights.length; l < ll; l ++ ) {
 
 					const light = lights[ l ];
 					const lightColor = light.color;
-
 					if ( light.isAmbientLight ) {
 
 						_ambientLight.r += lightColor.r;
@@ -322,11 +293,9 @@
 
 					const light = lights[ l ];
 					const lightColor = light.color;
-
 					if ( light.isDirectionalLight ) {
 
 						const lightPosition = _vector3.setFromMatrixPosition( light.matrixWorld ).normalize();
-
 						let amount = normal.dot( lightPosition );
 						if ( amount <= 0 ) continue;
 						amount *= light.intensity;
@@ -337,7 +306,6 @@
 					} else if ( light.isPointLight ) {
 
 						const lightPosition = _vector3.setFromMatrixPosition( light.matrixWorld );
-
 						let amount = normal.dot( _vector3.subVectors( lightPosition, position ).normalize() );
 						if ( amount <= 0 ) continue;
 						amount *= light.distance == 0 ? 1 : 1 - Math.min( position.distanceTo( lightPosition ) / light.distance, 1 );
@@ -357,7 +325,6 @@
 
 				let scaleX = element.scale.x * _svgWidthHalf;
 				let scaleY = element.scale.y * _svgHeightHalf;
-
 				if ( material.isPointsMaterial ) {
 
 					scaleX *= material.size;
@@ -367,7 +334,6 @@
 
 				const path = 'M' + convert( v1.x - scaleX * 0.5 ) + ',' + convert( v1.y - scaleY * 0.5 ) + 'h' + convert( scaleX ) + 'v' + convert( scaleY ) + 'h' + convert( - scaleX ) + 'z';
 				let style = '';
-
 				if ( material.isSpriteMaterial || material.isPointsMaterial ) {
 
 					style = 'fill:' + material.color.getStyle() + ';fill-opacity:' + material.opacity;
@@ -381,11 +347,9 @@
 			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 );
-
 				if ( material.isLineBasicMaterial ) {
 
 					let style = 'fill:none;stroke:' + material.color.getStyle() + ';stroke-opacity:' + material.opacity + ';stroke-width:' + material.linewidth + ';stroke-linecap:' + material.linecap;
-
 					if ( material.isLineDashedMaterial ) {
 
 						style = style + ';stroke-dasharray:' + material.dashSize + ',' + material.gapSize;
@@ -404,11 +368,9 @@
 				_this.info.render.faces ++;
 				const path = 'M' + convert( v1.positionScreen.x ) + ',' + convert( v1.positionScreen.y ) + 'L' + convert( v2.positionScreen.x ) + ',' + convert( v2.positionScreen.y ) + 'L' + convert( v3.positionScreen.x ) + ',' + convert( v3.positionScreen.y ) + 'z';
 				let style = '';
-
 				if ( material.isMeshBasicMaterial ) {
 
 					_color.copy( material.color );
-
 					if ( material.vertexColors ) {
 
 						_color.multiply( element.color );
@@ -418,7 +380,6 @@
 				} else if ( material.isMeshLambertMaterial || material.isMeshPhongMaterial || material.isMeshStandardMaterial ) {
 
 					_diffuseColor.copy( material.color );
-
 					if ( material.vertexColors ) {
 
 						_diffuseColor.multiply( element.color );
@@ -426,17 +387,13 @@
 					}
 
 					_color.copy( _ambientLight );
-
 					_centroid.copy( v1.positionWorld ).add( v2.positionWorld ).add( v3.positionWorld ).divideScalar( 3 );
-
 					calculateLight( _lights, _centroid, element.normalModel, _color );
-
 					_color.multiply( _diffuseColor ).add( material.emissive );
 
 				} else if ( material.isMeshNormalMaterial ) {
 
 					_normal.copy( element.normalModel ).applyMatrix3( _normalViewMatrix ).normalize();
-
 					_color.setRGB( _normal.x, _normal.y, _normal.z ).multiplyScalar( 0.5 ).addScalar( 0.5 );
 
 				}
@@ -453,8 +410,9 @@
 
 				addPath( style, path );
 
-			} // Hide anti-alias gaps
+			}
 
+			// Hide anti-alias gaps
 
 			function expand( v1, v2, pixels ) {
 
@@ -493,11 +451,8 @@
 				if ( _currentPath ) {
 
 					_svgNode = getPathNode( _pathCount ++ );
-
 					_svgNode.setAttribute( 'd', _currentPath );
-
 					_svgNode.setAttribute( 'style', _currentStyle );
-
 					_svg.appendChild( _svgNode );
 
 				}
@@ -512,7 +467,6 @@
 				if ( _svgPathPool[ id ] == null ) {
 
 					_svgPathPool[ id ] = document.createElementNS( 'http://www.w3.org/2000/svg', 'path' );
-
 					if ( _quality == 0 ) {
 
 						_svgPathPool[ id ].setAttribute( 'shape-rendering', 'crispEdges' ); //optimizeSpeed

package/examples/js/shaders/ACESFilmicToneMappingShader.js

@@ -7,6 +7,7 @@
  * this implementation of ACES is modified to accommodate a brighter viewing environment.
  * the scale factor of 1/0.6 is subjective. see discussion in #19621.
  */
+
 	const ACESFilmicToneMappingShader = {
 		uniforms: {
 			'tDiffuse': {
@@ -16,9 +17,7 @@
 				value: 1.0
 			}
 		},
-		vertexShader:
-  /* glsl */
-  `
+		vertexShader: /* glsl */`
 
 		varying vec2 vUv;
 
@@ -28,9 +27,7 @@
 			gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );
 
 		}`,
-		fragmentShader:
-  /* glsl */
-  `
+		fragmentShader: /* glsl */`
 
 		#define saturate(a) clamp( a, 0.0, 1.0 )
 

package/examples/js/shaders/AfterimageShader.js

@@ -5,6 +5,7 @@
  * I created this effect inspired by a demo on codepen:
  * https://codepen.io/brunoimbrizi/pen/MoRJaN?page=1&
  */
+
 	const AfterimageShader = {
 		uniforms: {
 			'damp': {
@@ -17,9 +18,7 @@
 				value: null
 			}
 		},
-		vertexShader:
-  /* glsl */
-  `
+		vertexShader: /* glsl */`
 
 		varying vec2 vUv;
 
@@ -29,9 +28,7 @@
 			gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );
 
 		}`,
-		fragmentShader:
-  /* glsl */
-  `
+		fragmentShader: /* glsl */`
 
 		uniform float damp;
 

package/examples/js/shaders/BasicShader.js

@@ -3,20 +3,17 @@
 	/**
  * Simple test shader
  */
+
 	const BasicShader = {
 		uniforms: {},
-		vertexShader:
-  /* glsl */
-  `
+		vertexShader: /* glsl */`
 
 		void main() {
 
 			gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );
 
 		}`,
-		fragmentShader:
-  /* glsl */
-  `
+		fragmentShader: /* glsl */`
 
 		void main() {
 

package/examples/js/shaders/BleachBypassShader.js

@@ -5,6 +5,7 @@
  * - based on Nvidia example
  * http://developer.download.nvidia.com/shaderlibrary/webpages/shader_library.html#post_bleach_bypass
  */
+
 	const BleachBypassShader = {
 		uniforms: {
 			'tDiffuse': {
@@ -14,9 +15,7 @@
 				value: 1.0
 			}
 		},
-		vertexShader:
-  /* glsl */
-  `
+		vertexShader: /* glsl */`
 
 		varying vec2 vUv;
 
@@ -26,9 +25,7 @@
 			gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );
 
 		}`,
-		fragmentShader:
-  /* glsl */
-  `
+		fragmentShader: /* glsl */`
 
 		uniform float opacity;
 

package/examples/js/shaders/BlendShader.js

@@ -3,6 +3,7 @@
 	/**
  * Blend two textures
  */
+
 	const BlendShader = {
 		uniforms: {
 			'tDiffuse1': {
@@ -18,9 +19,7 @@
 				value: 1.0
 			}
 		},
-		vertexShader:
-  /* glsl */
-  `
+		vertexShader: /* glsl */`
 
 		varying vec2 vUv;
 
@@ -30,9 +29,7 @@
 			gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );
 
 		}`,
-		fragmentShader:
-  /* glsl */
-  `
+		fragmentShader: /* glsl */`
 
 		uniform float opacity;
 		uniform float mixRatio;

package/examples/js/shaders/BokehShader.js

@@ -5,6 +5,7 @@
  * ported from GLSL shader by Martins Upitis
  * http://artmartinsh.blogspot.com/2010/02/glsl-lens-blur-filter-with-bokeh.html
  */
+
 	const BokehShader = {
 		defines: {
 			'DEPTH_PACKING': 1,
@@ -36,9 +37,7 @@
 				value: 1000.0
 			}
 		},
-		vertexShader:
-  /* glsl */
-  `
+		vertexShader: /* glsl */`
 
 		varying vec2 vUv;
 
@@ -48,9 +47,7 @@
 			gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );
 
 		}`,
-		fragmentShader:
-  /* glsl */
-  `
+		fragmentShader: /* glsl */`
 
 		#include <common>
 

package/examples/js/shaders/BokehShader2.js

@@ -7,7 +7,6 @@
  *
  * Requires #define RINGS and SAMPLES integers
  */
-
 	const BokehShader = {
 		uniforms: {
 			'textureWidth': {
@@ -80,9 +79,7 @@
 				value: new THREE.Vector2()
 			}
 		},
-		vertexShader:
-  /* glsl */
-  `
+		vertexShader: /* glsl */`
 
 		varying vec2 vUv;
 
@@ -92,9 +89,7 @@
 			gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );
 
 		}`,
-		fragmentShader:
-  /* glsl */
-  `
+		fragmentShader: /* glsl */`
 
 		#include <common>
 
@@ -391,9 +386,7 @@
 				value: 1000.0
 			}
 		},
-		vertexShader:
-  /* glsl */
-  `
+		vertexShader: /* glsl */`
 
 		varying float vViewZDepth;
 
@@ -405,9 +398,7 @@
 			vViewZDepth = - mvPosition.z;
 
 		}`,
-		fragmentShader:
-  /* glsl */
-  `
+		fragmentShader: /* glsl */`
 
 		uniform float mNear;
 		uniform float mFar;

package/examples/js/shaders/BrightnessContrastShader.js

@@ -6,6 +6,7 @@
  * brightness: -1 to 1 (-1 is solid black, 0 is no change, and 1 is solid white)
  * contrast: -1 to 1 (-1 is solid gray, 0 is no change, and 1 is maximum contrast)
  */
+
 	const BrightnessContrastShader = {
 		uniforms: {
 			'tDiffuse': {
@@ -18,9 +19,7 @@
 				value: 0
 			}
 		},
-		vertexShader:
-  /* glsl */
-  `
+		vertexShader: /* glsl */`
 
 		varying vec2 vUv;
 
@@ -31,9 +30,7 @@
 			gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );
 
 		}`,
-		fragmentShader:
-  /* glsl */
-  `
+		fragmentShader: /* glsl */`
 
 		uniform sampler2D tDiffuse;
 		uniform float brightness;

package/examples/js/shaders/ColorCorrectionShader.js

@@ -19,9 +19,7 @@
 				value: new THREE.Vector3( 0, 0, 0 )
 			}
 		},
-		vertexShader:
-  /* glsl */
-  `
+		vertexShader: /* glsl */`
 
 		varying vec2 vUv;
 
@@ -32,9 +30,7 @@
 			gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );
 
 		}`,
-		fragmentShader:
-  /* glsl */
-  `
+		fragmentShader: /* glsl */`
 
 		uniform sampler2D tDiffuse;
 		uniform vec3 powRGB;

package/examples/js/shaders/ColorifyShader.js

@@ -13,9 +13,7 @@
 				value: new THREE.Color( 0xffffff )
 			}
 		},
-		vertexShader:
-  /* glsl */
-  `
+		vertexShader: /* glsl */`
 
 		varying vec2 vUv;
 
@@ -25,9 +23,7 @@
 			gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );
 
 		}`,
-		fragmentShader:
-  /* glsl */
-  `
+		fragmentShader: /* glsl */`
 
 		uniform vec3 color;
 		uniform sampler2D tDiffuse;

package/examples/js/shaders/ConvolutionShader.js

@@ -21,9 +21,7 @@
 				value: []
 			}
 		},
-		vertexShader:
-  /* glsl */
-  `
+		vertexShader: /* glsl */`
 
 		uniform vec2 uImageIncrement;
 
@@ -35,9 +33,7 @@
 			gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );
 
 		}`,
-		fragmentShader:
-  /* glsl */
-  `
+		fragmentShader: /* glsl */`
 
 		uniform float cKernel[ KERNEL_SIZE_INT ];
 
@@ -64,28 +60,27 @@
 		buildKernel: function ( sigma ) {
 
 			// We lop off the sqrt(2 * pi) * sigma term, since we're going to normalize anyway.
+
 			const kMaxKernelSize = 25;
 			let kernelSize = 2 * Math.ceil( sigma * 3.0 ) + 1;
 			if ( kernelSize > kMaxKernelSize ) kernelSize = kMaxKernelSize;
 			const halfWidth = ( kernelSize - 1 ) * 0.5;
 			const values = new Array( kernelSize );
 			let sum = 0.0;
-
 			for ( let i = 0; i < kernelSize; ++ i ) {
 
 				values[ i ] = gauss( i - halfWidth, sigma );
 				sum += values[ i ];
 
-			} // normalize the kernel
+			}
 
+			// normalize the kernel
 
 			for ( let i = 0; i < kernelSize; ++ i ) values[ i ] /= sum;
-
 			return values;
 
 		}
 	};
-
 	function gauss( x, sigma ) {
 
 		return Math.exp( - ( x * x ) / ( 2.0 * sigma * sigma ) );

package/examples/js/shaders/CopyShader.js

@@ -3,6 +3,7 @@
 	/**
  * Full-screen textured quad shader
  */
+
 	const CopyShader = {
 		uniforms: {
 			'tDiffuse': {
@@ -12,9 +13,7 @@
 				value: 1.0
 			}
 		},
-		vertexShader:
-  /* glsl */
-  `
+		vertexShader: /* glsl */`
 
 		varying vec2 vUv;
 
@@ -24,9 +23,7 @@
 			gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );
 
 		}`,
-		fragmentShader:
-  /* glsl */
-  `
+		fragmentShader: /* glsl */`
 
 		uniform float opacity;
 

package/examples/js/shaders/DOFMipMapShader.js

@@ -5,6 +5,7 @@
  * - from Matt Handley @applmak
  * - requires power-of-2 sized render target with enabled mipmaps
  */
+
 	const DOFMipMapShader = {
 		uniforms: {
 			'tColor': {
@@ -20,9 +21,7 @@
 				value: 1.0
 			}
 		},
-		vertexShader:
-  /* glsl */
-  `
+		vertexShader: /* glsl */`
 
 		varying vec2 vUv;
 
@@ -32,9 +31,7 @@
 			gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );
 
 		}`,
-		fragmentShader:
-  /* glsl */
-  `
+		fragmentShader: /* glsl */`
 
 		uniform float focus;
 		uniform float maxblur;