diff options
author | hwc487 | 2012-03-05 04:51:31 -0800 |
---|---|---|
committer | hwc487 | 2012-03-05 04:51:31 -0800 |
commit | cad4d6cb3f667f6174ec05cecead675b244285b9 (patch) | |
tree | fc5c9688069043f02fb9781a60c7984dba184f83 /js/helper-classes/RDGE/Materials | |
parent | d044b6d9755d8ca686501fc3dd5644180e2ffbf0 (diff) | |
download | ninja-cad4d6cb3f667f6174ec05cecead675b244285b9.tar.gz |
Added more materials/canvas2D drawing to runtime.
Diffstat (limited to 'js/helper-classes/RDGE/Materials')
-rw-r--r-- | js/helper-classes/RDGE/Materials/PulseMaterial.js | 3 | ||||
-rw-r--r-- | js/helper-classes/RDGE/Materials/WaterMaterial.js | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/js/helper-classes/RDGE/Materials/PulseMaterial.js b/js/helper-classes/RDGE/Materials/PulseMaterial.js index 28f2a430..b0fbd998 100644 --- a/js/helper-classes/RDGE/Materials/PulseMaterial.js +++ b/js/helper-classes/RDGE/Materials/PulseMaterial.js | |||
@@ -185,6 +185,9 @@ function PulseMaterial() | |||
185 | // every material needs the base type and instance name | 185 | // every material needs the base type and instance name |
186 | var exportStr = "material: " + this.getShaderName() + "\n"; | 186 | var exportStr = "material: " + this.getShaderName() + "\n"; |
187 | exportStr += "name: " + this.getName() + "\n"; | 187 | exportStr += "name: " + this.getName() + "\n"; |
188 | |||
189 | var texMapName = this._propValues[this._propNames[0]]; | ||
190 | exportStr += "texture: " + texMapName; | ||
188 | 191 | ||
189 | // every material needs to terminate like this | 192 | // every material needs to terminate like this |
190 | exportStr += "endMaterial\n"; | 193 | exportStr += "endMaterial\n"; |
diff --git a/js/helper-classes/RDGE/Materials/WaterMaterial.js b/js/helper-classes/RDGE/Materials/WaterMaterial.js index 9ece3b45..49761c58 100644 --- a/js/helper-classes/RDGE/Materials/WaterMaterial.js +++ b/js/helper-classes/RDGE/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; |