From 1e26eb05b6e95b3d7e168878196e4807793b79b5 Mon Sep 17 00:00:00 2001 From: SUNAG Date: Thu, 10 Dec 2015 21:47:33 -0200 Subject: [PATCH] rename *MaterialNode to *NodeMaterial --- .../{MaterialNode.js => NodeMaterial.js} | 58 +++++++++---------- .../js/materials/nodes/inputs/ColorNode.js | 2 +- .../js/materials/nodes/inputs/Vector2Node.js | 2 +- .../js/materials/nodes/inputs/Vector3Node.js | 2 +- .../js/materials/nodes/inputs/Vector4Node.js | 2 +- .../nodes/interfaces/PhongMaterialNode.js | 17 ------ .../nodes/interfaces/PhongNodeMaterial.js | 17 ++++++ .../nodes/interfaces/StandardMaterialNode.js | 17 ------ .../nodes/interfaces/StandardNodeMaterial.js | 17 ++++++ examples/webgl_materials_nodes.html | 38 ++++++------ 10 files changed, 86 insertions(+), 86 deletions(-) rename examples/js/materials/nodes/{MaterialNode.js => NodeMaterial.js} (81%) delete mode 100644 examples/js/materials/nodes/interfaces/PhongMaterialNode.js create mode 100644 examples/js/materials/nodes/interfaces/PhongNodeMaterial.js delete mode 100644 examples/js/materials/nodes/interfaces/StandardMaterialNode.js create mode 100644 examples/js/materials/nodes/interfaces/StandardNodeMaterial.js diff --git a/examples/js/materials/nodes/MaterialNode.js b/examples/js/materials/nodes/NodeMaterial.js similarity index 81% rename from examples/js/materials/nodes/MaterialNode.js rename to examples/js/materials/nodes/NodeMaterial.js index 653efdcffe..d060808691 100644 --- a/examples/js/materials/nodes/MaterialNode.js +++ b/examples/js/materials/nodes/NodeMaterial.js @@ -2,7 +2,7 @@ * @author sunag / http://www.sunag.com.br/ */ -THREE.MaterialNode = function( vertex, fragment ) { +THREE.NodeMaterial = function( vertex, fragment ) { THREE.ShaderMaterial.call( this ); @@ -11,10 +11,10 @@ THREE.MaterialNode = function( vertex, fragment ) { }; -THREE.MaterialNode.prototype = Object.create( THREE.ShaderMaterial.prototype ); -THREE.MaterialNode.prototype.constructor = THREE.MaterialNode; +THREE.NodeMaterial.prototype = Object.create( THREE.ShaderMaterial.prototype ); +THREE.NodeMaterial.prototype.constructor = THREE.NodeMaterial; -THREE.MaterialNode.Type = { +THREE.NodeMaterial.Type = { t : 'sampler2D', tc : 'samplerCube', bv1 : 'bool', @@ -26,7 +26,7 @@ THREE.MaterialNode.Type = { v4 : 'vec4' }; -THREE.MaterialNode.GetShortcuts = function( prop, name ) { +THREE.NodeMaterial.GetShortcuts = function( prop, name ) { return { get: function () { return this[prop][name]; }, @@ -35,7 +35,7 @@ THREE.MaterialNode.GetShortcuts = function( prop, name ) { }; -THREE.MaterialNode.Shortcuts = function( proto, prop, list ) { +THREE.NodeMaterial.Shortcuts = function( proto, prop, list ) { var shortcuts = {}; @@ -51,7 +51,7 @@ THREE.MaterialNode.Shortcuts = function( proto, prop, list ) { }; -THREE.MaterialNode.prototype.updateAnimation = function( delta ) { +THREE.NodeMaterial.prototype.updateAnimation = function( delta ) { for(var i = 0; i < this.requestUpdate.length; ++i) { @@ -61,7 +61,7 @@ THREE.MaterialNode.prototype.updateAnimation = function( delta ) { }; -THREE.MaterialNode.prototype.build = function() { +THREE.NodeMaterial.prototype.build = function() { var vertex, fragment; @@ -214,19 +214,19 @@ THREE.MaterialNode.prototype.build = function() { return this; }; -THREE.MaterialNode.prototype.define = function(name, value) { +THREE.NodeMaterial.prototype.define = function(name, value) { this.defines[name] = value == undefined ? 1 : value; }; -THREE.MaterialNode.prototype.isDefined = function(name) { +THREE.NodeMaterial.prototype.isDefined = function(name) { return this.defines[name] != undefined; }; -THREE.MaterialNode.prototype.mergeUniform = function( uniforms ) { +THREE.NodeMaterial.prototype.mergeUniform = function( uniforms ) { for (var name in uniforms) { @@ -236,7 +236,7 @@ THREE.MaterialNode.prototype.mergeUniform = function( uniforms ) { }; -THREE.MaterialNode.prototype.createUniform = function( value, type, needsUpdate ) { +THREE.NodeMaterial.prototype.createUniform = function( value, type, needsUpdate ) { var index = this.uniformList.length; @@ -253,7 +253,7 @@ THREE.MaterialNode.prototype.createUniform = function( value, type, needsUpdate }; -THREE.MaterialNode.prototype.getVertexTemp = function( uuid, type ) { +THREE.NodeMaterial.prototype.getVertexTemp = function( uuid, type ) { if (!this.vertexTemps[ uuid ]) { @@ -270,7 +270,7 @@ THREE.MaterialNode.prototype.getVertexTemp = function( uuid, type ) { }; -THREE.MaterialNode.prototype.getIncludes = function( incs ) { +THREE.NodeMaterial.prototype.getIncludes = function( incs ) { function sortByPosition(a, b){ return b.deps - a.deps; @@ -293,7 +293,7 @@ THREE.MaterialNode.prototype.getIncludes = function( incs ) { } }(); -THREE.MaterialNode.prototype.getFragmentTemp = function( uuid, type ) { +THREE.NodeMaterial.prototype.getFragmentTemp = function( uuid, type ) { if (!this.fragmentTemps[ uuid ]) { @@ -310,37 +310,37 @@ THREE.MaterialNode.prototype.getFragmentTemp = function( uuid, type ) { }; -THREE.MaterialNode.prototype.addVertexPars = function( code ) { +THREE.NodeMaterial.prototype.addVertexPars = function( code ) { this.vertexPars += code + '\n'; }; -THREE.MaterialNode.prototype.addFragmentPars = function( code ) { +THREE.NodeMaterial.prototype.addFragmentPars = function( code ) { this.fragmentPars += code + '\n'; }; -THREE.MaterialNode.prototype.addVertexCode = function( code ) { +THREE.NodeMaterial.prototype.addVertexCode = function( code ) { this.vertexCode += code + '\n'; }; -THREE.MaterialNode.prototype.addFragmentCode = function( code ) { +THREE.NodeMaterial.prototype.addFragmentCode = function( code ) { this.fragmentCode += code + '\n'; }; -THREE.MaterialNode.prototype.addVertexNode = function( code ) { +THREE.NodeMaterial.prototype.addVertexNode = function( code ) { this.vertexNode += code + '\n'; }; -THREE.MaterialNode.prototype.clearVertexNode = function() { +THREE.NodeMaterial.prototype.clearVertexNode = function() { var code = this.fragmentNode; @@ -350,13 +350,13 @@ THREE.MaterialNode.prototype.clearVertexNode = function() { }; -THREE.MaterialNode.prototype.addFragmentNode = function( code ) { +THREE.NodeMaterial.prototype.addFragmentNode = function( code ) { this.fragmentNode += code + '\n'; }; -THREE.MaterialNode.prototype.clearFragmentNode = function() { +THREE.NodeMaterial.prototype.clearFragmentNode = function() { var code = this.fragmentNode; @@ -366,7 +366,7 @@ THREE.MaterialNode.prototype.clearFragmentNode = function() { }; -THREE.MaterialNode.prototype.getCodePars = function( pars, prefix ) { +THREE.NodeMaterial.prototype.getCodePars = function( pars, prefix ) { prefix = prefix || ''; @@ -380,7 +380,7 @@ THREE.MaterialNode.prototype.getCodePars = function( pars, prefix ) { if (parsType == 't' && parsValue instanceof THREE.CubeTexture) parsType = 'tc'; - var type = THREE.MaterialNode.Type[ parsType ]; + var type = THREE.NodeMaterial.Type[ parsType ]; if (type == undefined) throw new Error( "Node pars " + parsType + " not found." ); @@ -391,7 +391,7 @@ THREE.MaterialNode.prototype.getCodePars = function( pars, prefix ) { }; -THREE.MaterialNode.prototype.getVertexUniform = function( value, type, needsUpdate ) { +THREE.NodeMaterial.prototype.getVertexUniform = function( value, type, needsUpdate ) { var uniform = this.createUniform( value, type, needsUpdate ); @@ -404,7 +404,7 @@ THREE.MaterialNode.prototype.getVertexUniform = function( value, type, needsUpda }; -THREE.MaterialNode.prototype.getFragmentUniform = function( value, type, needsUpdate ) { +THREE.NodeMaterial.prototype.getFragmentUniform = function( value, type, needsUpdate ) { var uniform = this.createUniform( value, type, needsUpdate ); @@ -417,13 +417,13 @@ THREE.MaterialNode.prototype.getFragmentUniform = function( value, type, needsUp }; -THREE.MaterialNode.prototype.getDataNode = function( uuid ) { +THREE.NodeMaterial.prototype.getDataNode = function( uuid ) { return this.nodeData[uuid] = this.nodeData[uuid] || {}; }; -THREE.MaterialNode.prototype.include = function( shader, node ) { +THREE.NodeMaterial.prototype.include = function( shader, node ) { var includes; diff --git a/examples/js/materials/nodes/inputs/ColorNode.js b/examples/js/materials/nodes/inputs/ColorNode.js index 299a23c49d..4e98dc5a7b 100644 --- a/examples/js/materials/nodes/inputs/ColorNode.js +++ b/examples/js/materials/nodes/inputs/ColorNode.js @@ -13,4 +13,4 @@ THREE.ColorNode = function( color ) { THREE.ColorNode.prototype = Object.create( THREE.InputNode.prototype ); THREE.ColorNode.prototype.constructor = THREE.ColorNode; -THREE.MaterialNode.Shortcuts( THREE.ColorNode.prototype, 'value', [ 'r', 'g', 'b' ] ); \ No newline at end of file +THREE.NodeMaterial.Shortcuts( THREE.ColorNode.prototype, 'value', [ 'r', 'g', 'b' ] ); \ No newline at end of file diff --git a/examples/js/materials/nodes/inputs/Vector2Node.js b/examples/js/materials/nodes/inputs/Vector2Node.js index e790e6110e..5242a15a50 100644 --- a/examples/js/materials/nodes/inputs/Vector2Node.js +++ b/examples/js/materials/nodes/inputs/Vector2Node.js @@ -13,4 +13,4 @@ THREE.Vector2Node = function( x, y ) { THREE.Vector2Node.prototype = Object.create( THREE.InputNode.prototype ); THREE.Vector2Node.prototype.constructor = THREE.Vector2Node; -THREE.MaterialNode.Shortcuts( THREE.Vector2Node.prototype, 'value', [ 'x', 'y' ] ); \ No newline at end of file +THREE.NodeMaterial.Shortcuts( THREE.Vector2Node.prototype, 'value', [ 'x', 'y' ] ); \ No newline at end of file diff --git a/examples/js/materials/nodes/inputs/Vector3Node.js b/examples/js/materials/nodes/inputs/Vector3Node.js index 370cef4417..b10aa3d2b2 100644 --- a/examples/js/materials/nodes/inputs/Vector3Node.js +++ b/examples/js/materials/nodes/inputs/Vector3Node.js @@ -14,4 +14,4 @@ THREE.Vector3Node = function( x, y, z ) { THREE.Vector3Node.prototype = Object.create( THREE.InputNode.prototype ); THREE.Vector3Node.prototype.constructor = THREE.Vector3Node; -THREE.MaterialNode.Shortcuts( THREE.Vector3Node.prototype, 'value', [ 'x', 'y', 'z' ] ); \ No newline at end of file +THREE.NodeMaterial.Shortcuts( THREE.Vector3Node.prototype, 'value', [ 'x', 'y', 'z' ] ); \ No newline at end of file diff --git a/examples/js/materials/nodes/inputs/Vector4Node.js b/examples/js/materials/nodes/inputs/Vector4Node.js index 67a41230e6..aa89530825 100644 --- a/examples/js/materials/nodes/inputs/Vector4Node.js +++ b/examples/js/materials/nodes/inputs/Vector4Node.js @@ -13,4 +13,4 @@ THREE.Vector4Node = function( x, y, z, w ) { THREE.Vector4Node.prototype = Object.create( THREE.InputNode.prototype ); THREE.Vector4Node.prototype.constructor = THREE.Vector4Node; -THREE.MaterialNode.Shortcuts( THREE.Vector4Node.prototype, 'value', [ 'x', 'y', 'z', 'w' ] ); \ No newline at end of file +THREE.NodeMaterial.Shortcuts( THREE.Vector4Node.prototype, 'value', [ 'x', 'y', 'z', 'w' ] ); \ No newline at end of file diff --git a/examples/js/materials/nodes/interfaces/PhongMaterialNode.js b/examples/js/materials/nodes/interfaces/PhongMaterialNode.js deleted file mode 100644 index 3ba7e95d37..0000000000 --- a/examples/js/materials/nodes/interfaces/PhongMaterialNode.js +++ /dev/null @@ -1,17 +0,0 @@ -/** - * @author sunag / http://www.sunag.com.br/ - */ - -THREE.PhongMaterialNode = function() { - - this.node = new THREE.PhongNode(); - - THREE.MaterialNode.call( this, this.node, this.node ); - -}; - -THREE.PhongMaterialNode.prototype = Object.create( THREE.MaterialNode.prototype ); -THREE.PhongMaterialNode.prototype.constructor = THREE.PhongMaterialNode; - -THREE.MaterialNode.Shortcuts( THREE.PhongMaterialNode.prototype, 'node', -[ 'color', 'alpha', 'specular', 'shininess', 'normal', 'normalScale', 'emissive', 'ambient', 'shadow', 'ao', 'environment', 'reflectivity', 'transform' ] ); \ No newline at end of file diff --git a/examples/js/materials/nodes/interfaces/PhongNodeMaterial.js b/examples/js/materials/nodes/interfaces/PhongNodeMaterial.js new file mode 100644 index 0000000000..388971a34c --- /dev/null +++ b/examples/js/materials/nodes/interfaces/PhongNodeMaterial.js @@ -0,0 +1,17 @@ +/** + * @author sunag / http://www.sunag.com.br/ + */ + +THREE.PhongNodeMaterial = function() { + + this.node = new THREE.PhongNode(); + + THREE.NodeMaterial.call( this, this.node, this.node ); + +}; + +THREE.PhongNodeMaterial.prototype = Object.create( THREE.NodeMaterial.prototype ); +THREE.PhongNodeMaterial.prototype.constructor = THREE.PhongNodeMaterial; + +THREE.NodeMaterial.Shortcuts( THREE.PhongNodeMaterial.prototype, 'node', +[ 'color', 'alpha', 'specular', 'shininess', 'normal', 'normalScale', 'emissive', 'ambient', 'shadow', 'ao', 'environment', 'reflectivity', 'transform' ] ); \ No newline at end of file diff --git a/examples/js/materials/nodes/interfaces/StandardMaterialNode.js b/examples/js/materials/nodes/interfaces/StandardMaterialNode.js deleted file mode 100644 index c79da639ad..0000000000 --- a/examples/js/materials/nodes/interfaces/StandardMaterialNode.js +++ /dev/null @@ -1,17 +0,0 @@ -/** - * @author sunag / http://www.sunag.com.br/ - */ - -THREE.StandardMaterialNode = function() { - - this.node = new THREE.StandardNode(); - - THREE.MaterialNode.call( this, this.node, this.node ); - -}; - -THREE.StandardMaterialNode.prototype = Object.create( THREE.MaterialNode.prototype ); -THREE.StandardMaterialNode.prototype.constructor = THREE.StandardMaterialNode; - -THREE.MaterialNode.Shortcuts( THREE.StandardMaterialNode.prototype, 'node', -[ 'color', 'alpha', 'roughness', 'metalness', 'normal', 'normalScale', 'emissive', 'ambient', 'shadow', 'ao', 'environment', 'reflectivity', 'transform' ] ); \ No newline at end of file diff --git a/examples/js/materials/nodes/interfaces/StandardNodeMaterial.js b/examples/js/materials/nodes/interfaces/StandardNodeMaterial.js new file mode 100644 index 0000000000..809a914bd8 --- /dev/null +++ b/examples/js/materials/nodes/interfaces/StandardNodeMaterial.js @@ -0,0 +1,17 @@ +/** + * @author sunag / http://www.sunag.com.br/ + */ + +THREE.StandardNodeMaterial = function() { + + this.node = new THREE.StandardNode(); + + THREE.NodeMaterial.call( this, this.node, this.node ); + +}; + +THREE.StandardNodeMaterial.prototype = Object.create( THREE.NodeMaterial.prototype ); +THREE.StandardNodeMaterial.prototype.constructor = THREE.StandardNodeMaterial; + +THREE.NodeMaterial.Shortcuts( THREE.StandardNodeMaterial.prototype, 'node', +[ 'color', 'alpha', 'roughness', 'metalness', 'normal', 'normalScale', 'emissive', 'ambient', 'shadow', 'ao', 'environment', 'reflectivity', 'transform' ] ); \ No newline at end of file diff --git a/examples/webgl_materials_nodes.html b/examples/webgl_materials_nodes.html index c9022fadfb..31793bf29a 100644 --- a/examples/webgl_materials_nodes.html +++ b/examples/webgl_materials_nodes.html @@ -1,7 +1,7 @@ - WebGL MaterialNode + WebGL NodeMaterial