super-three 0.141.0 → 0.147.0

package/examples/js/postprocessing/CubeTexturePass.js

@@ -2,7 +2,7 @@
 
 	class CubeTexturePass extends THREE.Pass {
 
-		constructor( camera, envMap, opacity = 1 ) {
+		constructor( camera, tCube, opacity = 1 ) {
 
 			super();
 			this.camera = camera;
@@ -19,28 +19,25 @@
 			Object.defineProperty( this.cubeMesh.material, 'envMap', {
 				get: function () {
 
-					return this.uniforms.envMap.value;
+					return this.uniforms.tCube.value;
 
 				}
 			} );
-			this.envMap = envMap;
+			this.tCube = tCube;
 			this.opacity = opacity;
 			this.cubeScene = new THREE.Scene();
 			this.cubeCamera = new THREE.PerspectiveCamera();
 			this.cubeScene.add( this.cubeMesh );
 
 		}
-
-		render( renderer, writeBuffer, readBuffer
-			/*, deltaTime, maskActive*/
-		) {
+		render( renderer, writeBuffer, readBuffer /*, deltaTime, maskActive*/ ) {
 
 			const oldAutoClear = renderer.autoClear;
 			renderer.autoClear = false;
 			this.cubeCamera.projectionMatrix.copy( this.camera.projectionMatrix );
 			this.cubeCamera.quaternion.setFromRotationMatrix( this.camera.matrixWorld );
-			this.cubeMesh.material.uniforms.envMap.value = this.envMap;
-			this.cubeMesh.material.uniforms.flipEnvMap.value = this.envMap.isCubeTexture && this.envMap.isRenderTargetTexture === false ? - 1 : 1;
+			this.cubeMesh.material.uniforms.tCube.value = this.tCube;
+			this.cubeMesh.material.uniforms.tFlip.value = this.tCube.isCubeTexture && this.tCube.isRenderTargetTexture === false ? - 1 : 1;
 			this.cubeMesh.material.uniforms.opacity.value = this.opacity;
 			this.cubeMesh.material.transparent = this.opacity < 1.0;
 			renderer.setRenderTarget( this.renderToScreen ? null : readBuffer );
@@ -49,6 +46,12 @@
 			renderer.autoClear = oldAutoClear;
 
 		}
+		dispose() {
+
+			this.cubeMesh.geometry.dispose();
+			this.cubeMesh.material.dispose();
+
+		}
 
 	}
 

package/examples/js/postprocessing/DotScreenPass.js

@@ -19,14 +19,10 @@
 			this.fsQuad = new THREE.FullScreenQuad( this.material );
 
 		}
-
-		render( renderer, writeBuffer, readBuffer
-			/*, deltaTime, maskActive */
-		) {
+		render( renderer, writeBuffer, readBuffer /*, deltaTime, maskActive */ ) {
 
 			this.uniforms[ 'tDiffuse' ].value = readBuffer.texture;
 			this.uniforms[ 'tSize' ].value.set( readBuffer.width, readBuffer.height );
-
 			if ( this.renderToScreen ) {
 
 				renderer.setRenderTarget( null );
@@ -41,6 +37,12 @@
 			}
 
 		}
+		dispose() {
+
+			this.material.dispose();
+			this.fsQuad.dispose();
+
+		}
 
 	}
 

package/examples/js/postprocessing/EffectComposer.js

@@ -5,7 +5,6 @@
 		constructor( renderer, renderTarget ) {
 
 			this.renderer = renderer;
-
 			if ( renderTarget === undefined ) {
 
 				const size = renderer.getSize( new THREE.Vector2() );
@@ -29,7 +28,9 @@
 			this.writeBuffer = this.renderTarget1;
 			this.readBuffer = this.renderTarget2;
 			this.renderToScreen = true;
-			this.passes = []; // dependencies
+			this.passes = [];
+
+			// dependencies
 
 			if ( THREE.CopyShader === undefined ) {
 
@@ -47,7 +48,6 @@
 			this.clock = new THREE.Clock();
 
 		}
-
 		swapBuffers() {
 
 			const tmp = this.readBuffer;
@@ -55,25 +55,21 @@
 			this.writeBuffer = tmp;
 
 		}
-
 		addPass( pass ) {
 
 			this.passes.push( pass );
 			pass.setSize( this._width * this._pixelRatio, this._height * this._pixelRatio );
 
 		}
-
 		insertPass( pass, index ) {
 
 			this.passes.splice( index, 0, pass );
 			pass.setSize( this._width * this._pixelRatio, this._height * this._pixelRatio );
 
 		}
-
 		removePass( pass ) {
 
 			const index = this.passes.indexOf( pass );
-
 			if ( index !== - 1 ) {
 
 				this.passes.splice( index, 1 );
@@ -81,7 +77,6 @@
 			}
 
 		}
-
 		isLastEnabledPass( passIndex ) {
 
 			for ( let i = passIndex + 1; i < this.passes.length; i ++ ) {
@@ -97,10 +92,10 @@
 			return true;
 
 		}
-
 		render( deltaTime ) {
 
 			// deltaTime value is in seconds
+
 			if ( deltaTime === undefined ) {
 
 				deltaTime = this.clock.getDelta();
@@ -109,24 +104,24 @@
 
 			const currentRenderTarget = this.renderer.getRenderTarget();
 			let maskActive = false;
-
 			for ( let i = 0, il = this.passes.length; i < il; i ++ ) {
 
 				const pass = this.passes[ i ];
 				if ( pass.enabled === false ) continue;
 				pass.renderToScreen = this.renderToScreen && this.isLastEnabledPass( i );
 				pass.render( this.renderer, this.writeBuffer, this.readBuffer, deltaTime, maskActive );
-
 				if ( pass.needsSwap ) {
 
 					if ( maskActive ) {
 
 						const context = this.renderer.getContext();
-						const stencil = this.renderer.state.buffers.stencil; //context.stencilFunc( context.NOTEQUAL, 1, 0xffffffff );
+						const stencil = this.renderer.state.buffers.stencil;
 
+						//context.stencilFunc( context.NOTEQUAL, 1, 0xffffffff );
 						stencil.setFunc( context.NOTEQUAL, 1, 0xffffffff );
-						this.copyPass.render( this.renderer, this.writeBuffer, this.readBuffer, deltaTime ); //context.stencilFunc( context.EQUAL, 1, 0xffffffff );
+						this.copyPass.render( this.renderer, this.writeBuffer, this.readBuffer, deltaTime );
 
+						//context.stencilFunc( context.EQUAL, 1, 0xffffffff );
 						stencil.setFunc( context.EQUAL, 1, 0xffffffff );
 
 					}
@@ -154,7 +149,6 @@
 			this.renderer.setRenderTarget( currentRenderTarget );
 
 		}
-
 		reset( renderTarget ) {
 
 			if ( renderTarget === undefined ) {
@@ -176,7 +170,6 @@
 			this.readBuffer = this.renderTarget2;
 
 		}
-
 		setSize( width, height ) {
 
 			this._width = width;
@@ -185,7 +178,6 @@
 			const effectiveHeight = this._height * this._pixelRatio;
 			this.renderTarget1.setSize( effectiveWidth, effectiveHeight );
 			this.renderTarget2.setSize( effectiveWidth, effectiveHeight );
-
 			for ( let i = 0; i < this.passes.length; i ++ ) {
 
 				this.passes[ i ].setSize( effectiveWidth, effectiveHeight );
@@ -193,51 +185,56 @@
 			}
 
 		}
-
 		setPixelRatio( pixelRatio ) {
 
 			this._pixelRatio = pixelRatio;
 			this.setSize( this._width, this._height );
 
 		}
+		dispose() {
 
-	}
+			this.renderTarget1.dispose();
+			this.renderTarget2.dispose();
+			this.copyPass.dispose();
+
+		}
 
+	}
 	class Pass {
 
 		constructor() {
 
 			// if set to true, the pass is processed by the composer
-			this.enabled = true; // if set to true, the pass indicates to swap read and write buffer after rendering
+			this.enabled = true;
 
-			this.needsSwap = true; // if set to true, the pass clears its buffer before rendering
+			// if set to true, the pass indicates to swap read and write buffer after rendering
+			this.needsSwap = true;
 
-			this.clear = false; // if set to true, the result of the pass is rendered to screen. This is set automatically by EffectComposer.
+			// if set to true, the pass clears its buffer before rendering
+			this.clear = false;
 
+			// if set to true, the result of the pass is rendered to screen. This is set automatically by EffectComposer.
 			this.renderToScreen = false;
 
 		}
-
 		setSize() {}
-
 		render() {
 
 			console.error( 'THREE.Pass: .render() must be implemented in derived pass.' );
 
 		}
 
-	} // Helper for passes that need to fill the viewport with a single quad.
+	}
 
+	// Helper for passes that need to fill the viewport with a single quad.
 
-	const _camera = new THREE.OrthographicCamera( - 1, 1, 1, - 1, 0, 1 ); // https://github.com/mrdoob/three.js/pull/21358
+	const _camera = new THREE.OrthographicCamera( - 1, 1, 1, - 1, 0, 1 );
 
+	// https://github.com/mrdoob/three.js/pull/21358
 
 	const _geometry = new THREE.BufferGeometry();
-
 	_geometry.setAttribute( 'position', new THREE.Float32BufferAttribute( [ - 1, 3, 0, - 1, - 1, 0, 3, - 1, 0 ], 3 ) );
-
 	_geometry.setAttribute( 'uv', new THREE.Float32BufferAttribute( [ 0, 2, 0, 0, 2, 0 ], 2 ) );
-
 	class FullScreenQuad {
 
 		constructor( material ) {
@@ -245,25 +242,21 @@
 			this._mesh = new THREE.Mesh( _geometry, material );
 
 		}
-
 		dispose() {
 
 			this._mesh.geometry.dispose();
 
 		}
-
 		render( renderer ) {
 
 			renderer.render( this._mesh, _camera );
 
 		}
-
 		get material() {
 
 			return this._mesh.material;
 
 		}
-
 		set material( value ) {
 
 			this._mesh.material = value;

package/examples/js/postprocessing/FilmPass.js

@@ -20,14 +20,10 @@
 			this.fsQuad = new THREE.FullScreenQuad( this.material );
 
 		}
-
-		render( renderer, writeBuffer, readBuffer, deltaTime
-			/*, maskActive */
-		) {
+		render( renderer, writeBuffer, readBuffer, deltaTime /*, maskActive */ ) {
 
 			this.uniforms[ 'tDiffuse' ].value = readBuffer.texture;
 			this.uniforms[ 'time' ].value += deltaTime;
-
 			if ( this.renderToScreen ) {
 
 				renderer.setRenderTarget( null );
@@ -42,6 +38,12 @@
 			}
 
 		}
+		dispose() {
+
+			this.material.dispose();
+			this.fsQuad.dispose();
+
+		}
 
 	}
 

package/examples/js/postprocessing/GlitchPass.js

@@ -8,7 +8,8 @@
 			if ( THREE.DigitalGlitch === undefined ) console.error( 'THREE.GlitchPass relies on THREE.DigitalGlitch' );
 			const shader = THREE.DigitalGlitch;
 			this.uniforms = THREE.UniformsUtils.clone( shader.uniforms );
-			this.uniforms[ 'tDisp' ].value = this.generateHeightmap( dt_size );
+			this.heightMap = this.generateHeightmap( dt_size );
+			this.uniforms[ 'tDisp' ].value = this.heightMap;
 			this.material = new THREE.ShaderMaterial( {
 				uniforms: this.uniforms,
 				vertexShader: shader.vertexShader,
@@ -20,17 +21,12 @@
 			this.generateTrigger();
 
 		}
-
-		render( renderer, writeBuffer, readBuffer
-			/*, deltaTime, maskActive */
-		) {
+		render( renderer, writeBuffer, readBuffer /*, deltaTime, maskActive */ ) {
 
 			if ( renderer.capabilities.isWebGL2 === false ) this.uniforms[ 'tDisp' ].value.format = THREE.LuminanceFormat;
 			this.uniforms[ 'tDiffuse' ].value = readBuffer.texture;
 			this.uniforms[ 'seed' ].value = Math.random(); //default seeding
-
 			this.uniforms[ 'byp' ].value = 0;
-
 			if ( this.curF % this.randX == 0 || this.goWild == true ) {
 
 				this.uniforms[ 'amount' ].value = Math.random() / 30;
@@ -58,7 +54,6 @@
 			}
 
 			this.curF ++;
-
 			if ( this.renderToScreen ) {
 
 				renderer.setRenderTarget( null );
@@ -73,18 +68,15 @@
 			}
 
 		}
-
 		generateTrigger() {
 
 			this.randX = THREE.MathUtils.randInt( 120, 240 );
 
 		}
-
 		generateHeightmap( dt_size ) {
 
 			const data_arr = new Float32Array( dt_size * dt_size );
 			const length = dt_size * dt_size;
-
 			for ( let i = 0; i < length; i ++ ) {
 
 				const val = THREE.MathUtils.randFloat( 0, 1 );
@@ -97,6 +89,13 @@
 			return texture;
 
 		}
+		dispose() {
+
+			this.material.dispose();
+			this.heightMap.dispose();
+			this.fsQuad.dispose();
+
+		}
 
 	}
 

package/examples/js/postprocessing/HalftonePass.js

@@ -9,7 +9,6 @@
 		constructor( width, height, params ) {
 
 			super();
-
 			if ( THREE.HalftoneShader === undefined ) {
 
 				console.error( 'THREE.HalftonePass requires THREE.HalftoneShader' );
@@ -21,11 +20,11 @@
 				uniforms: this.uniforms,
 				fragmentShader: THREE.HalftoneShader.fragmentShader,
 				vertexShader: THREE.HalftoneShader.vertexShader
-			} ); // set params
+			} );
 
+			// set params
 			this.uniforms.width.value = width;
 			this.uniforms.height.value = height;
-
 			for ( const key in params ) {
 
 				if ( params.hasOwnProperty( key ) && this.uniforms.hasOwnProperty( key ) ) {
@@ -39,13 +38,9 @@
 			this.fsQuad = new THREE.FullScreenQuad( this.material );
 
 		}
-
-		render( renderer, writeBuffer, readBuffer
-			/*, deltaTime, maskActive*/
-		) {
+		render( renderer, writeBuffer, readBuffer /*, deltaTime, maskActive*/ ) {
 
 			this.material.uniforms[ 'tDiffuse' ].value = readBuffer.texture;
-
 			if ( this.renderToScreen ) {
 
 				renderer.setRenderTarget( null );
@@ -60,13 +55,18 @@
 			}
 
 		}
-
 		setSize( width, height ) {
 
 			this.uniforms.width.value = width;
 			this.uniforms.height.value = height;
 
 		}
+		dispose() {
+
+			this.material.dispose();
+			this.fsQuad.dispose();
+
+		}
 
 	}
 

package/examples/js/postprocessing/LUTPass.js

@@ -21,9 +21,7 @@
 				value: 1.0
 			}
 		},
-		vertexShader:
-  /* glsl */
-  `
+		vertexShader: /* glsl */`
 
 		varying vec2 vUv;
 
@@ -35,9 +33,7 @@
 		}
 
 	`,
-		fragmentShader:
-  /* glsl */
-  `
+		fragmentShader: /* glsl */`
 
 		uniform float lutSize;
 		#if USE_3DTEXTURE
@@ -110,22 +106,18 @@
 
 	`
 	};
-
 	class LUTPass extends THREE.ShaderPass {
 
 		set lut( v ) {
 
 			const material = this.material;
-
 			if ( v !== this.lut ) {
 
 				material.uniforms.lut3d.value = null;
 				material.uniforms.lut.value = null;
-
 				if ( v ) {
 
 					const is3dTextureDefine = v.isData3DTexture ? 1 : 0;
-
 					if ( is3dTextureDefine !== material.defines.USE_3DTEXTURE ) {
 
 						material.defines.USE_3DTEXTURE = is3dTextureDefine;
@@ -134,7 +126,6 @@
 					}
 
 					material.uniforms.lutSize.value = v.image.width;
-
 					if ( v.isData3DTexture ) {
 
 						material.uniforms.lut3d.value = v;
@@ -150,25 +141,21 @@
 			}
 
 		}
-
 		get lut() {
 
 			return this.material.uniforms.lut.value || this.material.uniforms.lut3d.value;
 
 		}
-
 		set intensity( v ) {
 
 			this.material.uniforms.intensity.value = v;
 
 		}
-
 		get intensity() {
 
 			return this.material.uniforms.intensity.value;
 
 		}
-
 		constructor( options = {} ) {
 
 			super( LUTShader );

package/examples/js/postprocessing/MaskPass.js

@@ -12,22 +12,24 @@
 			this.inverse = false;
 
 		}
-
-		render( renderer, writeBuffer, readBuffer
-			/*, deltaTime, maskActive */
-		) {
+		render( renderer, writeBuffer, readBuffer /*, deltaTime, maskActive */ ) {
 
 			const context = renderer.getContext();
-			const state = renderer.state; // don't update color or depth
+			const state = renderer.state;
+
+			// don't update color or depth
 
 			state.buffers.color.setMask( false );
-			state.buffers.depth.setMask( false ); // lock buffers
+			state.buffers.depth.setMask( false );
+
+			// lock buffers
 
 			state.buffers.color.setLocked( true );
-			state.buffers.depth.setLocked( true ); // set up stencil
+			state.buffers.depth.setLocked( true );
 
-			let writeValue, clearValue;
+			// set up stencil
 
+			let writeValue, clearValue;
 			if ( this.inverse ) {
 
 				writeValue = 0;
@@ -44,28 +46,32 @@
 			state.buffers.stencil.setOp( context.REPLACE, context.REPLACE, context.REPLACE );
 			state.buffers.stencil.setFunc( context.ALWAYS, writeValue, 0xffffffff );
 			state.buffers.stencil.setClear( clearValue );
-			state.buffers.stencil.setLocked( true ); // draw into the stencil buffer
+			state.buffers.stencil.setLocked( true );
+
+			// draw into the stencil buffer
 
 			renderer.setRenderTarget( readBuffer );
 			if ( this.clear ) renderer.clear();
 			renderer.render( this.scene, this.camera );
 			renderer.setRenderTarget( writeBuffer );
 			if ( this.clear ) renderer.clear();
-			renderer.render( this.scene, this.camera ); // unlock color and depth buffer for subsequent rendering
+			renderer.render( this.scene, this.camera );
+
+			// unlock color and depth buffer for subsequent rendering
 
 			state.buffers.color.setLocked( false );
-			state.buffers.depth.setLocked( false ); // only render where stencil is set to 1
+			state.buffers.depth.setLocked( false );
+
+			// only render where stencil is set to 1
 
 			state.buffers.stencil.setLocked( false );
 			state.buffers.stencil.setFunc( context.EQUAL, 1, 0xffffffff ); // draw if == 1
-
 			state.buffers.stencil.setOp( context.KEEP, context.KEEP, context.KEEP );
 			state.buffers.stencil.setLocked( true );
 
 		}
 
 	}
-
 	class ClearMaskPass extends THREE.Pass {
 
 		constructor() {
@@ -74,10 +80,7 @@
 			this.needsSwap = false;
 
 		}
-
-		render( renderer
-			/*, writeBuffer, readBuffer, deltaTime, maskActive */
-		) {
+		render( renderer /*, writeBuffer, readBuffer, deltaTime, maskActive */ ) {
 
 			renderer.state.buffers.stencil.setLocked( false );
 			renderer.state.buffers.stencil.setTest( false );