diff options
| author | Valerio Virgillito | 2012-03-13 11:15:34 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-03-13 11:15:34 -0700 |
| commit | f6b958360d82854bdaf51848e7fd715d1f633179 (patch) | |
| tree | 80f6c08bb730089bdd3f26310df8d2363f9ba863 /js/helper-classes/backup-delete/Materials/PlasmaMaterial.js | |
| parent | c24f58c10231c30d3a8a4c9fb9a4f395dd746180 (diff) | |
| parent | 4d7b86f55c504ee4e8c2460cf6b60cb9a2cf18f0 (diff) | |
| download | ninja-f6b958360d82854bdaf51848e7fd715d1f633179.tar.gz | |
Merge pull request #105 from joseeight/FileIO-Build-Candidate
File I/O adding webGL/canvas data functionality
Diffstat (limited to 'js/helper-classes/backup-delete/Materials/PlasmaMaterial.js')
| -rw-r--r-- | js/helper-classes/backup-delete/Materials/PlasmaMaterial.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/helper-classes/backup-delete/Materials/PlasmaMaterial.js b/js/helper-classes/backup-delete/Materials/PlasmaMaterial.js index a65f3a33..4e60df9f 100644 --- a/js/helper-classes/backup-delete/Materials/PlasmaMaterial.js +++ b/js/helper-classes/backup-delete/Materials/PlasmaMaterial.js | |||
| @@ -74,7 +74,7 @@ function PlasmaMaterial() | |||
| 74 | this.setProperty( "color", [this._time, 0, 0, 1] ); | 74 | this.setProperty( "color", [this._time, 0, 0, 1] ); |
| 75 | 75 | ||
| 76 | // set up the material node | 76 | // set up the material node |
| 77 | this._materialNode = createMaterialNode("plasmaMaterial"); | 77 | this._materialNode = createMaterialNode("plasmaMaterial_" + world.generateUniqueNodeID()); |
| 78 | this._materialNode.setShader(this._shader); | 78 | this._materialNode.setShader(this._shader); |
| 79 | } | 79 | } |
| 80 | 80 | ||