OpenGL2: Fix merged lightmaps using tcGen environment #638
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zturtleman
commented
Feb 10, 2024
zturtleman
commented
- Fix the texcoord range for external lightmaps in a shader with an internal lightmap to be 0.0 to 1.0. (With texture repeating it would wrap around and read correctly but clampMap or tcMods might not of worked.)
- Fix merged lightmaps using tcGen environment. (Fixes OpenGL2: Lightmap as an environment map renders incorrect with r_mergeLightmaps 1 #636.)
- Only apply the hack to fix tcMod transform on internal merged lightmaps to tcGen lightmap.
This fixes the texcoord range to be 0.0 to 1.0 for external lightmaps in shaders that also have an internal lightmap. (Instead of 2.0 to 3.0 for example.) This only affects clampMap as repeating wrapping sampled the correct location. I haven't found such a shader but I need to get real lightmap index for future merged lightmap hacks.
tcGen environment generates texcoords in range of 0.0 to 1.0 and they need to be offset to the position/size in the merged lightmap atlas. This also needs to be after tcMods so they apply for the original range. This fixes tcMod scale used by main_q3abanner and shinygrate1_4. This issue was visible on the blue monitor (comp3c) near the plasmagun in q3dm0 and the Quake III Arena banner in q3dm17. Affected shaders in Quake 3 and Team Arena maps: textures/base_wall/comp3 textures/base_wall/comp3b textures/base_wall/comp3b_dark textures/base_wall/comp3c textures/base_wall/main_q3abanner textures/base_wall/shinygrate1_4 textures/sfx/teslacoil All of the shaders are used by q3dm0 but other maps also use some.
When using merged lightmaps, only change tcMod transform for tcGen lightmap.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.