From 3fd881f88ddfe324f0926b03f338dcf17d56c3b6 Mon Sep 17 00:00:00 2001
From: Louis <contact@louiscap.co>
Date: Sun, 27 Apr 2025 02:06:17 +0100
Subject: [PATCH] Move from bevy to bevy_[module] imports
---
Cargo.lock | 1618 ++++++++---------------------------
Cargo.toml | 25 +-
src/assets/asset_events.rs | 8 +-
src/assets/asset_storage.rs | 5 +-
src/camera.rs | 27 +-
src/ldtk/mod.rs | 15 +-
src/lib.rs | 6 +-
src/map_query.rs | 3 +-
src/pregen.rs | 14 +-
src/system/locator.rs | 4 +-
src/system/types.rs | 4 +-
src/system/utils.rs | 6 +-
tests/bevy.rs | 94 +-
13 files changed, 473 insertions(+), 1356 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 74ea1ae..cba3020 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,79 +2,6 @@
# It is not intended for manual editing.
version = 4
-[[package]]
-name = "accesskit"
-version = "0.17.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3d3b8f9bae46a948369bc4a03e815d4ed6d616bd00de4051133a5019dc31c5a"
-
-[[package]]
-name = "accesskit_consumer"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f47983a1084940ba9a39c077a8c63e55c619388be5476ac04c804cfbd1e63459"
-dependencies = [
- "accesskit",
- "hashbrown 0.15.2",
- "immutable-chunkmap",
-]
-
-[[package]]
-name = "accesskit_macos"
-version = "0.18.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7329821f3bd1101e03a7d2e03bd339e3ac0dc64c70b4c9f9ae1949e3ba8dece1"
-dependencies = [
- "accesskit",
- "accesskit_consumer",
- "hashbrown 0.15.2",
- "objc2",
- "objc2-app-kit",
- "objc2-foundation",
-]
-
-[[package]]
-name = "accesskit_windows"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24fcd5d23d70670992b823e735e859374d694a3d12bfd8dd32bd3bd8bedb5d81"
-dependencies = [
- "accesskit",
- "accesskit_consumer",
- "hashbrown 0.15.2",
- "paste",
- "static_assertions",
- "windows",
- "windows-core",
-]
-
-[[package]]
-name = "accesskit_winit"
-version = "0.23.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6a48dad5530b6deb9fc7a52cc6c3bf72cdd9eb8157ac9d32d69f2427a5e879"
-dependencies = [
- "accesskit",
- "accesskit_macos",
- "accesskit_windows",
- "raw-window-handle",
- "winit",
-]
-
-[[package]]
-name = "ahash"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
-dependencies = [
- "cfg-if",
- "const-random",
- "getrandom",
- "once_cell",
- "version_check",
- "zerocopy 0.7.35",
-]
-
[[package]]
name = "aho-corasick"
version = "1.1.3"
@@ -84,12 +11,6 @@ dependencies = [
"memchr",
]
-[[package]]
-name = "allocator-api2"
-version = "0.2.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
-
[[package]]
name = "android-activity"
version = "0.6.0"
@@ -175,12 +96,14 @@ dependencies = [
[[package]]
name = "async-broadcast"
-version = "0.5.1"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b"
+checksum = "435a87a52755b8f27fcf321ac4f04b2802e337c8c4872923137471ec39c37532"
dependencies = [
- "event-listener 2.5.3",
+ "event-listener",
+ "event-listener-strategy",
"futures-core",
+ "pin-project-lite",
]
[[package]]
@@ -225,7 +148,7 @@ version = "3.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
dependencies = [
- "event-listener 5.4.0",
+ "event-listener",
"event-listener-strategy",
"pin-project-lite",
]
@@ -235,12 +158,18 @@ name = "async-task"
version = "4.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
+dependencies = [
+ "portable-atomic",
+]
[[package]]
name = "atomic-waker"
version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+dependencies = [
+ "portable-atomic",
+]
[[package]]
name = "atomicow"
@@ -264,52 +193,34 @@ version = "0.21.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
-[[package]]
-name = "bevy"
-version = "0.15.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eaad7fe854258047680c51c3cacb804468553c04241912f6254c841c67c0198"
-dependencies = [
- "bevy_internal",
-]
-
-[[package]]
-name = "bevy_a11y"
-version = "0.15.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "245a938f754f70a380687b89f1c4dac75b62d58fae90ae969fcfb8ecd91ed879"
-dependencies = [
- "accesskit",
- "bevy_app",
- "bevy_derive",
- "bevy_ecs",
- "bevy_reflect",
-]
-
[[package]]
name = "bevy_app"
-version = "0.15.3"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0ac033a388b8699d241499a43783a09e6a3bab2430f1297c6bd4974095efb3f"
+checksum = "a2b6267ac23a9947d5b2725ff047a1e1add70076d85fa9fb73d044ab9bea1f3c"
dependencies = [
"bevy_derive",
"bevy_ecs",
+ "bevy_platform",
"bevy_reflect",
"bevy_tasks",
"bevy_utils",
+ "cfg-if",
"console_error_panic_hook",
"ctrlc",
- "derive_more",
"downcast-rs",
+ "log",
+ "thiserror 2.0.12",
+ "variadics_please",
"wasm-bindgen",
"web-sys",
]
[[package]]
name = "bevy_asset"
-version = "0.15.3"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73fd901b3be016088c4dda2f628bda96b7cb578b9bc8ae684bbf30bec0a9483e"
+checksum = "0698040d63199391ea77fd02e039630748e3e335c3070c6d932fd96cbf80f5d6"
dependencies = [
"async-broadcast",
"async-fs",
@@ -318,6 +229,7 @@ dependencies = [
"bevy_app",
"bevy_asset_macros",
"bevy_ecs",
+ "bevy_platform",
"bevy_reflect",
"bevy_tasks",
"bevy_utils",
@@ -336,6 +248,8 @@ dependencies = [
"ron",
"serde",
"stackfuture",
+ "thiserror 2.0.12",
+ "tracing",
"uuid",
"wasm-bindgen",
"wasm-bindgen-futures",
@@ -344,9 +258,9 @@ dependencies = [
[[package]]
name = "bevy_asset_macros"
-version = "0.15.3"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6725a785789ece8d8c73bba25fdac5e50494d959530e89565bbcea9f808b7181"
+checksum = "0bf8c00b5d532f8e5ac7b49af10602f9f7774a2d522cf0638323b5dfeee7b31c"
dependencies = [
"bevy_macro_utils",
"proc-macro2 1.0.94",
@@ -356,9 +270,9 @@ dependencies = [
[[package]]
name = "bevy_color"
-version = "0.15.4"
+version = "0.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a87b7137ffa9844ae542043769fb98c35efbf2f8a8429ff2a73d8ef30e58baaa"
+checksum = "ddf6a5ad35496bbc41713efbcf06ab72b9a310fabcab0f9db1debb56e8488c6e"
dependencies = [
"bevy_math",
"bevy_reflect",
@@ -366,56 +280,15 @@ dependencies = [
"derive_more",
"encase",
"serde",
+ "thiserror 2.0.12",
"wgpu-types",
]
-[[package]]
-name = "bevy_core"
-version = "0.15.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e9ce8da8e4016f63c1d361b52e61aaf4348c569829c74f1a5bbedfd8d3d57a3"
-dependencies = [
- "bevy_app",
- "bevy_ecs",
- "bevy_reflect",
- "bevy_tasks",
- "bevy_utils",
- "serde",
- "uuid",
-]
-
-[[package]]
-name = "bevy_core_pipeline"
-version = "0.15.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee0ff0f4723f30a5a6578915dbfe0129f2befaec8438dde70ac1fb363aee01f5"
-dependencies = [
- "bevy_app",
- "bevy_asset",
- "bevy_color",
- "bevy_core",
- "bevy_derive",
- "bevy_ecs",
- "bevy_image",
- "bevy_math",
- "bevy_reflect",
- "bevy_render",
- "bevy_transform",
- "bevy_utils",
- "bevy_window",
- "bitflags 2.9.0",
- "derive_more",
- "nonmax",
- "radsort",
- "serde",
- "smallvec",
-]
-
[[package]]
name = "bevy_derive"
-version = "0.15.3"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57d94761ce947b0a2402fd949fe1e7a5b1535293130ba4cd9893be6295d4680a"
+checksum = "f626531b9c05c25a758ede228727bd11c2c2c8498ecbed9925044386d525a2a3"
dependencies = [
"bevy_macro_utils",
"quote 1.0.40",
@@ -424,46 +297,54 @@ dependencies = [
[[package]]
name = "bevy_diagnostic"
-version = "0.15.3"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e83c65979f063b593917ab9b1d7328c5854dba4b6ddf1ab78156c0105831fdf"
+checksum = "048a1ff3944a534b8472516866284181eef0a75b6dd4d39b6e5925715e350766"
dependencies = [
"bevy_app",
- "bevy_core",
"bevy_ecs",
+ "bevy_platform",
"bevy_tasks",
"bevy_time",
"bevy_utils",
"const-fnv1a-hash",
+ "log",
+ "serde",
]
[[package]]
name = "bevy_ecs"
-version = "0.15.3"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1597106cc01e62e6217ccb662e0748b2ce330893f27c7dc17bac33e0bb99bca9"
+checksum = "d9e807b5d9aab3bb8dfe47e7a44c9ff088bad2ceefe299b80ac77609a87fe9d4"
dependencies = [
+ "arrayvec",
"bevy_ecs_macros",
+ "bevy_platform",
"bevy_ptr",
"bevy_reflect",
"bevy_tasks",
"bevy_utils",
"bitflags 2.9.0",
+ "bumpalo",
"concurrent-queue",
"derive_more",
"disqualified",
- "fixedbitset 0.5.7",
+ "fixedbitset",
+ "indexmap",
+ "log",
"nonmax",
- "petgraph",
"serde",
"smallvec",
+ "thiserror 2.0.12",
+ "variadics_please",
]
[[package]]
name = "bevy_ecs_macros"
-version = "0.15.3"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f453adf07712b39826bc5845e5b0887ce03204ee8359bbe6b40a9afda60564a1"
+checksum = "467d7bb98aeb8dd30f36e6a773000c12a891d4f1bee2adc3841ec89cc8eaf54e"
dependencies = [
"bevy_macro_utils",
"proc-macro2 1.0.94",
@@ -473,146 +354,89 @@ dependencies = [
[[package]]
name = "bevy_encase_derive"
-version = "0.15.3"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f37ad69d36bb9e8479a88d481ef9748f5d7ab676040531d751d3a44441dcede7"
+checksum = "b8bb31dc1090c6f8fabbf6b21994d19a12766e786885ee48ffc547f0f1fa7863"
dependencies = [
"bevy_macro_utils",
"encase_derive_impl",
]
-[[package]]
-name = "bevy_gizmos"
-version = "0.15.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1614516d0922ad60e87cc39658422286ed684aaf4b3162d25051bc105eed814"
-dependencies = [
- "bevy_app",
- "bevy_asset",
- "bevy_color",
- "bevy_core_pipeline",
- "bevy_ecs",
- "bevy_gizmos_macros",
- "bevy_image",
- "bevy_math",
- "bevy_reflect",
- "bevy_render",
- "bevy_sprite",
- "bevy_time",
- "bevy_transform",
- "bevy_utils",
- "bytemuck",
-]
-
-[[package]]
-name = "bevy_gizmos_macros"
-version = "0.15.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0edb9e0dca64e0fc9d6b1d9e6e2178396e339e3e2b9f751e2504e3ea4ddf4508"
-dependencies = [
- "bevy_macro_utils",
- "proc-macro2 1.0.94",
- "quote 1.0.40",
- "syn 2.0.100",
-]
-
-[[package]]
-name = "bevy_hierarchy"
-version = "0.15.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19ced04e04437d0a439fe4722544c2a4678c1fe3412b57ee489d817c11884045"
-dependencies = [
- "bevy_app",
- "bevy_core",
- "bevy_ecs",
- "bevy_reflect",
- "bevy_utils",
- "disqualified",
- "smallvec",
-]
-
[[package]]
name = "bevy_image"
-version = "0.15.3"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b384d1ce9c87f6151292a76233897a628c2a50b3560487c4d74472225d49826"
+checksum = "840b25f7f58894c641739f756959028a04f519c448db7e2cd3e2e29fc5fd188d"
dependencies = [
+ "bevy_app",
"bevy_asset",
"bevy_color",
"bevy_math",
+ "bevy_platform",
"bevy_reflect",
"bevy_utils",
"bitflags 2.9.0",
"bytemuck",
- "derive_more",
"futures-lite",
+ "guillotiere",
+ "half",
"image",
+ "rectangle-pack",
"serde",
- "wgpu",
+ "thiserror 2.0.12",
+ "tracing",
+ "wgpu-types",
]
[[package]]
name = "bevy_input"
-version = "0.15.3"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52589939ca09695c69d629d166c5edf1759feaaf8f2078904aae9c33d08f5c3"
+checksum = "763410715714f3d4d2dcdf077af276e2e4ea93fd8081b183d446d060ea95baaa"
dependencies = [
"bevy_app",
- "bevy_core",
"bevy_ecs",
"bevy_math",
+ "bevy_platform",
"bevy_reflect",
"bevy_utils",
"derive_more",
- "serde",
- "smol_str",
+ "log",
+ "thiserror 2.0.12",
]
[[package]]
name = "bevy_internal"
-version = "0.15.3"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1e0c1d980d276e11558184d0627c8967ad8b70dab3e54a0f377bb53b98515b6"
+checksum = "526ffd64c58004cb97308826e896c07d0e23dc056c243b97492e31cdf72e2830"
dependencies = [
"bevy_app",
- "bevy_asset",
- "bevy_color",
- "bevy_core",
- "bevy_core_pipeline",
"bevy_derive",
"bevy_diagnostic",
"bevy_ecs",
- "bevy_gizmos",
- "bevy_hierarchy",
- "bevy_image",
"bevy_input",
- "bevy_log",
"bevy_math",
- "bevy_picking",
+ "bevy_platform",
"bevy_ptr",
"bevy_reflect",
- "bevy_render",
- "bevy_scene",
- "bevy_sprite",
"bevy_tasks",
"bevy_time",
"bevy_transform",
- "bevy_ui",
"bevy_utils",
- "bevy_window",
- "bevy_winit",
]
[[package]]
name = "bevy_log"
-version = "0.15.3"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b381a22e01f24af51536ef1eace94298dd555d06ffcf368125d16317f5f179cb"
+checksum = "7156df8d2f11135cf71c03eb4c11132b65201fd4f51648571e59e39c9c9ee2f6"
dependencies = [
"android_log-sys",
"bevy_app",
"bevy_ecs",
"bevy_utils",
+ "tracing",
"tracing-log",
"tracing-oslog",
"tracing-subscriber",
@@ -621,10 +445,11 @@ dependencies = [
[[package]]
name = "bevy_macro_utils"
-version = "0.15.3"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bb6ded1ddc124ea214f6a2140e47a78d1fe79b0638dad39419cdeef2e1133f1"
+checksum = "7a2473db70d8785b5c75d6dd951a2e51e9be2c2311122db9692c79c9d887517b"
dependencies = [
+ "parking_lot",
"proc-macro2 1.0.94",
"quote 1.0.40",
"syn 2.0.100",
@@ -633,25 +458,29 @@ dependencies = [
[[package]]
name = "bevy_math"
-version = "0.15.3"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c2650169161b64f9a93e41f13253701fdf971dc95265ed667d17bea6d2a334f"
+checksum = "f1a3a926d02dc501c6156a047510bdb538dcb1fa744eeba13c824b73ba88de55"
dependencies = [
+ "approx",
"bevy_reflect",
"derive_more",
"glam",
- "itertools",
+ "itertools 0.14.0",
+ "libm",
"rand",
"rand_distr",
"serde",
"smallvec",
+ "thiserror 2.0.12",
+ "variadics_please",
]
[[package]]
name = "bevy_mesh"
-version = "0.15.3"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "760f3c41b4c61a5f0d956537f454c49f79b8ed0fd0781b1a879ead8e69d95283"
+checksum = "12af58280c7453e32e2f083d86eaa4c9b9d03ea8683977108ded8f1930c539f2"
dependencies = [
"bevy_asset",
"bevy_derive",
@@ -659,61 +488,60 @@ dependencies = [
"bevy_image",
"bevy_math",
"bevy_mikktspace",
+ "bevy_platform",
"bevy_reflect",
"bevy_transform",
"bevy_utils",
"bitflags 2.9.0",
"bytemuck",
- "derive_more",
"hexasphere",
"serde",
- "wgpu",
+ "thiserror 2.0.12",
+ "tracing",
+ "wgpu-types",
]
[[package]]
name = "bevy_mikktspace"
-version = "0.15.3"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "226f663401069ded4352ed1472a85bb1f43e2b7305d6a50e53a4f6508168e380"
+checksum = "75e0258423c689f764556e36b5d9eebdbf624b29a1fd5b33cd9f6c42dcc4d5f3"
dependencies = [
"glam",
]
[[package]]
-name = "bevy_picking"
-version = "0.15.3"
+name = "bevy_platform"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2091a495c0f9c8962abb1e30f9d99696296c332b407e1f6fe1fe28aab96a8629"
+checksum = "704db2c11b7bc31093df4fbbdd3769f9606a6a5287149f4b51f2680f25834ebc"
dependencies = [
- "bevy_app",
- "bevy_asset",
- "bevy_derive",
- "bevy_ecs",
- "bevy_hierarchy",
- "bevy_input",
- "bevy_math",
- "bevy_reflect",
- "bevy_render",
- "bevy_time",
- "bevy_transform",
- "bevy_utils",
- "bevy_window",
- "uuid",
+ "cfg-if",
+ "critical-section",
+ "foldhash",
+ "getrandom 0.2.15",
+ "hashbrown",
+ "portable-atomic",
+ "portable-atomic-util",
+ "serde",
+ "spin",
+ "web-time",
]
[[package]]
name = "bevy_ptr"
-version = "0.15.3"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89fe0b0b919146939481a3a7c38864face2c6d0fd2c73ab3d430dc693ecd9b11"
+checksum = "86f1275dfb4cfef4ffc90c3fa75408964864facf833acc932413d52aa5364ba4"
[[package]]
name = "bevy_reflect"
-version = "0.15.3"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ddbca0a39e88eff2c301dc794ee9d73a53f4b08d47b2c9b5a6aac182fae6217"
+checksum = "607ebacc31029cf2f39ac330eabf1d4bc411b159528ec08dbe6b0593eaccfd41"
dependencies = [
"assert_type_match",
+ "bevy_platform",
"bevy_ptr",
"bevy_reflect_derive",
"bevy_utils",
@@ -721,18 +549,22 @@ dependencies = [
"disqualified",
"downcast-rs",
"erased-serde",
+ "foldhash",
"glam",
"serde",
"smallvec",
"smol_str",
+ "thiserror 2.0.12",
"uuid",
+ "variadics_please",
+ "wgpu-types",
]
[[package]]
name = "bevy_reflect_derive"
-version = "0.15.3"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d62affb769db17d34ad0b75ff27eca94867e2acc8ea350c5eca97d102bd98709"
+checksum = "cf35e45e4eb239018369f63f2adc2107a54c329f9276d020e01eee1625b0238b"
dependencies = [
"bevy_macro_utils",
"proc-macro2 1.0.94",
@@ -743,23 +575,22 @@ dependencies = [
[[package]]
name = "bevy_render"
-version = "0.15.3"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4aa9d7df5c2b65540093b8402aceec0a55d67b54606e57ce2969abe280b4c48"
+checksum = "85a7306235b3343b032801504f3e884b93abfb7ba58179fc555c479df509f349"
dependencies = [
"async-channel",
"bevy_app",
"bevy_asset",
"bevy_color",
- "bevy_core",
"bevy_derive",
"bevy_diagnostic",
"bevy_ecs",
"bevy_encase_derive",
- "bevy_hierarchy",
"bevy_image",
"bevy_math",
"bevy_mesh",
+ "bevy_platform",
"bevy_reflect",
"bevy_render_macros",
"bevy_tasks",
@@ -767,13 +598,16 @@ dependencies = [
"bevy_transform",
"bevy_utils",
"bevy_window",
+ "bitflags 2.9.0",
"bytemuck",
"codespan-reporting",
"derive_more",
"downcast-rs",
"encase",
+ "fixedbitset",
"futures-lite",
"image",
+ "indexmap",
"js-sys",
"naga",
"naga_oil",
@@ -782,6 +616,9 @@ dependencies = [
"send_wrapper",
"serde",
"smallvec",
+ "thiserror 2.0.12",
+ "tracing",
+ "variadics_please",
"wasm-bindgen",
"web-sys",
"wgpu",
@@ -789,9 +626,9 @@ dependencies = [
[[package]]
name = "bevy_render_macros"
-version = "0.15.3"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3469307d1b5ca5c37b7f9269be033845357412ebad33eace46826e59da592f66"
+checksum = "b85c4fb26b66d3a257b655485d11b9b6df9d3c85026493ba8092767a5edfc1b2"
dependencies = [
"bevy_macro_utils",
"proc-macro2 1.0.94",
@@ -799,235 +636,89 @@ dependencies = [
"syn 2.0.100",
]
-[[package]]
-name = "bevy_scene"
-version = "0.15.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdfe819202aa97bbb206d79fef83504b34d45529810563aafc2fe02cc10e3ee4"
-dependencies = [
- "bevy_app",
- "bevy_asset",
- "bevy_derive",
- "bevy_ecs",
- "bevy_hierarchy",
- "bevy_reflect",
- "bevy_render",
- "bevy_transform",
- "bevy_utils",
- "derive_more",
- "serde",
- "uuid",
-]
-
-[[package]]
-name = "bevy_sprite"
-version = "0.15.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27411a31704117002787c9e8cc1f2f89babf5e67572508aa029366d4643f8d01"
-dependencies = [
- "bevy_app",
- "bevy_asset",
- "bevy_color",
- "bevy_core_pipeline",
- "bevy_derive",
- "bevy_ecs",
- "bevy_image",
- "bevy_math",
- "bevy_picking",
- "bevy_reflect",
- "bevy_render",
- "bevy_transform",
- "bevy_utils",
- "bevy_window",
- "bitflags 2.9.0",
- "bytemuck",
- "derive_more",
- "fixedbitset 0.5.7",
- "guillotiere",
- "nonmax",
- "radsort",
- "rectangle-pack",
- "serde",
-]
-
[[package]]
name = "bevy_tasks"
-version = "0.15.3"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "028630ddc355563bd567df1076db3515858aa26715ddf7467d2086f9b40e5ab1"
+checksum = "444c450b65e108855f42ecb6db0c041a56ea7d7f10cc6222f0ca95e9536a7d19"
dependencies = [
"async-executor",
+ "async-task",
+ "atomic-waker",
+ "bevy_platform",
+ "cfg-if",
+ "crossbeam-queue",
+ "derive_more",
"futures-channel",
"futures-lite",
+ "heapless",
"pin-project",
"wasm-bindgen-futures",
]
-[[package]]
-name = "bevy_text"
-version = "0.15.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "872b0b627cedf6d1bd97b75bc4d59c16f67afdd4f2fed8f7d808a258d6cb982e"
-dependencies = [
- "bevy_app",
- "bevy_asset",
- "bevy_color",
- "bevy_derive",
- "bevy_ecs",
- "bevy_hierarchy",
- "bevy_image",
- "bevy_math",
- "bevy_reflect",
- "bevy_render",
- "bevy_sprite",
- "bevy_transform",
- "bevy_utils",
- "bevy_window",
- "cosmic-text",
- "derive_more",
- "serde",
- "smallvec",
- "sys-locale",
- "unicode-bidi",
-]
-
[[package]]
name = "bevy_time"
-version = "0.15.3"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b2051ec56301b994f7c182a2a6eb1490038149ad46d95eee715e1a922acdfd9"
+checksum = "456369ca10f8e039aaf273332744674844827854833ee29e28f9e161702f2f55"
dependencies = [
"bevy_app",
"bevy_ecs",
+ "bevy_platform",
"bevy_reflect",
- "bevy_utils",
"crossbeam-channel",
+ "log",
"serde",
]
[[package]]
name = "bevy_transform"
-version = "0.15.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8109b1234b0e58931f51df12bc8895daa69298575cf92da408848f79a4ce201"
-dependencies = [
- "bevy_app",
- "bevy_ecs",
- "bevy_hierarchy",
- "bevy_math",
- "bevy_reflect",
- "derive_more",
- "serde",
-]
-
-[[package]]
-name = "bevy_ui"
-version = "0.15.3"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e534590222d044c875bf3511e5d0b3da78889bb21ad797953484ce011af77b46"
+checksum = "8479cdd5461246943956a7c8347e4e5d6ff857e57add889fb50eee0b5c26ab48"
dependencies = [
- "accesskit",
- "bevy_a11y",
"bevy_app",
- "bevy_asset",
- "bevy_color",
- "bevy_core_pipeline",
- "bevy_derive",
"bevy_ecs",
- "bevy_hierarchy",
- "bevy_image",
- "bevy_input",
+ "bevy_log",
"bevy_math",
"bevy_reflect",
- "bevy_render",
- "bevy_sprite",
- "bevy_text",
- "bevy_transform",
+ "bevy_tasks",
"bevy_utils",
- "bevy_window",
- "bytemuck",
"derive_more",
- "nonmax",
"serde",
- "smallvec",
- "taffy",
+ "thiserror 2.0.12",
]
[[package]]
name = "bevy_utils"
-version = "0.15.3"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63c2174d43a0de99f863c98a472370047a2bfa7d1e5cec8d9d647fb500905d9d"
+checksum = "ac2da3b3c1f94dadefcbe837aaa4aa119fcea37f7bdc5307eb05b4ede1921e24"
dependencies = [
- "ahash",
- "bevy_utils_proc_macros",
- "getrandom",
- "hashbrown 0.14.5",
+ "bevy_platform",
"thread_local",
- "tracing",
- "web-time",
-]
-
-[[package]]
-name = "bevy_utils_proc_macros"
-version = "0.15.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94847541f6dd2e28f54a9c2b0e857da5f2631e2201ebc25ce68781cdcb721391"
-dependencies = [
- "proc-macro2 1.0.94",
- "quote 1.0.40",
- "syn 2.0.100",
]
[[package]]
name = "bevy_window"
-version = "0.15.3"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1e1e7c6713c04404a3e7cede48a9c47b76c30efc764664ec1246147f6fb9878"
+checksum = "0d83327cc5584da463d12b7a88ddb97f9e006828832287e1564531171fffdeb4"
dependencies = [
"android-activity",
- "bevy_a11y",
"bevy_app",
"bevy_ecs",
"bevy_input",
"bevy_math",
+ "bevy_platform",
"bevy_reflect",
"bevy_utils",
+ "log",
"raw-window-handle",
"serde",
"smol_str",
]
-[[package]]
-name = "bevy_winit"
-version = "0.15.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e158a73d6d896b1600a61bc115017707ecb467d1a5ad49231c5e58294f6f6e13"
-dependencies = [
- "accesskit",
- "accesskit_winit",
- "approx",
- "bevy_a11y",
- "bevy_app",
- "bevy_derive",
- "bevy_ecs",
- "bevy_hierarchy",
- "bevy_input",
- "bevy_log",
- "bevy_math",
- "bevy_reflect",
- "bevy_tasks",
- "bevy_utils",
- "bevy_window",
- "cfg-if",
- "crossbeam-channel",
- "raw-window-handle",
- "serde",
- "wasm-bindgen",
- "web-sys",
- "winit",
-]
-
[[package]]
name = "bindgen"
version = "0.70.1"
@@ -1037,7 +728,7 @@ dependencies = [
"bitflags 2.9.0",
"cexpr",
"clang-sys",
- "itertools",
+ "itertools 0.13.0",
"log",
"prettyplease",
"proc-macro2 1.0.94",
@@ -1112,15 +803,6 @@ version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
-[[package]]
-name = "block2"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f"
-dependencies = [
- "objc2",
-]
-
[[package]]
name = "blocking"
version = "1.6.1"
@@ -1160,6 +842,12 @@ dependencies = [
"syn 2.0.100",
]
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
[[package]]
name = "byteorder-lite"
version = "0.1.0"
@@ -1172,20 +860,6 @@ version = "1.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
-[[package]]
-name = "calloop"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec"
-dependencies = [
- "bitflags 2.9.0",
- "log",
- "polling",
- "rustix",
- "slab",
- "thiserror 1.0.69",
-]
-
[[package]]
name = "cc"
version = "1.2.17"
@@ -1218,12 +892,6 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-[[package]]
-name = "cfg_aliases"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
-
[[package]]
name = "cfg_aliases"
version = "0.2.1"
@@ -1268,6 +936,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
dependencies = [
"crossbeam-utils",
+ "portable-atomic",
]
[[package]]
@@ -1286,26 +955,6 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32b13ea120a812beba79e34316b3942a857c86ec1593cb34f27bb28272ce2cca"
-[[package]]
-name = "const-random"
-version = "0.1.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359"
-dependencies = [
- "const-random-macro",
-]
-
-[[package]]
-name = "const-random-macro"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
-dependencies = [
- "getrandom",
- "once_cell",
- "tiny-keccak",
-]
-
[[package]]
name = "const_panic"
version = "0.2.12"
@@ -1349,19 +998,6 @@ version = "0.8.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
-[[package]]
-name = "core-graphics"
-version = "0.23.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation",
- "core-graphics-types",
- "foreign-types",
- "libc",
-]
-
[[package]]
name = "core-graphics-types"
version = "0.1.3"
@@ -1374,52 +1010,25 @@ dependencies = [
]
[[package]]
-name = "cosmic-text"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59fd57d82eb4bfe7ffa9b1cec0c05e2fd378155b47f255a67983cb4afe0e80c2"
-dependencies = [
- "bitflags 2.9.0",
- "fontdb",
- "log",
- "rangemap",
- "rayon",
- "rustc-hash",
- "rustybuzz",
- "self_cell",
- "swash",
- "sys-locale",
- "ttf-parser 0.21.1",
- "unicode-bidi",
- "unicode-linebreak",
- "unicode-script",
- "unicode-segmentation",
-]
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471"
-dependencies = [
- "crossbeam-utils",
-]
+name = "critical-section"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b"
[[package]]
-name = "crossbeam-deque"
-version = "0.8.6"
+name = "crossbeam-channel"
+version = "0.5.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
+checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471"
dependencies = [
- "crossbeam-epoch",
"crossbeam-utils",
]
[[package]]
-name = "crossbeam-epoch"
-version = "0.9.18"
+name = "crossbeam-queue"
+version = "0.3.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115"
dependencies = [
"crossbeam-utils",
]
@@ -1446,12 +1055,6 @@ dependencies = [
"windows-sys 0.59.0",
]
-[[package]]
-name = "cursor-icon"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991"
-
[[package]]
name = "darling"
version = "0.9.0"
@@ -1539,27 +1142,12 @@ dependencies = [
"unicode-xid 0.2.6",
]
-[[package]]
-name = "dispatch"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
-
[[package]]
name = "disqualified"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c9c272297e804878a2a4b707cfcfc6d2328b5bb936944613b4fdf2b9269afdfd"
-[[package]]
-name = "dlib"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
-dependencies = [
- "libloading",
-]
-
[[package]]
name = "document-features"
version = "0.2.11"
@@ -1571,15 +1159,9 @@ dependencies = [
[[package]]
name = "downcast-rs"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
-
-[[package]]
-name = "dpi"
-version = "0.1.1"
+version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53"
+checksum = "ea8a8b81cacc08888170eef4d13b775126db426d0b348bee9d18c2c1eaf123cf"
[[package]]
name = "either"
@@ -1635,16 +1217,6 @@ dependencies = [
"typeid",
]
-[[package]]
-name = "errno"
-version = "0.3.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
-dependencies = [
- "libc",
- "windows-sys 0.59.0",
-]
-
[[package]]
name = "euclid"
version = "0.22.11"
@@ -1654,12 +1226,6 @@ dependencies = [
"num-traits",
]
-[[package]]
-name = "event-listener"
-version = "2.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
-
[[package]]
name = "event-listener"
version = "5.4.0"
@@ -1677,7 +1243,7 @@ version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2"
dependencies = [
- "event-listener 5.4.0",
+ "event-listener",
"pin-project-lite",
]
@@ -1696,12 +1262,6 @@ version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
-[[package]]
-name = "fixedbitset"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
-
[[package]]
name = "fixedbitset"
version = "0.5.7"
@@ -1720,38 +1280,6 @@ version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
-[[package]]
-name = "font-types"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3971f9a5ca983419cdc386941ba3b9e1feba01a0ab888adf78739feb2798492"
-dependencies = [
- "bytemuck",
-]
-
-[[package]]
-name = "fontconfig-parser"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1fcfcd44ca6e90c921fee9fa665d530b21ef1327a4c1a6c5250ea44b776ada7"
-dependencies = [
- "roxmltree",
-]
-
-[[package]]
-name = "fontdb"
-version = "0.16.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3"
-dependencies = [
- "fontconfig-parser",
- "log",
- "memmap2",
- "slotmap",
- "tinyvec",
- "ttf-parser 0.20.0",
-]
-
[[package]]
name = "foreign-types"
version = "0.5.0"
@@ -1822,10 +1350,22 @@ dependencies = [
"cfg-if",
"js-sys",
"libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
"wasm-bindgen",
]
+[[package]]
+name = "getrandom"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi",
+ "wasi 0.14.2+wasi-0.2.4",
+]
+
[[package]]
name = "gl_generator"
version = "0.14.0"
@@ -1839,11 +1379,12 @@ dependencies = [
[[package]]
name = "glam"
-version = "0.29.2"
+version = "0.29.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc46dd3ec48fdd8e693a98d2b8bafae273a2d54c1de02a2a7e3d57d501f39677"
+checksum = "8babf46d4c1c9d92deac9f7be466f76dfc4482b6452fc5024b5e8daf6ffeb3ee"
dependencies = [
"bytemuck",
+ "libm",
"rand",
"serde",
]
@@ -1856,9 +1397,9 @@ checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
[[package]]
name = "glow"
-version = "0.14.2"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d51fa363f025f5c111e03f13eda21162faeacb6911fe8caa0c0349f9cf0c4483"
+checksum = "c5e5ea60d70410161c8bf5da3fdfeaa1c72ed2c15f8bbb9d19fe3a4fad085f08"
dependencies = [
"js-sys",
"slotmap",
@@ -1914,7 +1455,7 @@ checksum = "dcf29e94d6d243368b7a56caa16bc213e4f9f8ed38c4d9557069527b5d5281ca"
dependencies = [
"bitflags 2.9.0",
"gpu-descriptor-types",
- "hashbrown 0.15.2",
+ "hashbrown",
]
[[package]]
@@ -1926,12 +1467,6 @@ dependencies = [
"bitflags 2.9.0",
]
-[[package]]
-name = "grid"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be136d9dacc2a13cc70bb6c8f902b414fb2641f8db1314637c6b7933411a8f82"
-
[[package]]
name = "guillotiere"
version = "0.6.2"
@@ -1943,14 +1478,22 @@ dependencies = [
]
[[package]]
-name = "hashbrown"
-version = "0.14.5"
+name = "half"
+version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9"
dependencies = [
- "ahash",
- "allocator-api2",
- "serde",
+ "cfg-if",
+ "crunchy",
+]
+
+[[package]]
+name = "hash32"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606"
+dependencies = [
+ "byteorder",
]
[[package]]
@@ -1959,14 +1502,27 @@ version = "0.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
dependencies = [
+ "equivalent",
"foldhash",
+ "serde",
]
[[package]]
-name = "hermit-abi"
-version = "0.4.0"
+name = "heapless"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad"
+dependencies = [
+ "hash32",
+ "portable-atomic",
+ "stable_deref_trait",
+]
+
+[[package]]
+name = "heck"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
[[package]]
name = "hexasphere"
@@ -2002,15 +1558,6 @@ dependencies = [
"num-traits",
]
-[[package]]
-name = "immutable-chunkmap"
-version = "2.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12f97096f508d54f8f8ab8957862eee2ccd628847b6217af1a335e1c44dee578"
-dependencies = [
- "arrayvec",
-]
-
[[package]]
name = "indexmap"
version = "2.8.0"
@@ -2018,7 +1565,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3954d50fe15b02142bf25d3b8bdadb634ec3948f103d04ffe3031bc8fe9d7058"
dependencies = [
"equivalent",
- "hashbrown 0.15.2",
+ "hashbrown",
]
[[package]]
@@ -2039,6 +1586,15 @@ dependencies = [
"either",
]
+[[package]]
+name = "itertools"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
+dependencies = [
+ "either",
+]
+
[[package]]
name = "itoa"
version = "1.0.15"
@@ -2131,23 +1687,6 @@ version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
-[[package]]
-name = "libredox"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
-dependencies = [
- "bitflags 2.9.0",
- "libc",
- "redox_syscall 0.5.10",
-]
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.4.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
-
[[package]]
name = "litrs"
version = "0.4.1"
@@ -2194,20 +1733,11 @@ version = "2.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
-[[package]]
-name = "memmap2"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f"
-dependencies = [
- "libc",
-]
-
[[package]]
name = "metal"
-version = "0.29.0"
+version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21"
+checksum = "f569fb946490b5743ad69813cb19629130ce9374034abe31614a36402d18f99e"
dependencies = [
"bitflags 2.9.0",
"block",
@@ -2229,9 +1759,17 @@ dependencies = [
[[package]]
name = "micro_ldtk"
-version = "0.14.1"
+version = "0.15.0"
dependencies = [
- "bevy",
+ "bevy_app",
+ "bevy_asset",
+ "bevy_ecs",
+ "bevy_image",
+ "bevy_internal",
+ "bevy_math",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_transform",
"glam",
"log",
"micro_autotile",
@@ -2251,14 +1789,14 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]]
name = "naga"
-version = "23.1.0"
+version = "24.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "364f94bc34f61332abebe8cad6f6cd82a5b65cff22c828d05d0968911462ca4f"
+checksum = "e380993072e52eef724eddfcde0ed013b0c023c3f0417336ed041aa9f076994e"
dependencies = [
"arrayvec",
"bit-set 0.8.0",
"bitflags 2.9.0",
- "cfg_aliases 0.1.1",
+ "cfg_aliases",
"codespan-reporting",
"hexf-parse",
"indexmap",
@@ -2266,16 +1804,17 @@ dependencies = [
"pp-rs",
"rustc-hash",
"spirv",
+ "strum",
"termcolor",
- "thiserror 1.0.69",
+ "thiserror 2.0.12",
"unicode-xid 0.2.6",
]
[[package]]
name = "naga_oil"
-version = "0.16.0"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31ea1f080bb359927cd5404d0af1e5e6758f4f2d82ecfbebb0a0c434764e40f1"
+checksum = "0ca507a365f886f95f74420361b75442a3709c747a8a6e8b6c45b8667f45a82c"
dependencies = [
"bit-set 0.5.3",
"codespan-reporting",
@@ -2302,7 +1841,6 @@ dependencies = [
"log",
"ndk-sys 0.6.0+11769913",
"num_enum",
- "raw-window-handle",
"thiserror 1.0.69",
]
@@ -2338,7 +1876,7 @@ checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
dependencies = [
"bitflags 2.9.0",
"cfg-if",
- "cfg_aliases 0.2.1",
+ "cfg_aliases",
"libc",
]
@@ -2454,228 +1992,25 @@ dependencies = [
"num_enum_derive",
]
-[[package]]
-name = "num_enum_derive"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2 1.0.94",
- "quote 1.0.40",
- "syn 2.0.100",
-]
-
-[[package]]
-name = "objc"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
-dependencies = [
- "malloc_buf",
-]
-
-[[package]]
-name = "objc-sys"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310"
-
-[[package]]
-name = "objc2"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804"
-dependencies = [
- "objc-sys",
- "objc2-encode",
-]
-
-[[package]]
-name = "objc2-app-kit"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
-dependencies = [
- "bitflags 2.9.0",
- "block2",
- "libc",
- "objc2",
- "objc2-core-data",
- "objc2-core-image",
- "objc2-foundation",
- "objc2-quartz-core",
-]
-
-[[package]]
-name = "objc2-cloud-kit"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009"
-dependencies = [
- "bitflags 2.9.0",
- "block2",
- "objc2",
- "objc2-core-location",
- "objc2-foundation",
-]
-
-[[package]]
-name = "objc2-contacts"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889"
-dependencies = [
- "block2",
- "objc2",
- "objc2-foundation",
-]
-
-[[package]]
-name = "objc2-core-data"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
-dependencies = [
- "bitflags 2.9.0",
- "block2",
- "objc2",
- "objc2-foundation",
-]
-
-[[package]]
-name = "objc2-core-image"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80"
-dependencies = [
- "block2",
- "objc2",
- "objc2-foundation",
- "objc2-metal",
-]
-
-[[package]]
-name = "objc2-core-location"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781"
-dependencies = [
- "block2",
- "objc2",
- "objc2-contacts",
- "objc2-foundation",
-]
-
-[[package]]
-name = "objc2-encode"
-version = "4.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33"
-
-[[package]]
-name = "objc2-foundation"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
-dependencies = [
- "bitflags 2.9.0",
- "block2",
- "dispatch",
- "libc",
- "objc2",
-]
-
-[[package]]
-name = "objc2-link-presentation"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398"
-dependencies = [
- "block2",
- "objc2",
- "objc2-app-kit",
- "objc2-foundation",
-]
-
-[[package]]
-name = "objc2-metal"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
-dependencies = [
- "bitflags 2.9.0",
- "block2",
- "objc2",
- "objc2-foundation",
-]
-
-[[package]]
-name = "objc2-quartz-core"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
-dependencies = [
- "bitflags 2.9.0",
- "block2",
- "objc2",
- "objc2-foundation",
- "objc2-metal",
-]
-
-[[package]]
-name = "objc2-symbols"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc"
-dependencies = [
- "objc2",
- "objc2-foundation",
-]
-
-[[package]]
-name = "objc2-ui-kit"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f"
-dependencies = [
- "bitflags 2.9.0",
- "block2",
- "objc2",
- "objc2-cloud-kit",
- "objc2-core-data",
- "objc2-core-image",
- "objc2-core-location",
- "objc2-foundation",
- "objc2-link-presentation",
- "objc2-quartz-core",
- "objc2-symbols",
- "objc2-uniform-type-identifiers",
- "objc2-user-notifications",
-]
-
-[[package]]
-name = "objc2-uniform-type-identifiers"
-version = "0.2.2"
+[[package]]
+name = "num_enum_derive"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe"
+checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
dependencies = [
- "block2",
- "objc2",
- "objc2-foundation",
+ "proc-macro-crate",
+ "proc-macro2 1.0.94",
+ "quote 1.0.40",
+ "syn 2.0.100",
]
[[package]]
-name = "objc2-user-notifications"
-version = "0.2.2"
+name = "objc"
+version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3"
+checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
dependencies = [
- "bitflags 2.9.0",
- "block2",
- "objc2",
- "objc2-core-location",
- "objc2-foundation",
+ "malloc_buf",
]
[[package]]
@@ -2695,12 +2030,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc"
[[package]]
-name = "orbclient"
-version = "0.3.48"
+name = "ordered-float"
+version = "4.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba0b26cec2e24f08ed8bb31519a9333140a6599b867dac464bb150bdb796fd43"
+checksum = "7bb71e1b3fa6ca1c61f383464aaf2bb0e2f8e772a1f01d486832464de363b951"
dependencies = [
- "libredox",
+ "num-traits",
]
[[package]]
@@ -2733,7 +2068,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
dependencies = [
"cfg-if",
"libc",
- "redox_syscall 0.5.10",
+ "redox_syscall",
"smallvec",
"windows-targets 0.52.6",
]
@@ -2744,16 +2079,6 @@ version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
-[[package]]
-name = "petgraph"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
-dependencies = [
- "fixedbitset 0.4.2",
- "indexmap",
-]
-
[[package]]
name = "pin-project"
version = "1.1.10"
@@ -2797,21 +2122,6 @@ version = "0.3.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
-[[package]]
-name = "polling"
-version = "3.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f"
-dependencies = [
- "cfg-if",
- "concurrent-queue",
- "hermit-abi",
- "pin-project-lite",
- "rustix",
- "tracing",
- "windows-sys 0.59.0",
-]
-
[[package]]
name = "portable-atomic"
version = "1.11.0"
@@ -2842,7 +2152,7 @@ version = "0.2.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
dependencies = [
- "zerocopy 0.8.24",
+ "zerocopy",
]
[[package]]
@@ -2923,10 +2233,10 @@ dependencies = [
]
[[package]]
-name = "radsort"
-version = "0.1.1"
+name = "r-efi"
+version = "5.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "019b4b213425016d7d84a153c4c73afb0946fbb4840e4eece7ba8848b9d6da22"
+checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
[[package]]
name = "rand"
@@ -2955,7 +2265,7 @@ version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
dependencies = [
- "getrandom",
+ "getrandom 0.2.15",
]
[[package]]
@@ -2974,63 +2284,18 @@ version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3d6831663a5098ea164f89cff59c6284e95f4e3c76ce9848d4529f5ccca9bde"
-[[package]]
-name = "rangemap"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684"
-
[[package]]
name = "raw-window-handle"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"
-[[package]]
-name = "rayon"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
-dependencies = [
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
-dependencies = [
- "crossbeam-deque",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "read-fonts"
-version = "0.22.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69aacb76b5c29acfb7f90155d39759a29496aebb49395830e928a9703d2eec2f"
-dependencies = [
- "bytemuck",
- "font-types",
-]
-
[[package]]
name = "rectangle-pack"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a0d463f2884048e7153449a55166f91028d5b0ea53c79377099ce4e8cf0cf9bb"
-[[package]]
-name = "redox_syscall"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
-dependencies = [
- "bitflags 1.3.2",
-]
-
[[package]]
name = "redox_syscall"
version = "0.5.10"
@@ -3102,54 +2367,18 @@ dependencies = [
"serde_derive",
]
-[[package]]
-name = "roxmltree"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97"
-
[[package]]
name = "rustc-hash"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-[[package]]
-name = "rustix"
-version = "0.38.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
-dependencies = [
- "bitflags 2.9.0",
- "errno",
- "libc",
- "linux-raw-sys",
- "windows-sys 0.59.0",
-]
-
[[package]]
name = "rustversion"
version = "1.0.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
-[[package]]
-name = "rustybuzz"
-version = "0.14.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfb9cf8877777222e4a3bc7eb247e398b56baba500c38c1c46842431adc8b55c"
-dependencies = [
- "bitflags 2.9.0",
- "bytemuck",
- "libm",
- "smallvec",
- "ttf-parser 0.21.1",
- "unicode-bidi-mirroring",
- "unicode-ccc",
- "unicode-properties",
- "unicode-script",
-]
-
[[package]]
name = "ryu"
version = "1.0.20"
@@ -3171,12 +2400,6 @@ version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-[[package]]
-name = "self_cell"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2fdfc24bc566f839a2da4c4295b82db7d25a24253867d5c64355abb5799bdbe"
-
[[package]]
name = "send_wrapper"
version = "0.6.0"
@@ -3230,16 +2453,6 @@ version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
-[[package]]
-name = "skrifa"
-version = "0.22.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e1c44ad1f6c5bdd4eefed8326711b7dbda9ea45dfd36068c427d332aa382cbe"
-dependencies = [
- "bytemuck",
- "read-fonts",
-]
-
[[package]]
name = "slab"
version = "0.4.9"
@@ -3263,9 +2476,6 @@ name = "smallvec"
version = "1.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
-dependencies = [
- "serde",
-]
[[package]]
name = "smol_str"
@@ -3276,6 +2486,15 @@ dependencies = [
"serde",
]
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+dependencies = [
+ "portable-atomic",
+]
+
[[package]]
name = "spirv"
version = "0.3.0+sdk-1.3.268.0"
@@ -3285,6 +2504,12 @@ dependencies = [
"bitflags 2.9.0",
]
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
[[package]]
name = "stackfuture"
version = "0.3.0"
@@ -3304,22 +2529,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550"
[[package]]
-name = "svg_fmt"
-version = "0.4.4"
+name = "strum"
+version = "0.26.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce5d813d71d82c4cbc1742135004e4a79fd870214c155443451c139c9470a0aa"
+checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
+dependencies = [
+ "strum_macros",
+]
[[package]]
-name = "swash"
-version = "0.1.19"
+name = "strum_macros"
+version = "0.26.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbd59f3f359ddd2c95af4758c18270eddd9c730dde98598023cdabff472c2ca2"
+checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
dependencies = [
- "skrifa",
- "yazi",
- "zeno",
+ "heck",
+ "proc-macro2 1.0.94",
+ "quote 1.0.40",
+ "rustversion",
+ "syn 2.0.100",
]
+[[package]]
+name = "svg_fmt"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce5d813d71d82c4cbc1742135004e4a79fd870214c155443451c139c9470a0aa"
+
[[package]]
name = "syn"
version = "0.15.44"
@@ -3342,28 +2578,6 @@ dependencies = [
"unicode-ident",
]
-[[package]]
-name = "sys-locale"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eab9a99a024a169fe8a903cf9d4a3b3601109bcc13bd9e3c6fff259138626c4"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "taffy"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cb893bff0f80ae17d3a57e030622a967b8dbc90e38284d9b4b1442e23873c94"
-dependencies = [
- "arrayvec",
- "grid",
- "num-traits",
- "serde",
- "slotmap",
-]
-
[[package]]
name = "termcolor"
version = "1.4.1"
@@ -3456,15 +2670,6 @@ dependencies = [
"once_cell",
]
-[[package]]
-name = "tiny-keccak"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
-dependencies = [
- "crunchy",
-]
-
[[package]]
name = "tinyvec"
version = "1.9.0"
@@ -3584,72 +2789,18 @@ dependencies = [
"wasm-bindgen",
]
-[[package]]
-name = "ttf-parser"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4"
-
-[[package]]
-name = "ttf-parser"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8"
-
[[package]]
name = "typeid"
version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c"
-[[package]]
-name = "unicode-bidi"
-version = "0.3.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5"
-
-[[package]]
-name = "unicode-bidi-mirroring"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23cb788ffebc92c5948d0e997106233eeb1d8b9512f93f41651f52b6c5f5af86"
-
-[[package]]
-name = "unicode-ccc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1df77b101bcc4ea3d78dafc5ad7e4f58ceffe0b2b16bf446aeb50b6cb4157656"
-
[[package]]
name = "unicode-ident"
version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
-[[package]]
-name = "unicode-linebreak"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
-
-[[package]]
-name = "unicode-properties"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0"
-
-[[package]]
-name = "unicode-script"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb421b350c9aff471779e262955939f565ec18b86c15364e6bdf0d662ca7c1f"
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
-
[[package]]
name = "unicode-width"
version = "0.1.14"
@@ -3670,12 +2821,14 @@ checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
[[package]]
name = "uuid"
-version = "1.12.1"
+version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3758f5e68192bb96cc8f9b7e2c2cfdabb435499a28499a42f8f984092adad4b"
+checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9"
dependencies = [
- "getrandom",
+ "getrandom 0.3.2",
+ "js-sys",
"serde",
+ "wasm-bindgen",
]
[[package]]
@@ -3684,6 +2837,17 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
+[[package]]
+name = "variadics_please"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41b6d82be61465f97d42bd1d15bf20f3b0a3a0905018f38f9d6f6962055b0b5c"
+dependencies = [
+ "proc-macro2 1.0.94",
+ "quote 1.0.40",
+ "syn 2.0.100",
+]
+
[[package]]
name = "version_check"
version = "0.9.5"
@@ -3706,6 +2870,15 @@ version = "0.11.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+[[package]]
+name = "wasi"
+version = "0.14.2+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+dependencies = [
+ "wit-bindgen-rt",
+]
+
[[package]]
name = "wasm-bindgen"
version = "0.2.100"
@@ -3799,12 +2972,13 @@ dependencies = [
[[package]]
name = "wgpu"
-version = "23.0.1"
+version = "24.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80f70000db37c469ea9d67defdc13024ddf9a5f1b89cb2941b812ad7cde1735a"
+checksum = "35904fb00ba2d2e0a4d002fcbbb6e1b89b574d272a50e5fc95f6e81cf281c245"
dependencies = [
"arrayvec",
- "cfg_aliases 0.1.1",
+ "bitflags 2.9.0",
+ "cfg_aliases",
"document-features",
"js-sys",
"log",
@@ -3824,14 +2998,14 @@ dependencies = [
[[package]]
name = "wgpu-core"
-version = "23.0.1"
+version = "24.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d63c3c478de8e7e01786479919c8769f62a22eec16788d8c2ac77ce2c132778a"
+checksum = "671c25545d479b47d3f0a8e373aceb2060b67c6eb841b24ac8c32348151c7a0c"
dependencies = [
"arrayvec",
"bit-vec 0.8.0",
"bitflags 2.9.0",
- "cfg_aliases 0.1.1",
+ "cfg_aliases",
"document-features",
"indexmap",
"log",
@@ -3842,16 +3016,16 @@ dependencies = [
"raw-window-handle",
"rustc-hash",
"smallvec",
- "thiserror 1.0.69",
+ "thiserror 2.0.12",
"wgpu-hal",
"wgpu-types",
]
[[package]]
name = "wgpu-hal"
-version = "23.0.1"
+version = "24.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89364b8a0b211adc7b16aeaf1bd5ad4a919c1154b44c9ce27838213ba05fd821"
+checksum = "f112f464674ca69f3533248508ee30cb84c67cf06c25ff6800685f5e0294e259"
dependencies = [
"android_system_properties",
"arrayvec",
@@ -3860,7 +3034,7 @@ dependencies = [
"bitflags 2.9.0",
"block",
"bytemuck",
- "cfg_aliases 0.1.1",
+ "cfg_aliases",
"core-graphics-types",
"glow",
"glutin_wgl_sys",
@@ -3877,6 +3051,7 @@ dependencies = [
"ndk-sys 0.5.0+25.2.9519653",
"objc",
"once_cell",
+ "ordered-float",
"parking_lot",
"profiling",
"range-alloc",
@@ -3884,7 +3059,7 @@ dependencies = [
"renderdoc-sys",
"rustc-hash",
"smallvec",
- "thiserror 1.0.69",
+ "thiserror 2.0.12",
"wasm-bindgen",
"web-sys",
"wgpu-types",
@@ -3894,12 +3069,14 @@ dependencies = [
[[package]]
name = "wgpu-types"
-version = "23.0.0"
+version = "24.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "610f6ff27778148c31093f3b03abc4840f9636d58d597ca2f5977433acfe0068"
+checksum = "50ac044c0e76c03a0378e7786ac505d010a873665e2d51383dcff8dd227dc69c"
dependencies = [
"bitflags 2.9.0",
"js-sys",
+ "log",
+ "serde",
"web-sys",
]
@@ -4007,15 +3184,6 @@ dependencies = [
"windows-targets 0.42.2",
]
-[[package]]
-name = "windows-sys"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
[[package]]
name = "windows-sys"
version = "0.59.0"
@@ -4146,46 +3314,6 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
-[[package]]
-name = "winit"
-version = "0.30.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a809eacf18c8eca8b6635091543f02a5a06ddf3dad846398795460e6e0ae3cc0"
-dependencies = [
- "android-activity",
- "atomic-waker",
- "bitflags 2.9.0",
- "block2",
- "calloop",
- "cfg_aliases 0.2.1",
- "concurrent-queue",
- "core-foundation",
- "core-graphics",
- "cursor-icon",
- "dpi",
- "js-sys",
- "libc",
- "ndk",
- "objc2",
- "objc2-app-kit",
- "objc2-foundation",
- "objc2-ui-kit",
- "orbclient",
- "pin-project",
- "raw-window-handle",
- "redox_syscall 0.4.1",
- "rustix",
- "smol_str",
- "tracing",
- "unicode-segmentation",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "web-time",
- "windows-sys 0.52.0",
- "xkbcommon-dl",
-]
-
[[package]]
name = "winnow"
version = "0.7.4"
@@ -4196,69 +3324,27 @@ dependencies = [
]
[[package]]
-name = "xkbcommon-dl"
-version = "0.4.2"
+name = "wit-bindgen-rt"
+version = "0.39.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5"
+checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
dependencies = [
"bitflags 2.9.0",
- "dlib",
- "log",
- "once_cell",
- "xkeysym",
]
-[[package]]
-name = "xkeysym"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56"
-
[[package]]
name = "xml-rs"
version = "0.8.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c5b940ebc25896e71dd073bad2dbaa2abfe97b0a391415e22ad1326d9c54e3c4"
-[[package]]
-name = "yazi"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1"
-
-[[package]]
-name = "zeno"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697"
-
-[[package]]
-name = "zerocopy"
-version = "0.7.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
-dependencies = [
- "zerocopy-derive 0.7.35",
-]
-
[[package]]
name = "zerocopy"
version = "0.8.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2586fea28e186957ef732a5f8b3be2da217d65c5969d4b1e17f973ebbe876879"
dependencies = [
- "zerocopy-derive 0.8.24",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.7.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
-dependencies = [
- "proc-macro2 1.0.94",
- "quote 1.0.40",
- "syn 2.0.100",
+ "zerocopy-derive",
]
[[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 50b6872..e4461a2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,14 +1,13 @@
[package]
name = "micro_ldtk"
-version = "0.14.1"
+version = "0.15.0"
edition = "2021"
-
+description = "Load data from LDTK, index it and make it accessible through Bevy assets, extract and use autotile rules"
+repository = "https://lab.lcr.gr/microhacks/bevy-micro-ldtk.git"
+license = "Apache-2.0"
authors = [
"Louis Capitanchik <louis@microhacks.co.uk>"
]
-repository = "https://lab.lcr.gr/microhacks/bevy-micro-ldtk.git"
-description = "Load data from LDTK, index it and make it accessible through Bevy assets, extract and use autotile rules"
-license = "Apache-2.0"
[features]
default = ["ldtk_1_5_3", "autotile"]
@@ -28,7 +27,7 @@ ldtk_1_1_1 = ["_supports_ldtk"]
ldtk_1_1_0 = ["_supports_ldtk"]
ldtk_1_0_0 = ["_supports_ldtk"]
autotile = ["dep:micro_autotile"]
-bevy = ["dep:bevy"]
+bevy = ["dep:bevy_render", "dep:bevy_image", "dep:bevy_asset", "dep:bevy_ecs", "dep:bevy_reflect", "dep:bevy_math", "dep:bevy_app", "dep:bevy_transform"]
_supports_ui_tags = []
_supports_intgridgroup = []
_supports_ldtk = []
@@ -37,7 +36,16 @@ _optional_tile_list = []
no_panic = []
[dependencies]
-bevy = { optional = true, version = "0.15", default-features = false, features = ["bevy_render", "bevy_sprite", "bevy_asset", "serialize"] }
+bevy_render = { version = "0.16", optional = true }
+bevy_image = { version = "0.16", optional = true }
+bevy_asset = { version = "0.16", optional = true }
+bevy_ecs = { version = "0.16.0", optional = true }
+bevy_reflect = { version = "0.16", optional = true }
+bevy_math = { version = "0.16", optional = true }
+bevy_app = { version = "0.16", optional = true }
+bevy_transform = { version = "0.16", optional = true }
+
+#bevy = { optional = true, version = "0.15", default-features = false, features = ["bevy_render", "bevy_sprite", "bevy_asset", "serialize"] }
log = "0.4"
thiserror = "2.0"
@@ -49,4 +57,5 @@ micro_autotile = { version = "0.2", optional = true }
glam = { version = "0.29", features = ["serde"] }
[dev-dependencies]
-test-case = "3.3.1"
\ No newline at end of file
+test-case = "3.3.1"
+bevy_internal = "0.16"
\ No newline at end of file
diff --git a/src/assets/asset_events.rs b/src/assets/asset_events.rs
index d3f5dd2..28bb537 100644
--- a/src/assets/asset_events.rs
+++ b/src/assets/asset_events.rs
@@ -1,10 +1,10 @@
-use std::collections::HashMap;
-
-use bevy::prelude::*;
-
use crate::assets::{LevelIndex, TileMetadata, TilesetIndex};
use crate::ldtk::{Level, LevelSet, Project};
use crate::{LdtkLevel, LevelDataUpdated};
+use bevy_asset::{AssetEvent, Assets};
+use bevy_ecs::event::{EventReader, EventWriter};
+use bevy_ecs::system::{Res, ResMut};
+use std::collections::HashMap;
pub fn handle_ldtk_project_events(
mut events: EventReader<AssetEvent<Project>>,
diff --git a/src/assets/asset_storage.rs b/src/assets/asset_storage.rs
index 3d2260e..1fb407e 100644
--- a/src/assets/asset_storage.rs
+++ b/src/assets/asset_storage.rs
@@ -1,9 +1,8 @@
+use bevy_ecs::resource::Resource;
+use serde_json::Value;
use std::collections::HashMap;
use std::ops::{Deref, DerefMut};
-use bevy::prelude::Resource;
-use serde_json::Value;
-
use crate::LdtkLevel;
#[derive(Resource, Default)]
diff --git a/src/camera.rs b/src/camera.rs
index ef87736..6b2bdf1 100644
--- a/src/camera.rs
+++ b/src/camera.rs
@@ -1,12 +1,13 @@
-use bevy::ecs::query::QueryFilter;
-use bevy::ecs::system::SystemParam;
-use bevy::prelude::*;
-
use crate::MapQuery;
+use bevy_ecs::query::QueryFilter;
+use bevy_ecs::system::{Query, SystemParam};
+use bevy_math::{Rect, Vec2, Vec3};
+use bevy_render::camera::Projection;
+use bevy_transform::components::Transform;
pub fn lock_camera_to_level<CameraSelector: QueryFilter>(
map_query: MapQuery,
- mut camera_query: Query<(&mut Transform, &OrthographicProjection), CameraSelector>,
+ mut camera_query: Query<(&mut Transform, &Projection), CameraSelector>,
) {
let bounds = match map_query.get_camera_bounds() {
Some(bounds) => bounds,
@@ -14,7 +15,10 @@ pub fn lock_camera_to_level<CameraSelector: QueryFilter>(
};
for (mut transform, proj) in &mut camera_query {
- let rect = proj.area;
+ let rect = match proj {
+ Projection::Orthographic(ortho) => ortho.area,
+ _ => continue,
+ };
let width = rect.width();
let height = rect.height();
@@ -32,13 +36,16 @@ pub fn lock_camera_to_level<CameraSelector: QueryFilter>(
#[derive(SystemParam)]
pub struct CameraBounder<'w, 's, Filter: QueryFilter + 'static> {
map_query: MapQuery<'w>,
- query: Query<'w, 's, &'static OrthographicProjection, Filter>,
+ query: Query<'w, 's, &'static Projection, Filter>,
}
impl<Filter: QueryFilter + 'static> CameraBounder<'_, '_, Filter> {
pub fn get_extremeties(&self) -> Option<Rect> {
if let Some(bounds) = self.map_query.get_camera_bounds() {
- if let Ok(proj) = self.query.get_single() {
- let rect = proj.area;
+ if let Ok(proj) = self.query.single() {
+ let rect = match proj {
+ Projection::Orthographic(ortho) => ortho.area,
+ _ => return None,
+ };
let width = rect.width();
let height = rect.height();
@@ -66,7 +73,7 @@ impl<Filter: QueryFilter + 'static> CameraBounder<'_, '_, Filter> {
#[cfg(test)]
mod test {
- use bevy::math::{Rect, Vec2};
+ use bevy_math::{Rect, Vec2};
#[test]
fn min_max_vec() {
diff --git a/src/ldtk/mod.rs b/src/ldtk/mod.rs
index d0f757e..0feee5e 100644
--- a/src/ldtk/mod.rs
+++ b/src/ldtk/mod.rs
@@ -87,10 +87,10 @@ impl_from_bytes!(Project);
#[cfg(feature = "bevy")]
mod _bevy_impl {
use super::*;
- use bevy::asset::io::Reader;
- use bevy::asset::{AssetLoader, LoadContext, UntypedAssetId, VisitAssetDependencies};
- use bevy::prelude::{Asset, Handle};
- use bevy::reflect::TypePath;
+ use bevy_asset::io::Reader;
+ use bevy_asset::{Asset, Handle};
+ use bevy_asset::{AssetLoader, LoadContext, UntypedAssetId, VisitAssetDependencies};
+ use bevy_reflect::TypePath;
impl TypePath for Project {
fn type_path() -> &'static str {
@@ -163,10 +163,7 @@ mod _bevy_impl {
});
}
- load_context.add_labeled_asset(
- "ExternalLevels".into(),
- LevelSet(level_set),
- );
+ load_context.add_labeled_asset("ExternalLevels".into(), LevelSet(level_set));
Ok(project)
}
@@ -245,9 +242,9 @@ pub type LdtkProject = Project;
#[cfg(feature = "autotile")]
mod autotile_support {
+ use crate::ldtk::{AutoLayerRuleDefinition, AutoLayerRuleGroup, Project};
use micro_autotile::{AutoRuleSet, AutoTileRule, TileMatcher, TileOutput, TileStatus};
use num_traits::AsPrimitive;
- use crate::ldtk::{AutoLayerRuleDefinition, AutoLayerRuleGroup, Project};
#[cfg(feature = "_optional_tile_list")]
fn create_output(rule: &AutoLayerRuleDefinition) -> TileOutput {
diff --git a/src/lib.rs b/src/lib.rs
index 5afb1b2..0f60660 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -34,11 +34,11 @@ pub fn set_ldtk_tile_scale_f32(scale: f32) {
#[cfg(feature = "bevy")]
mod __plugin {
- use bevy::ecs::query::QueryFilter;
+ use bevy_app::{App, Plugin, PostUpdate, Update};
+ use bevy_asset::AssetApp;
+ use bevy_ecs::query::QueryFilter;
use std::marker::PhantomData;
- use bevy::prelude::*;
-
pub struct MicroLDTKPlugin;
impl Plugin for MicroLDTKPlugin {
fn build(&self, app: &mut App) {
diff --git a/src/map_query.rs b/src/map_query.rs
index b6723ce..9ee5721 100644
--- a/src/map_query.rs
+++ b/src/map_query.rs
@@ -2,8 +2,7 @@ use std::fmt::Debug;
use std::ops::Index;
use std::str::FromStr;
-use bevy::ecs::system::SystemParam;
-use bevy::prelude::*;
+use bevy_ecs::system::{Res, SystemParam};
use crate::assets::LevelIndex;
use crate::ldtk::EntityInstance;
diff --git a/src/pregen.rs b/src/pregen.rs
index d2e5898..5096eb3 100644
--- a/src/pregen.rs
+++ b/src/pregen.rs
@@ -1,7 +1,5 @@
-use bevy::image::TextureFormatPixelInfo;
-use bevy::prelude::Image;
-use bevy::render::render_resource::TextureFormat;
-use bevy::sprite::TextureAtlasLayout;
+use bevy_image::{Image, TextureAtlasLayout, TextureFormatPixelInfo};
+use bevy_render::render_resource::TextureFormat;
use crate::{
get_ldtk_tile_scale, Indexer, LdtkLayer, LdtkLevel, SuppliesImage, SuppliesTextureAtlas,
@@ -44,8 +42,12 @@ pub fn write_layer_to_texture(
let output_y = real_y as usize + relative_y;
let output_index = layer_indexer.index(output_x, output_y);
- if let Some(target_pixel) =
- image.data.chunks_exact(format.pixel_size()).nth(tile_index)
+ if let Some(target_pixel) = image
+ .data
+ .as_ref()
+ .expect("failed to get data")
+ .chunks_exact(format.pixel_size())
+ .nth(tile_index)
{
if let Some(map_px) = buffer
.chunks_exact_mut(format.pixel_size())
diff --git a/src/system/locator.rs b/src/system/locator.rs
index f4ebaf3..9bee020 100644
--- a/src/system/locator.rs
+++ b/src/system/locator.rs
@@ -1,5 +1,5 @@
-use bevy::prelude::{Handle, Image};
-use bevy::sprite::TextureAtlasLayout;
+use bevy_asset::Handle;
+use bevy_image::{Image, TextureAtlasLayout};
pub trait SuppliesTextureAtlas {
fn get_atlas_handle(&self, name: impl ToString) -> Option<&Handle<TextureAtlasLayout>>;
diff --git a/src/system/types.rs b/src/system/types.rs
index 0e8bd95..2fa3315 100644
--- a/src/system/types.rs
+++ b/src/system/types.rs
@@ -4,7 +4,7 @@ use std::ops::{Deref, DerefMut, Index};
use std::path::Path;
#[cfg(feature = "bevy")]
-use bevy::math::Rect;
+use bevy_math::Rect;
#[cfg(not(feature = "bevy"))]
use compat::Rect;
@@ -24,7 +24,7 @@ use crate::{get_ldtk_tile_scale, px_to_grid};
mod compat;
#[derive(Default, Clone, Debug, Ord, PartialOrd, PartialEq, Eq)]
-#[cfg_attr(feature = "bevy", derive(bevy::prelude::Event))]
+#[cfg_attr(feature = "bevy", derive(bevy_ecs::event::Event))]
pub struct LevelDataUpdated(pub String);
pub struct TileRef<'a> {
diff --git a/src/system/utils.rs b/src/system/utils.rs
index e3469ad..00c1610 100644
--- a/src/system/utils.rs
+++ b/src/system/utils.rs
@@ -1,5 +1,3 @@
-#[cfg(feature = "bevy")]
-use bevy::prelude::{Component, Resource};
use glam::IVec2;
use num_traits::AsPrimitive;
@@ -20,11 +18,11 @@ pub fn entity_centre(level_height: i64, entity: &EntityInstance) -> (f32, f32) {
(x as f32, y as f32)
}
-#[cfg_attr(feature = "bevy", derive(Component))]
+#[cfg_attr(feature = "bevy", derive(bevy_ecs::component::Component))]
pub struct WorldLinked;
#[derive(Default, Clone, Debug)]
-#[cfg_attr(feature = "bevy", derive(Resource))]
+#[cfg_attr(feature = "bevy", derive(bevy_ecs::resource::Resource))]
pub struct ActiveLevel {
pub map: String,
pub dirty: bool,
diff --git a/tests/bevy.rs b/tests/bevy.rs
index 08dc0d9..ed67240 100644
--- a/tests/bevy.rs
+++ b/tests/bevy.rs
@@ -1,53 +1,73 @@
-use bevy::asset::LoadState;
-use bevy::ecs::system::RunSystemOnce;
-use bevy::prelude::*;
-use bevy::render::RenderPlugin;
-use bevy::render::settings::{RenderCreation, WgpuSettings};
+#[cfg(feature = "bevy")]
+use bevy_app::App;
+#[cfg(feature = "bevy")]
+use bevy_asset::{AssetPlugin, AssetServer};
+#[cfg(feature = "bevy")]
+use bevy_asset::{Handle, LoadState};
+#[cfg(feature = "bevy")]
+use bevy_ecs::prelude::{Res, ResMut};
+#[cfg(feature = "bevy")]
+use bevy_ecs::resource::Resource;
+#[cfg(feature = "bevy")]
+use bevy_ecs::system::RunSystemOnce;
+#[cfg(feature = "bevy")]
+use bevy_internal::MinimalPlugins;
use micro_ldtk::ldtk::Project;
#[derive(Default, Resource)]
+#[cfg(feature = "bevy")]
pub struct LevelHandle(Handle<Project>);
macro_rules! test_loads_assets {
- ($file_name: literal = $cfg_version: literal) => {
- #[test]
- #[cfg(all(feature = "bevy", feature = $cfg_version))]
- fn loads_ldtk_file() {
- static ASSET_PATH: &str = $file_name;
+ ($file_name: literal = $cfg_version: literal) => {
+ #[test]
+ #[cfg(all(feature = "bevy", feature = $cfg_version))]
+ fn loads_ldtk_file() {
+ static ASSET_PATH: &str = $file_name;
- let mut app = App::new();
- app.init_resource::<LevelHandle>()
- .add_plugins((
- MinimalPlugins,
- AssetPlugin::default(),
- ));
+ let mut app = App::new();
+ app.init_resource::<LevelHandle>()
+ .add_plugins((MinimalPlugins, AssetPlugin::default()));
- app.add_plugins(micro_ldtk::MicroLDTKPlugin);
- app.update();
+ app.add_plugins(micro_ldtk::MicroLDTKPlugin);
+ app.update();
- app.world_mut().run_system_once(|assets: Res<AssetServer>, mut handle: ResMut<LevelHandle>| {
- *handle = LevelHandle(assets.load(ASSET_PATH))
- }).expect("Failed to load LDTK file");
- app.update();
+ app.world_mut()
+ .run_system_once(
+ |assets: Res<AssetServer>, mut handle: ResMut<LevelHandle>| {
+ *handle = LevelHandle(assets.load(ASSET_PATH))
+ },
+ )
+ .expect("Failed to load LDTK file");
+ app.update();
- let mut status: LoadState = app.world_mut().run_system_once(|assets: Res<AssetServer>, handle: Res<LevelHandle>| {
- assets.get_load_state(handle.0.id()).expect("Unable to get load state")
- }).expect("Failed to get load state");
+ let mut status: LoadState = app
+ .world_mut()
+ .run_system_once(|assets: Res<AssetServer>, handle: Res<LevelHandle>| {
+ assets
+ .get_load_state(handle.0.id())
+ .expect("Unable to get load state")
+ })
+ .expect("Failed to get load state");
- while matches!(status, LoadState::Loading) {
- status = app.world_mut().run_system_once(|assets: Res<AssetServer>, handle: Res<LevelHandle>| {
- assets.get_load_state(handle.0.id()).expect("Unable to get load state")
- }).expect("Failed to get load state");
- }
+ while matches!(status, LoadState::Loading) {
+ status = app
+ .world_mut()
+ .run_system_once(|assets: Res<AssetServer>, handle: Res<LevelHandle>| {
+ assets
+ .get_load_state(handle.0.id())
+ .expect("Unable to get load state")
+ })
+ .expect("Failed to get load state");
+ }
- if !status.is_loaded() {
- panic!("Failed to load LDTK file: {:?}", status);
- }
- }
- };
+ if !status.is_loaded() {
+ panic!("Failed to load LDTK file: {:?}", status);
+ }
+ }
+ };
}
-
test_loads_assets!("ldtk_v1_0_0.ldtk" = "ldtk_1_0_0");
test_loads_assets!("ldtk_v1_1_0.ldtk" = "ldtk_1_1_0");
test_loads_assets!("ldtk_v1_1_1.ldtk" = "ldtk_1_1_1");
@@ -61,4 +81,4 @@ test_loads_assets!("ldtk_v1_2_5.ldtk" = "ldtk_1_2_5");
test_loads_assets!("ldtk_v1_3_0.ldtk" = "ldtk_1_3_0");
test_loads_assets!("ldtk_v1_4_0.ldtk" = "ldtk_1_4_0");
test_loads_assets!("ldtk_v1_4_1.ldtk" = "ldtk_1_4_1");
-test_loads_assets!("ldtk_v1_5_3.ldtk" = "ldtk_1_5_3");
\ No newline at end of file
+test_loads_assets!("ldtk_v1_5_3.ldtk" = "ldtk_1_5_3");
--
GitLab