super-three 0.147.1 → 0.152.0

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

@@ -1,9 +1,10 @@
 import TempNode from '../core/TempNode.js';
-import { vec2, add, sub, mul, cos, sin } from '../shadernode/ShaderNodeBaseElements.js';
+import { addNodeClass } from '../core/Node.js';
+import { addNodeElement, nodeProxy, vec2 } from '../shadernode/ShaderNode.js';
 
 class RotateUVNode extends TempNode {
 
-	constructor( uvNode, rotationNode, centerNode = vec2( .5 ) ) {
+	constructor( uvNode, rotationNode, centerNode = vec2( 0.5 ) ) {
 
 		super( 'vec2' );
 
@@ -17,16 +18,26 @@ class RotateUVNode extends TempNode {
 
 		const { uvNode, rotationNode, centerNode } = this;
 
-		const cosAngle = cos( rotationNode );
-		const sinAngle = sin( rotationNode );
+		const cosAngle = rotationNode.cos();
+		const sinAngle = rotationNode.sin();
 
-		return vec2(
-			add( add( mul( cosAngle, sub( uvNode.x, centerNode.x ) ), mul( sinAngle, sub( uvNode.y, centerNode.y ) ) ), centerNode.x ),
-			add( sub( mul( cosAngle, sub( uvNode.y, centerNode.y ) ), mul( sinAngle, sub( uvNode.x, centerNode.x ) ) ), centerNode.y )
+		const vector = uvNode.sub( centerNode );
+
+		const rotatedVector = vec2( // @TODO: Maybe we can create mat2 and write something like rotationMatrix.mul( vector )?
+			vec2( cosAngle, sinAngle ).dot( vector ),
+			vec2( sinAngle.negate(), cosAngle ).dot( vector )
 		);
 
+		return rotatedVector.add( centerNode );
+
 	}
 
 }
 
 export default RotateUVNode;
+
+export const rotateUV = nodeProxy( RotateUVNode );
+
+addNodeElement( 'rotateUV', rotateUV );
+
+addNodeClass( RotateUVNode );

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

@@ -0,0 +1,37 @@
+import Node, { addNodeClass } from '../core/Node.js';
+import { maxMipLevel } from './MaxMipLevelNode.js';
+import { nodeProxy } from '../shadernode/ShaderNode.js';
+
+class SpecularMIPLevelNode extends Node {
+
+	constructor( textureNode, roughnessNode = null ) {
+
+		super( 'float' );
+
+		this.textureNode = textureNode;
+		this.roughnessNode = roughnessNode;
+
+	}
+
+	construct() {
+
+		const { textureNode, roughnessNode } = this;
+
+		// taken from here: http://casual-effects.blogspot.ca/2011/08/plausible-environment-lighting-in-two.html
+
+		const maxMIPLevelScalar = maxMipLevel( textureNode );
+
+		const sigma = roughnessNode.mul( roughnessNode ).mul( Math.PI ).div( roughnessNode.add( 1.0 ) );
+		const desiredMIPLevel = maxMIPLevelScalar.add( sigma.log2() );
+
+		return desiredMIPLevel.clamp( 0.0, maxMIPLevelScalar );
+
+	}
+
+}
+
+export default SpecularMIPLevelNode;
+
+export const specularMIPLevel = nodeProxy( SpecularMIPLevelNode );
+
+addNodeClass( SpecularMIPLevelNode );

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

@@ -1,7 +1,7 @@
-import Node from '../core/Node.js';
-import { vector } from '../core/NodeBuilder.js';
+import Node, { addNodeClass } from '../core/Node.js';
+import { vectorComponents } from '../core/constants.js';
 
-const vectorComponents = 'xyzw';
+const stringVectorComponents = vectorComponents.join( '' );
 
 class SplitNode extends Node {
 
@@ -20,7 +20,7 @@ class SplitNode extends Node {
 
 		for ( const c of this.components ) {
 
-			vectorLength = Math.max( vector.indexOf( c ) + 1, vectorLength );
+			vectorLength = Math.max( vectorComponents.indexOf( c ) + 1, vectorLength );
 
 		}
 
@@ -57,7 +57,7 @@ class SplitNode extends Node {
 
 			const nodeSnippet = node.build( builder, type );
 
-			if ( this.components.length === nodeTypeLength && this.components === vectorComponents.slice( 0, this.components.length ) ) {
+			if ( this.components.length === nodeTypeLength && this.components === stringVectorComponents.slice( 0, this.components.length ) ) {
 
 				// unecessary swizzle
 
@@ -100,3 +100,5 @@ class SplitNode extends Node {
 }
 
 export default SplitNode;
+
+addNodeClass( SplitNode );

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

@@ -1,14 +1,10 @@
-import Node from '../core/Node.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';
-import SplitNode from '../utils/SplitNode.js';
-import JoinNode from '../utils/JoinNode.js';
+import Node, { addNodeClass } from '../core/Node.js';
+import { uv } from '../accessors/UVNode.js';
+import { nodeProxy, float, vec2 } from '../shadernode/ShaderNode.js';
 
 class SpriteSheetUVNode extends Node {
 
-	constructor( countNode, uvNode = new UVNode(), frameNode = new ConstNode( 0 ) ) {
+	constructor( countNode, uvNode = uv(), frameNode = float( 0 ) ) {
 
 		super( 'vec2' );
 
@@ -22,35 +18,24 @@ class SpriteSheetUVNode extends Node {
 
 		const { frameNode, uvNode, countNode } = this;
 
-		const one = new ConstNode( 1 );
+		const { width, height } = countNode;
 
-		const width = new SplitNode( countNode, 'x' );
-		const height = new SplitNode( countNode, 'y' );
+		const frameNum = frameNode.mod( width.mul( height ) ).floor();
 
-		const total = new OperatorNode( '*', width, height );
+		const column = frameNum.mod( width );
+		const row = height.sub( frameNum.add( 1 ).div( width ).ceil() );
 
-		const roundFrame = new MathNode( MathNode.FLOOR, new MathNode( MathNode.MOD, frameNode, total ) );
+		const scale = countNode.reciprocal();
+		const uvFrameOffset = vec2( column, row );
 
-		const frameNum = new OperatorNode( '+', roundFrame, one );
-
-		const cell = new MathNode( MathNode.MOD, roundFrame, width );
-		const row = new MathNode( MathNode.CEIL, new OperatorNode( '/', frameNum, width ) );
-		const rowInv = new OperatorNode( '-', height, row );
-
-		const scale = new OperatorNode( '/', one, countNode );
-
-		const uvFrameOffset = new JoinNode( [
-			new OperatorNode( '*', cell, new SplitNode( scale, 'x' ) ),
-			new OperatorNode( '*', rowInv, new SplitNode( scale, 'y' ) )
-		] );
-
-		const uvScale = new OperatorNode( '*', uvNode, scale );
-		const uvFrame = new OperatorNode( '+', uvScale, uvFrameOffset );
-
-		return uvFrame;
+		return uvNode.add( uvFrameOffset ).mul( scale );
 
 	}
 
 }
 
 export default SpriteSheetUVNode;
+
+export const spritesheetUV = nodeProxy( SpriteSheetUVNode );
+
+addNodeClass( SpriteSheetUVNode );

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

@@ -1,13 +1,10 @@
 import UniformNode from '../core/UniformNode.js';
 import { NodeUpdateType } from '../core/constants.js';
+import { nodeObject, nodeImmutable } from '../shadernode/ShaderNode.js';
+import { addNodeClass } from '../core/Node.js';
 
 class TimerNode extends UniformNode {
 
-	static LOCAL = 'local';
-	static GLOBAL = 'global';
-	static DELTA = 'delta';
-	static FRAME = 'frame';
-
 	constructor( scope = TimerNode.LOCAL, scale = 1, value = 0 ) {
 
 		super( value );
@@ -18,7 +15,7 @@ class TimerNode extends UniformNode {
 		this.updateType = NodeUpdateType.FRAME;
 
 	}
-/*
+	/*
 	@TODO:
 	getNodeType( builder ) {
 
@@ -81,4 +78,17 @@ class TimerNode extends UniformNode {
 
 }
 
+TimerNode.LOCAL = 'local';
+TimerNode.GLOBAL = 'global';
+TimerNode.DELTA = 'delta';
+TimerNode.FRAME = 'frame';
+
 export default TimerNode;
+
+// @TODO: add support to use node in timeScale
+export const timerLocal = ( timeScale, value = 0 ) => nodeObject( new TimerNode( TimerNode.LOCAL, timeScale, value ) );
+export const timerGlobal = ( timeScale, value = 0 ) => nodeObject( new TimerNode( TimerNode.GLOBAL, timeScale, value ) );
+export const timerDelta = ( timeScale, value = 0 ) => nodeObject( new TimerNode( TimerNode.DELTA, timeScale, value ) );
+export const frameId = nodeImmutable( TimerNode, TimerNode.FRAME );
+
+addNodeClass( TimerNode );

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

@@ -1,5 +1,9 @@
-import Node from '../core/Node.js';
-import { float, vec3, add, mul, div, dot, normalize, abs, texture, positionWorld, normalWorld } from '../shadernode/ShaderNodeBaseElements.js';
+import Node, { addNodeClass } from '../core/Node.js';
+import { add } from '../math/OperatorNode.js';
+import { normalWorld } from '../accessors/NormalNode.js';
+import { positionWorld } from '../accessors/PositionNode.js';
+import { texture } from '../accessors/TextureNode.js';
+import { addNodeElement, nodeProxy, float, vec3 } from '../shadernode/ShaderNode.js';
 
 class TriplanarTexturesNode extends Node {
 
@@ -25,22 +29,22 @@ class TriplanarTexturesNode extends Node {
 		// Ref: https://github.com/keijiro/StandardTriplanar
 
 		// Blending factor of triplanar mapping
-		let bf = normalize( abs( normalNode ) );
-		bf = div( bf, dot( bf, vec3( 1.0 ) ) );
+		let bf = normalNode.abs().normalize();
+		bf = bf.div( bf.dot( vec3( 1.0 ) ) );
 
 		// Triplanar mapping
-		const tx = mul( positionNode.yz, scaleNode );
-		const ty = mul( positionNode.zx, scaleNode );
-		const tz = mul( positionNode.xy, scaleNode );
+		const tx = positionNode.yz.mul( scaleNode );
+		const ty = positionNode.zx.mul( scaleNode );
+		const tz = positionNode.xy.mul( scaleNode );
 
 		// Base color
 		const textureX = textureXNode.value;
 		const textureY = textureYNode !== null ? textureYNode.value : textureX;
 		const textureZ = textureZNode !== null ? textureZNode.value : textureX;
 
-		const cx = mul( texture( textureX, tx ), bf.x );
-		const cy = mul( texture( textureY, ty ), bf.y );
-		const cz = mul( texture( textureZ, tz ), bf.z );
+		const cx = texture( textureX, tx ).mul( bf.x );
+		const cy = texture( textureY, ty ).mul( bf.y );
+		const cz = texture( textureZ, tz ).mul( bf.z );
 
 		return add( cx, cy, cz );
 
@@ -49,3 +53,10 @@ class TriplanarTexturesNode extends Node {
 }
 
 export default TriplanarTexturesNode;
+
+export const triplanarTextures = nodeProxy( TriplanarTexturesNode );
+export const triplanarTexture = ( texture, ...params ) => triplanarTextures( texture, texture, texture, ...params );
+
+addNodeElement( 'triplanarTexture', triplanarTexture );
+
+addNodeClass( TriplanarTexturesNode );

package/examples/jsm/objects/GroundProjectedSkybox.js

@@ -0,0 +1,172 @@
+import { Mesh, IcosahedronGeometry, ShaderMaterial, DoubleSide } from 'three';
+
+/**
+ * Ground projected env map adapted from @react-three/drei.
+ * https://github.com/pmndrs/drei/blob/master/src/core/Environment.tsx
+ */
+class GroundProjectedSkybox extends Mesh {
+
+	constructor( texture, options = {} ) {
+
+		const isCubeMap = texture.isCubeTexture;
+
+		const defines = [
+			isCubeMap ? '#define ENVMAP_TYPE_CUBE' : ''
+		];
+
+		const vertexShader = /* glsl */ `
+			varying vec3 vWorldPosition;
+
+			void main() {
+
+				vec4 worldPosition = ( modelMatrix * vec4( position, 1.0 ) );
+				vWorldPosition = worldPosition.xyz;
+
+				gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );
+
+			}
+			`;
+		const fragmentShader = defines.join( '\n' ) + /* glsl */ `
+
+				varying vec3 vWorldPosition;
+
+				uniform float radius;
+				uniform float height;
+				uniform float angle;
+
+				#ifdef ENVMAP_TYPE_CUBE
+
+					uniform samplerCube map;
+
+				#else
+
+					uniform sampler2D map;
+
+				#endif
+
+				// From: https://www.shadertoy.com/view/4tsBD7
+				float diskIntersectWithBackFaceCulling( vec3 ro, vec3 rd, vec3 c, vec3 n, float r ) 
+				{
+
+					float d = dot ( rd, n );
+
+					if( d > 0.0 ) { return 1e6; }
+
+					vec3 o = ro - c;
+					float t = - dot( n, o ) / d;
+					vec3 q = o + rd * t;
+
+					return ( dot( q, q ) < r * r ) ? t : 1e6;
+
+				}
+
+				// From: https://www.iquilezles.org/www/articles/intersectors/intersectors.htm
+				float sphereIntersect( vec3 ro, vec3 rd, vec3 ce, float ra ) {
+
+					vec3 oc = ro - ce;
+					float b = dot( oc, rd );
+					float c = dot( oc, oc ) - ra * ra;
+					float h = b * b - c;
+
+					if( h < 0.0 ) { return -1.0; }
+
+					h = sqrt( h );
+
+					return - b + h;
+
+				}
+
+				vec3 project() {
+
+					vec3 p = normalize( vWorldPosition );
+					vec3 camPos = cameraPosition;
+					camPos.y -= height;
+
+					float intersection = sphereIntersect( camPos, p, vec3( 0.0 ), radius );
+					if( intersection > 0.0 ) {
+
+						vec3 h = vec3( 0.0, - height, 0.0 );
+						float intersection2 = diskIntersectWithBackFaceCulling( camPos, p, h, vec3( 0.0, 1.0, 0.0 ), radius );
+						p = ( camPos + min( intersection, intersection2 ) * p ) / radius;
+
+					} else {
+
+						p = vec3( 0.0, 1.0, 0.0 );
+
+					}
+
+					return p;
+
+				}
+
+				#include <common>
+
+				void main() {
+
+					vec3 projectedWorldPosition = project();
+
+					#ifdef ENVMAP_TYPE_CUBE
+
+						vec3 outcolor = textureCube( map, projectedWorldPosition ).rgb;
+
+					#else
+
+						vec3 direction = normalize( projectedWorldPosition );
+						vec2 uv = equirectUv( direction );
+						vec3 outcolor = texture2D( map, uv ).rgb;
+
+					#endif
+
+					gl_FragColor = vec4( outcolor, 1.0 );
+
+					#include <tonemapping_fragment>
+					#include <encodings_fragment>
+
+				}
+				`;
+
+		const uniforms = {
+			map: { value: texture },
+			height: { value: options.height || 15 },
+			radius: { value: options.radius || 100 },
+		};
+
+		const geometry = new IcosahedronGeometry( 1, 16 );
+		const material = new ShaderMaterial( {
+			uniforms,
+			fragmentShader,
+			vertexShader,
+			side: DoubleSide,
+		} );
+
+		super( geometry, material );
+
+	}
+
+	set radius( radius ) {
+
+		this.material.uniforms.radius.value = radius;
+
+	}
+
+	get radius() {
+
+		return this.material.uniforms.radius.value;
+
+	}
+
+	set height( height ) {
+
+		this.material.uniforms.height.value = height;
+
+	}
+
+	get height() {
+
+		return this.material.uniforms.height.value;
+
+	}
+
+}
+
+export { GroundProjectedSkybox };

package/examples/jsm/objects/Reflector.js

@@ -11,7 +11,7 @@ import {
 	WebGLRenderTarget,
 	HalfFloatType,
 	NoToneMapping,
-	LinearEncoding
+	LinearSRGBColorSpace
 } from 'three';
 
 class Reflector extends Mesh {
@@ -146,12 +146,12 @@ class Reflector extends Mesh {
 
 			const currentXrEnabled = renderer.xr.enabled;
 			const currentShadowAutoUpdate = renderer.shadowMap.autoUpdate;
-			const currentOutputEncoding = renderer.outputEncoding;
+			const currentOutputColorSpace = renderer.outputColorSpace;
 			const currentToneMapping = renderer.toneMapping;
 
 			renderer.xr.enabled = false; // Avoid camera modification
 			renderer.shadowMap.autoUpdate = false; // Avoid re-computing shadows
-			renderer.outputEncoding = LinearEncoding;
+			renderer.outputColorSpace = LinearSRGBColorSpace;
 			renderer.toneMapping = NoToneMapping;
 
 			renderer.setRenderTarget( renderTarget );
@@ -163,7 +163,7 @@ class Reflector extends Mesh {
 
 			renderer.xr.enabled = currentXrEnabled;
 			renderer.shadowMap.autoUpdate = currentShadowAutoUpdate;
-			renderer.outputEncoding = currentOutputEncoding;
+			renderer.outputColorSpace = currentOutputColorSpace;
 			renderer.toneMapping = currentToneMapping;
 
 			renderer.setRenderTarget( currentRenderTarget );

package/examples/jsm/objects/Refractor.js

@@ -10,7 +10,7 @@ import {
 	Vector3,
 	Vector4,
 	WebGLRenderTarget,
-	LinearEncoding,
+	LinearSRGBColorSpace,
 	NoToneMapping,
 	HalfFloatType
 } from 'three';
@@ -194,12 +194,12 @@ class Refractor extends Mesh {
 			const currentRenderTarget = renderer.getRenderTarget();
 			const currentXrEnabled = renderer.xr.enabled;
 			const currentShadowAutoUpdate = renderer.shadowMap.autoUpdate;
-			const currentOutputEncoding = renderer.outputEncoding;
+			const currentOutputColorSpace = renderer.outputColorSpace;
 			const currentToneMapping = renderer.toneMapping;
 
 			renderer.xr.enabled = false; // avoid camera modification
 			renderer.shadowMap.autoUpdate = false; // avoid re-computing shadows
-			renderer.outputEncoding = LinearEncoding;
+			renderer.outputColorSpace = LinearSRGBColorSpace;
 			renderer.toneMapping = NoToneMapping;
 
 			renderer.setRenderTarget( renderTarget );
@@ -208,7 +208,7 @@ class Refractor extends Mesh {
 
 			renderer.xr.enabled = currentXrEnabled;
 			renderer.shadowMap.autoUpdate = currentShadowAutoUpdate;
-			renderer.outputEncoding = currentOutputEncoding;
+			renderer.outputColorSpace = currentOutputColorSpace;
 			renderer.toneMapping = currentToneMapping;
 			renderer.setRenderTarget( currentRenderTarget );
 

package/examples/jsm/objects/ShadowMesh.js

@@ -23,9 +23,9 @@ class ShadowMesh extends Mesh {
 			opacity: 0.6,
 			depthWrite: false,
 			stencilWrite: true,
-            		stencilFunc: EqualStencilFunc,
-            		stencilRef: 0,
-            		stencilZPass: IncrementStencilOp
+			stencilFunc: EqualStencilFunc,
+			stencilRef: 0,
+			stencilZPass: IncrementStencilOp
 
 		} );
 

package/examples/jsm/physics/AmmoPhysics.js

@@ -188,57 +188,56 @@ async function AmmoPhysics() {
 
 			const delta = ( time - lastTime ) / 1000;
 
-			// console.time( 'world.step' );
 			world.stepSimulation( delta, 10 );
-			// console.timeEnd( 'world.step' );
 
-		}
+			//
 
-		lastTime = time;
+			for ( let i = 0, l = meshes.length; i < l; i ++ ) {
 
-		//
+				const mesh = meshes[ i ];
 
-		for ( let i = 0, l = meshes.length; i < l; i ++ ) {
+				if ( mesh.isInstancedMesh ) {
 
-			const mesh = meshes[ i ];
+					const array = mesh.instanceMatrix.array;
+					const bodies = meshMap.get( mesh );
 
-			if ( mesh.isInstancedMesh ) {
+					for ( let j = 0; j < bodies.length; j ++ ) {
 
-				const array = mesh.instanceMatrix.array;
-				const bodies = meshMap.get( mesh );
+						const body = bodies[ j ];
 
-				for ( let j = 0; j < bodies.length; j ++ ) {
+						const motionState = body.getMotionState();
+						motionState.getWorldTransform( worldTransform );
 
-					const body = bodies[ j ];
+						const position = worldTransform.getOrigin();
+						const quaternion = worldTransform.getRotation();
 
-					const motionState = body.getMotionState();
-					motionState.getWorldTransform( worldTransform );
+						compose( position, quaternion, array, j * 16 );
 
-					const position = worldTransform.getOrigin();
-					const quaternion = worldTransform.getRotation();
+					}
 
-					compose( position, quaternion, array, j * 16 );
+					mesh.instanceMatrix.needsUpdate = true;
+					mesh.computeBoundingSphere();
 
-				}
+				} else if ( mesh.isMesh ) {
 
-				mesh.instanceMatrix.needsUpdate = true;
+					const body = meshMap.get( mesh );
 
-			} else if ( mesh.isMesh ) {
-
-				const body = meshMap.get( mesh );
+					const motionState = body.getMotionState();
+					motionState.getWorldTransform( worldTransform );
 
-				const motionState = body.getMotionState();
-				motionState.getWorldTransform( worldTransform );
+					const position = worldTransform.getOrigin();
+					const quaternion = worldTransform.getRotation();
+					mesh.position.set( position.x(), position.y(), position.z() );
+					mesh.quaternion.set( quaternion.x(), quaternion.y(), quaternion.z(), quaternion.w() );
 
-				const position = worldTransform.getOrigin();
-				const quaternion = worldTransform.getRotation();
-				mesh.position.set( position.x(), position.y(), position.z() );
-				mesh.quaternion.set( quaternion.x(), quaternion.y(), quaternion.z(), quaternion.w() );
+				}
 
 			}
 
 		}
 
+		lastTime = time;
+
 	}
 
 	// animate