diff options
author | Jonathan Duran | 2012-03-14 08:59:17 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-03-14 08:59:17 -0700 |
commit | e065244ac75d1d0f25fd5c75cb58e714a13fe16b (patch) | |
tree | 6b49a85a45fdd41b81be5603fbbc2e0d197eb187 /js/helper-classes/backup-delete/Materials/WaterMaterial.js | |
parent | e8f207dc50ad942ee8c1c1db6b146c0110ce3216 (diff) | |
download | ninja-e065244ac75d1d0f25fd5c75cb58e714a13fe16b.tar.gz |
Squashed commit of the following:
merge master into timeline
Signed-off-by: Jonathan Duran <jduran@motorola.com>
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; |