phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-05-03 08:03:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix black glow cards on streetlamps: discard dark pixels in Mod blend batches

Browse source 
Mod blend (GL_DST_COLOR, GL_ZERO) multiplies the framebuffer by texture color,
so dark pixels create visible black rectangles. Use a variable colorKeyThreshold
uniform (0.7 for Mod/Mod2x, 0.08 default) to discard dark pixels from these
batches while preserving normal colorKeyBlack behavior elsewhere.
This commit is contained in:
Kelsi 2026-02-19 19:07:58 -08:00
parent a61f319f1d
commit d0a0cf6e5e
1 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/rendering/m2_renderer.cpp
View file

@ -326,6 +326,7 @@ bool M2Renderer::initialize(pipeline::AssetManager* assets) {
uniform bool uHasTexture; uniform bool uHasTexture;
uniform bool uAlphaTest; uniform bool uAlphaTest;
uniform bool uColorKeyBlack; uniform bool uColorKeyBlack;
uniform float uColorKeyThreshold;
uniform bool uUnlit; uniform bool uUnlit;
uniform int uBlendMode; uniform int uBlendMode;
uniform float uFadeAlpha; uniform float uFadeAlpha;
@ -358,7 +359,7 @@ bool M2Renderer::initialize(pipeline::AssetManager* assets) {
if (uAlphaTest && maxRgb < 0.06) { if (uAlphaTest && maxRgb < 0.06) {
discard; discard;
} }
if (uColorKeyBlack && maxRgb < 0.08) { if (uColorKeyBlack && maxRgb < uColorKeyThreshold) {
discard; discard;
} }
// Additive blend modes (3=Add, 6=BlendAdd): near-black fragments // Additive blend modes (3=Add, 6=BlendAdd): near-black fragments
@ -1919,6 +1920,7 @@ void M2Renderer::render(const Camera& camera, const glm::mat4& view, const glm::
glActiveTexture(GL_TEXTURE0); glActiveTexture(GL_TEXTURE0);
shader->setUniform("uTexture", 0); // Texture unit 0, set once per frame shader->setUniform("uTexture", 0); // Texture unit 0, set once per frame
shader->setUniform("uColorKeyBlack", false); shader->setUniform("uColorKeyBlack", false);
shader->setUniform("uColorKeyThreshold", 0.08f);
shader->setUniform("uBlendMode", 0); shader->setUniform("uBlendMode", 0);
// Performance counters // Performance counters
@ -2151,6 +2153,16 @@ void M2Renderer::render(const Camera& camera, const glm::mat4& view, const glm::
shader->setUniform("uColorKeyBlack", colorKeyBlack); shader->setUniform("uColorKeyBlack", colorKeyBlack);
lastColorKeyBlack = colorKeyBlack; lastColorKeyBlack = colorKeyBlack;
} }
// ColorKeyBlack textures: discard dark pixels so background shows through.
// Mod blend (4) multiplies framebuffer by texture — dark pixels darken
// the scene, so use a high threshold to remove the dark rectangle.
if (colorKeyBlack) {
float thresh = 0.08f;
if (batch.blendMode == 4 || batch.blendMode == 5) {
thresh = 0.7f; // Mod/Mod2x: only keep near-white pixels
}
shader->setUniform("uColorKeyThreshold", thresh);
}
// Only bind texture if it changed (texture unit already set to GL_TEXTURE0) // Only bind texture if it changed (texture unit already set to GL_TEXTURE0)
if (hasTexture && batch.texture != lastBoundTexture) { if (hasTexture && batch.texture != lastBoundTexture) {