Blend tile lighting correctly

1 files changed, 8 insertions, 4 deletions

diff --git a/assets/opensb/rendering/world.frag b/assets/opensb/rendering/world.frag
index ed197c3..b4450ad 100644
--- a/assets/opensb/rendering/world.frag
+++ b/assets/opensb/rendering/world.frag
@@ -55,10 +55,14 @@ vec4 bicubicSample(sampler2D texture, vec2 texcoord, vec2 texscale) {
     mix(sample1, sample0, sx), sy);
 }
 
-vec4 sampleLightMap(vec2 texcoord, vec2 texscale) {
-  vec4 a = bicubicSample(lightMap, texcoord, texscale);
+vec3 sampleLightMap(vec2 texcoord, vec2 texscale) {
   vec4 b = bicubicSample(tileLightMap, texcoord, texscale);
-  return mix(a, b, b.z);
+  vec4 a = bicubicSample(lightMap, texcoord, texscale);
+
+  if (b.z <= 0.0)
+    return a.rgb;
+
+  return mix(a.rgb, b.rgb / b.z, b.z);
 }
 
 void main() {
@@ -80,6 +84,6 @@ void main() {
   if (texColor.a == 0.99607843137)
     finalColor.a = fragmentColor.a;
   else if (lightMapEnabled && finalLightMapMultiplier > 0.0)
-    finalColor.rgb *= sampleLightMap(fragmentLightMapCoordinate, 1.0 / lightMapSize).rgb * finalLightMapMultiplier;
+    finalColor.rgb *= sampleLightMap(fragmentLightMapCoordinate, 1.0 / lightMapSize) * finalLightMapMultiplier;
   gl_FragColor = finalColor;
 }
\ No newline at end of file