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/WaterMaterial.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/WaterMaterial.js')
| -rw-r--r-- | js/helper-classes/backup-delete/Materials/WaterMaterial.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/helper-classes/backup-delete/Materials/WaterMaterial.js b/js/helper-classes/backup-delete/Materials/WaterMaterial.js index 101a8c0c..49761c58 100644 --- a/js/helper-classes/backup-delete/Materials/WaterMaterial.js +++ b/js/helper-classes/backup-delete/Materials/WaterMaterial.js | |||
| @@ -22,7 +22,7 @@ function WaterMaterial() | |||
| 22 | this._name = "WaterMaterial"; | 22 | this._name = "WaterMaterial"; |
| 23 | this._shaderName = "water"; | 23 | this._shaderName = "water"; |
| 24 | 24 | ||
| 25 | this._texMap = 'assets/images/rocky-normal.jpg'; | 25 | this._texMap = 'assets/images/rocky-normal.jpg\n'; |
| 26 | 26 | ||
| 27 | this._time = 0.0; | 27 | this._time = 0.0; |
| 28 | this._dTime = 0.01; | 28 | this._dTime = 0.01; |
| @@ -71,7 +71,7 @@ function WaterMaterial() | |||
| 71 | this._shader.init(); | 71 | this._shader.init(); |
| 72 | 72 | ||
| 73 | // set up the material node | 73 | // set up the material node |
| 74 | this._materialNode = createMaterialNode("waterMaterial"); | 74 | this._materialNode = createMaterialNode("waterMaterial_" + world.generateUniqueNodeID()); |
| 75 | this._materialNode.setShader(this._shader); | 75 | this._materialNode.setShader(this._shader); |
| 76 | 76 | ||
| 77 | this._time = 0; | 77 | this._time = 0; |