Water (Enhanced/High; Classic stays byte-identical to upstream): - the enhanced water now lives in its own WGSL library, benilla::enhanced_water (enhanced_water.wgsl), with its own bindings 103-106; upstream liquid.wgsl keeps three small hooks only - depth look: per-channel extinction over the real path through the water, refraction of an opaque-colour copy bent by the waves (samples landing on anything in front of the water are refused via the scene depth), caustic web on sunlit shallow beds - High: screen-space reflection of the scenery (bisected march against the scene depth) - the module fogs its own surface terms only (the refracted/reflected scene is already fogged); depth+colour copies run both-or-neither - credits: portions derived from WarcraftXL wxl-experimental-water by iThorgrim, used with permission (WATER.md) Volumetric fog (Advanced Graphics -> Volumetric Fog: Off/Low/High, cvar volumetricFog, env WOW_VOLFOG): own fullscreen pass after the main pass, near-field haze converging on the zone fog colour, denser at dawn and in weather, faint indoors, plus sun/moon light shafts from the shadow map. Tests: addon-harness oracle fixtures no longer require unix symlinks. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
6.0 KiB
benilla-water
An optional enhanced water renderer for benilla, the Rust +
Bevy reimplementation of the 1.12.1 client. It needs no data changes: everything is derived from
what a 1.12 install already carries (MCLQ / MLIQ liquid grids and their authored depth bytes, the
Light.dbc water and sky rows, the opaque scene depth).
It is a module on top of the reference water, not a replacement for it. The reference path
(Classic) is untouched and stays byte-identical to upstream; the enhanced path only runs when the
player picks it, and every part of it can be switched off.
Credits
- Original project: WarcraftXL — the
wxl-experimental-watermodule for the 1.12 client. - Author: iThorgrim.
The WarcraftXL water module is the design reference for this one, and its author has given
permission to reuse its code here on the condition that the author and the original project are
named. This section is that attribution; it must travel with the module (this file, and the
enhanced_water.wgsl header) wherever the module is copied or shared.
Rule for contributors: a file that ports code or a technique from WarcraftXL says so in its header
(Portions derived from WarcraftXL wxl-experimental-water by iThorgrim, used with permission) and
the technique is listed in the table below. Do not remove either.
| Technique | Status here | From WarcraftXL |
|---|---|---|
| Visual-only wave riding for swimmers (authoritative position never moves) | shipped (water_fx/bob.rs) |
same principle as world/Ride.cpp, implemented independently |
| Shore surf limited by the TERRAIN column, so objects in the water never foam | shipped (authored depth gate, on_bed) |
principle from sea/Shore.hpp |
| Per-channel extinction + scene-copy refraction | shipped (enhanced_water.wgsl DEPTH LOOK; bent samples landing on anything in front of the water are refused via the scene depth) |
ported from shaders/Surface.ps.hlsl, render/Refraction.cpp |
| Caustics, two layers at incommensurate scales/rates | shipped (floor web; built from animated cell edges, not value noise) | ported from shaders/Surface.ps.hlsl, render/Noise.cpp |
| Screen-space reflection of the scenery | shipped on High (a bisected march against the scene depth, not WXL's single probe) |
principle from shaders/Surface.ps.hlsl |
| Gerstner trains + breaker index, crest-fold foam | planned | sea/Spectrum.*, sea/Shore.hpp, shaders/Wave.hlsli |
| Specular lobe widened by the normal's screen derivative, distance glints | shipped / planned | shaders/Surface.ps.hlsl |
What it does
| Lane | What you see | Main switch |
|---|---|---|
| Quality tiers | Classic = the reference water, Enhanced, High (= Enhanced + scenery reflections) |
Video options → Water Quality, cvar waterQuality, env WOW_WATER=0|1|2 |
| Procedural waves | multi-band analytic waves with exact normals; the long swell moves ocean vertices | tier |
| Ocean / inland profiles | the sea and lakes/rivers have their own colour, energy and reflectivity | tier |
| Depth look | light fades per channel over the real path through the water; the bed is seen through it, bent by the waves; sunlit shallows carry a caustic web | tier |
| Reflection and glints | Fresnel sky reflection from the zone's sky rows, sun path, moon path, point-light glints | tier |
| Beach surf | a travelling wave front, a lace of foam that dissolves behind it, a swash sheet on the sand | tier |
| Swimmers | wake foam, treading rings and a visual-only bob with the swell | tier |
| Lava glow | magma surfaces emit warm point lights through the lighting module | Advanced Graphics → Lava Glow, lavaLightGain |
Rivers deliberately have NO flow effect: a derived current was tried and removed at the owner's request. If it ever returns it should read the authored MCLQ flow records, not derive one.
Where the code lives
- Shader:
crates/benilla-assets/src/shaders/enhanced_water.wgsl- the whole module on the GPU side, an importable library (benilla::enhanced_water) with its own bindings: 103 scene depth, 104WaterParams(benilla_assets::WaterUniform), 105 the shared light buffer (a second read-only view of upstream's binding 90), 106 the scene colour (for refraction and reflection). Upstream'sliquid.wgslcarries three hooks only: the#import,water_swellin its vertex stage, and thewater_active()branch at the top of its fragment stage, which returns the module's result as-is (the module fogs its own surface terms only: the scene it refracts and reflects is already fogged). Keep it that way: new water code goes in the module, not inliquid.wgsl. - Assets (
crates/benilla-assets/src):water_depth.rs(WaterUniform, the scene-depth image),materials.rs(LiquidExtfields 103-106, shader registration),lib.rs(WaterQuality). - World (
crates/benilla-world/src):liquid/scene_depth.rs(copies the opaque depth AND colour after the main opaque pass),liquid/waves.rs(the CPU mirror of the vertex swell),liquid/surface.rs(per-kind material parameters),water_fx/bob.rs(swimmer bob),lighting/lava_light.rs. - App (
crates/benilla-app/src): the setting incvars.rs/video.rs, the options rows inassets/ui/OptionsFrame.xml, the capture sceneswater-*andlava-*incapture/scenarios.rs.
Invariants worth knowing before editing
Classicmust stay byte-identical: capturewater-noonwithWOW_WATER=0and compare with the baseline before and after any edit.- The CPU swell (
liquid/waves.rs) and the shader'sWATER_WAVEStable are one contract. - Every screen derivative in
enhanced_water()is taken at the top of the function (WGSL uniformity); WGSL only fails at pipeline creation, so verify by running awater-*scene. - Never rotate a noise domain by a per-pixel angle at world coordinates (~1e4 yd): it shears.
- Run one GPU capture at a time, and run
cargo testin a shell WITHOUTWOW_DATAexported.