diff options
| author | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
| commit | 03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch) | |
| tree | c51112223ceb9121cd595a60335eb2795215590f /js/helper-classes/RDGE/src/core/script/precompiled.js | |
| parent | fcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff) | |
| parent | 053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff) | |
| download | ninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz | |
Merge branch 'pentool' into brushtool
Conflicts:
imports/codemirror/mode/scheme/scheme.js
js/tools/BrushTool.js
Diffstat (limited to 'js/helper-classes/RDGE/src/core/script/precompiled.js')
| -rwxr-xr-x[-rw-r--r--] | 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 100644..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]}, |