Skip to content

Add label and temp functions to ShaderNode #23546

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

Merged
merged 11 commits into from
Mar 2, 2022
Merged

Add label and temp functions to ShaderNode #23546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0d2e0d4
Add makeVar function to ShaderNode
LeviPesin Feb 21, 2022
288cacd
Fix
LeviPesin Feb 21, 2022
8d31e61
Update VarNode
LeviPesin Feb 23, 2022
07a481d
Update makeVar
LeviPesin Feb 23, 2022
5ea778b
Add temp and label functions
LeviPesin Mar 2, 2022
a7fecf1
Refactor label function
LeviPesin Mar 2, 2022
409bdf5
Try to resolve merge conflicts
LeviPesin Mar 2, 2022
1ca0a41
Try to resolve merge conflicts
LeviPesin Mar 2, 2022
1386a96
Try to resolve merge conflicts
LeviPesin Mar 2, 2022
416e094
Try to resolve merge conflicts
LeviPesin Mar 2, 2022
54fe7ad
Merge branch 'dev' into patch-1
LeviPesin Mar 2, 2022
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
30 changes: 29 additions & 1 deletion examples/jsm/nodes/ShaderNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,34 @@ export const nodeObject = ( val ) => {

};

export const label = ( node, name = null, nodeType = null ) => {

if ( node.isVarNode === true ) {

// node is already a VarNode

if ( ( node.name !== name ) && ( name !== null ) ) {

node.name = name;

}

if ( ( node.nodeType !== nodeType ) && ( nodeType !== null ) ) {

node.nodeType = nodeType;

}

return nodeObject( node );

}

return nodeObject( new VarNode( nodeObject( node ), name, nodeType ) );

};

export const temp = ( node, nodeType = null ) => label( node, null, nodeType );

export const float = ( val ) => {

if ( val?.isNode === true ) {
Expand Down Expand Up @@ -226,7 +254,7 @@ export const color = ( ...params ) => {

if ( params[ 0 ]?.isNode === true ) {

return nodeObject( new ConvertNode( params[0], 'color' ) );
return nodeObject( new ConvertNode( params[ 0 ], 'color' ) );

}

Expand Down
2 changes: 2 additions & 0 deletions examples/jsm/nodes/core/VarNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,6 @@ class VarNode extends Node {

}

VarNode.prototype.isVarNode = true;

export default VarNode;