aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/backup-delete/Materials/TaperMaterial.js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-03-13 13:05:16 -0700
committerNivesh Rajbhandari2012-03-13 13:05:16 -0700
commite19376c54eedd1f1c457ba405b2f110be376a559 (patch)
treed48c090f71ed2cd6bd6ce38ff68c36ab69299985 /js/helper-classes/backup-delete/Materials/TaperMaterial.js
parent970c2e63aa8ec3f70df2bf073cedb9e3b7617755 (diff)
parentf56b8cf4d3316d250c0f0045fb78f0dbd5c56e94 (diff)
downloadninja-e19376c54eedd1f1c457ba405b2f110be376a559.tar.gz
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Diffstat (limited to 'js/helper-classes/backup-delete/Materials/TaperMaterial.js')
-rw-r--r--js/helper-classes/backup-delete/Materials/TaperMaterial.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/helper-classes/backup-delete/Materials/TaperMaterial.js b/js/helper-classes/backup-delete/Materials/TaperMaterial.js
index e8cc7a49..eea3f699 100644
--- a/js/helper-classes/backup-delete/Materials/TaperMaterial.js
+++ b/js/helper-classes/backup-delete/Materials/TaperMaterial.js
@@ -42,7 +42,7 @@ function TaperMaterial()
42 // duplcate method requirde 42 // duplcate method requirde
43 this.dup = function() { return new TaperMaterial(); } 43 this.dup = function() { return new TaperMaterial(); }
44 44
45 this.init = function() 45 this.init = function( world )
46 { 46 {
47 // set up the shader 47 // set up the shader
48 this._shader = new jshader(); 48 this._shader = new jshader();
@@ -53,7 +53,7 @@ function TaperMaterial()
53 this._shader.colorMe.color.set( this.getColor() ); 53 this._shader.colorMe.color.set( this.getColor() );
54 54
55 // set up the material node 55 // set up the material node
56 this._materialNode = createMaterialNode("taperMaterial"); 56 this._materialNode = createMaterialNode("taperMaterial_" + world.generateUniqueNodeID());
57 this._materialNode.setShader(this._shader); 57 this._materialNode.setShader(this._shader);
58 58
59 // initialize the taper properties 59 // initialize the taper properties