diff options
| author | John Mayhew | 2012-04-03 09:39:38 -0700 |
|---|---|---|
| committer | John Mayhew | 2012-04-03 09:39:38 -0700 |
| commit | b4ba63045158e108356e065c1237fb72b56473a5 (patch) | |
| tree | 727039d99f65713ea45957202984a52aa3d16731 /js/helper-classes/RDGE/src/core/script/jshader.js | |
| parent | 1a3c7d0d5c4ee40af189459749a459990fd08b7e (diff) | |
| download | ninja-b4ba63045158e108356e065c1237fb72b56473a5.tar.gz | |
fixed remaining namespace bugs ensuring the use of the RDGE namespace everywhere it is required
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 cad66b2a..2bccaa80 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(g_Engine._assetPath+"images/white.png")]; break; | 196 | case "tex2d": this.data = [ctx.canvas.renderer.getTextureByName(RDGE.globals.engine._assetPath+"images/white.png")]; break; |
| 197 | case "texCube": this.data = [ctx.canvas.renderer.getTextureByName(g_Engine._assetPath+"images/white.png")]; break; | 197 | case "texCube": this.data = [ctx.canvas.renderer.getTextureByName(RDGE.globals.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(g_Engine._assetPath+"images/white.png")]; break; | 248 | case "tex2d": this.data = [ctx.canvas.renderer.getTextureByName(RDGE.globals.engine._assetPath+"images/white.png")]; break; |
| 249 | case "texCube": this.data = [ctx.canvas.renderer.getTextureByName(g_Engine._assetPath+"images/white.png")]; break; | 249 | case "texCube": this.data = [ctx.canvas.renderer.getTextureByName(RDGE.globals.engine._assetPath+"images/white.png")]; break; |
| 250 | } | 250 | } |
| 251 | } | 251 | } |
| 252 | else { | 252 | else { |