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.

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: Support for split assignment #27796

Merged
merged 1 commit into from
Feb 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
62 changes: 53 additions & 9 deletions examples/jsm/nodes/core/AssignNode.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { addNodeClass } from '../core/Node.js';
import TempNode from '../core/TempNode.js';
import { addNodeElement, nodeProxy } from '../shadernode/ShaderNode.js';
import { vectorComponents } from '../core/constants.js';

class AssignNode extends TempNode {

Expand All @@ -25,39 +26,82 @@ class AssignNode extends TempNode {

}

needsSplitAssign( builder ) {

const { targetNode } = this;

if ( builder.isAvailable( 'swizzleAssign' ) === false && targetNode.isSplitNode && targetNode.components.length > 1 ) {

const targetLength = builder.getTypeLength( targetNode.getNodeType( builder ) );
const assignDiferentVector = vectorComponents.join( '' ).slice( 0, targetLength ) !== targetNode.components;

return assignDiferentVector;

}

return false;

}

generate( builder, output ) {

const { targetNode, sourceNode } = this;

const needsSplitAssign = this.needsSplitAssign( builder );

if ( needsSplitAssign ) sourceNode.increaseUsage( builder ); // flag to cache system

const targetType = targetNode.getNodeType( builder );

const target = targetNode.context( { assign: true } ).build( builder );
const source = sourceNode.build( builder, targetType );

const snippet = `${ target } = ${ source }`;
const sourceType = sourceNode.getNodeType( builder );

if ( output === 'void' ) {
//

builder.addLineFlowCode( snippet );
let snippet;

return;
if ( needsSplitAssign ) {

} else {
const targetRoot = targetNode.node.context( { assign: true } ).build( builder );

for ( let i = 0; i < targetNode.components.length; i ++ ) {

const sourceType = sourceNode.getNodeType( builder );
const component = targetNode.components[ i ];

if ( sourceType === 'void' ) {
snippet = `${ targetRoot }.${ component } = ${ source }[ ${ i } ]`;

builder.addLineFlowCode( snippet );

return target;
}

if ( output !== 'void' ) {

snippet = target;

}

return builder.format( snippet, targetType, output );
} else {

snippet = `${ target } = ${ source }`;

if ( output === 'void' || sourceType === 'void' ) {

builder.addLineFlowCode( snippet );

if ( output !== 'void' ) {

snippet = target;

}

}

}

return builder.format( snippet, targetType, output );

}

}
Expand Down
4 changes: 2 additions & 2 deletions examples/jsm/renderers/webgl/nodes/GLSLNodeBuilder.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ const precisionLib = {
};

const supports = {
instance: true
instance: true,
swizzleAssign: true
};

const defaultPrecisions = `
Expand Down Expand Up @@ -540,7 +541,6 @@ ${ flowData.code }

}


isFlipY() {

return true;
Expand Down
3 changes: 1 addition & 2 deletions examples/webgpu_compute_particles_rain.html
Original file line number Diff line number Diff line change
Expand Up @@ -167,9 +167,8 @@

position.y = 25;

ripplePosition.x = position.x;
ripplePosition.xz = position.xz;
ripplePosition.y = floorPosition;
ripplePosition.z = position.z;

// reset hit time: x = time

Expand Down