phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-04-17 17:43:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix particle glow transparency for textures without alpha

Browse source
This commit is contained in:
Kelsi 2026-02-14 22:32:12 -08:00
parent a2c049b00b
commit 630019aea9
3 changed files with 29 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/rendering/m2_renderer.hpp
View file

@ -360,8 +360,10 @@ private:
GLuint id = 0; GLuint id = 0;
size_t approxBytes = 0; size_t approxBytes = 0;
uint64_t lastUse = 0; uint64_t lastUse = 0;
bool hasAlpha = true;
}; };
std::unordered_map<std::string, TextureCacheEntry> textureCache; std::unordered_map<std::string, TextureCacheEntry> textureCache;
std::unordered_map<GLuint, bool> textureHasAlphaById_;
size_t textureCacheBytes_ = 0; size_t textureCacheBytes_ = 0;
uint64_t textureCacheCounter_ = 0; uint64_t textureCacheCounter_ = 0;
size_t textureCacheBudgetBytes_ = 2048ull * 1024 * 1024; // Default, overridden at init size_t textureCacheBudgetBytes_ = 2048ull * 1024 * 1024; // Default, overridden at init

9
src/pipeline/blp_loader.cpp
View file

@ -167,13 +167,8 @@ BLPImage BLPLoader::loadBLP2(const uint8_t* data, size_t size) {
return BLPImage(); return BLPImage();
} }
// DXT1 with alphaDepth=0 has no meaningful alpha channel, but the DXT1 // Note: DXT1 may encode 1-bit transparency via the color-key mode (c0 <= c1).
// color-key mode can produce alpha=0 pixels. Force all alpha to 255. // Do not override alpha based on alphaDepth; preserve whatever the DXT decompressor produced.
if (header->alphaDepth == 0) {
for (int i = 0; i < pixelCount; i++) {
image.data[i * 4 + 3] = 255;
}
}
return image; return image;
} }

27
src/rendering/m2_renderer.cpp
View file

@ -659,6 +659,7 @@ void M2Renderer::shutdown() {
textureCache.clear(); textureCache.clear();
textureCacheBytes_ = 0; textureCacheBytes_ = 0;
textureCacheCounter_ = 0; textureCacheCounter_ = 0;
textureHasAlphaById_.clear();
if (whiteTexture != 0) { if (whiteTexture != 0) {
glDeleteTextures(1, &whiteTexture); glDeleteTextures(1, &whiteTexture);
whiteTexture = 0; whiteTexture = 0;
@ -2420,8 +2421,19 @@ void M2Renderer::renderM2Particles(const glm::mat4& view, const glm::mat4& proj)
for (auto& [key, group] : groups) { for (auto& [key, group] : groups) {
if (group.vertexData.empty()) continue; if (group.vertexData.empty()) continue;
// Set blend mode // Set blend mode. Many classic glow textures use a black background with no alpha,
if (group.blendType == 4) { // and expect additive blending so black contributes nothing.
bool texHasAlpha = true;
if (auto it = textureHasAlphaById_.find(group.texture); it != textureHasAlphaById_.end()) {
texHasAlpha = it->second;
}
uint8_t blendType = group.blendType;
if ((blendType == 1 || blendType == 2) && !texHasAlpha) {
blendType = 4; // Treat as additive fallback
}
if (blendType == 3 || blendType == 4) {
glBlendFunc(GL_SRC_ALPHA, GL_ONE); // Additive glBlendFunc(GL_SRC_ALPHA, GL_ONE); // Additive
} else { } else {
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // Alpha glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // Alpha
@ -2717,6 +2729,15 @@ GLuint M2Renderer::loadTexture(const std::string& path) {
return whiteTexture; return whiteTexture;
} }
// Track whether the texture actually uses alpha (any pixel with alpha < 255).
bool hasAlpha = false;
for (size_t i = 3; i < blp.data.size(); i += 4) {
if (blp.data[i] != 255) {
hasAlpha = true;
break;
}
}
GLuint textureID; GLuint textureID;
glGenTextures(1, &textureID); glGenTextures(1, &textureID);
glBindTexture(GL_TEXTURE_2D, textureID); glBindTexture(GL_TEXTURE_2D, textureID);
@ -2738,9 +2759,11 @@ GLuint M2Renderer::loadTexture(const std::string& path) {
e.id = textureID; e.id = textureID;
size_t base = static_cast<size_t>(blp.width) * static_cast<size_t>(blp.height) * 4ull; size_t base = static_cast<size_t>(blp.width) * static_cast<size_t>(blp.height) * 4ull;
e.approxBytes = base + (base / 3); e.approxBytes = base + (base / 3);
e.hasAlpha = hasAlpha;
e.lastUse = ++textureCacheCounter_; e.lastUse = ++textureCacheCounter_;
textureCacheBytes_ += e.approxBytes; textureCacheBytes_ += e.approxBytes;
textureCache[key] = e; textureCache[key] = e;
textureHasAlphaById_[textureID] = hasAlpha;
LOG_DEBUG("M2: Loaded texture: ", path, " (", blp.width, "x", blp.height, ")"); LOG_DEBUG("M2: Loaded texture: ", path, " (", blp.width, "x", blp.height, ")");
return textureID; return textureID;