diff options
| author | SmileTheory <SmileTheory@gmail.com> | 2013-09-16 05:57:14 -0700 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2014-06-17 17:43:34 +0100 |
| commit | fc232c31d075091fea63c6dffa9ec69677b7068b (patch) | |
| tree | 0cb4c91901ca6a287ab9a4adb44b382ff3656945 /src/renderergl2/glsl | |
| parent | 75fe4796280cc95fe6b96cc9c9df5d74fc478ffa (diff) | |
OpenGL2: Use RGBM instead of RGBE encoding for lightmaps.
Diffstat (limited to 'src/renderergl2/glsl')
| -rw-r--r-- | src/renderergl2/glsl/generic_fp.glsl | 4 | ||||
| -rw-r--r-- | src/renderergl2/glsl/lightall_fp.glsl | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/renderergl2/glsl/generic_fp.glsl b/src/renderergl2/glsl/generic_fp.glsl index dea52e06..997d4daa 100644 --- a/src/renderergl2/glsl/generic_fp.glsl +++ b/src/renderergl2/glsl/generic_fp.glsl @@ -20,8 +20,8 @@ void main() vec4 color = texture2D(u_DiffuseMap, var_DiffuseTex); #if defined(USE_LIGHTMAP) vec4 color2 = texture2D(u_LightMap, var_LightTex); - #if defined(RGBE_LIGHTMAP) - color2.rgb *= exp2(color2.a * 255.0 - 128.0); + #if defined(RGBM_LIGHTMAP) + color2.rgb *= 32.0 * color2.a; color2.a = 1.0; #endif diff --git a/src/renderergl2/glsl/lightall_fp.glsl b/src/renderergl2/glsl/lightall_fp.glsl index efd01399..6aec2b4a 100644 --- a/src/renderergl2/glsl/lightall_fp.glsl +++ b/src/renderergl2/glsl/lightall_fp.glsl @@ -285,8 +285,8 @@ void main() #if defined(USE_LIGHTMAP) vec4 lightSample = texture2D(u_LightMap, var_LightTex).rgba; - #if defined(RGBE_LIGHTMAP) - lightSample.rgb *= exp2(lightSample.a * 255.0 - 128.0); + #if defined(RGBM_LIGHTMAP) + lightSample.rgb *= 32.0 * lightSample.a; #endif vec3 lightColor = lightSample.rgb; #elif defined(USE_LIGHT_VECTOR) && !defined(USE_FAST_LIGHT) |