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

fix(rendering): alpha-to-coverage for hair, skip eye glow geosets, add missing include

Browse source 
- Enable alpha-to-coverage on alphaTestPipeline for smooth hair edges
  when MSAA is active (both init and recreatePipelines paths)
- Shader uses fwidth()-based alpha rescaling for clean coverage
- Skip group 17/18 geosets (DK/NE eye glow) when no geoset filter is
  set — prevents blue eye glow on all NPCs
- Add missing <libgen.h> include for dirname() on Linux
This commit is contained in:
Kelsi 2026-04-04 00:21:15 -07:00
parent 5538655383
commit 84108c44f5
4 changed files with 35 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
assets/shaders/character.frag.glsl
View file

@ -126,7 +126,14 @@ void main() {
vec4 texColor = texture(uTexture, finalUV);
if (alphaTest != 0 && texColor.a < 0.5) discard;
if (alphaTest != 0) {
// Screen-space sharpened alpha for alpha-to-coverage anti-aliasing.
// Rescales alpha so the 0.5 cutoff maps to exactly the texel boundary,
// giving smooth edges when MSAA + alpha-to-coverage is active.
float aGrad = fwidth(texColor.a);
texColor.a = clamp((texColor.a - 0.5) / max(aGrad, 0.001) * 0.5 + 0.5, 0.0, 1.0);
if (texColor.a < 1.0 / 255.0) discard;
}
if (colorKeyBlack != 0) {
float lum = dot(texColor.rgb, vec3(0.299, 0.587, 0.114));
float ck = smoothstep(0.12, 0.30, lum);

BIN
assets/shaders/character.frag.spv
View file

Binary file not shown.

1
src/main.cpp
View file

@ -15,6 +15,7 @@
#include <X11/Xlib.h>
#include <execinfo.h>
#include <unistd.h>
#include <libgen.h>
#include <cstring>
// Keep a persistent X11 connection for emergency mouse release in signal handlers.

34
src/rendering/character_renderer.cpp
View file

@ -253,8 +253,9 @@ bool CharacterRenderer::initialize(VkContext* ctx, VkDescriptorSetLayout perFram
};
// --- Build pipelines ---
auto buildCharPipeline = [&](VkPipelineColorBlendAttachmentState blendState, bool depthWrite) -> VkPipeline {
return PipelineBuilder()
auto buildCharPipeline = [&](VkPipelineColorBlendAttachmentState blendState,
bool depthWrite, bool alphaToCoverage = false) -> VkPipeline {
auto builder = PipelineBuilder()
.setShaders(charVert.stageInfo(VK_SHADER_STAGE_VERTEX_BIT),
charFrag.stageInfo(VK_SHADER_STAGE_FRAGMENT_BIT))
.setVertexInput({charBinding}, charAttrs)
@ -262,7 +263,10 @@ bool CharacterRenderer::initialize(VkContext* ctx, VkDescriptorSetLayout perFram
.setRasterization(VK_POLYGON_MODE_FILL, VK_CULL_MODE_NONE)
.setDepthTest(true, depthWrite, VK_COMPARE_OP_LESS_OR_EQUAL)
.setColorBlendAttachment(blendState)
.setMultisample(samples)
.setMultisample(samples);
if (alphaToCoverage)
builder.setAlphaToCoverage(true);
return builder
.setLayout(pipelineLayout_)
.setRenderPass(mainPass)
.setDynamicStates({VK_DYNAMIC_STATE_VIEWPORT, VK_DYNAMIC_STATE_SCISSOR})
@ -270,7 +274,7 @@ bool CharacterRenderer::initialize(VkContext* ctx, VkDescriptorSetLayout perFram
};
opaquePipeline_ = buildCharPipeline(PipelineBuilder::blendDisabled(), true);
alphaTestPipeline_ = buildCharPipeline(PipelineBuilder::blendDisabled(), true);
alphaTestPipeline_ = buildCharPipeline(PipelineBuilder::blendDisabled(), true, true);
alphaPipeline_ = buildCharPipeline(PipelineBuilder::blendAlpha(), false);
additivePipeline_ = buildCharPipeline(PipelineBuilder::blendAdditive(), false);
@ -2385,6 +2389,12 @@ void CharacterRenderer::render(VkCommandBuffer cmd, VkDescriptorSet perFrameSet,
if (instance.activeGeosets.find(batch.submeshId) == instance.activeGeosets.end()) {
continue;
}
} else {
// Even without a geoset filter, skip eye glow (group 17)
// and group 18 unless explicitly opted in. These geosets are
// only for DK/NE eye glow and should be off by default.
uint16_t grp = batch.submeshId / 100;
if (grp == 17 || grp == 18) continue;
}
// Resolve texture for this batch (prefer hair textures for hair geosets).
@ -2950,6 +2960,10 @@ void CharacterRenderer::renderShadow(VkCommandBuffer cmd, const glm::mat4& light
if (blendMode >= 2) continue; // skip transparent
if (applyGeosetFilter &&
inst.activeGeosets.find(batch.submeshId) == inst.activeGeosets.end()) continue;
if (!applyGeosetFilter) {
uint16_t grp = batch.submeshId / 100;
if (grp == 17 || grp == 18) continue;
}
vkCmdDrawIndexed(cmd, batch.indexCount, 1, batch.indexStart, 0, 0);
}
}
@ -3487,8 +3501,9 @@ void CharacterRenderer::recreatePipelines() {
{5, 0, VK_FORMAT_R32G32B32A32_SFLOAT, static_cast<uint32_t>(offsetof(CharVertexGPU, tangent))},
};
auto buildCharPipeline = [&](VkPipelineColorBlendAttachmentState blendState, bool depthWrite) -> VkPipeline {
return PipelineBuilder()
auto buildCharPipeline = [&](VkPipelineColorBlendAttachmentState blendState,
bool depthWrite, bool alphaToCoverage = false) -> VkPipeline {
auto builder = PipelineBuilder()
.setShaders(charVert.stageInfo(VK_SHADER_STAGE_VERTEX_BIT),
charFrag.stageInfo(VK_SHADER_STAGE_FRAGMENT_BIT))
.setVertexInput({charBinding}, charAttrs)
@ -3496,7 +3511,10 @@ void CharacterRenderer::recreatePipelines() {
.setRasterization(VK_POLYGON_MODE_FILL, VK_CULL_MODE_NONE)
.setDepthTest(true, depthWrite, VK_COMPARE_OP_LESS_OR_EQUAL)
.setColorBlendAttachment(blendState)
.setMultisample(samples)
.setMultisample(samples);
if (alphaToCoverage)
builder.setAlphaToCoverage(true);
return builder
.setLayout(pipelineLayout_)
.setRenderPass(mainPass)
.setDynamicStates({VK_DYNAMIC_STATE_VIEWPORT, VK_DYNAMIC_STATE_SCISSOR})
@ -3508,7 +3526,7 @@ void CharacterRenderer::recreatePipelines() {
" pipelineLayout=", (void*)pipelineLayout_);
opaquePipeline_ = buildCharPipeline(PipelineBuilder::blendDisabled(), true);
alphaTestPipeline_ = buildCharPipeline(PipelineBuilder::blendDisabled(), true);
alphaTestPipeline_ = buildCharPipeline(PipelineBuilder::blendDisabled(), true, true);
alphaPipeline_ = buildCharPipeline(PipelineBuilder::blendAlpha(), false);
additivePipeline_ = buildCharPipeline(PipelineBuilder::blendAdditive(), false);