Skip to content

[pull] dev from mrdoob:dev #1059

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
pull merged 1 commit into from
Jan 5, 2026
Merged

[pull] dev from mrdoob:dev #1059

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
22 changes: 12 additions & 10 deletions src/nodes/core/OutputStructNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,17 @@ class OutputStructNode extends Node {

}

getNodeType( builder ) {
getNodeType( /*builder*/ ) {

const properties = builder.getNodeProperties( this );
return 'OutputType';

if ( properties.membersLayout === undefined ) {
}

generate( builder ) {

const nodeData = builder.getDataFromNode( this );

if ( nodeData.membersLayout === undefined ) {

const members = this.members;
const membersLayout = [];
Expand All @@ -60,16 +66,12 @@ class OutputStructNode extends Node {

}

properties.membersLayout = membersLayout;
properties.structType = builder.getOutputStructTypeFromNode( this, properties.membersLayout );
nodeData.membersLayout = membersLayout;
nodeData.structType = builder.getOutputStructTypeFromNode( this, nodeData.membersLayout );

}

return properties.structType.name;

}

generate( builder ) {
//

const propertyName = builder.getOutputStructName();
const members = this.members;
Expand Down
12 changes: 6 additions & 6 deletions src/nodes/core/StackNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,19 +90,19 @@ class StackNode extends Node {

getElementType( builder ) {

return this.hasOutput ? this.outputNode.getElementType( builder ) : 'void';
return this.hasOutput( builder ) ? this.outputNode.getElementType( builder ) : 'void';

}

getNodeType( builder ) {

return this.hasOutput ? this.outputNode.getNodeType( builder ) : 'void';
return this.hasOutput( builder ) ? this.outputNode.getNodeType( builder ) : 'void';

}

getMemberType( builder, name ) {

return this.hasOutput ? this.outputNode.getMemberType( builder, name ) : 'void';
return this.hasOutput( builder ) ? this.outputNode.getMemberType( builder, name ) : 'void';

}

Expand Down Expand Up @@ -311,9 +311,9 @@ class StackNode extends Node {

}

get hasOutput() {
hasOutput( builder ) {

return this.outputNode && this.outputNode.isNode;
return this.outputNode && this.outputNode.isNode && this.outputNode.getNodeType( builder ) !== 'void';

}

Expand Down Expand Up @@ -392,7 +392,7 @@ class StackNode extends Node {

let result;

if ( this.hasOutput ) {
if ( this.hasOutput( builder ) ) {

result = this.outputNode.build( builder, ...params );

Expand Down