Files
gromandClaude Opus 5 624ccec808 water: graft deepthought84's Improved Water onto this fork
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
2026-11-09 10:57:18 -07:00

34 lines
1.3 KiB
TOML

[package]
name = "benilla-assets"
version.workspace = true
edition.workspace = true
license.workspace = true
description = "Bevy AssetSource + AssetLoaders over the WoW 1.12.1 MPQ patch chain"
[lints]
workspace = true
[features]
# The dev/player seam, on by default. `benilla-formats` comes in without default features and its
# `dev` is forwarded here, or unification would put it back in a player build.
default = ["dev"]
dev = ["benilla-formats/dev"]
[dependencies]
anyhow.workspace = true
bevy.workspace = true
benilla-formats = { path = "../benilla-formats", default-features = false }
# Nearest-neighbour resize of layer BLPs smaller than `LAYER_TEX_SIZE`: texel replication in gamma
# bytes, with no averaging to darken mid-tones.
image = { version = "0.25", default-features = false }
serde = { version = "1", features = ["derive"] }
[dev-dependencies]
# The WGSL tripwire (`tests/liquid_wgsl_compiles.rs`) composes and validates the liquid shader as
# Bevy does. The versions and features are the ones Bevy's own build already uses, so nothing new
# is compiled into the dependency graph.
# The composite's CPU mirror (`src/liquid_composite.rs`) models a half-float blender.
half = "2.7"
naga = { version = "27", features = ["wgsl-in"] }
naga_oil = { version = "0.20", default-features = false, features = ["test_shader"] }