Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TSL: Different params order if method chaining is used. #25683

Merged
merged 5 commits into from
Mar 20, 2023
Merged

TSL: Different params order if method chaining is used. #25683

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
818d2ea
CodeNode: Added language and serialize.
sunag Mar 16, 2023
49b4a18
TSL: Renamed inversesqrt -> inverseSqrt, faceforward -> faceForward,
sunag Mar 16, 2023
bb5ba65
TSL: Added saturate
sunag Mar 16, 2023
a136476
TSL: Different params order if method chaining is used.
sunag Mar 16, 2023
9070cca
Nodes: Change mix order and added FogNode.mixAssign()
sunag Mar 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
TSL: Different params order if method chaining is used.
  • Loading branch information
@sunag
sunag committed Mar 16, 2023
commit a1364768cfba9272debe37ba2a27f5537ce67e0d
7 changes: 5 additions & 2 deletions examples/jsm/nodes/math/MathNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,9 @@ export const refract = nodeProxy( MathNode, MathNode.REFRACT );
export const smoothstep = nodeProxy( MathNode, MathNode.SMOOTHSTEP );
export const faceForward = nodeProxy( MathNode, MathNode.FACEFORWARD );

export const mixElement = ( t, e1, e2 ) => mix( e1, e2, t );
export const smoothstepElement = ( x, low, high ) => smoothstep( low, high, x );

addNodeElement( 'radians', radians );
addNodeElement( 'degrees', degrees );
addNodeElement( 'exp', exp );
Expand Down Expand Up @@ -339,10 +342,10 @@ addNodeElement( 'pow2', pow2 );
addNodeElement( 'pow3', pow3 );
addNodeElement( 'pow4', pow4 );
addNodeElement( 'transformDirection', transformDirection );
addNodeElement( 'mix', mix );
addNodeElement( 'mix', mixElement );
addNodeElement( 'clamp', clamp );
addNodeElement( 'refract', refract );
addNodeElement( 'smoothstep', smoothstep );
addNodeElement( 'smoothstep', smoothstepElement );
addNodeElement( 'faceForward', faceForward );
addNodeElement( 'difference', difference );
addNodeElement( 'saturate', saturate );
Expand Down
2 changes: 1 addition & 1 deletion examples/webgpu_sandbox.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@

const materialCompressed = new MeshBasicNodeMaterial();
materialCompressed.colorNode = texture( dxt5Texture );
materialCompressed.emissiveNode = color( 0x663300 );
materialCompressed.emissiveNode = oscSine().mix( color( 0x663300 ), color( 0x0000FF ) );
materialCompressed.alphaTestNode = oscSine();
materialCompressed.transparent = true;

Expand Down