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.

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

NodeMaterial: Node.type to Node.nodeType #22572

Merged
merged 2 commits into from
Sep 23, 2021
Merged

NodeMaterial: Node.type to Node.nodeType #22572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79eea2e
Nodes: .type to .nodeType
sunag Sep 23, 2021
b5891c7
rename: type to nodeType
sunag Sep 23, 2021
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 examples/jsm/renderers/nodes/accessors/CameraNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class CameraNode extends Object3DNode {

}

getType( builder ) {
getNodeType( builder ) {

const scope = this.scope;

Expand All @@ -21,7 +21,7 @@ class CameraNode extends Object3DNode {

}

return super.getType( builder );
return super.getNodeType( builder );

}

Expand Down
6 changes: 3 additions & 3 deletions examples/jsm/renderers/nodes/accessors/MaterialNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class MaterialNode extends Node {

}

getType( builder ) {
getNodeType( builder ) {

const scope = this.scope;
const material = builder.getContextValue( 'material' );
Expand Down Expand Up @@ -99,9 +99,9 @@ class MaterialNode extends Node {

} else {

const type = this.getType( builder );
const outputType = this.getNodeType( builder );

node = new MaterialReferenceNode( scope, type );
node = new MaterialReferenceNode( scope, outputType );

}

Expand Down
2 changes: 1 addition & 1 deletion examples/jsm/renderers/nodes/accessors/ModelViewProjectionNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class ModelViewProjectionNode extends Node {

generate( builder, output ) {

const type = this.getType( builder );
const type = this.getNodeType( builder );

const mvpSnipped = this._mvpMatrix.build( builder );
const positionSnipped = this.position.build( builder, 'vec3' );
Expand Down
2 changes: 1 addition & 1 deletion examples/jsm/renderers/nodes/accessors/NormalNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class NormalNode extends Node {

generate( builder, output ) {

const type = this.getType( builder );
const type = this.getNodeType( builder );
const nodeData = builder.getDataFromNode( this, builder.shaderStage );
const scope = this.scope;

Expand Down
2 changes: 1 addition & 1 deletion examples/jsm/renderers/nodes/accessors/Object3DNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class Object3DNode extends Node {

}

getType() {
getNodeType() {

const scope = this.scope;

Expand Down
2 changes: 1 addition & 1 deletion examples/jsm/renderers/nodes/accessors/PointUVNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class PointUVNode extends Node {

generate( builder, output ) {

const type = this.getType( builder );
const type = this.getNodeType( builder );
const snippet = 'vec2( gl_PointCoord.x, 1.0 - gl_PointCoord.y )';

return builder.format( snippet, type, output );
Expand Down
2 changes: 1 addition & 1 deletion examples/jsm/renderers/nodes/accessors/PositionNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class PositionNode extends Node {

generate( builder, output ) {

const type = this.getType( builder );
const type = this.getNodeType( builder );
const nodeData = builder.getDataFromNode( this );
const scope = this.scope;

Expand Down
20 changes: 10 additions & 10 deletions examples/jsm/renderers/nodes/accessors/ReferenceNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,38 +29,38 @@ class ReferenceNode extends Node {
setNodeType( inputType ) {

let node = null;
let type = inputType;
let nodeType = inputType;

if ( type === 'float' ) {
if ( nodeType === 'float' ) {

node = new FloatNode();

} else if ( type === 'vec2' ) {
} else if ( nodeType === 'vec2' ) {

node = new Vector2Node( null );

} else if ( type === 'vec3' ) {
} else if ( nodeType === 'vec3' ) {

node = new Vector3Node( null );

} else if ( type === 'vec4' ) {
} else if ( nodeType === 'vec4' ) {

node = new Vector4Node( null );

} else if ( type === 'color' ) {
} else if ( nodeType === 'color' ) {

node = new ColorNode( null );
type = 'vec3';
nodeType = 'vec3';

} else if ( type === 'texture' ) {
} else if ( nodeType === 'texture' ) {

node = new TextureNode();
type = 'vec4';
nodeType = 'vec4';

}

this.node = node;
this.type = type;
this.nodeType = nodeType;
this.inputType = inputType;

}
Expand Down
4 changes: 2 additions & 2 deletions examples/jsm/renderers/nodes/core/ArrayInputNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ class ArrayInputNode extends InputNode {

}

getType( builder ) {
getNodeType( builder ) {

return this.value[ 0 ].getType( builder );
return this.value[ 0 ].getNodeType( builder );

}

Expand Down
6 changes: 3 additions & 3 deletions examples/jsm/renderers/nodes/core/AttributeNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import VaryNode from './VaryNode.js';

class AttributeNode extends Node {

constructor( attributeName, type ) {
constructor( attributeName, nodeType ) {

super( type );
super( nodeType );

this._attributeName = attributeName;

Expand All @@ -28,7 +28,7 @@ class AttributeNode extends Node {
generate( builder, output ) {

const attributeName = this.getAttributeName( builder );
const attributeType = this.getType( builder );
const attributeType = this.getNodeType( builder );

const attribute = builder.getAttribute( attributeName, attributeType );

Expand Down
6 changes: 3 additions & 3 deletions examples/jsm/renderers/nodes/core/CodeNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import Node from './Node.js';

class CodeNode extends Node {

constructor( code = '', type = 'code' ) {
constructor( code = '', nodeType = 'code' ) {

super( type );
super( nodeType );

this.code = code;

Expand Down Expand Up @@ -66,7 +66,7 @@ class CodeNode extends Node {

}

const type = this.getType( builder );
const type = this.getNodeType( builder );
const nodeCode = builder.getCodeFromNode( this, type );

nodeCode.code = this.code;
Expand Down
2 changes: 1 addition & 1 deletion examples/jsm/renderers/nodes/core/ConstNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class ConstNode extends CodeNode {

const code = super.generate( builder );

const type = this.getType( builder );
const type = this.getNodeType( builder );
const nodeCode = builder.getCodeFromNode( this, type );

if ( this.name !== '' ) {
Expand Down
8 changes: 4 additions & 4 deletions examples/jsm/renderers/nodes/core/ContextNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import Node from './Node.js';

class ContextNode extends Node {

constructor( node, type, context = {} ) {
constructor( node, nodeType, context = {} ) {

super( type );
super( nodeType );

this.node = node;

Expand All @@ -28,9 +28,9 @@ class ContextNode extends Node {

}

getType( builder ) {
getNodeType( builder ) {

return this.node.getType( builder );
return this.node.getNodeType( builder );

}

Expand Down
6 changes: 3 additions & 3 deletions examples/jsm/renderers/nodes/core/ExpressionNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ import Node from './Node.js';

class ExpressionNode extends Node {

constructor( snipped = '', type = null ) {
constructor( snipped = '', nodeType = null ) {

super( type );
super( nodeType );

this.snipped = snipped;

}

generate( builder, output ) {

const type = this.getType( builder );
const type = this.getNodeType( builder );
const snipped = this.snipped;

return builder.format( `( ${ snipped } )`, type, output );
Expand Down
6 changes: 3 additions & 3 deletions examples/jsm/renderers/nodes/core/FunctionCallNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ class FunctionCallNode extends TempNode {

}

getType( builder ) {
getNodeType( builder ) {

return this.functionNode.getType( builder );
return this.functionNode.getNodeType( builder );

}

Expand Down Expand Up @@ -56,7 +56,7 @@ class FunctionCallNode extends TempNode {

}

const type = this.getType( builder );
const type = this.getNodeType( builder );
const functionName = functionNode.build( builder, 'property' );

const callSnippet = `${functionName}( ${params.join( ', ' )} )`;
Expand Down
8 changes: 4 additions & 4 deletions examples/jsm/renderers/nodes/core/FunctionNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ class FunctionNode extends CodeNode {

}

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

if ( this.needsUpdate === true ) {

this.parse();

}

return this.type;
return super.getNodeType( builder );

}

Expand Down Expand Up @@ -120,7 +120,7 @@ class FunctionNode extends CodeNode {
const blockCode = mainCode.substring( declaration[ 0 ].length );

this.name = declaration[ 3 ] !== undefined ? declaration[ 3 ] : '';
this.type = declaration[ 2 ];
this.nodeType = declaration[ 2 ];

this.presicion = declaration[ 1 ] !== undefined ? declaration[ 1 ] : '';

Expand Down Expand Up @@ -151,7 +151,7 @@ class FunctionNode extends CodeNode {

super.generate( builder );

const type = this.getType( builder );
const type = this.getNodeType( builder );
const nodeCode = builder.getCodeFromNode( this, type );

if ( this.name !== '' ) {
Expand Down
8 changes: 4 additions & 4 deletions examples/jsm/renderers/nodes/core/InputNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import Node from './Node.js';

class InputNode extends Node {

constructor( type ) {
constructor( nodeType ) {

super( type );
super( nodeType );

this.constant = false;

Expand All @@ -26,13 +26,13 @@ class InputNode extends Node {

generateConst( builder ) {

return builder.getConst( this.getType( builder ), this.value );
return builder.getConst( this.getNodeType( builder ), this.value );

}

generate( builder, output ) {

const type = this.getType( builder );
const type = this.getNodeType( builder );

if ( this.constant === true ) {

Expand Down
16 changes: 11 additions & 5 deletions examples/jsm/renderers/nodes/core/Node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,35 @@ import { NodeUpdateType } from './constants.js';

class Node {

constructor( type = null ) {
constructor( nodeType = null ) {

this.type = type;
this.nodeType = nodeType;

this.updateType = NodeUpdateType.None;

}

get type() {

return this.constructor.name;

}

getUpdateType( /*builder*/ ) {

return this.updateType;

}

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

return this.type;
return this.nodeType;

}

getTypeLength( builder ) {

return builder.getTypeLength( this.getType( builder ) );
return builder.getTypeLength( this.getNodeType( builder ) );

}

Expand Down
7 changes: 3 additions & 4 deletions examples/jsm/renderers/nodes/core/PropertyNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,17 @@ import Node from './Node.js';

class PropertyNode extends Node {

constructor( name, type ) {
constructor( name, nodeType ) {

super();
super( nodeType );

this.name = name;
this.type = type;

}

generate( builder, output ) {

const type = this.getType( builder );
const type = this.getNodeType( builder );

const nodeVary = builder.getVarFromNode( this, type );
nodeVary.name = this.name;
Expand Down
Loading