Skip to content
Open
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
4 changes: 2 additions & 2 deletions src/nodes/core/NodeBuilder.js
Original file line number Diff line number Diff line change
Expand Up @@ -952,7 +952,7 @@ class NodeBuilder {

const context = { ...this.context };

delete context.material;
context.material = undefined;

return this.context;

Expand Down Expand Up @@ -2515,7 +2515,7 @@ class NodeBuilder {
this.setShaderStage( shaderStage );

const context = { ...this.context };
delete context.nodeBlock;
context.nodeBlock = undefined;

this.cache = this.globalCache;
this.tab = '\t';
Expand Down
2 changes: 1 addition & 1 deletion src/nodes/core/UniformNode.js
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ class UniformNode extends InputNode {
const nodeUniform = builder.getUniformFromNode( sharedNode, sharedNodeType, builder.shaderStage, this.name || builder.context.nodeName );
const uniformName = builder.getPropertyName( nodeUniform );

if ( builder.context.nodeName !== undefined ) delete builder.context.nodeName;
if ( builder.context.nodeName !== undefined ) builder.context.nodeName = undefined;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The TSL context system is designed to work in a cascading manner, similar to CSS; in that sense, setting it to undefined is different from removing it.

Deleting

const a = {
    property: 'value'
};

const b = {
    property: 'override'
};

delete b.property;

const result = { ...a, ...b };

result.property // value

Defining as undefined

const a = {
    property: 'value'
};

const b = {
    property: 'override'
};

b.property = undefined;

const result = { ...a, ...b };

result.property // undefined

I personally don't like assignments like undefined, because we often use undefined to detect a variable that has never been assigned, but when it is assigned as 'undefined', the key remains assigned to the object while delete removes the entire property.

If the idea is to preserve the structure of the objects, it's preferable to define them as null in the declaration, as we already do in classes.


//

Expand Down
32 changes: 23 additions & 9 deletions src/renderers/common/RenderObject.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,36 +2,50 @@ import { hash, hashString } from '../../nodes/core/NodeUtils.js';

let _id = 0;

const prototypeKeys = new WeakMap();

function getKeys( obj ) {

const keys = Object.keys( obj );

let proto = Object.getPrototypeOf( obj );
const proto = Object.getPrototypeOf( obj );
let cachedKeys = prototypeKeys.get( proto );

if ( cachedKeys === undefined ) {

while ( proto ) {
cachedKeys = [];
let p = proto;

const descriptors = Object.getOwnPropertyDescriptors( proto );
while ( p ) {

for ( const key in descriptors ) {
const descriptors = Object.getOwnPropertyDescriptors( p );

if ( descriptors[ key ] !== undefined ) {
for ( const key in descriptors ) {

const descriptor = descriptors[ key ];
if ( descriptors[ key ] !== undefined ) {

if ( descriptor && typeof descriptor.get === 'function' ) {
const descriptor = descriptors[ key ];

keys.push( key );
if ( descriptor && typeof descriptor.get === 'function' ) {

cachedKeys.push( key );

}

}

}

p = Object.getPrototypeOf( p );

}

proto = Object.getPrototypeOf( proto );
prototypeKeys.set( proto, cachedKeys );

}

keys.push( ...cachedKeys );

return keys;

}
Expand Down
4 changes: 2 additions & 2 deletions src/renderers/common/Renderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -1037,8 +1037,8 @@ class Renderer {

} else if ( this.highPrecision ) {

delete contextNodeData.modelViewMatrix;
delete contextNodeData.modelNormalViewMatrix;
contextNodeData.modelViewMatrix = undefined;
contextNodeData.modelNormalViewMatrix = undefined;

}

Expand Down
12 changes: 6 additions & 6 deletions src/renderers/common/nodes/Nodes.js
Original file line number Diff line number Diff line change
Expand Up @@ -525,8 +525,8 @@ class Nodes extends DataMap {

} else if ( sceneData.backgroundNode ) {

delete sceneData.backgroundNode;
delete sceneData.background;
sceneData.backgroundNode = undefined;
sceneData.background = undefined;

}

Expand Down Expand Up @@ -606,8 +606,8 @@ class Nodes extends DataMap {

} else {

delete sceneData.fogNode;
delete sceneData.fog;
sceneData.fogNode = undefined;
sceneData.fog = undefined;

}

Expand Down Expand Up @@ -653,8 +653,8 @@ class Nodes extends DataMap {

} else if ( sceneData.environmentNode ) {

delete sceneData.environmentNode;
delete sceneData.environment;
sceneData.environmentNode = undefined;
sceneData.environment = undefined;

}

Expand Down