diff options
| author | Pushkar Joshi | 2012-03-13 11:24:35 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-03-13 11:24:35 -0700 |
| commit | 4ad1650f629e7e345eade52ed6dadc233b27cc45 (patch) | |
| tree | 0e7b925f4dedf27f2684915e7e247e79c4a74aff /js/helper-classes/backup-delete/Materials/WaterMaterial.js | |
| parent | 730c42e005b1ebd96448e3bc2dd700ffd8909cb5 (diff) | |
| parent | 9f3307810541ca6f95d7ca6d1febe8afdcd2c101 (diff) | |
| download | ninja-4ad1650f629e7e345eade52ed6dadc233b27cc45.tar.gz | |
Merge branch 'master' into pentool
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; |