diff options
| author | Valerio Virgillito | 2012-02-23 17:05:43 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-02-23 17:05:43 -0800 |
| commit | afc53c6f553c97ab778154154aa2b7a146cb5fef (patch) | |
| tree | 66b5ec886a49894feda44ccf8b5233ef39a46536 /js/helper-classes/RDGE/src/core/script/precompiled.js | |
| parent | 8974ecd564563a991ff96f9cb6d47da172174242 (diff) | |
| parent | db2fd02a1b0e909bb536fa63cefd2144f4642ead (diff) | |
| download | ninja-afc53c6f553c97ab778154154aa2b7a146cb5fef.tar.gz | |
Merge branch 'refs/heads/master' into local-storage-version
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]}, |