Files
.CooCoo 49ebd50416 craft-libs: take every crate from craft-libs main at 453b0da78 (#262)
* craft-libs: take every crate from craft-libs main at 3af2280ee

The 15 craft-libs dependencies in the workspace Cargo.toml were pinned at
six different revs. They now all use 3af2280ee, the craft-libs main that
merged storytold/craft-libs#1337. Cargo.lock changes only the craft-libs
sources, and the two craft-xml entries become one.

* craft-libs: take every crate from craft-libs main at 453b0da78

Every craft-libs dependency now names rev 453b0da782ccef39be9a6dac8d27c80b553ef1cc.

- With one rev for every crate, craft-texture and the craft-texture-dds alias are the same
  package, which cargo does not allow under two names. materialcraft-formats now takes
  craft-texture with its dds feature, and dds_image.rs uses craft_texture paths.
- Cargo.lock comes from cargo update --workspace: only craft-libs sources change, the two
  craft-texture and two craft-xml entries become one each, and craft-dds is added as a
  dependency of craft-image-codecs.
- Updater::offer now opens the prompt at a later tick, after its own thread has inspected the
  install (storytold/craft-libs#1149). The update-prompt tests use a helper that offers and
  ticks until the prompt is open, and fails if the offer is declined.

* Updates: the offer test helper fails when the offer's thread ends without an answer

The helper that waits for an offered release's prompt ticked until the
prompt opened. When the offer's channel disconnects, the updater drops
the offer without a prompt (craft-update `updater.rs:606-610` at
453b0da78), so the helper kept ticking forever. It now runs each tick
through `Context::run_logic` and fails when a tick leaves no prompt, no
launcher choice and no repaint request, which the updater makes on
every tick while the offer waits for its thread.

* Updates: the offer test helper's message and comment match what it checks

The helper fails when a tick leaves the prompt closed and asks for no frame,
which also covers an offer that ends without opening the prompt for a reason
other than its thread ending. The failure message and the doc comment now say
that.

---------

Co-authored-by: chasse20 <chasse20@gmail.com>
2026-11-18 08:43:52 +07:00

171 lines
8.0 KiB
TOML

[workspace]
resolver = "3"
members = [
"crates/core",
"crates/geom",
"crates/nodes",
"crates/eval",
"crates/formats",
"crates/engine",
"crates/render",
"crates/automation",
"crates/ui-egui",
"apps/materialcraft",
"apps/materialcraft-cli",
"apps/materialcraft-web",
"xtask",
]
exclude = ["vendor"]
# The web app only builds for wasm32 (trunk); everything else is the default.
default-members = [
"crates/core",
"crates/geom",
"crates/nodes",
"crates/eval",
"crates/formats",
"crates/engine",
"crates/render",
"crates/automation",
"crates/ui-egui",
"apps/materialcraft",
"apps/materialcraft-cli",
"xtask",
]
[workspace.package]
version = "0.4.1"
edition = "2024"
license = "MIT OR Apache-2.0"
[workspace.dependencies]
# Standard Base64 output; strict SBS decoding remains app-local
craft-mime = { git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc", version = "0.1.0" }
# Read 3D meshes through craft-mesh; keep mesh processing app-local
craft-mesh = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc", default-features = false, features = ["obj", "gltf"] }
# Shared XML escaping; SBS model and serialization policy stay app-local
craft-xml = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc" }
# Bound SVG parsing and drawing through craft-svg
craft-svg = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc", features = ["tree-render"] }
# internal
materialcraft-core = { path = "crates/core" }
materialcraft-geom = { path = "crates/geom" }
materialcraft-nodes = { path = "crates/nodes" }
materialcraft-eval = { path = "crates/eval" }
materialcraft-formats = { path = "crates/formats" }
materialcraft-engine = { path = "crates/engine" }
materialcraft-render = { path = "crates/render" }
materialcraft-automation = { path = "crates/automation" }
materialcraft-ui-egui = { path = "crates/ui-egui" }
# external
thiserror = "2"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
sha2 = "0.10" # MIT OR Apache-2.0; stable content keys for persistent previews.
glam = { version = "0.30", features = ["serde", "bytemuck"] }
rayon = "1"
log = "0.4"
image = { version = "0.25", default-features = false, features = ["png", "jpeg", "tga", "tiff", "exr", "hdr", "bmp", "webp", "gif", "pnm"] }
dds = { version = "0.2", default-features = false }
half = "2"
eframe = { version = "0.37", default-features = false }
egui = "0.37"
rfd = "0.17"
rustix = { version = "1", default-features = false, features = ["std", "fs", "process"] }
zip = { version = "2", default-features = false, features = ["deflate"] }
mikktspace = { version = "0.3", default-features = false, features = ["glam"] }
rmcp = { version = "3.5", default-features = false, features = ["server", "macros", "transport-io"] }
tokio = { version = "1", features = ["rt-multi-thread", "macros", "io-std", "sync", "net", "io-util", "time"] }
schemars = "1"
base64 = "0.22"
roxmltree = "0.20"
flate2 = { version = "1", default-features = false, features = ["rust_backend"] }
cap-std = "4"
getrandom = "0.3"
# Shared Craft egui components from storytold/craft-libs
# MIT OR Apache-2.0; all shared dependencies use one reviewed revision
egui_kittest = "0.37"
craft-mcmat = { git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc" }
craft-ui = { git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc", features = ["serde"] }
# Keyboard bindings (chords, dispatch and display text): storytold/craft-libs, MIT OR Apache-2.0
craft-keymap = { git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc", features = ["egui"] }
# Native dialogs that do not block the event loop: storytold/craft-libs, MIT OR Apache-2.0
craft-dialogs = { git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc" }
# The platform quit and the macOS Quit menu item: storytold/craft-libs, MIT OR Apache-2.0
craft-quit = { git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc", features = ["egui"] }
craft-menu = { git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc" }
# Who draws the window frame, and an app-drawn strip as the title bar: storytold/craft-libs, MIT OR Apache-2.0
craft-window = { git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc", features = ["egui"] }
# Release checks and self-updates for the desktop app: storytold/craft-libs, MIT OR Apache-2.0
craft-update = { git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc", features = ["egui"] }
# Atomic persistence, at the suite's current revision
craft-atomic = { git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc" }
# Parse the optional shared font catalog at build time; the font repository is not a dependency
craft-fonts-build = { git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc" }
# Float image planes and texture sampling for node cooking: storytold/craft-libs, MIT OR Apache-2.0
craft-texture = { git = "https://github.com/storytold/craft-libs", rev = "453b0da782ccef39be9a6dac8d27c80b553ef1cc", features = ["parallel"] }
# egui 0.37 and winit: the suite's forks (storytold/egui, storytold/winit), as craft-libs pins them.
[patch.crates-io]
ecolor = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
emath = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
epaint = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
epaint_default_fonts = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
egui = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
egui-winit = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
egui-wgpu = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
egui_glow = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
eframe = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
winit = { git = "https://github.com/storytold/winit.git", rev = "a517b3846ee8457d84ee4975110bfda6797c44dc" }
egui_kittest = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
# egui-phosphor has no release for egui 0.37 (vendor/egui-phosphor/VENDORED.md).
egui-phosphor = { path = "vendor/egui-phosphor" }
[workspace.lints.rust]
unsafe_code = "forbid"
[workspace.lints.clippy]
dbg_macro = "warn"
todo = "warn"
# Index loops read better than zipped iterators in per-pixel code.
needless_range_loop = "allow"
field_reassign_with_default = "allow"
too_many_arguments = "allow"
[profile.dev.package."*"]
opt-level = 2
[profile.dev]
opt-level = 1
[profile.release]
lto = "thin"
codegen-units = 1
# Fast optimized verification: each test executable otherwise repeats cross-crate LTO
# `false` keeps thin LTO within each crate; release packaging keeps the profile above
[profile.verify]
inherits = "release"
lto = false
codegen-units = 16
[profile.wasm-release]
inherits = "release"
opt-level = "s"
lto = "fat"
codegen-units = 1
strip = "debuginfo"
[profile.wasm-release.package."*"]
opt-level = "s"
# Node cooking and the vector math under it run per pixel.
[profile.wasm-release.package.craft-texture]
opt-level = 3
[profile.wasm-release.package.materialcraft-nodes]
opt-level = 3
[profile.wasm-release.package.materialcraft-render]
opt-level = 3
[profile.wasm-release.package.glam]
opt-level = 3