diff options
| author | Jose Antonio Marquez | 2012-02-23 10:38:51 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-23 10:38:51 -0800 |
| commit | d764428023d87446fbbb153d8e04a23b900d71d5 (patch) | |
| tree | 2581815db5567b52d4c59663ea9e37d6df057ca3 /js/helper-classes/RDGE/src/core/script/scenegraphNodes.js | |
| parent | 3e1be6d4d4f0d3a2474af7d915954f9b6464fe2e (diff) | |
| parent | cc295dd0fb873505eed01c232bd987cf6e2dcdd9 (diff) | |
| download | ninja-d764428023d87446fbbb153d8e04a23b900d71d5.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into Color
Diffstat (limited to 'js/helper-classes/RDGE/src/core/script/scenegraphNodes.js')
| -rwxr-xr-x | js/helper-classes/RDGE/src/core/script/scenegraphNodes.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/js/helper-classes/RDGE/src/core/script/scenegraphNodes.js b/js/helper-classes/RDGE/src/core/script/scenegraphNodes.js index 48f0aab9..e80a14fb 100755 --- a/js/helper-classes/RDGE/src/core/script/scenegraphNodes.js +++ b/js/helper-classes/RDGE/src/core/script/scenegraphNodes.js | |||
| @@ -321,10 +321,10 @@ materialNodeTemplate = function(matNode) | |||
| 321 | var renderer = g_Engine.getContext().renderer; | 321 | var renderer = g_Engine.getContext().renderer; |
| 322 | matNode.textureList = | 322 | matNode.textureList = |
| 323 | [ | 323 | [ |
| 324 | {'name':"colMap", 'handle':renderer.getTextureByName("assets/images/white"), 'unit': TEX_DIF, "type":UNIFORMTYPE.TEXTURE2D}, | 324 | // {'name':"colMap", 'handle':renderer.getTextureByName("assets/images/white"), 'unit': TEX_DIF, "type":UNIFORMTYPE.TEXTURE2D}, |
| 325 | {'name':"envMap", 'handle':renderer.getTextureByName("assets/images/material_paint"),'unit': TEX_SPEC, "type":UNIFORMTYPE.TEXTURE2D}, | 325 | // {'name':"envMap", 'handle':renderer.getTextureByName("assets/images/material_paint"),'unit': TEX_SPEC, "type":UNIFORMTYPE.TEXTURE2D}, |
| 326 | {'name':"normalMap",'handle':renderer.getTextureByName("assets/images/blue"), 'unit': TEX_NORM, "type":UNIFORMTYPE.TEXTURE2D}, | 326 | // {'name':"normalMap",'handle':renderer.getTextureByName("assets/images/blue"), 'unit': TEX_NORM, "type":UNIFORMTYPE.TEXTURE2D}, |
| 327 | {'name':"glowMap", 'handle':renderer.getTextureByName("assets/images/black"), 'unit': TEX_GLOW, "type":UNIFORMTYPE.TEXTURE2D} | 327 | // {'name':"glowMap", 'handle':renderer.getTextureByName("assets/images/black"), 'unit': TEX_GLOW, "type":UNIFORMTYPE.TEXTURE2D} |
| 328 | ]; | 328 | ]; |
| 329 | } | 329 | } |
| 330 | 330 | ||