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 | |
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')
-rw-r--r-- | js/lib/rdge/materials/cloud-material.js | 10 | ||||
-rw-r--r-- | js/lib/rdge/materials/pulse-material.js | 5 |
2 files changed, 10 insertions, 5 deletions
diff --git a/js/lib/rdge/materials/cloud-material.js b/js/lib/rdge/materials/cloud-material.js index 28796c42..4200c1b2 100644 --- a/js/lib/rdge/materials/cloud-material.js +++ b/js/lib/rdge/materials/cloud-material.js | |||
@@ -23,6 +23,8 @@ var CloudMaterial = function CloudMaterial() { | |||
23 | this._shaderName = "cloud"; | 23 | this._shaderName = "cloud"; |
24 | 24 | ||
25 | this._texMap = 'assets/images/cloud10.png'; | 25 | this._texMap = 'assets/images/cloud10.png'; |
26 | //this._texMap = 'assets/images/CL13.png'; | ||
27 | //this._texMap = 'assets/images/material_paint.png'; | ||
26 | //this._texMap = 'assets/images/us_flag.png'; | 28 | //this._texMap = 'assets/images/us_flag.png'; |
27 | //this._texMap = 'assets/images/cubelight.png'; | 29 | //this._texMap = 'assets/images/cubelight.png'; |
28 | this._diffuseColor = [0.5, 0.5, 0.5, 0.5]; | 30 | this._diffuseColor = [0.5, 0.5, 0.5, 0.5]; |
@@ -36,8 +38,10 @@ var CloudMaterial = function CloudMaterial() { | |||
36 | // parameter initial values | 38 | // parameter initial values |
37 | this._time = 0.0; | 39 | this._time = 0.0; |
38 | this._surfaceAlpha = 0.5; | 40 | this._surfaceAlpha = 0.5; |
39 | this._zmin = 2.0; | 41 | // this._zmin = 2.0; |
40 | this._zmax = 5.0; | 42 | // this._zmax = 5.0; |
43 | this._zmin = 5.0; | ||
44 | this._zmax = 10.0; | ||
41 | 45 | ||
42 | // the adjusted zMin and zMax values are | 46 | // the adjusted zMin and zMax values are |
43 | // what get sent to the shader. They are initialized | 47 | // what get sent to the shader. They are initialized |
@@ -211,7 +215,7 @@ var CloudMaterial = function CloudMaterial() { | |||
211 | { | 215 | { |
212 | if (this._srcWorld) | 216 | if (this._srcWorld) |
213 | { | 217 | { |
214 | this._srcWorld.update(); | 218 | //this._srcWorld.update(); |
215 | this._srcWorld.draw(); | 219 | this._srcWorld.draw(); |
216 | g_Engine.setContext( this.getWorld()._canvas.rdgeid ); | 220 | g_Engine.setContext( this.getWorld()._canvas.rdgeid ); |
217 | } | 221 | } |
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; |