super-three 0.133.4 → 0.136.1

package/examples/jsm/node-editor/utils/OscillatorEditor.js

@@ -0,0 +1,42 @@
+import { ObjectNode, SelectInput, LabelElement } from '../../libs/flow.module.js';
+import { OscNode, FloatNode } from '../../renderers/nodes/Nodes.js';
+
+const NULL_VALUE = new FloatNode();
+
+export class OscillatorEditor extends ObjectNode {
+
+	constructor() {
+
+		const node = new OscNode( OscNode.SINE, NULL_VALUE );
+
+		super( 'Oscillator', 1, node, 250 );
+
+		const methodInput = new SelectInput( [
+			{ name: 'Sine', value: OscNode.SINE },
+			{ name: 'Square', value: OscNode.SQUARE },
+			{ name: 'Triangle', value: OscNode.TRIANGLE },
+			{ name: 'Sawtooth', value: OscNode.SAWTOOTH }
+		] );
+
+		methodInput.onChange( () => {
+
+			node.method = methodInput.getValue();
+
+			this.invalidate();
+
+		} );
+
+		const timeElement = new LabelElement( 'Time' ).setInput( 1 );
+
+		timeElement.onConnect( () => {
+
+			node.timeNode = timeElement.linkedExtra || NULL_VALUE;
+
+		} );
+
+		this.add( new LabelElement( 'Method' ).add( methodInput ) )
+			.add( timeElement );
+
+	}
+
+}

package/examples/jsm/node-editor/utils/TimerEditor.js

@@ -0,0 +1,57 @@
+import { ObjectNode, NumberInput, LabelElement, Element, ButtonInput } from '../../libs/flow.module.js';
+import { TimerNode } from '../../renderers/nodes/Nodes.js';
+
+export class TimerEditor extends ObjectNode {
+
+	constructor() {
+
+		const node = new TimerNode();
+
+		super( 'Timer', 1, node, 250 );
+
+		this.title.setIcon( 'ti ti-clock' );
+
+		const updateField = () => {
+
+			field.setValue( node.value.toFixed( 3 ) );
+
+		};
+
+		const field = new NumberInput().onChange( () => {
+
+			node.value = field.getValue();
+
+		} );
+
+		const scaleField = new NumberInput( 1 ).onChange( () => {
+
+			node.scale = scaleField.getValue();
+
+		} );
+
+		const moreElement = new Element().add( new ButtonInput( 'Reset' ).onClick( () => {
+
+			node.value = 0;
+
+			updateField();
+
+		} ) ).setSerializable( false );
+
+		this.add( new LabelElement( 'Value' ).add( field ).setSerializable( false ) )
+			.add( new LabelElement( 'Scale' ).add( scaleField ) )
+			.add( moreElement );
+
+		// extends node
+
+		node._update = node.update;
+		node.update = function ( ...params ) {
+
+			this._update( ...params );
+
+			updateField();
+
+		};
+
+	}
+
+}

package/examples/jsm/nodes/core/NodeBuilder.js

@@ -4,7 +4,7 @@ import {
 	CubeUVReflectionMapping,
 	CubeUVRefractionMapping,
 	LinearEncoding,
-	GammaEncoding
+	sRGBEncoding
 } from 'three';
 
 import { NodeUniform } from './NodeUniform.js';
@@ -951,7 +951,7 @@ class NodeBuilder {
 
 		if ( encoding === LinearEncoding && this.context.gamma ) {
 
-			encoding = GammaEncoding;
+			encoding = sRGBEncoding;
 
 		}
 

package/examples/jsm/nodes/materials/StandardNodeMaterial.js

@@ -34,7 +34,7 @@ NodeUtils.addShortcuts( StandardNodeMaterial.prototype, 'fragment', [
 	'environment',
 	'mask',
 	'position',
-	'sheenTint'
+	'sheenColor'
 ] );
 
 export { StandardNodeMaterial };

package/examples/jsm/nodes/materials/nodes/StandardNode.js

@@ -32,6 +32,7 @@ class StandardNode extends Node {
 		if ( useClearcoat ) {
 
 			builder.define( 'CLEARCOAT' );
+			builder.define( 'USE_CLEARCOAT' );
 
 		}
 
@@ -185,7 +186,7 @@ class StandardNode extends Node {
 
 			}
 
-			if ( this.sheenTint ) this.sheenTint.analyze( builder );
+			if ( this.sheenColor ) this.sheenColor.analyze( builder );
 
 			// build code
 
@@ -230,7 +231,7 @@ class StandardNode extends Node {
 
 			const clearcoatEnv = useClearcoat && environment ? this.environment.flow( builder, 'c', { cache: 'clearcoat', context: contextClearcoatEnvironment, slot: 'environment' } ) : undefined;
 
-			const sheenTint = this.sheenTint ? this.sheenTint.flow( builder, 'c' ) : undefined;
+			const sheenColor = this.sheenColor ? this.sheenColor.flow( builder, 'c' ) : undefined;
 
 			builder.requires.transparent = alpha !== undefined;
 
@@ -368,9 +369,9 @@ class StandardNode extends Node {
 
 			}
 
-			if ( sheenTint ) {
+			if ( sheenColor ) {
 
-				output.push( 'material.sheenTint = ' + sheenTint.result + ';' );
+				output.push( 'material.sheenColor = ' + sheenColor.result + ';' );
 
 			}
 
@@ -547,7 +548,7 @@ class StandardNode extends Node {
 
 		if ( source.environment ) this.environment = source.environment;
 
-		if ( source.sheenTint ) this.sheenTint = source.sheenTint;
+		if ( source.sheenColor ) this.sheenColor = source.sheenColor;
 
 		return this;
 
@@ -593,7 +594,7 @@ class StandardNode extends Node {
 
 			if ( this.environment ) data.environment = this.environment.toJSON( meta ).uuid;
 
-			if ( this.sheenTint ) data.sheenTint = this.sheenTint.toJSON( meta ).uuid;
+			if ( this.sheenColor ) data.sheenColor = this.sheenColor.toJSON( meta ).uuid;
 
 		}
 

package/examples/jsm/nodes/math/MathNode.js

@@ -18,6 +18,14 @@ class MathNode extends TempNode {
 
 		switch ( this.method ) {
 
+			// variable
+
+			case MathNode.ARCTAN:
+
+				return this.b ? 2 : 1;
+
+			// 3
+
 			case MathNode.MIX:
 			case MathNode.CLAMP:
 			case MathNode.REFRACT:
@@ -26,6 +34,8 @@ class MathNode extends TempNode {
 
 				return 3;
 
+			// 2
+
 			case MathNode.MIN:
 			case MathNode.MAX:
 			case MathNode.MOD:
@@ -38,6 +48,8 @@ class MathNode extends TempNode {
 
 				return 2;
 
+			// 1
+
 			default:
 
 				return 1;

package/examples/jsm/nodes/misc/BumpMapNode.js

@@ -90,7 +90,7 @@ class BumpMapNode extends TempNode {
 BumpMapNode.Nodes = ( function () {
 
 	// Bump Mapping Unparametrized Surfaces on the GPU by Morten S. Mikkelsen
-	// http://api.unrealengine.com/attachments/Engine/Rendering/LightingAndShadows/BumpMappingWithoutTangentSpace/mm_sfgrad_bump.pdf
+	// https://mmikk.github.io/papers3d/mm_sfgrad_bump.pdf
 
 	// Evaluate the derivative of the height w.r.t. screen-space using forward differencing (listing 2)
 

package/examples/jsm/nodes/misc/TextureCubeUVNode.js

@@ -26,19 +26,15 @@ class TextureCubeUVNode extends TempNode {
 		const bilinearCubeUV = new FunctionCallNode( TextureCubeUVNode.Nodes.bilinearCubeUV, [ texture, uv, mipInt ] );
 
 		this.colorSpaceTL = this.colorSpaceTL || new ColorSpaceNode( new ExpressionNode( '', 'v4' ) );
-		this.colorSpaceTL.fromDecoding( builder.getTextureEncodingFromMap( this.value.value ) );
 		this.colorSpaceTL.input.parse( bilinearCubeUV.build( builder ) + '.tl' );
 
 		this.colorSpaceTR = this.colorSpaceTR || new ColorSpaceNode( new ExpressionNode( '', 'v4' ) );
-		this.colorSpaceTR.fromDecoding( builder.getTextureEncodingFromMap( this.value.value ) );
 		this.colorSpaceTR.input.parse( bilinearCubeUV.build( builder ) + '.tr' );
 
 		this.colorSpaceBL = this.colorSpaceBL || new ColorSpaceNode( new ExpressionNode( '', 'v4' ) );
-		this.colorSpaceBL.fromDecoding( builder.getTextureEncodingFromMap( this.value.value ) );
 		this.colorSpaceBL.input.parse( bilinearCubeUV.build( builder ) + '.bl' );
 
 		this.colorSpaceBR = this.colorSpaceBR || new ColorSpaceNode( new ExpressionNode( '', 'v4' ) );
-		this.colorSpaceBR.fromDecoding( builder.getTextureEncodingFromMap( this.value.value ) );
 		this.colorSpaceBR.input.parse( bilinearCubeUV.build( builder ) + '.br' );
 
 		// add a custom context for fix incompatibility with the core
@@ -230,6 +226,7 @@ TextureCubeUVNode.Nodes = ( function () {
 
 			return TextureCubeUVData( tl, tr, br, bl, f );
 		}`, [ TextureCubeUVData, getFace, getUV, cubeUV_maxMipLevel, cubeUV_minMipLevel, cubeUV_maxTileSize, cubeUV_minTileSize ] );
+
 	bilinearCubeUV.useKeywords = false;
 
 	// These defines must match with PMREMGenerator

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

@@ -1,18 +1,10 @@
 import {
-	GammaEncoding,
 	LinearEncoding,
-	RGBEEncoding,
-	RGBM7Encoding,
-	RGBM16Encoding,
-	RGBDEncoding,
 	sRGBEncoding
 } from 'three';
 
 import { TempNode } from '../core/TempNode.js';
-import { ConstNode } from '../core/ConstNode.js';
-import { FloatNode } from '../inputs/FloatNode.js';
 import { FunctionNode } from '../core/FunctionNode.js';
-import { ExpressionNode } from '../core/ExpressionNode.js';
 
 class ColorSpaceNode extends TempNode {
 
@@ -65,9 +57,11 @@ class ColorSpaceNode extends TempNode {
 
 	}
 
-	fromDecoding( encoding ) {
+	fromDecoding() {
 
-		const components = ColorSpaceNode.getEncodingComponents( encoding );
+		// TODO: Remove fromDecoding()
+
+		const components = ColorSpaceNode.getEncodingComponents( LinearEncoding );
 
 		this.method = components[ 0 ] + 'ToLinear';
 		this.factor = components[ 1 ];
@@ -106,8 +100,6 @@ class ColorSpaceNode extends TempNode {
 
 ColorSpaceNode.Nodes = ( function () {
 
-	// For a discussion of what this is, please read this: http://lousodrome.net/blog/light/2013/05/26/gamma-correct-and-hdr-rendering-in-a-32-bits-buffer/
-
 	const LinearToLinear = new FunctionNode( /* glsl */`
 		vec4 LinearToLinear( in vec4 value ) {
 
@@ -116,30 +108,6 @@ ColorSpaceNode.Nodes = ( function () {
 		}`
 	);
 
-	const GammaToLinear = new FunctionNode( /* glsl */`
-		vec4 GammaToLinear( in vec4 value, in float gammaFactor ) {
-
-			return vec4( pow( value.xyz, vec3( gammaFactor ) ), value.w );
-
-		}`
-	);
-
-	const LinearToGamma = new FunctionNode( /* glsl */`
-		vec4 LinearToGamma( in vec4 value, in float gammaFactor ) {
-
-			return vec4( pow( value.xyz, vec3( 1.0 / gammaFactor ) ), value.w );
-
-		}`
-	);
-
-	const sRGBToLinear = new FunctionNode( /* glsl */`
-		vec4 sRGBToLinear( in vec4 value ) {
-
-			return vec4( mix( pow( value.rgb * 0.9478672986 + vec3( 0.0521327014 ), vec3( 2.4 ) ), value.rgb * 0.0773993808, vec3( lessThanEqual( value.rgb, vec3( 0.04045 ) ) ) ), value.w );
-
-		}`
-	);
-
 	const LinearTosRGB = new FunctionNode( /* glsl */`
 		vec4 LinearTosRGB( in vec4 value ) {
 
@@ -148,146 +116,16 @@ ColorSpaceNode.Nodes = ( function () {
 		}`
 	);
 
-	const RGBEToLinear = new FunctionNode( /* glsl */`
-		vec4 RGBEToLinear( in vec4 value ) {
-
-			return vec4( value.rgb * exp2( value.a * 255.0 - 128.0 ), 1.0 );
-
-		}`
-	);
-
-	const LinearToRGBE = new FunctionNode( /* glsl */`
-		vec4 LinearToRGBE( in vec4 value ) {
-
-			float maxComponent = max( max( value.r, value.g ), value.b );
-			float fExp = clamp( ceil( log2( maxComponent ) ), -128.0, 127.0 );
-			return vec4( value.rgb / exp2( fExp ), ( fExp + 128.0 ) / 255.0 );
-
-		}`
-	);
-
-	// reference: http://iwasbeingirony.blogspot.ca/2010/06/difference-between-rgbm-and-rgbd.html
-
-	const RGBMToLinear = new FunctionNode( /* glsl */`
-		vec3 RGBMToLinear( in vec4 value, in float maxRange ) {
-
-			return vec4( value.xyz * value.w * maxRange, 1.0 );
-
-		}`
-	);
-
-	const LinearToRGBM = new FunctionNode( /* glsl */`
-		vec3 LinearToRGBM( in vec4 value, in float maxRange ) {
-
-			float maxRGB = max( value.x, max( value.g, value.b ) );
-			float M      = clamp( maxRGB / maxRange, 0.0, 1.0 );
-			M            = ceil( M * 255.0 ) / 255.0;
-			return vec4( value.rgb / ( M * maxRange ), M );
-
-		}`
-	);
-
-	// reference: http://iwasbeingirony.blogspot.ca/2010/06/difference-between-rgbm-and-rgbd.html
-
-	const RGBDToLinear = new FunctionNode( /* glsl */`
-		vec3 RGBDToLinear( in vec4 value, in float maxRange ) {
-
-			return vec4( value.rgb * ( ( maxRange / 255.0 ) / value.a ), 1.0 );
-
-		}`
-	);
-
-
-	const LinearToRGBD = new FunctionNode( /* glsl */`
-		vec3 LinearToRGBD( in vec4 value, in float maxRange ) {
-
-			float maxRGB = max( value.x, max( value.g, value.b ) );
-			float D      = max( maxRange / maxRGB, 1.0 );
-			D            = clamp( floor( D ) / 255.0, 0.0, 1.0 );
-			return vec4( value.rgb * ( D * ( 255.0 / maxRange ) ), D );
-
-		}`
-	);
-
-	// LogLuv reference: http://graphicrants.blogspot.ca/2009/04/rgbm-color-encoding.html
-
-	// M matrix, for encoding
-
-	const cLogLuvM = new ConstNode( 'const mat3 cLogLuvM = mat3( 0.2209, 0.3390, 0.4184, 0.1138, 0.6780, 0.7319, 0.0102, 0.1130, 0.2969 );' );
-
-	const LinearToLogLuv = new FunctionNode( /* glsl */`
-		vec4 LinearToLogLuv( in vec4 value ) {
-
-			vec3 Xp_Y_XYZp = cLogLuvM * value.rgb;
-			Xp_Y_XYZp = max(Xp_Y_XYZp, vec3(1e-6, 1e-6, 1e-6));
-			vec4 vResult;
-			vResult.xy = Xp_Y_XYZp.xy / Xp_Y_XYZp.z;
-			float Le = 2.0 * log2(Xp_Y_XYZp.y) + 127.0;
-			vResult.w = fract(Le);
-			vResult.z = (Le - (floor(vResult.w*255.0))/255.0)/255.0;
-			return vResult;
-
-		}`
-	, [ cLogLuvM ] );
-
-	// Inverse M matrix, for decoding
-
-	const cLogLuvInverseM = new ConstNode( 'const mat3 cLogLuvInverseM = mat3( 6.0014, -2.7008, -1.7996, -1.3320, 3.1029, -5.7721, 0.3008, -1.0882, 5.6268 );' );
-
-	const LogLuvToLinear = new FunctionNode( /* glsl */`
-		vec4 LogLuvToLinear( in vec4 value ) {
-
-			float Le = value.z * 255.0 + value.w;
-			vec3 Xp_Y_XYZp;
-			Xp_Y_XYZp.y = exp2((Le - 127.0) / 2.0);
-			Xp_Y_XYZp.z = Xp_Y_XYZp.y / value.y;
-			Xp_Y_XYZp.x = value.x * Xp_Y_XYZp.z;
-			vec3 vRGB = cLogLuvInverseM * Xp_Y_XYZp.rgb;
-			return vec4( max(vRGB, 0.0), 1.0 );
-
-		}`
-	, [ cLogLuvInverseM ] );
-
 	return {
 		LinearToLinear: LinearToLinear,
-		GammaToLinear: GammaToLinear,
-		LinearToGamma: LinearToGamma,
-		sRGBToLinear: sRGBToLinear,
-		LinearTosRGB: LinearTosRGB,
-		RGBEToLinear: RGBEToLinear,
-		LinearToRGBE: LinearToRGBE,
-		RGBMToLinear: RGBMToLinear,
-		LinearToRGBM: LinearToRGBM,
-		RGBDToLinear: RGBDToLinear,
-		LinearToRGBD: LinearToRGBD,
-		cLogLuvM: cLogLuvM,
-		LinearToLogLuv: LinearToLogLuv,
-		cLogLuvInverseM: cLogLuvInverseM,
-		LogLuvToLinear: LogLuvToLinear
+		LinearTosRGB: LinearTosRGB
 	};
 
 } )();
 
 ColorSpaceNode.LINEAR_TO_LINEAR = 'LinearToLinear';
-
-ColorSpaceNode.GAMMA_TO_LINEAR = 'GammaToLinear';
-ColorSpaceNode.LINEAR_TO_GAMMA = 'LinearToGamma';
-
-ColorSpaceNode.SRGB_TO_LINEAR = 'sRGBToLinear';
 ColorSpaceNode.LINEAR_TO_SRGB = 'LinearTosRGB';
 
-ColorSpaceNode.RGBE_TO_LINEAR = 'RGBEToLinear';
-ColorSpaceNode.LINEAR_TO_RGBE = 'LinearToRGBE';
-
-ColorSpaceNode.RGBM_TO_LINEAR = 'RGBMToLinear';
-ColorSpaceNode.LINEAR_TO_RGBM = 'LinearToRGBM';
-
-ColorSpaceNode.RGBD_TO_LINEAR = 'RGBDToLinear';
-ColorSpaceNode.LINEAR_TO_RGBD = 'LinearToRGBD';
-
-ColorSpaceNode.LINEAR_TO_LOG_LUV = 'LinearToLogLuv';
-ColorSpaceNode.LOG_LUV_TO_LINEAR = 'LogLuvToLinear';
-
 ColorSpaceNode.getEncodingComponents = function ( encoding ) {
 
 	switch ( encoding ) {
@@ -296,16 +134,6 @@ ColorSpaceNode.getEncodingComponents = function ( encoding ) {
 			return [ 'Linear' ];
 		case sRGBEncoding:
 			return [ 'sRGB' ];
-		case RGBEEncoding:
-			return [ 'RGBE' ];
-		case RGBM7Encoding:
-			return [ 'RGBM', new FloatNode( 7.0 ).setReadonly( true ) ];
-		case RGBM16Encoding:
-			return [ 'RGBM', new FloatNode( 16.0 ).setReadonly( true ) ];
-		case RGBDEncoding:
-			return [ 'RGBD', new FloatNode( 256.0 ).setReadonly( true ) ];
-		case GammaEncoding:
-			return [ 'Gamma', new ExpressionNode( 'float( GAMMA_FACTOR )', 'f' ) ];
 
 	}
 

package/examples/jsm/objects/Lensflare.js

@@ -2,19 +2,17 @@ import {
 	AdditiveBlending,
 	Box2,
 	BufferGeometry,
-	ClampToEdgeWrapping,
 	Color,
-	DataTexture,
+	FramebufferTexture,
 	InterleavedBuffer,
 	InterleavedBufferAttribute,
 	Mesh,
 	MeshBasicMaterial,
-	NearestFilter,
-	RGBFormat,
 	RawShaderMaterial,
 	Vector2,
 	Vector3,
-	Vector4
+	Vector4,
+	RGBAFormat
 } from 'three';
 
 class Lensflare extends Mesh {
@@ -34,17 +32,8 @@ class Lensflare extends Mesh {
 
 		// textures
 
-		const tempMap = new DataTexture( new Uint8Array( 16 * 16 * 3 ), 16, 16, RGBFormat );
-		tempMap.minFilter = NearestFilter;
-		tempMap.magFilter = NearestFilter;
-		tempMap.wrapS = ClampToEdgeWrapping;
-		tempMap.wrapT = ClampToEdgeWrapping;
-
-		const occlusionMap = new DataTexture( new Uint8Array( 16 * 16 * 3 ), 16, 16, RGBFormat );
-		occlusionMap.minFilter = NearestFilter;
-		occlusionMap.magFilter = NearestFilter;
-		occlusionMap.wrapS = ClampToEdgeWrapping;
-		occlusionMap.wrapT = ClampToEdgeWrapping;
+		const tempMap = new FramebufferTexture( 16, 16, RGBAFormat );
+		const occlusionMap = new FramebufferTexture( 16, 16, RGBAFormat );
 
 		// material