Skip to content

TSL: Support primitive values in custom struct constructors #34113

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

Draft
sunag wants to merge 1 commit into
base: dev
Choose a base branch
from
+11 −10
Draft

TSL: Support primitive values in custom struct constructors #34113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions src/nodes/core/NodeUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,3 +488,9 @@ export function base64ToArrayBuffer( base64 ) {
return Uint8Array.from( atob( base64 ), c => c.charCodeAt( 0 ) ).buffer;

}

export function isArrayAsParameter( params ) {

return ( params[ 0 ] !== undefined && params[ 0 ] !== null ) && ( params[ 0 ].isNode || Object.getPrototypeOf( params[ 0 ] ) !== Object.prototype );

}
7 changes: 4 additions & 3 deletions src/nodes/core/StructNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import Node from './Node.js';
import StructTypeNode from './StructTypeNode.js';
import { nodeProxyConstructor } from '../tsl/TSLCore.js';
import { nodeObject, nodeProxyConstructor } from '../tsl/TSLCore.js';
import { isArrayAsParameter } from './NodeUtils.js';

/**
* StructNode allows to create custom structures with multiple members.
Expand Down Expand Up @@ -103,15 +104,15 @@ export const struct = ( membersLayout, name = null ) => {

if ( params.length > 0 ) {

if ( params[ 0 ].isNode ) {
if ( isArrayAsParameter( params ) ) {

values = {};

const names = Object.keys( membersLayout );

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

values[ names[ i ] ] = params[ i ];
values[ names[ i ] ] = nodeObject( params[ i ] );

}

Expand Down
8 changes: 1 addition & 7 deletions src/nodes/tsl/TSLCore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import FlipNode from '../utils/FlipNode.js';
import ConstNode from '../core/ConstNode.js';
import MemberNode from '../utils/MemberNode.js';
import StackTrace from '../core/StackTrace.js';
import { getValueFromType, getValueType } from '../core/NodeUtils.js';
import { getValueFromType, getValueType, isArrayAsParameter } from '../core/NodeUtils.js';
import { warn, error } from '../../utils.js';

let currentStack = null;
Expand Down Expand Up @@ -703,12 +703,6 @@ class ShaderCallNodeInternal extends Node {

}

function isArrayAsParameter( params ) {

return params[ 0 ] && ( params[ 0 ].isNode || Object.getPrototypeOf( params[ 0 ] ) !== Object.prototype );

}

function getLayoutParameters( params ) {

let output;
Expand Down
Loading