super-three 0.137.0 → 0.141.0

package/examples/jsm/{renderers/nodes → nodes}/utils/SpriteSheetUVNode.js

@@ -1,5 +1,5 @@
 import Node from '../core/Node.js';
-import FloatNode from '../inputs/FloatNode.js';
+import ConstNode from '../core/ConstNode.js';
 import UVNode from '../accessors/UVNode.js';
 import MathNode from '../math/MathNode.js';
 import OperatorNode from '../math/OperatorNode.js';
@@ -8,7 +8,7 @@ import JoinNode from '../utils/JoinNode.js';
 
 class SpriteSheetUVNode extends Node {
 
-	constructor( countNode, uvNode = new UVNode(), frameNode = new FloatNode( 0 ).setConst( true ) ) {
+	constructor( countNode, uvNode = new UVNode(), frameNode = new ConstNode( 0 ) ) {
 
 		super( 'vec2' );
 
@@ -24,7 +24,7 @@ class SpriteSheetUVNode extends Node {
 		const uv = this.uvNode;
 		const frame = this.frameNode;
 
-		const one = new FloatNode( 1 ).setConst( true );
+		const one = new ConstNode( 1 );
 
 		const width = new SplitNode( count, 'x' );
 		const height = new SplitNode( count, 'y' );

package/examples/jsm/nodes/utils/TimerNode.js

@@ -1,99 +1,64 @@
-import { FloatNode } from '../inputs/FloatNode.js';
-import { NodeLib } from '../core/NodeLib.js';
+import UniformNode from '../core/UniformNode.js';
+import { NodeUpdateType } from '../core/constants.js';
 
-class TimerNode extends FloatNode {
+class TimerNode extends UniformNode {
 
-	constructor( scale, scope, timeScale ) {
+	static LOCAL = 'local';
+	static GLOBAL = 'global';
+	static DELTA = 'delta';
 
-		super();
+	constructor( scope = TimerNode.LOCAL, scale = 1 ) {
 
-		this.scale = scale !== undefined ? scale : 1;
-		this.scope = scope || TimerNode.GLOBAL;
+		super( 0 );
 
-		this.timeScale = timeScale !== undefined ? timeScale : scale !== undefined;
+		this.scope = scope;
+		this.scale = scale;
 
-	}
-
-	getReadonly() {
-
-		// never use TimerNode as readonly but aways as "uniform"
-
-		return false;
-
-	}
-
-	getUnique() {
-
-		// share TimerNode "uniform" input if is used on more time with others TimerNode
-
-		return this.timeScale && ( this.scope === TimerNode.GLOBAL || this.scope === TimerNode.DELTA );
+		this.updateType = NodeUpdateType.Frame;
 
 	}
 
-	updateFrame( frame ) {
+	update( frame ) {
 
-		const scale = this.timeScale ? this.scale : 1;
+		const scope = this.scope;
+		const scale = this.scale;
 
-		switch ( this.scope ) {
+		if ( scope === TimerNode.LOCAL ) {
 
-			case TimerNode.LOCAL:
+			this.value += frame.deltaTime * scale;
 
-				this.value += frame.delta * scale;
+		} else if ( scope === TimerNode.DELTA ) {
 
-				break;
+			this.value = frame.deltaTime * scale;
 
-			case TimerNode.DELTA:
+		} else {
 
-				this.value = frame.delta * scale;
+			// global
 
-				break;
-
-			default:
-
-				this.value = frame.time * scale;
+			this.value = frame.time * scale;
 
 		}
 
 	}
 
-	copy( source ) {
-
-		super.copy( source );
-
-		this.scope = source.scope;
-		this.scale = source.scale;
-
-		this.timeScale = source.timeScale;
-
-		return this;
-
-	}
-
-	toJSON( meta ) {
+	serialize( data ) {
 
-		const data = super.toJSON( meta );
+		super.serialize( data );
 
 		data.scope = this.scope;
 		data.scale = this.scale;
 
-		data.timeScale = this.timeScale;
-
-		return data;
-
 	}
 
-}
-
-TimerNode.GLOBAL = 'global';
-TimerNode.LOCAL = 'local';
-TimerNode.DELTA = 'delta';
+	deserialize( data ) {
 
-TimerNode.prototype.nodeType = 'Timer';
+		super.deserialize( data );
 
-NodeLib.addKeyword( 'time', function () {
+		this.scope = data.scope;
+		this.scale = data.scale;
 
-	return new TimerNode();
+	}
 
-} );
+}
 
-export { TimerNode };
+export default TimerNode;

package/examples/jsm/objects/Lensflare.js

@@ -21,6 +21,8 @@ class Lensflare extends Mesh {
 
 		super( Lensflare.Geometry, new MeshBasicMaterial( { opacity: 0, transparent: true } ) );
 
+		this.isLensflare = true;
+
 		this.type = 'Lensflare';
 		this.frustumCulled = false;
 		this.renderOrder = Infinity;
@@ -265,8 +267,6 @@ class Lensflare extends Mesh {
 
 }
 
-Lensflare.prototype.isLensflare = true;
-
 //
 
 class LensflareElement {

package/examples/jsm/objects/LightningStorm.js

@@ -58,6 +58,8 @@ class LightningStorm extends Object3D {
 
 		super();
 
+		this.isLightningStorm = true;
+
 		// Parameters
 
 		this.stormParams = stormParams;
@@ -205,9 +207,9 @@ class LightningStorm extends Object3D {
 
 	}
 
-	copy( source ) {
+	copy( source, recursive ) {
 
-		super.copy( source );
+		super.copy( source, recursive );
 
 		this.stormParams.size = source.stormParams.size;
 		this.stormParams.minHeight = source.stormParams.minHeight;
@@ -240,6 +242,4 @@ class LightningStorm extends Object3D {
 
 }
 
-LightningStorm.prototype.isLightningStorm = true;
-
 export { LightningStorm };

package/examples/jsm/objects/MarchingCubes.js

@@ -18,6 +18,8 @@ class MarchingCubes extends Mesh {
 
 		super( geometry, material );
 
+		this.isMarchingCubes = true;
+
 		const scope = this;
 
 		// temp buffers used in polygonize
@@ -812,7 +814,7 @@ class MarchingCubes extends Mesh {
 
 		};
 
-		this.onBeforeRender = function () {
+		this.update = function () {
 
 			this.count = 0;
 
@@ -843,13 +845,9 @@ class MarchingCubes extends Mesh {
 
 			}
 
-			// reset unneeded data
-
-			for ( let i = this.count * 3; i < this.positionArray.length; i ++ ) {
+			// set the draw range to only the processed triangles
 
-				this.positionArray[ i ] = 0.0;
-
-			}
+			this.geometry.setDrawRange( 0, this.count );
 
 			// update geometry data
 
@@ -871,8 +869,6 @@ class MarchingCubes extends Mesh {
 
 }
 
-MarchingCubes.prototype.isMarchingCubes = true;
-
 /////////////////////////////////////
 // Marching cubes lookup tables
 /////////////////////////////////////

package/examples/jsm/objects/Reflector.js

@@ -17,7 +17,10 @@ class Reflector extends Mesh {
 
 		super( geometry );
 
+		this.isReflector = true;
+
 		this.type = 'Reflector';
+		this.camera = new PerspectiveCamera();
 
 		const scope = this;
 
@@ -26,6 +29,7 @@ class Reflector extends Mesh {
 		const textureHeight = options.textureHeight || 512;
 		const clipBias = options.clipBias || 0;
 		const shader = options.shader || Reflector.ReflectorShader;
+		const multisample = ( options.multisample !== undefined ) ? options.multisample : 4;
 
 		//
 
@@ -42,9 +46,9 @@ class Reflector extends Mesh {
 		const q = new Vector4();
 
 		const textureMatrix = new Matrix4();
-		const virtualCamera = new PerspectiveCamera();
+		const virtualCamera = this.camera;
 
-		const renderTarget = new WebGLRenderTarget( textureWidth, textureHeight );
+		const renderTarget = new WebGLRenderTarget( textureWidth, textureHeight, { samples: multisample } );
 
 		const material = new ShaderMaterial( {
 			uniforms: UniformsUtils.clone( shader.uniforms ),
@@ -189,8 +193,6 @@ class Reflector extends Mesh {
 
 }
 
-Reflector.prototype.isReflector = true;
-
 Reflector.ReflectorShader = {
 
 	uniforms: {
@@ -252,6 +254,8 @@ Reflector.ReflectorShader = {
 			vec4 base = texture2DProj( tDiffuse, vUv );
 			gl_FragColor = vec4( blendOverlay( base.rgb, color ), 1.0 );
 
+			#include <encodings_fragment>
+
 		}`
 };
 

package/examples/jsm/objects/ReflectorForSSRPass.js

@@ -20,6 +20,8 @@ class ReflectorForSSRPass extends Mesh {
 
 		super( geometry );
 
+		this.isReflectorForSSRPass = true;
+
 		this.type = 'ReflectorForSSRPass';
 
 		const scope = this;
@@ -249,8 +251,6 @@ class ReflectorForSSRPass extends Mesh {
 
 }
 
-ReflectorForSSRPass.prototype.isReflectorForSSRPass = true;
-
 ReflectorForSSRPass.ReflectorShader = {
 
 	defines: {

package/examples/jsm/objects/Refractor.js

@@ -18,7 +18,10 @@ class Refractor extends Mesh {
 
 		super( geometry );
 
+		this.isRefractor = true;
+
 		this.type = 'Refractor';
+		this.camera = new PerspectiveCamera();
 
 		const scope = this;
 
@@ -27,10 +30,11 @@ class Refractor extends Mesh {
 		const textureHeight = options.textureHeight || 512;
 		const clipBias = options.clipBias || 0;
 		const shader = options.shader || Refractor.RefractorShader;
+		const multisample = ( options.multisample !== undefined ) ? options.multisample : 4;
 
 		//
 
-		const virtualCamera = new PerspectiveCamera();
+		const virtualCamera = this.camera;
 		virtualCamera.matrixAutoUpdate = false;
 		virtualCamera.userData.refractor = true;
 
@@ -41,7 +45,7 @@ class Refractor extends Mesh {
 
 		// render target
 
-		const renderTarget = new WebGLRenderTarget( textureWidth, textureHeight );
+		const renderTarget = new WebGLRenderTarget( textureWidth, textureHeight, { samples: multisample } );
 
 		// material
 
@@ -258,8 +262,6 @@ class Refractor extends Mesh {
 
 }
 
-Refractor.prototype.isRefractor = true;
-
 Refractor.RefractorShader = {
 
 	uniforms: {
@@ -315,6 +317,8 @@ Refractor.RefractorShader = {
 			vec4 base = texture2DProj( tDiffuse, vUv );
 			gl_FragColor = vec4( blendOverlay( base.rgb, color ), 1.0 );
 
+			#include <encodings_fragment>
+
 		}`
 
 };

package/examples/jsm/objects/ShadowMesh.js

@@ -25,6 +25,8 @@ class ShadowMesh extends Mesh {
 
 		super( mesh.geometry, shadowMaterial );
 
+		this.isShadowMesh = true;
+
 		this.meshMatrix = mesh.matrixWorld;
 
 		this.frustumCulled = false;
@@ -69,6 +71,4 @@ class ShadowMesh extends Mesh {
 
 }
 
-ShadowMesh.prototype.isShadowMesh = true;
-
 export { ShadowMesh };

package/examples/jsm/objects/Sky.js

@@ -38,12 +38,12 @@ class Sky extends Mesh {
 
 		super( new BoxGeometry( 1, 1, 1 ), material );
 
+		this.isSky = true;
+
 	}
 
 }
 
-Sky.prototype.isSky = true;
-
 Sky.SkyShader = {
 
 	uniforms: {

package/examples/jsm/objects/Water.js

@@ -26,6 +26,8 @@ class Water extends Mesh {
 
 		super( geometry );
 
+		this.isWater = true;
+
 		const scope = this;
 
 		const textureWidth = options.textureWidth !== undefined ? options.textureWidth : 512;
@@ -324,6 +326,4 @@ class Water extends Mesh {
 
 }
 
-Water.prototype.isWater = true;
-
 export { Water };

package/examples/jsm/objects/Water2.js

@@ -27,6 +27,8 @@ class Water extends Mesh {
 
 		super( geometry );
 
+		this.isWater = true;
+
 		this.type = 'Water';
 
 		const scope = this;
@@ -201,8 +203,6 @@ class Water extends Mesh {
 
 }
 
-Water.prototype.isWater = true;
-
 Water.WaterShader = {
 
 	uniforms: {

package/examples/jsm/offscreen/jank.js

@@ -1,9 +1,9 @@
-var interval = null;
-var result = null;
+let interval = null;
+let result = null;
 
 function initJank() {
 
-	var button = document.getElementById( 'button' );
+	const button = document.getElementById( 'button' );
 	button.addEventListener( 'click', function () {
 
 		if ( interval === null ) {
@@ -30,9 +30,9 @@ function initJank() {
 
 function jank() {
 
-	var number = 0;
+	let number = 0;
 
-	for ( var i = 0; i < 10000000; i ++ ) {
+	for ( let i = 0; i < 10000000; i ++ ) {
 
 		number += Math.random();
 

package/examples/jsm/offscreen/offscreen.js

@@ -2,7 +2,7 @@ import init from './scene.js';
 
 self.onmessage = function ( message ) {
 
-	var data = message.data;
+	const data = message.data;
 	init( data.drawingSurface, data.width, data.height, data.pixelRatio, data.path );
 
 };

package/examples/jsm/offscreen/scene.js

@@ -1,6 +1,6 @@
-import * as THREE from 'three';
+import * as THREE from '../../../build/three.module.js';
 
-var camera, scene, renderer, group;
+let camera, scene, renderer, group;
 
 function init( canvas, width, height, pixelRatio, path ) {
 
@@ -16,24 +16,24 @@ function init( canvas, width, height, pixelRatio, path ) {
 
 	// we don't use ImageLoader since it has a DOM dependency (HTML5 image element)
 
-	var loader = new THREE.ImageBitmapLoader().setPath( path );
+	const loader = new THREE.ImageBitmapLoader().setPath( path );
 	loader.setOptions( { imageOrientation: 'flipY' } );
 	loader.load( 'textures/matcaps/matcap-porcelain-white.jpg', function ( imageBitmap ) {
 
-		var texture = new THREE.CanvasTexture( imageBitmap );
+		const texture = new THREE.CanvasTexture( imageBitmap );
 
-		var geometry = new THREE.IcosahedronGeometry( 5, 8 );
-		var materials = [
+		const geometry = new THREE.IcosahedronGeometry( 5, 8 );
+		const materials = [
 			new THREE.MeshMatcapMaterial( { color: 0xaa24df, matcap: texture } ),
 			new THREE.MeshMatcapMaterial( { color: 0x605d90, matcap: texture } ),
 			new THREE.MeshMatcapMaterial( { color: 0xe04a3f, matcap: texture } ),
 			new THREE.MeshMatcapMaterial( { color: 0xe30456, matcap: texture } )
 		];
 
-		for ( var i = 0; i < 100; i ++ ) {
+		for ( let i = 0; i < 100; i ++ ) {
 
-			var material = materials[ i % materials.length ];
-			var mesh = new THREE.Mesh( geometry, material );
+			const material = materials[ i % materials.length ];
+			const mesh = new THREE.Mesh( geometry, material );
 			mesh.position.x = random() * 200 - 100;
 			mesh.position.y = random() * 200 - 100;
 			mesh.position.z = random() * 200 - 100;
@@ -73,11 +73,11 @@ function animate() {
 
 // PRNG
 
-var seed = 1;
+let seed = 1;
 
 function random() {
 
-	var x = Math.sin( seed ++ ) * 10000;
+	const x = Math.sin( seed ++ ) * 10000;
 
 	return x - Math.floor( x );
 

package/examples/jsm/postprocessing/AdaptiveToneMappingPass.js

@@ -1,9 +1,7 @@
 import {
-	LinearFilter,
 	LinearMipmapLinearFilter,
 	MeshBasicMaterial,
 	NoBlending,
-	RGBAFormat,
 	ShaderMaterial,
 	UniformsUtils,
 	WebGLRenderTarget
@@ -215,19 +213,19 @@ class AdaptiveToneMappingPass extends Pass {
 
 		}
 
-		const pars = { minFilter: LinearFilter, magFilter: LinearFilter, format: RGBAFormat }; // was RGB format. changed to RGBA format. see discussion in #8415 / #8450
 
-		this.luminanceRT = new WebGLRenderTarget( this.resolution, this.resolution, pars );
+		this.luminanceRT = new WebGLRenderTarget( this.resolution, this.resolution );
 		this.luminanceRT.texture.name = 'AdaptiveToneMappingPass.l';
 		this.luminanceRT.texture.generateMipmaps = false;
 
-		this.previousLuminanceRT = new WebGLRenderTarget( this.resolution, this.resolution, pars );
+		this.previousLuminanceRT = new WebGLRenderTarget( this.resolution, this.resolution );
 		this.previousLuminanceRT.texture.name = 'AdaptiveToneMappingPass.pl';
 		this.previousLuminanceRT.texture.generateMipmaps = false;
 
 		// We only need mipmapping for the current luminosity because we want a down-sampled version to sample in our adaptive shader
-		pars.minFilter = LinearMipmapLinearFilter;
-		pars.generateMipmaps = true;
+
+		const pars = { minFilter: LinearMipmapLinearFilter, generateMipmaps: true };
+
 		this.currentLuminanceRT = new WebGLRenderTarget( this.resolution, this.resolution, pars );
 		this.currentLuminanceRT.texture.name = 'AdaptiveToneMappingPass.cl';
 

package/examples/jsm/postprocessing/AfterimagePass.js

@@ -1,8 +1,6 @@
 import {
-	LinearFilter,
 	MeshBasicMaterial,
 	NearestFilter,
-	RGBAFormat,
 	ShaderMaterial,
 	UniformsUtils,
 	WebGLRenderTarget
@@ -25,19 +23,11 @@ class AfterimagePass extends Pass {
 		this.uniforms[ 'damp' ].value = damp;
 
 		this.textureComp = new WebGLRenderTarget( window.innerWidth, window.innerHeight, {
-
-			minFilter: LinearFilter,
 			magFilter: NearestFilter,
-			format: RGBAFormat
-
 		} );
 
 		this.textureOld = new WebGLRenderTarget( window.innerWidth, window.innerHeight, {
-
-			minFilter: LinearFilter,
 			magFilter: NearestFilter,
-			format: RGBAFormat
-
 		} );
 
 		this.shaderMaterial = new ShaderMaterial( {

package/examples/jsm/postprocessing/BloomPass.js

@@ -1,14 +1,11 @@
 import {
 	AdditiveBlending,
-	LinearFilter,
-	RGBAFormat,
 	ShaderMaterial,
 	UniformsUtils,
 	Vector2,
 	WebGLRenderTarget
 } from 'three';
 import { Pass, FullScreenQuad } from './Pass.js';
-import { CopyShader } from '../shaders/CopyShader.js';
 import { ConvolutionShader } from '../shaders/ConvolutionShader.js';
 
 class BloomPass extends Pass {
@@ -19,28 +16,22 @@ class BloomPass extends Pass {
 
 		// render targets
 
-		const pars = { minFilter: LinearFilter, magFilter: LinearFilter, format: RGBAFormat };
-
-		this.renderTargetX = new WebGLRenderTarget( resolution, resolution, pars );
+		this.renderTargetX = new WebGLRenderTarget( resolution, resolution );
 		this.renderTargetX.texture.name = 'BloomPass.x';
-		this.renderTargetY = new WebGLRenderTarget( resolution, resolution, pars );
+		this.renderTargetY = new WebGLRenderTarget( resolution, resolution );
 		this.renderTargetY.texture.name = 'BloomPass.y';
 
-		// copy material
-
-		if ( CopyShader === undefined ) console.error( 'THREE.BloomPass relies on CopyShader' );
-
-		const copyShader = CopyShader;
+		// combine material
 
-		this.copyUniforms = UniformsUtils.clone( copyShader.uniforms );
+		this.combineUniforms = UniformsUtils.clone( CombineShader.uniforms );
 
-		this.copyUniforms[ 'opacity' ].value = strength;
+		this.combineUniforms[ 'strength' ].value = strength;
 
-		this.materialCopy = new ShaderMaterial( {
+		this.materialCombine = new ShaderMaterial( {
 
-			uniforms: this.copyUniforms,
-			vertexShader: copyShader.vertexShader,
-			fragmentShader: copyShader.fragmentShader,
+			uniforms: this.combineUniforms,
+			vertexShader: CombineShader.vertexShader,
+			fragmentShader: CombineShader.fragmentShader,
 			blending: AdditiveBlending,
 			transparent: true
 
@@ -102,9 +93,9 @@ class BloomPass extends Pass {
 
 		// Render original scene with superimposed blur to texture
 
-		this.fsQuad.material = this.materialCopy;
+		this.fsQuad.material = this.materialCombine;
 
-		this.copyUniforms[ 'tDiffuse' ].value = this.renderTargetY.texture;
+		this.combineUniforms[ 'tDiffuse' ].value = this.renderTargetY.texture;
 
 		if ( maskActive ) renderer.state.buffers.stencil.setTest( true );
 
@@ -116,6 +107,43 @@ class BloomPass extends Pass {
 
 }
 
+const CombineShader = {
+
+	uniforms: {
+
+		'tDiffuse': { value: null },
+		'strength': { value: 1.0 }
+
+	},
+
+	vertexShader: /* glsl */`
+
+		varying vec2 vUv;
+
+		void main() {
+
+			vUv = uv;
+			gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );
+
+		}`,
+
+	fragmentShader: /* glsl */`
+
+		uniform float strength;
+
+		uniform sampler2D tDiffuse;
+
+		varying vec2 vUv;
+
+		void main() {
+
+			vec4 texel = texture2D( tDiffuse, vUv );
+			gl_FragColor = strength * texel;
+
+		}`
+
+};
+
 BloomPass.blurX = new Vector2( 0.001953125, 0.0 );
 BloomPass.blurY = new Vector2( 0.0, 0.001953125 );