diff options
author | hwc487 | 2012-03-07 16:48:48 -0800 |
---|---|---|
committer | hwc487 | 2012-03-07 16:48:48 -0800 |
commit | 818582d389f504c915be0c9052fafa33e3e76c92 (patch) | |
tree | ff686f52903d91f27f983b19e18c9909af5957d9 /js/lib/rdge/materials/bump-metal-material.js | |
parent | 855e8727b147771ff7b05e71bed481e65fe4b6b0 (diff) | |
download | ninja-818582d389f504c915be0c9052fafa33e3e76c92.tar.gz |
File IO
Diffstat (limited to 'js/lib/rdge/materials/bump-metal-material.js')
-rwxr-xr-x | js/lib/rdge/materials/bump-metal-material.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/lib/rdge/materials/bump-metal-material.js b/js/lib/rdge/materials/bump-metal-material.js index 61126952..67b16371 100755 --- a/js/lib/rdge/materials/bump-metal-material.js +++ b/js/lib/rdge/materials/bump-metal-material.js | |||
@@ -75,7 +75,7 @@ var BumpMetalMaterial = function BumpMetalMaterial() { | |||
75 | this.setProperty = function( prop, value ) | 75 | this.setProperty = function( prop, value ) |
76 | { | 76 | { |
77 | // every material should do something with the "color" property | 77 | // every material should do something with the "color" property |
78 | if (prop === "color") prop = "lightDiff"; | 78 | if (prop === "color") return; |
79 | 79 | ||
80 | // make sure we have legitimate imput | 80 | // make sure we have legitimate imput |
81 | var ok = this.validateProperty( prop, value ); | 81 | var ok = this.validateProperty( prop, value ); |
@@ -116,7 +116,7 @@ var BumpMetalMaterial = function BumpMetalMaterial() { | |||
116 | this._shader['default'].u_light0Diff.set( this.getLightDiff() ); | 116 | this._shader['default'].u_light0Diff.set( this.getLightDiff() ); |
117 | 117 | ||
118 | // set up the material node | 118 | // set up the material node |
119 | this._materialNode = createMaterialNode( this.getShaderName() ); | 119 | this._materialNode = createMaterialNode( this.getShaderName() + "_" + world.generateUniqueNodeID() ); |
120 | this._materialNode.setShader(this._shader); | 120 | this._materialNode.setShader(this._shader); |
121 | 121 | ||
122 | // set some image maps | 122 | // set some image maps |