diff options
author | John Mayhew | 2012-04-02 16:28:39 -0700 |
---|---|---|
committer | John Mayhew | 2012-04-02 16:28:39 -0700 |
commit | b4155fb4c33675a8a7cd37473513718043fdf0ba (patch) | |
tree | 3d8c802473f2395d53d599ec9d8b70b60a4db50c /js/helper-classes/RDGE/src/core/script/jshader.js | |
parent | 5ba9aeac94c86049423fd5d4b37b277263939c13 (diff) | |
parent | c6de22bf42be90b403491b5f87b1818d9020310c (diff) | |
download | ninja-b4155fb4c33675a8a7cd37473513718043fdf0ba.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts:
js/helper-classes/RDGE/rdge-compiled.js
js/helper-classes/RDGE/runtime/GLRuntime.js
js/helper-classes/RDGE/src/core/script/MeshManager.js
js/helper-classes/RDGE/src/core/script/engine.js
js/helper-classes/RDGE/src/core/script/fx/ssao.js
js/helper-classes/RDGE/src/core/script/init_state.js
js/helper-classes/RDGE/src/core/script/run_state.js
js/helper-classes/RDGE/src/core/script/scenegraphNodes.js
js/helper-classes/RDGE/src/core/script/utilities.js
js/helper-classes/RDGE/src/tools/compile-rdge-core.bat
js/helper-classes/RDGE/src/tools/compile-rdge-core.sh
js/helper-classes/RDGE/src/tools/rdge-compiled.js
js/lib/drawing/world.js
js/lib/rdge/materials/bump-metal-material.js
js/lib/rdge/materials/deform-material.js
js/lib/rdge/materials/flat-material.js
js/lib/rdge/materials/fly-material.js
js/lib/rdge/materials/julia-material.js
js/lib/rdge/materials/keleidoscope-material.js
js/lib/rdge/materials/linear-gradient-material.js
js/lib/rdge/materials/mandel-material.js
js/lib/rdge/materials/plasma-material.js
js/lib/rdge/materials/pulse-material.js
js/lib/rdge/materials/radial-blur-material.js
js/lib/rdge/materials/radial-gradient-material.js
js/lib/rdge/materials/relief-tunnel-material.js
js/lib/rdge/materials/square-tunnel-material.js
js/lib/rdge/materials/star-material.js
js/lib/rdge/materials/taper-material.js
js/lib/rdge/materials/tunnel-material.js
js/lib/rdge/materials/twist-material.js
js/lib/rdge/materials/twist-vert-material.js
js/lib/rdge/materials/uber-material.js
js/lib/rdge/materials/water-material.js
js/lib/rdge/materials/z-invert-material.js
js/preloader/Preloader.js
Diffstat (limited to 'js/helper-classes/RDGE/src/core/script/jshader.js')
-rwxr-xr-x | js/helper-classes/RDGE/src/core/script/jshader.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/js/helper-classes/RDGE/src/core/script/jshader.js b/js/helper-classes/RDGE/src/core/script/jshader.js index 368036c2..cad66b2a 100755 --- a/js/helper-classes/RDGE/src/core/script/jshader.js +++ b/js/helper-classes/RDGE/src/core/script/jshader.js | |||
@@ -193,8 +193,8 @@ RDGE.jshader = function (addr) { | |||
193 | case "mat2": this.data = [0, 0, 0, 0]; break; | 193 | case "mat2": this.data = [0, 0, 0, 0]; break; |
194 | case "float": this.data = [0]; break; | 194 | case "float": this.data = [0]; break; |
195 | case "int": this.data = [0]; break; | 195 | case "int": this.data = [0]; break; |
196 | case "tex2d": this.data = [ctx.canvas.renderer.getTextureByName("assets/images/white.png")]; break; | 196 | case "tex2d": this.data = [ctx.canvas.renderer.getTextureByName(g_Engine._assetPath+"images/white.png")]; break; |
197 | case "texCube": this.data = [ctx.canvas.renderer.getTextureByName("assets/images/white.png")]; break; | 197 | case "texCube": this.data = [ctx.canvas.renderer.getTextureByName(g_Engine._assetPath+"images/white.png")]; break; |
198 | } | 198 | } |
199 | } | 199 | } |
200 | else { | 200 | else { |
@@ -245,8 +245,8 @@ RDGE.jshader = function (addr) { | |||
245 | case "mat2": this.data = [0, 0, 0, 0]; break; | 245 | case "mat2": this.data = [0, 0, 0, 0]; break; |
246 | case "float": this.data = [0]; break; | 246 | case "float": this.data = [0]; break; |
247 | case "int": this.data = [0]; break; | 247 | case "int": this.data = [0]; break; |
248 | case "tex2d": this.data = [ctx.canvas.renderer.getTextureByName("assets/images/white.png")]; break; | 248 | case "tex2d": this.data = [ctx.canvas.renderer.getTextureByName(g_Engine._assetPath+"images/white.png")]; break; |
249 | case "texCube": this.data = [ctx.canvas.renderer.getTextureByName("assets/images/white.png")]; break; | 249 | case "texCube": this.data = [ctx.canvas.renderer.getTextureByName(g_Engine._assetPath+"images/white.png")]; break; |
250 | } | 250 | } |
251 | } | 251 | } |
252 | else { | 252 | else { |