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/precompiled.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/precompiled.js')
-rwxr-xr-x | js/helper-classes/RDGE/src/core/script/precompiled.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/js/helper-classes/RDGE/src/core/script/precompiled.js b/js/helper-classes/RDGE/src/core/script/precompiled.js index 7fd1a425..bed94e4e 100755 --- a/js/helper-classes/RDGE/src/core/script/precompiled.js +++ b/js/helper-classes/RDGE/src/core/script/precompiled.js | |||
@@ -48,11 +48,11 @@ rdgeGlobalParameters = | |||
48 | "u_light3Amb": {'type': 'vec4', 'data': [0.5, 0.5, 0.5, 1.0]}, | 48 | "u_light3Amb": {'type': 'vec4', 'data': [0.5, 0.5, 0.5, 1.0]}, |
49 | "u_light3Spec": {'type': 'vec4', 'data': [1.0, 1.0, 1.0, 1.0]}}, | 49 | "u_light3Spec": {'type': 'vec4', 'data': [1.0, 1.0, 1.0, 1.0]}}, |
50 | "colMap": {'type': 'tex2d', 'data': "assets/images/white.png"}, | 50 | "colMap": {'type': 'tex2d', 'data': "assets/images/white.png"}, |
51 | "envMap": {'type': 'tex2d', 'data': null}, | 51 | //"envMap": {'type': 'tex2d', 'data': null}, |
52 | "normalMap": {'type': 'tex2d', 'data': null}, | 52 | //"normalMap": {'type': 'tex2d', 'data': null}, |
53 | "glowMap": {'type': 'tex2d', 'data': "assets/images/black.png"}, | 53 | //"glowMap": {'type': 'tex2d', 'data': "assets/images/black.png"}, |
54 | "u_shadowDepthMap": {'type': 'tex2d', 'data': null}, | 54 | //"u_shadowDepthMap": {'type': 'tex2d', 'data': null}, |
55 | "u_depthMap": {'type': 'tex2d', 'data': null}, | 55 | //"u_depthMap": {'type': 'tex2d', 'data': null}, |
56 | "u_matAmbient": {'type': 'vec4', 'data': [1.00,1.00,1.00, 1]}, | 56 | "u_matAmbient": {'type': 'vec4', 'data': [1.00,1.00,1.00, 1]}, |
57 | "u_matDiffuse": {'type': 'vec4', 'data': [1.0, 1.0, 1.0, 1.0]}, | 57 | "u_matDiffuse": {'type': 'vec4', 'data': [1.0, 1.0, 1.0, 1.0]}, |
58 | "u_matSpecular": {'type': 'vec4', 'data': [1.0, 1.0, 1.0, 1.0]}, | 58 | "u_matSpecular": {'type': 'vec4', 'data': [1.0, 1.0, 1.0, 1.0]}, |