diff options
| author | hwc487 | 2012-04-18 15:44:26 -0700 |
|---|---|---|
| committer | hwc487 | 2012-04-18 15:44:26 -0700 |
| commit | ae7eb87564632ce7c676bd728b8ff2710ff0bb83 (patch) | |
| tree | 43bced103fb7487222202777ff5bb29850776bef /js/lib/rdge/materials/pulse-material.js | |
| parent | 447268000c379f619c78d7132c81e23b5c252598 (diff) | |
| download | ninja-ae7eb87564632ce7c676bd728b8ff2710ff0bb83.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Snapping_II
Conflicts:
js/tools/Rotate3DToolBase.js
js/tools/RotateStage3DTool.js
js/tools/Translate3DToolBase.js
js/tools/modifier-tool-base.js
Diffstat (limited to 'js/lib/rdge/materials/pulse-material.js')
| -rw-r--r-- | js/lib/rdge/materials/pulse-material.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/js/lib/rdge/materials/pulse-material.js b/js/lib/rdge/materials/pulse-material.js index 9cb500c8..4ba5110e 100644 --- a/js/lib/rdge/materials/pulse-material.js +++ b/js/lib/rdge/materials/pulse-material.js | |||
| @@ -25,8 +25,9 @@ var PulseMaterial = function PulseMaterial() | |||
| 25 | this._name = "PulseMaterial"; | 25 | this._name = "PulseMaterial"; |
| 26 | this._shaderName = "pulse"; | 26 | this._shaderName = "pulse"; |
| 27 | 27 | ||
| 28 | //this._texMap = 'assets/images/cubelight.png'; | 28 | this._texMap = 'assets/images/cubelight.png'; |
| 29 | this._texMap = 'texture'; | 29 | //this._texMap = 'assets/images/cloud10.png'; |
| 30 | //this._texMap = 'texture'; | ||
| 30 | 31 | ||
| 31 | this._time = 0.0; | 32 | this._time = 0.0; |
| 32 | this._dTime = 0.01; | 33 | this._dTime = 0.01; |