Skip to content
Merged
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
19 changes: 10 additions & 9 deletions src/nodes/core/NodeBuilder.js
Original file line number Diff line number Diff line change
Expand Up @@ -2268,28 +2268,29 @@ class NodeBuilder {
const shaderStage = this.shaderStage;
const declarations = this.declarations[ shaderStage ] || ( this.declarations[ shaderStage ] = {} );

const property = this.getPropertyName( node );
const baseName = node.name;

let name = baseName;
let property = this.getPropertyName( node );
let index = 1;
let name = property;

// Automatically renames the property if the name is already in use.

while ( declarations[ name ] !== undefined ) {
while ( declarations[ property ] !== undefined ) {

name = property + '_' + index ++;
name = baseName + '_' + index ++;
node.name = name;
property = this.getPropertyName( node );

}

if ( index > 1 ) {

node.name = name;
if ( name !== baseName ) {

warn( `TSL: Declaration name '${ property }' of '${ node.type }' already in use. Renamed to '${ name }'.` );
warn( `TSL: Declaration name '${ baseName }' of '${ node.type }' already in use. Renamed to '${ name }'.` );

}

declarations[ name ] = node;
declarations[ property ] = node;

}

Expand Down
Loading