evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Blend tile lighting correctly

Browse Source
This commit is contained in:
Kae 2023-07-04 05:26:47 +10:00
parent ced1ba32bb
commit 1d04c689ba
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
assets/opensb/rendering/world.frag
View File

@ -55,10 +55,14 @@ vec4 bicubicSample(sampler2D texture, vec2 texcoord, vec2 texscale) {
mix(sample1, sample0, sx), sy); mix(sample1, sample0, sx), sy);
} }
vec4 sampleLightMap(vec2 texcoord, vec2 texscale) { vec3 sampleLightMap(vec2 texcoord, vec2 texscale) {
vec4 a = bicubicSample(lightMap, texcoord, texscale);
vec4 b = bicubicSample(tileLightMap, texcoord, 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() { void main() {
@ -80,6 +84,6 @@ void main() {
if (texColor.a == 0.99607843137) if (texColor.a == 0.99607843137)
finalColor.a = fragmentColor.a; finalColor.a = fragmentColor.a;
else if (lightMapEnabled && finalLightMapMultiplier > 0.0) 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; gl_FragColor = finalColor;
} }