diff options
| author | Jose Antonio Marquez | 2012-02-23 10:37:04 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-23 10:37:04 -0800 |
| commit | 287a0bad5b774a380ec6c8b3ddf24dc03234e248 (patch) | |
| tree | edffa1dd9df53f26da4135068686997ccfbdf083 /js/helper-classes/RDGE/src/core/script/precompiled.js | |
| parent | 14a8f4c4e373db213b3d42d30edaea8354ae57e3 (diff) | |
| parent | cc295dd0fb873505eed01c232bd987cf6e2dcdd9 (diff) | |
| download | ninja-287a0bad5b774a380ec6c8b3ddf24dc03234e248.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into FileIO
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]}, |