OpenGL2: Fix q3map2 lightstyles effects

PadWorld-Entertainment / worldofpadman

World of PADMAN game repository

https://worldofpadman.net

Other

37 stars 8 forks source link

OpenGL2: Fix q3map2 lightstyles effects #243

Closed zturtleman closed 6 months ago

zturtleman commented 6 months ago

Fixes https://github.com/PadWorld-Entertainment/worldofpadman/issues/54 (wop_trashmap rendering)

For r_mergeLightmaps 1

Fix tcMod transform on "map $lightmap" stages
Fix external lightmap image texcoords if shader also has an internal lightmap

For r_sunlightMode 1

Fix "tcGen lightmap" stages with blendFunc GL_SRC_ALPHA GL_ONE being converted to white image + modulate lightmap and drawing incorrectly

I'll add it to ioquake3 after it's confirmed fixed in WoP, since that's what it's for.

kai-li-wop commented 6 months ago

Looks good to me and totally the same now like with the OpenGL1 renderer. Thx a lot for this fix which will enable us now to set the OpenGL2 renderer as default and to make use of the advanced effects and features.

kai-li-wop commented 6 months ago

@zturtleman: Does your fix break the cascaded shadow map? I just recognised, that in wop_trashmap the shadows are not cast on the side walk next to the sandbox but inside the sandbox. This is really strange. In wop_trashmapBB shadows arecast everywhere. Also a missing q3map_surfacelight key in the mtr shader breaks the skybox (textures are not drawn) so I need to set it at least to 0 to make it work again. tested with changes made in 0047db6b22b7f646d6b2d2c385bdc23b8f7c52c0.

zturtleman commented 6 months ago

Oops, I guess I forgot to test after switching CollapseStagesToGLSL() from checking lightmap is not rgbGen identity to not blendFunc filter. Fixed in #244.