Skip to content

build: fix unified water #1763

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
alandtse merged 1 commit into from
Jan 25, 2026
Merged

build: fix unified water #1763

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
12 changes: 6 additions & 6 deletions src/Features/UnifiedWater.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ void UnifiedWater::BGSTerrainBlock_Attach::thunk(RE::BGSTerrainBlock* block)
const auto water = block->water;
for (auto& child : water->GetChildren()) {
if (child) {
waterSystem->RemoveGeometry(child->AsGeometry());
waterSystem->RemoveWater(child.get());
water->DetachChild(child.get());
}
}
Expand All @@ -376,9 +376,9 @@ void UnifiedWater::BGSTerrainBlock_Attach::thunk(RE::BGSTerrainBlock* block)
const auto lodLevel = node->GetLODLevel();
const auto worldSpace = block->node->manager->worldSpace;

const auto instructions = singleton.waterCache->GetInstructions(worldSpace, lodLevel, node->x, node->y);
const auto instructions = singleton.waterCache->GetInstructions(worldSpace, lodLevel, node->baseCellX, node->baseCellY);
if (!instructions) {
logger::warn("[Unified Water] No instructions found for {} chunk at {}, {}", worldSpace->GetFormEditorID(), node->x, node->y);
logger::warn("[Unified Water] No instructions found for {} chunk at {}, {}", worldSpace->GetFormEditorID(), node->baseCellX, node->baseCellY);
func(block);
return;
}
Expand All @@ -392,8 +392,8 @@ void UnifiedWater::BGSTerrainBlock_Attach::thunk(RE::BGSTerrainBlock* block)
const auto targetShape = lodLevel > 4 || singleton.settings.UseOptimisedMeshes ? singleton.optimisedWaterMesh : singleton.waterMesh;
RE::BSTriShape* shape = targetShape->CreateClone(cloningProcess)->AsTriShape();

const auto posX = (instruction.x - node->x) * 4096.0f + instruction.size * 2048.0f;
const auto posY = (instruction.y - node->y) * 4096.0f + instruction.size * 2048.0f;
const auto posX = (instruction.x - node->baseCellX) * 4096.0f + instruction.size * 2048.0f;
const auto posY = (instruction.y - node->baseCellY) * 4096.0f + instruction.size * 2048.0f;
shape->local.scale = static_cast<float>(instruction.size);
shape->local.translate = { posX, posY, instruction.waterHeight };

Expand All @@ -410,7 +410,7 @@ void UnifiedWater::BGSTerrainBlock_Attach::thunk(RE::BGSTerrainBlock* block)
return;

for (auto& [shape, instruction] : built) {
waterSystem->InitializeWater(shape, instruction->form.ptr, instruction->waterHeight, nullptr, true, false);
waterSystem->AddWater(shape, instruction->form.ptr, instruction->waterHeight, nullptr, true, false);

if (const auto prop = shape->GetGeometryRuntimeData().properties[1].get(); prop && prop->GetRTTI() == globals::rtti::BSWaterShaderPropertyRTTI.get()) {
const auto waterShaderProp = static_cast<RE::BSWaterShaderProperty*>(prop);
Expand Down