diff options
author | Jose Antonio Marquez Russo | 2012-03-08 10:49:06 -0800 |
---|---|---|
committer | Jose Antonio Marquez Russo | 2012-03-08 10:49:06 -0800 |
commit | 85f21e020ac281e8e545df1cf269034de99a00b1 (patch) | |
tree | 441834fa8b02b1cc2a970210020d27e06d2c99be /js/helper-classes/backup-delete/Materials/TaperMaterial.js | |
parent | d9813946dc28d8c28033a68b68300b9d9eda115c (diff) | |
parent | 11a6f18e274d7232cdbb8f6e9e65e0a5ab756451 (diff) | |
download | ninja-85f21e020ac281e8e545df1cf269034de99a00b1.tar.gz |
Merge pull request #29 from ericmueller/integration
Integration
Diffstat (limited to 'js/helper-classes/backup-delete/Materials/TaperMaterial.js')
-rw-r--r-- | js/helper-classes/backup-delete/Materials/TaperMaterial.js | 4 |
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 |