diff options
author | Nivesh Rajbhandari | 2012-02-22 11:00:20 -0800 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-02-22 11:00:20 -0800 |
commit | 96a0a8c916533eb5625816192ed38488f639326d (patch) | |
tree | a6283ee8c546419c3e79aa71c8e39c61d6dc34ed /js/helper-classes/RDGE/src/core/script/scenegraphNodes.js | |
parent | d2f4d5e5f6742d53b6324d585a700566f73c992a (diff) | |
download | ninja-96a0a8c916533eb5625816192ed38488f639326d.tar.gz |
Integrating canvas-2d drawing and WebGL fixes, including adding back WebGL materials.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
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 | ||