The whole workspace compiles with his water in place of ours. Nothing is
verified beyond that yet -- no capture, no gates -- so this lands on
`water-port`, not on main.
Method: scripts/water-port-merge.sh stitches the common ancestor our squashed
history hides (both forks descend from samwhosung/benilla) and runs a real
three-way merge. 134 of his 168 files land clean; the 34 that conflict were
resolved by hand, 82 hunks, and the log is in docs/WATER_PORT.md.
What went, per grom's call (full swap, drop the extras): enhanced_water.wgsl,
liquid/{reflect,scene_depth,waves,lod}.rs, water_fx/bob.rs and the Water Quality
dropdown, with our LiquidExt bindings and the WaterDepth prepass they fed.
What was kept and re-applied onto his tree: the Ironforge magma palette
(MagmaTone, now multiplying the body before his stylised grade so a tinted pool's
crust and glow are its own colour) and our shader hooks -- fog, emissive,
monkey_frame, wind, wet, moonlight -- which his liquid.wgsl knew nothing about.
Four things needed real work rather than a side:
* static_gx now keys its pipelines per VIEW, not per world camera, because his
mirror and probe faces carry their own samples and format; our torch and
light groups and the shadow-filter def ride along, and the depth-only twin
his Hi-Z prepass needs is built beside each colour pipeline.
* the booth layer ladder moved past the liquid render layers. His seam claims
30 and 31; our pane block grew from UI_MODELS_LAYER with nothing stopping it
reaching them, and the const assert fired exactly as the doc predicted.
* two SystemParam tuples were already at the 16 ceiling (the minimap's blip
inputs, the capture driver) and had to nest to take his.
* sky.rs grew `dome_uniforms`, the one law his water march and the dome now
share, without losing our Enhanced sky inputs.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01SgstFWtn1RxEJ5kVrpgYwn
33 lines
1.1 KiB
TOML
33 lines
1.1 KiB
TOML
[package]
|
|
name = "benilla"
|
|
version.workspace = true
|
|
edition.workspace = true
|
|
license.workspace = true
|
|
description = "The launcher: build.rs stamps the git build id and main() hands it to benilla-app, so a new commit rebuilds this package and not the app crate"
|
|
|
|
[lints]
|
|
workspace = true
|
|
|
|
[features]
|
|
# The dev/player seam: `cargo build -p benilla --no-default-features` is the player build.
|
|
default = ["dev", "improved-water"]
|
|
dev = ["benilla-app/dev"]
|
|
# The Improved Water option's plugin (`benilla-water`); the player build keeps it.
|
|
improved-water = ["benilla-app/improved-water"]
|
|
# Profiling switches, forwarded so `cargo run -p benilla --features tracy` works.
|
|
tracy = ["benilla-app/tracy"]
|
|
trace_chrome = ["benilla-app/trace_chrome"]
|
|
|
|
[dependencies]
|
|
# `default-features = false`, or `--no-default-features` here still builds benilla-app with `dev`.
|
|
benilla-app = { path = "../benilla-app", default-features = false }
|
|
|
|
[build-dependencies]
|
|
benilla-buildstamp = { path = "../benilla-buildstamp" }
|
|
|
|
[[bin]]
|
|
name = "benilla"
|
|
path = "src/main.rs"
|
|
# No tests here, and test-building this bin would relink the whole app on every commit.
|
|
test = false
|