diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-03-15 10:22:09 +0100 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-03-15 10:22:09 +0100 |
| commit | aec4f57f9507208f9aef499d8a8e8d1642bf2c72 (patch) | |
| tree | fc326c281798915e9f6f38ab96d3b2ee30b69672 /drivers/gles2/shaders/material.glsl | |
| parent | c1a1adae280c6a25fa776dfd083b6d7a48f580c0 (diff) | |
| parent | de5281c3989fd4071cf57e5b7bc0cbbc174524e8 (diff) | |
Merge pull request #3528 from SaracenOne/baked_light_realtime_colourize
Ability to colourize baked lighting in real time.
Diffstat (limited to 'drivers/gles2/shaders/material.glsl')
| -rw-r--r-- | drivers/gles2/shaders/material.glsl | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/gles2/shaders/material.glsl b/drivers/gles2/shaders/material.glsl index ccd80bf2f0..e68949b056 100644 --- a/drivers/gles2/shaders/material.glsl +++ b/drivers/gles2/shaders/material.glsl @@ -618,6 +618,12 @@ uniform float ambient_dp_sampler_multiplier; #endif +#ifdef ENABLE_AMBIENT_COLOR + +uniform vec3 ambient_color; + +#endif + FRAGMENT_SHADER_GLOBALS @@ -1262,7 +1268,9 @@ LIGHT_SHADER_CODE #if defined(ENABLE_AMBIENT_OCTREE) || defined(ENABLE_AMBIENT_LIGHTMAP) || defined(ENABLE_AMBIENT_DP_SAMPLER) - +#if defined(ENABLE_AMBIENT_COLOR) + ambientmap_color*=ambient_color; +#endif diffuse.rgb+=ambientmap_color; #endif |