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
138 lines
6.3 KiB
TOML
138 lines
6.3 KiB
TOML
[package]
|
|
name = "benilla-app"
|
|
version.workspace = true
|
|
edition.workspace = true
|
|
license.workspace = true
|
|
description = "The Bevy app as a library: everything but the build-id stamp, which lives in the `benilla` launcher so a new commit does not rebuild this crate"
|
|
|
|
[lints]
|
|
workspace = true
|
|
|
|
[features]
|
|
# `dev` compiles in the instruments; the player build (`scripts/gates.sh`) has no defaults.
|
|
default = ["dev", "improved-water"]
|
|
# The asset, format and world crates default `dev` on, so they come in without it, forwarded here.
|
|
dev = [
|
|
"benilla-assets/dev",
|
|
"benilla-formats/dev",
|
|
"benilla-world/dev",
|
|
"benilla-water?/dev",
|
|
"dep:bevy_egui",
|
|
]
|
|
# benilla's own water look, the `benilla-water` plugin; without it the option draws the reference.
|
|
improved-water = ["dep:benilla-water"]
|
|
tracy = ["bevy/trace_tracy"]
|
|
# Writes every system's per-run span to `trace-<ts>.json` in the cwd.
|
|
trace_chrome = ["bevy/trace_chrome"]
|
|
|
|
[dependencies]
|
|
anyhow.workspace = true
|
|
# The EditBox clipboard, on the main thread as NSPasteboard requires; bevy_egui's 3.x.
|
|
arboard = "3"
|
|
benilla-ui = { path = "../benilla-ui" }
|
|
# The chunk cache's key: a load hashes 70 MiB of addon Lua, so the hash has to be the cheap part.
|
|
ahash = "0.8.12"
|
|
bevy.workspace = true
|
|
wgpu.workspace = true
|
|
winit.workspace = true
|
|
bevy_egui = { version = "0.39", optional = true }
|
|
bytemuck = { version = "1", features = ["derive"] }
|
|
# `f16` decode for the `WOW_BOOTH_DUMP` dump of the `Rgba16Float` booth targets.
|
|
half = "2"
|
|
# Compiles `assets/ui` into the binary, so the interface loads on a machine without the source.
|
|
include_dir = "0.7"
|
|
# The 1.12 chat filters (`text_filter`), with one `RegexSet` for the any-match pass per line.
|
|
regex = "1"
|
|
# `getrusage` for perf CPU time; the audio clock and render thread's realtime policy on macOS.
|
|
libc = "0.2"
|
|
# PNG encoding only: the macOS cursor's NSImage data and screenshots.
|
|
image = { version = "0.25", default-features = false, features = ["png"] }
|
|
# The "no WoW install" error dialog (`no_install`): AppKit, Win32 and, on Linux, `zenity`; no GTK.
|
|
# `xdg-portal` is the Linux backend that carries the message dialog; `wayland` is its file-dialog
|
|
# parent handle, which a message dialog without a parent never reads.
|
|
rfd = { version = "0.17", default-features = false, features = ["xdg-portal"] }
|
|
# Thread-to-ECS channels: crossbeam's `Receiver` is `Sync`, so it is a resource without a mutex.
|
|
crossbeam-channel = "0.5"
|
|
benilla-assets = { path = "../benilla-assets", default-features = false }
|
|
benilla-formats = { path = "../benilla-formats", default-features = false }
|
|
benilla-protocol = { path = "../benilla-protocol" }
|
|
benilla-world = { path = "../benilla-world", default-features = false }
|
|
benilla-water = { path = "../benilla-water", default-features = false, optional = true }
|
|
# The CVar diff persisted in `benilla-config/config.toml`.
|
|
serde = { version = "1", features = ["derive"] }
|
|
# The item cache's on-disk form (`item_persist.rs`); already in the tree through bevy.
|
|
serde_json = "1"
|
|
toml = "0.8"
|
|
# Collision for our kinematic character controller; 0.6 targets Bevy 0.18, 0.7 moves to 0.19.
|
|
avian3d = "0.6"
|
|
# Shapes and rasterizes `FontString` text standalone (`ui_text`), at bevy_text's own 0.16.
|
|
cosmic-text = "0.16"
|
|
# `cosmic-text`'s font database, named by `ui_text`; must stay the version it depends on.
|
|
fontdb = "0.23"
|
|
# The mixer. Its `cpal` backend stays off on every target: `sound::output` is our own backend.
|
|
# `ogg`/`vorbis` are the container and the codec, and both are needed for one `.ogg`: addon audio
|
|
# on this install is full of them (75 files across BigWigs, DoiteAuras, unitscan, HCWarn,
|
|
# TWThreat and Cleanup), and `PlaySoundFile` on one decoded to an error nobody saw — the play
|
|
# site logs at `debug!` — so every one of those alerts was simply silent. Stock 1.12 plays only
|
|
# wav and mp3; the Turtle/OctoWoW client those addons are written for plays ogg, which is why
|
|
# they ship it. `docs/ADDON_COMPAT.md` carries the row.
|
|
kira = { version = "0.12", default-features = false, features = [
|
|
"mp3",
|
|
"wav",
|
|
"pcm",
|
|
"adpcm",
|
|
"ogg",
|
|
"vorbis",
|
|
] }
|
|
# Aborts a debug build on an allocation in the audio IO callback or render pass; off in release.
|
|
assert_no_alloc = "1.1"
|
|
# `MediaSource`: our source raises kira's decode thread's QoS; must stay kira's version.
|
|
symphonia = { version = "0.5", default-features = false }
|
|
# The audio threads' lock-free SPSC rings (output, mix tap); kira's version, so the graph has one.
|
|
rtrb = "0.3"
|
|
mint = "0.5"
|
|
# The gossip greeting's weighted draw, re-rolled per open as in the reference.
|
|
rand = "0.8"
|
|
# HMAC-SHA1 for `credential.rs`, the one place a password is kept as a blob rather than as
|
|
# itself. Was a dev-dependency only (the fake realmd's SRP6 half); now a real one.
|
|
sha1.workspace = true
|
|
|
|
# Wayland clipboard over the standard `wl_data_device`; arboard's speaks `wlr-data-control`,
|
|
# which GNOME does not implement.
|
|
[target.'cfg(all(unix, not(any(target_os = "macos", target_os = "android"))))'.dependencies]
|
|
raw-window-handle = "0.6"
|
|
smithay-clipboard = "0.7"
|
|
|
|
# A native NSCursor: winit's cursor rects revert to the arrow under a continuous render loop.
|
|
[target.'cfg(target_os = "macos")'.dependencies]
|
|
# The audio device layer (`sound::output::coreaudio`), at the versions and features cpal uses.
|
|
coreaudio-rs = { version = "0.13", default-features = false, features = ["audio_unit", "core_audio"] }
|
|
objc2-core-audio = { version = "0.3", default-features = false, features = ["std", "AudioHardware"] }
|
|
objc2-core-audio-types = { version = "0.3", default-features = false, features = ["std", "CoreAudioBaseTypes"] }
|
|
objc2 = "0.5"
|
|
objc2-app-kit = { version = "0.2", features = [
|
|
"NSApplication",
|
|
"NSResponder",
|
|
"NSRunningApplication",
|
|
"NSWindow",
|
|
"NSView",
|
|
"NSImage",
|
|
"NSCursor",
|
|
"NSEvent",
|
|
] }
|
|
objc2-foundation = { version = "0.2", features = ["NSArray", "NSData", "NSGeometry"] }
|
|
|
|
# The audio device layer off macOS (`sound::output::cpal`); on macOS cpal cannot rebuild on a
|
|
# lost default device and drops the IO-cycle timestamp.
|
|
[target.'cfg(not(target_os = "macos"))'.dependencies]
|
|
cpal = "0.17"
|
|
|
|
# Windows CPU clocks for `perf::clock`.
|
|
[target.'cfg(windows)'.dependencies]
|
|
windows-sys = { version = "0.59", features = ["Win32_Foundation", "Win32_System_Threading"] }
|
|
|
|
# The login cycle's fake realmd runs the server half of SRP6 (`net::io::cycle_tests`).
|
|
[dev-dependencies]
|
|
benilla-srp = { path = "../benilla-srp" }
|
|
num-bigint = "0.4.6"
|