diff options
| author | Jose Antonio Marquez Russo | 2012-03-09 15:26:27 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez Russo | 2012-03-09 15:26:27 -0800 |
| commit | 165c4bc09d0abc58af4daaafd293d41641cabaa0 (patch) | |
| tree | dadc3d9853c5877434191259bdfec3a352564d13 /js/helper-classes/RDGE/src/core/script/jshader.js | |
| parent | 143c2b73c5a61e4bf1fe19884823c21a281d9ace (diff) | |
| parent | 9e048d2cf359c305e895fe7c0bebf09016896531 (diff) | |
| download | ninja-165c4bc09d0abc58af4daaafd293d41641cabaa0.tar.gz | |
Merge pull request #33 from ericmueller/integration
Integration
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 { |