Skip to content

fix(unified water): reduce transition flicker #2367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SkrubbySkrubInAShrub merged 1 commit into from
May 20, 2026
Merged

fix(unified water): reduce transition flicker #2367

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 20 additions & 7 deletions src/Features/UnifiedWater.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,7 @@ bool UnifiedWater::BuildWaterForBlock(RE::BGSTerrainBlock* block, RE::TESWaterSy
RemoveLODWater(waterSystem, shape, *gWaterLOD);
}

RemoveDuplicateWaterSystemObjects(waterSystem, *gWaterLOD);
DetachAllChildOccurrences(*gWaterLOD, block->water);
(*gWaterLOD)->AttachChild(block->water, true);
waterSystem->Enable();
Expand Down Expand Up @@ -645,21 +646,33 @@ void UnifiedWater::BGSTerrainBlock_Detach::thunk(RE::BGSTerrainBlock* block)
func(block);

if (water) {
auto count = water->GetChildren().size();
while (count > 0) {
water->DetachChildAt(--count);
}
ClearWaterNodeChildren(water, globals::game::waterSystem);

DetachAllChildOccurrences(*uw.gWaterLOD, water);
block->waterAttached = false;
if (uw.gWaterLOD && *uw.gWaterLOD)
DetachAllChildOccurrences(*uw.gWaterLOD, water);
if (block)
block->waterAttached = false;
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}
}

void UnifiedWater::BSWaterShader_SetupGeometry::thunk(RE::BSShader* waterShader, RE::BSRenderPass* pass)
{
auto& uw = globals::features::unifiedWater;

if (uw.flowmap) {
if (pass && pass->geometry) {
// Re-stabilize BSWaterShaderProperty.plane every draw. After interior/exterior
// transitions the cached plane can be stale for exactly one of two overlapping
// water surfaces, which presents as heavy flicker rather than missing water.
if (const auto prop = pass->geometry->GetGeometryRuntimeData().shaderProperty.get(); prop && prop->GetRTTI() == globals::rtti::BSWaterShaderPropertyRTTI.get()) {
const auto waterShaderProp = static_cast<RE::BSWaterShaderProperty*>(prop);
const float waterHeight = pass->geometry->world.translate.z;

waterShaderProp->plane.normal = { 0.0f, 0.0f, 1.0f };
waterShaderProp->plane.constant = waterHeight;
}
}

if (uw.flowmap && pass && pass->geometry) {
// ObjectUV.xyz below, xy contains width and height, z contains mesh scale
// Previously flowmap size was in x, yz contained flowmap offset for water displacement mesh
*uw.gFlowMapSize = uw.flowmap->GetWidth(); // ObjectUV.x
Expand Down
Loading