grom wants deepthought84/benilla-watershader's water in place of ours. Both
forks descend from samwhosung/benilla, so a real common ancestor exists even
though our own history is one squash and git cannot see it;
scripts/water-port-merge.sh stitches one together and runs the merge, so the
numbers below are measured rather than estimated.
His delta is 203 commits, 168 files, +46240/-742 against a current upstream.
98 of those files are brand new (28382 lines) and graft; 70 already existed
(18600 changed lines) and 59 of those we have also changed. A real three-way
merge leaves 34 conflicted files, 82 hunks, 3831 lines -- 134 of his 168 files
merge clean.
Five files are ours alone and are what "replace" removes: enhanced_water.wgsl,
liquid/reflect.rs, liquid/scene_depth.rs, liquid/waves.rs, liquid/lod.rs.
water_fx/ stays -- it is upstream's, which is why both forks changed it and why
it carries the most conflicts.
No code moved yet. The doc also lists the three things of ours the swap lands
on: the swimmer bob, which reads our vertex swell; the Water Quality dropdown
against his Improved Water checkbox; and our hook modules and the Ironforge
magma palette, which have to be re-applied onto his 9707-line liquid.wgsl.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01SgstFWtn1RxEJ5kVrpgYwn
gromandClaude Opus 5
a733f41223