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

Fix Vulkan shadow light direction and restore ground-clutter cutout visibility

Browse source
This commit is contained in:
Kelsi 2026-02-22 09:47:39 -08:00
parent bd0305f6dd
commit 2c5e0dd313
3 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
assets/shaders/m2.frag.glsl
View file

@ -42,6 +42,9 @@ void main() {
if (alphaTest == 2) { if (alphaTest == 2) {
// Vegetation cutout: lower threshold to preserve leaf coverage at grazing angles. // Vegetation cutout: lower threshold to preserve leaf coverage at grazing angles.
alphaCutoff = 0.33; alphaCutoff = 0.33;
} else if (alphaTest == 3) {
// Ground detail clutter (grass/small cards) needs softer clipping.
alphaCutoff = 0.20;
} else if (alphaTest != 0) { } else if (alphaTest != 0) {
alphaCutoff = 0.35; alphaCutoff = 0.35;
} }
@ -112,7 +115,7 @@ void main() {
} }
// Foliage cutout should stay opaque after alpha discard to avoid // Foliage cutout should stay opaque after alpha discard to avoid
// view-angle translucency artifacts. // view-angle translucency artifacts.
if (alphaTest == 2) { if (alphaTest == 2 || alphaTest == 3) {
outAlpha = 1.0 * fadeAlpha; outAlpha = 1.0 * fadeAlpha;
} }
outColor = vec4(result, outAlpha); outColor = vec4(result, outAlpha);

6
src/rendering/m2_renderer.cpp
View file

@ -2073,7 +2073,7 @@ void M2Renderer::render(VkCommandBuffer cmd, VkDescriptorSet perFrameSet, const
} }
if (model.isGroundDetail) { if (model.isGroundDetail) {
// Keep clutter local so distant grass doesn't overdraw the scene. // Keep clutter local so distant grass doesn't overdraw the scene.
effectiveMaxDistSq *= 0.45f; effectiveMaxDistSq *= 0.75f;
} }
// Removed aggressive small-object distance caps to prevent city pop-out // Removed aggressive small-object distance caps to prevent city pop-out
// Small props (barrels, lanterns, etc.) now use same distance as larger objects // Small props (barrels, lanterns, etc.) now use same distance as larger objects
@ -2360,7 +2360,9 @@ void M2Renderer::render(VkCommandBuffer cmd, VkDescriptorSet perFrameSet, const
} }
// Cutout path for foliage/cards. // Cutout path for foliage/cards.
if (forceCutout) { if (forceCutout) {
mat->alphaTest = foliageCutout ? 2 : 1; // Ground clutter uses a softer dedicated cutout mode so thin
// grass cards are not over-discarded.
mat->alphaTest = model.isGroundDetail ? 3 : (foliageCutout ? 2 : 1);
if (model.isGroundDetail) { if (model.isGroundDetail) {
mat->unlit = 0; mat->unlit = 0;
} }

6
src/rendering/renderer.cpp
View file

@ -3596,12 +3596,14 @@ glm::mat4 Renderer::computeLightSpaceMatrix() {
constexpr float kShadowNearPlane = 1.0f; constexpr float kShadowNearPlane = 1.0f;
constexpr float kShadowFarPlane = 600.0f; constexpr float kShadowFarPlane = 600.0f;
// Use active lighting direction so shadow projection matches sun/celestial. // Use active lighting direction so shadow projection matches main shading.
// Fragment shaders derive lighting with `ldir = normalize(-lightDir.xyz)`,
// therefore shadow rays must use -directionalDir to stay aligned.
glm::vec3 sunDir = glm::normalize(glm::vec3(-0.3f, -0.7f, -0.6f)); glm::vec3 sunDir = glm::normalize(glm::vec3(-0.3f, -0.7f, -0.6f));
if (lightingManager) { if (lightingManager) {
const auto& lighting = lightingManager->getLightingParams(); const auto& lighting = lightingManager->getLightingParams();
if (glm::length(lighting.directionalDir) > 0.001f) { if (glm::length(lighting.directionalDir) > 0.001f) {
sunDir = glm::normalize(lighting.directionalDir); sunDir = glm::normalize(-lighting.directionalDir);
} }
} }
// Shadow camera expects light rays pointing downward in render space (Z up). // Shadow camera expects light rays pointing downward in render space (Z up).