diff options
author | Pushkar Joshi | 2012-03-13 11:36:11 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-03-13 11:36:11 -0700 |
commit | 6023f7c8258e660388ee33730601f1161f9299e9 (patch) | |
tree | 632484428b398f71b8481aa8e30180895ff2483c /js/helper-classes/RDGE/src/core/script/jshader.js | |
parent | 76f2021618c0a6a99a1b855233e353e84ca99467 (diff) | |
parent | 4ad1650f629e7e345eade52ed6dadc233b27cc45 (diff) | |
download | ninja-6023f7c8258e660388ee33730601f1161f9299e9.tar.gz |
Merge branch 'pentool' into brushtool
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 36c5939e..ceb67536 100755 --- a/js/helper-classes/RDGE/src/core/script/jshader.js +++ b/js/helper-classes/RDGE/src/core/script/jshader.js | |||
@@ -191,8 +191,8 @@ jshader = function(addr) { | |||
191 | case "mat2": this.data = [0, 0, 0, 0]; break; | 191 | case "mat2": this.data = [0, 0, 0, 0]; break; |
192 | case "float": this.data = [0]; break; | 192 | case "float": this.data = [0]; break; |
193 | case "int": this.data = [0]; break; | 193 | case "int": this.data = [0]; break; |
194 | case "tex2d": this.data = [ctx.canvas.renderer.getTextureByName("assets/images/white.png")]; break; | 194 | case "tex2d": this.data = [ctx.canvas.renderer.getTextureByName(g_Engine._assetPath+"images/white.png")]; break; |
195 | case "texCube": this.data = [ctx.canvas.renderer.getTextureByName("assets/images/white.png")]; break; | 195 | case "texCube": this.data = [ctx.canvas.renderer.getTextureByName(g_Engine._assetPath+"images/white.png")]; break; |
196 | } | 196 | } |
197 | } | 197 | } |
198 | else { | 198 | else { |
@@ -243,8 +243,8 @@ jshader = function(addr) { | |||
243 | case "mat2": this.data = [0, 0, 0, 0]; break; | 243 | case "mat2": this.data = [0, 0, 0, 0]; break; |
244 | case "float": this.data = [0]; break; | 244 | case "float": this.data = [0]; break; |
245 | case "int": this.data = [0]; break; | 245 | case "int": this.data = [0]; break; |
246 | case "tex2d": this.data = [ctx.canvas.renderer.getTextureByName("assets/images/white.png")]; break; | 246 | case "tex2d": this.data = [ctx.canvas.renderer.getTextureByName(g_Engine._assetPath+"images/white.png")]; break; |
247 | case "texCube": this.data = [ctx.canvas.renderer.getTextureByName("assets/images/white.png")]; break; | 247 | case "texCube": this.data = [ctx.canvas.renderer.getTextureByName(g_Engine._assetPath+"images/white.png")]; break; |
248 | } | 248 | } |
249 | } | 249 | } |
250 | else { | 250 | else { |