aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials/bump-metal-material.js
diff options
context:
space:
mode:
authorJose Antonio Marquez Russo2012-03-08 10:49:06 -0800
committerJose Antonio Marquez Russo2012-03-08 10:49:06 -0800
commit85f21e020ac281e8e545df1cf269034de99a00b1 (patch)
tree441834fa8b02b1cc2a970210020d27e06d2c99be /js/lib/rdge/materials/bump-metal-material.js
parentd9813946dc28d8c28033a68b68300b9d9eda115c (diff)
parent11a6f18e274d7232cdbb8f6e9e65e0a5ab756451 (diff)
downloadninja-85f21e020ac281e8e545df1cf269034de99a00b1.tar.gz
Merge pull request #29 from ericmueller/integration
Integration
Diffstat (limited to 'js/lib/rdge/materials/bump-metal-material.js')
-rwxr-xr-xjs/lib/rdge/materials/bump-metal-material.js4
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