Avii/bevy_oxr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed things up for proper 0.16 release

Browse Source
This commit is contained in:
Malek
2025-04-25 17:20:05 -04:00
committed by Schmarni
parent 4528529417
commit ae54de3db9
13 changed files with 168 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

255
Cargo.lock generated
View File

@@ -338,16 +338,18 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
[[package]] [[package]]
name = "bevy" name = "bevy"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2a5cd3b24a5adb7c7378da7b3eea47639877643d11b6b087fc8a8094f2528615"
dependencies = [ dependencies = [
"bevy_internal", "bevy_internal",
] ]
[[package]] [[package]]
name = "bevy_a11y" name = "bevy_a11y"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "91ed969a58fbe449ef35ebec58ab19578302537f34ee8a35d04e5a038b3c40f5"
dependencies = [ dependencies = [
"accesskit", "accesskit",
"bevy_app", "bevy_app",
@@ -358,8 +360,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_animation" name = "bevy_animation"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3647b67c6bfd456922b2720ccef980dec01742d155d0eb454dc3d8fdc65e7aff"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_asset", "bevy_asset",
@@ -389,29 +392,11 @@ dependencies = [
"uuid", "uuid",
] ]
[[package]]
name = "bevy_anti_aliasing"
version = "0.16.0-dev"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37"
dependencies = [
"bevy_app",
"bevy_asset",
"bevy_core_pipeline",
"bevy_derive",
"bevy_diagnostic",
"bevy_ecs",
"bevy_image",
"bevy_math",
"bevy_reflect",
"bevy_render",
"bevy_utils",
"tracing",
]
[[package]] [[package]]
name = "bevy_app" name = "bevy_app"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2b6267ac23a9947d5b2725ff047a1e1add70076d85fa9fb73d044ab9bea1f3c"
dependencies = [ dependencies = [
"bevy_derive", "bevy_derive",
"bevy_ecs", "bevy_ecs",
@@ -432,8 +417,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_asset" name = "bevy_asset"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0698040d63199391ea77fd02e039630748e3e335c3070c6d932fd96cbf80f5d6"
dependencies = [ dependencies = [
"async-broadcast", "async-broadcast",
"async-fs", "async-fs",
@@ -471,8 +457,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_asset_macros" name = "bevy_asset_macros"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0bf8c00b5d532f8e5ac7b49af10602f9f7774a2d522cf0638323b5dfeee7b31c"
dependencies = [ dependencies = [
"bevy_macro_utils", "bevy_macro_utils",
"proc-macro2", "proc-macro2",
@@ -482,8 +469,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_audio" name = "bevy_audio"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74e54154e6369abdbaf5098e20424d59197c9b701d4f79fe8d0d2bde03d25f12"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_asset", "bevy_asset",
@@ -499,8 +487,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_color" name = "bevy_color"
version = "0.16.0-dev" version = "0.16.1"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ddf6a5ad35496bbc41713efbcf06ab72b9a310fabcab0f9db1debb56e8488c6e"
dependencies = [ dependencies = [
"bevy_math", "bevy_math",
"bevy_reflect", "bevy_reflect",
@@ -514,8 +503,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_core_pipeline" name = "bevy_core_pipeline"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55c2310717b9794e4a45513ee5946a7be0838852a4c1e185884195e1a8688ff3"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_asset", "bevy_asset",
@@ -543,8 +533,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_derive" name = "bevy_derive"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f626531b9c05c25a758ede228727bd11c2c2c8498ecbed9925044386d525a2a3"
dependencies = [ dependencies = [
"bevy_macro_utils", "bevy_macro_utils",
"quote", "quote",
@@ -553,8 +544,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_diagnostic" name = "bevy_diagnostic"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "048a1ff3944a534b8472516866284181eef0a75b6dd4d39b6e5925715e350766"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_ecs", "bevy_ecs",
@@ -570,8 +562,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_ecs" name = "bevy_ecs"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9e807b5d9aab3bb8dfe47e7a44c9ff088bad2ceefe299b80ac77609a87fe9d4"
dependencies = [ dependencies = [
"arrayvec", "arrayvec",
"bevy_ecs_macros", "bevy_ecs_macros",
@@ -597,8 +590,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_ecs_macros" name = "bevy_ecs_macros"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "467d7bb98aeb8dd30f36e6a773000c12a891d4f1bee2adc3841ec89cc8eaf54e"
dependencies = [ dependencies = [
"bevy_macro_utils", "bevy_macro_utils",
"proc-macro2", "proc-macro2",
@@ -608,8 +602,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_encase_derive" name = "bevy_encase_derive"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8bb31dc1090c6f8fabbf6b21994d19a12766e786885ee48ffc547f0f1fa7863"
dependencies = [ dependencies = [
"bevy_macro_utils", "bevy_macro_utils",
"encase_derive_impl", "encase_derive_impl",
@@ -617,8 +612,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_gilrs" name = "bevy_gilrs"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "950c84596dbff8a9691a050c37bb610ef9398af56369c2c2dd6dc41ef7b717a5"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_ecs", "bevy_ecs",
@@ -633,8 +629,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_gizmos" name = "bevy_gizmos"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54af8145b35ab2a830a6dd1058e23c1e1ddc4b893db79d295259ef82f51c7520"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_asset", "bevy_asset",
@@ -657,8 +654,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_gizmos_macros" name = "bevy_gizmos_macros"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "40137ace61f092b7a09eba41d7d1e6aef941f53a7818b06ef86dcce7b6a1fd3f"
dependencies = [ dependencies = [
"bevy_macro_utils", "bevy_macro_utils",
"proc-macro2", "proc-macro2",
@@ -668,8 +666,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_gltf" name = "bevy_gltf"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa25b809ee024ef2682bafc1ca22ca8275552edb549dc6f69a030fdffd976c63"
dependencies = [ dependencies = [
"base64 0.22.1", "base64 0.22.1",
"bevy_animation", "bevy_animation",
@@ -702,8 +701,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_image" name = "bevy_image"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "840b25f7f58894c641739f756959028a04f519c448db7e2cd3e2e29fc5fd188d"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_asset", "bevy_asset",
@@ -729,8 +729,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_input" name = "bevy_input"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "763410715714f3d4d2dcdf077af276e2e4ea93fd8081b183d446d060ea95baaa"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_ecs", "bevy_ecs",
@@ -746,8 +747,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_input_focus" name = "bevy_input_focus"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d7e7b4ed65e10927a39a987cf85ef98727dd319aafb6e6835f2cb05b883c6d66"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_ecs", "bevy_ecs",
@@ -761,12 +763,12 @@ dependencies = [
[[package]] [[package]]
name = "bevy_internal" name = "bevy_internal"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "526ffd64c58004cb97308826e896c07d0e23dc056c243b97492e31cdf72e2830"
dependencies = [ dependencies = [
"bevy_a11y", "bevy_a11y",
"bevy_animation", "bevy_animation",
"bevy_anti_aliasing",
"bevy_app", "bevy_app",
"bevy_asset", "bevy_asset",
"bevy_audio", "bevy_audio",
@@ -804,8 +806,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_log" name = "bevy_log"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7156df8d2f11135cf71c03eb4c11132b65201fd4f51648571e59e39c9c9ee2f6"
dependencies = [ dependencies = [
"android_log-sys", "android_log-sys",
"bevy_app", "bevy_app",
@@ -820,8 +823,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_macro_utils" name = "bevy_macro_utils"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a2473db70d8785b5c75d6dd951a2e51e9be2c2311122db9692c79c9d887517b"
dependencies = [ dependencies = [
"parking_lot", "parking_lot",
"proc-macro2", "proc-macro2",
@@ -832,8 +836,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_math" name = "bevy_math"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f1a3a926d02dc501c6156a047510bdb538dcb1fa744eeba13c824b73ba88de55"
dependencies = [ dependencies = [
"approx", "approx",
"bevy_reflect", "bevy_reflect",
@@ -851,8 +856,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_mesh" name = "bevy_mesh"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "12af58280c7453e32e2f083d86eaa4c9b9d03ea8683977108ded8f1930c539f2"
dependencies = [ dependencies = [
"bevy_asset", "bevy_asset",
"bevy_derive", "bevy_derive",
@@ -875,8 +881,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_mikktspace" name = "bevy_mikktspace"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75e0258423c689f764556e36b5d9eebdbf624b29a1fd5b33cd9f6c42dcc4d5f3"
dependencies = [ dependencies = [
"glam", "glam",
] ]
@@ -930,8 +937,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_pbr" name = "bevy_pbr"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9fe0de43b68bf9e5090a33efc963f125e9d3f9d97be9ebece7bcfdde1b6da80"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_asset", "bevy_asset",
@@ -963,8 +971,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_picking" name = "bevy_picking"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f73674f62b1033006bd75c89033f5d3516386cfd7d43bb9f7665012c0ab14d22"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_asset", "bevy_asset",
@@ -987,8 +996,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_platform" name = "bevy_platform"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "704db2c11b7bc31093df4fbbdd3769f9606a6a5287149f4b51f2680f25834ebc"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"critical-section", "critical-section",
@@ -1004,13 +1014,15 @@ dependencies = [
[[package]] [[package]]
name = "bevy_ptr" name = "bevy_ptr"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "86f1275dfb4cfef4ffc90c3fa75408964864facf833acc932413d52aa5364ba4"
[[package]] [[package]]
name = "bevy_reflect" name = "bevy_reflect"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "607ebacc31029cf2f39ac330eabf1d4bc411b159528ec08dbe6b0593eaccfd41"
dependencies = [ dependencies = [
"assert_type_match", "assert_type_match",
"bevy_platform", "bevy_platform",
@@ -1035,8 +1047,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_reflect_derive" name = "bevy_reflect_derive"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf35e45e4eb239018369f63f2adc2107a54c329f9276d020e01eee1625b0238b"
dependencies = [ dependencies = [
"bevy_macro_utils", "bevy_macro_utils",
"proc-macro2", "proc-macro2",
@@ -1047,8 +1060,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_render" name = "bevy_render"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85a7306235b3343b032801504f3e884b93abfb7ba58179fc555c479df509f349"
dependencies = [ dependencies = [
"async-channel", "async-channel",
"bevy_app", "bevy_app",
@@ -1098,8 +1112,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_render_macros" name = "bevy_render_macros"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b85c4fb26b66d3a257b655485d11b9b6df9d3c85026493ba8092767a5edfc1b2"
dependencies = [ dependencies = [
"bevy_macro_utils", "bevy_macro_utils",
"proc-macro2", "proc-macro2",
@@ -1109,8 +1124,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_scene" name = "bevy_scene"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e7b628f560f2d2fe9f35ecd4526627ba3992f082de03fd745536e4053a0266fe"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_asset", "bevy_asset",
@@ -1129,8 +1145,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_sprite" name = "bevy_sprite"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "01f97bf54fb1c37a1077139b59bb32bc77f7ca53149cfcaa512adbb69a2d492c"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_asset", "bevy_asset",
@@ -1158,8 +1175,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_state" name = "bevy_state"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "682c343c354b191fe6669823bce3b0695ee1ae4ac36f582e29c436a72b67cdd5"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_ecs", "bevy_ecs",
@@ -1173,8 +1191,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_state_macros" name = "bevy_state_macros"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55b4bf3970c4f0e60572901df4641656722172c222d71a80c430d36b0e31426c"
dependencies = [ dependencies = [
"bevy_macro_utils", "bevy_macro_utils",
"proc-macro2", "proc-macro2",
@@ -1184,8 +1203,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_tasks" name = "bevy_tasks"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "444c450b65e108855f42ecb6db0c041a56ea7d7f10cc6222f0ca95e9536a7d19"
dependencies = [ dependencies = [
"async-channel", "async-channel",
"async-executor", "async-executor",
@@ -1205,8 +1225,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_text" name = "bevy_text"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ef071262c5a9afbc39caba4c0b282c7d045fbb5cf33bdab1924bd2343403833"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_asset", "bevy_asset",
@@ -1234,8 +1255,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_time" name = "bevy_time"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "456369ca10f8e039aaf273332744674844827854833ee29e28f9e161702f2f55"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_ecs", "bevy_ecs",
@@ -1248,8 +1270,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_transform" name = "bevy_transform"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8479cdd5461246943956a7c8347e4e5d6ff857e57add889fb50eee0b5c26ab48"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_ecs", "bevy_ecs",
@@ -1265,8 +1288,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_ui" name = "bevy_ui"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "110dc5d0059f112263512be8cd7bfe0466dfb7c26b9bf4c74529355249fd23f9"
dependencies = [ dependencies = [
"accesskit", "accesskit",
"bevy_a11y", "bevy_a11y",
@@ -1299,8 +1323,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_utils" name = "bevy_utils"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac2da3b3c1f94dadefcbe837aaa4aa119fcea37f7bdc5307eb05b4ede1921e24"
dependencies = [ dependencies = [
"bevy_platform", "bevy_platform",
"thread_local", "thread_local",
@@ -1308,8 +1333,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_window" name = "bevy_window"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d83327cc5584da463d12b7a88ddb97f9e006828832287e1564531171fffdeb4"
dependencies = [ dependencies = [
"android-activity", "android-activity",
"bevy_app", "bevy_app",
@@ -1327,8 +1353,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy_winit" name = "bevy_winit"
version = "0.16.0-dev" version = "0.16.0"
source = "git+https://github.com/bevyengine/bevy#12f71a8936c77735b6f702b1ef849dfc8a306a37" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57b14928923ae4274f4b867dce3d0e7b2c8a31bebcb0f6e65a4261c3e0765064"
dependencies = [ dependencies = [
"accesskit", "accesskit",
"accesskit_winit", "accesskit_winit",

2
Cargo.toml
View File

@@ -10,7 +10,7 @@ resolver = "2"
members = ["crates/*", "crates/bevy_openxr/examples/android"] members = ["crates/*", "crates/bevy_openxr/examples/android"]
[workspace.dependencies] [workspace.dependencies]
bevy = { git = "https://github.com/bevyengine/bevy", default-features = false, features = [ bevy = { version = "0.16.0", default-features = false, features = [
"bevy_render", "bevy_render",
"bevy_core_pipeline", "bevy_core_pipeline",
"bevy_winit", "bevy_winit",

2
crates/bevy_openxr/src/openxr/action_binding.rs
View File

@@ -3,7 +3,7 @@ use std::ptr;
use bevy::ecs::schedule::ScheduleLabel; use bevy::ecs::schedule::ScheduleLabel;
use bevy::ecs::system::RunSystemOnce; use bevy::ecs::system::RunSystemOnce;
use bevy::platform_support::collections::HashMap; use bevy::platform::collections::HashMap;
use bevy::prelude::*; use bevy::prelude::*;
use bevy_mod_xr::session::XrSessionCreatedEvent; use bevy_mod_xr::session::XrSessionCreatedEvent;
use openxr::sys::ActionSuggestedBinding; use openxr::sys::ActionSuggestedBinding;

2
crates/bevy_openxr/src/openxr/features/handtracking.rs
View File

@@ -110,7 +110,7 @@ fn clean_up_default_hands(
) { ) {
for e in &query { for e in &query {
debug!("removing default hand entity"); debug!("removing default hand entity");
cmds.entity(e).despawn_recursive(); cmds.entity(e).despawn();
} }
} }

1
crates/bevy_openxr/src/openxr/features/passthrough.rs
View File

@@ -8,7 +8,6 @@ use openxr::PassthroughCapabilityFlagsFB;
use crate::layer_builder::PassthroughLayer; use crate::layer_builder::PassthroughLayer;
use crate::resources::*; use crate::resources::*;
use crate::session::OxrSession; use crate::session::OxrSession;
use crate::types::*;
pub struct OxrPassthroughPlugin; pub struct OxrPassthroughPlugin;

6
crates/bevy_openxr/src/openxr/init.rs
View File

@@ -198,7 +198,7 @@ fn detect_session_destroyed(
let state = state.0.load(Ordering::Relaxed); let state = state.0.load(Ordering::Relaxed);
if *last_state && !state { if *last_state && !state {
debug!("XrSession was fully destroyed!"); debug!("XrSession was fully destroyed!");
sender.send_default(); sender.write_default();
cmds.insert_resource(XrState::Available); cmds.insert_resource(XrState::Available);
} }
*last_state = state; *last_state = state;
@@ -327,14 +327,14 @@ pub fn handle_events(
}, },
_ => unreachable!(), _ => unreachable!(),
}; };
changed_event.send(XrStateChanged(new_status)); changed_event.write(XrStateChanged(new_status));
*status = new_status; *status = new_status;
} }
InstanceLossPending(_) => {} InstanceLossPending(_) => {}
EventsLost(e) => warn!("lost {} XR events", e.lost_event_count()), EventsLost(e) => warn!("lost {} XR events", e.lost_event_count()),
// we might want to check if this is the correct session? // we might want to check if this is the correct session?
Event::InteractionProfileChanged(_) => { Event::InteractionProfileChanged(_) => {
interaction_profile_changed_event.send_default(); interaction_profile_changed_event.write_default();
} }
_ => {} _ => {}
} }

4
crates/bevy_openxr/src/openxr/layer_builder.rs
View File

@@ -9,7 +9,7 @@ use crate::resources::*;
use crate::spaces::OxrSpaceExt as _; use crate::spaces::OxrSpaceExt as _;
pub trait LayerProvider { pub trait LayerProvider {
fn get<'a>(&'a self, world: &'a World) -> Option<Box<dyn CompositionLayer + '_>>; fn get<'a>(&'a self, world: &'a World) -> Option<Box<dyn CompositionLayer + 'a>>;
} }
pub struct ProjectionLayer; pub struct ProjectionLayer;
@@ -63,7 +63,7 @@ impl LayerProvider for ProjectionLayer {
} }
impl LayerProvider for PassthroughLayer { impl LayerProvider for PassthroughLayer {
fn get<'a>(&'a self, world: &'a World) -> Option<Box<dyn CompositionLayer + '_>> { fn get(&self, world: &World) -> Option<Box<dyn CompositionLayer>> {
Some(Box::new( Some(Box::new(
CompositionLayerPassthrough::new() CompositionLayerPassthrough::new()
.layer_handle(world.get_resource::<OxrPassthroughLayer>()?) .layer_handle(world.get_resource::<OxrPassthroughLayer>()?)

1
crates/bevy_openxr/src/openxr/mod.rs
View File

@@ -6,7 +6,6 @@ use bevy::{
utils::default, utils::default,
window::{PresentMode, Window, WindowPlugin}, window::{PresentMode, Window, WindowPlugin},
}; };
use bevy::render::camera::CameraPlugin;
use bevy_mod_xr::session::XrSessionPlugin; use bevy_mod_xr::session::XrSessionPlugin;
use bevy_mod_xr::{camera::XrCameraPlugin, session::XrState}; use bevy_mod_xr::{camera::XrCameraPlugin, session::XrState};
use init::OxrInitPlugin; use init::OxrInitPlugin;

4
crates/bevy_openxr/src/openxr/render.rs
View File

@@ -1,4 +1,4 @@
use bevy::render::camera::CustomProjection;
use bevy::{ use bevy::{
prelude::*, prelude::*,
render::{ render::{
@@ -147,7 +147,7 @@ pub fn clean_views(
) { ) {
for (e, cam) in &cam_query { for (e, cam) in &cam_query {
manual_texture_views.remove(&ManualTextureViewHandle(XR_TEXTURE_INDEX + cam.0)); manual_texture_views.remove(&ManualTextureViewHandle(XR_TEXTURE_INDEX + cam.0));
commands.entity(e).despawn_recursive(); commands.entity(e).despawn();
} }
} }

6
crates/bevy_openxr/src/openxr/spaces.rs
View File

@@ -1,8 +1,6 @@
use std::{mem::MaybeUninit, ptr, sync::Mutex}; use std::{mem::MaybeUninit, ptr, sync::Mutex};
use bevy::{prelude::*}; use bevy::{prelude::*};
use bevy::platform_support::*;
use bevy::platform_support::hash::FixedHasher;
use bevy_mod_xr::{ use bevy_mod_xr::{
session::{XrFirst, XrHandleEvents}, session::{XrFirst, XrHandleEvents},
spaces::{ spaces::{
@@ -66,7 +64,7 @@ fn destroy_space_event(instance: Res<OxrInstance>, mut events: EventReader<XrDes
} }
} }
pub static OXR_DO_NOT_CALL_DESTOY_SPACE_FOR_SPACES: Mutex<Option<bevy::platform_support::collections::hash_set::HashSet<u64, bevy::platform_support::hash::RandomState>>> = Mutex::new(None); pub static OXR_DO_NOT_CALL_DESTOY_SPACE_FOR_SPACES: Mutex<Option<bevy::platform::collections::hash_set::HashSet<u64>>> = Mutex::new(None);
pub static OXR_ORIGINAL_DESTOY_SPACE: Mutex<Option<openxr::sys::pfn::DestroySpace>> = pub static OXR_ORIGINAL_DESTOY_SPACE: Mutex<Option<openxr::sys::pfn::DestroySpace>> =
Mutex::new(None); Mutex::new(None);
@@ -74,7 +72,7 @@ fn patch_destroy_space(instance: ResMut<OxrInstance>) {
OXR_DO_NOT_CALL_DESTOY_SPACE_FOR_SPACES OXR_DO_NOT_CALL_DESTOY_SPACE_FOR_SPACES
.lock() .lock()
.unwrap() .unwrap()
.replace(bevy::platform_support::collections::hash_set::HashSet::new()); .replace(bevy::platform::collections::hash_set::HashSet::new());
let raw_instance_ptr = instance.fp() as *const _ as *mut openxr::raw::Instance; let raw_instance_ptr = instance.fp() as *const _ as *mut openxr::raw::Instance;
unsafe { unsafe {
OXR_ORIGINAL_DESTOY_SPACE OXR_ORIGINAL_DESTOY_SPACE

18
crates/bevy_xr_utils/src/tracking_utils.rs
View File

@@ -83,7 +83,7 @@ fn update_stage(
root_query: Query<&Transform, (With<XrTrackingRoot>, Without<XrTrackedStage>)>, root_query: Query<&Transform, (With<XrTrackingRoot>, Without<XrTrackedStage>)>,
mut stage_query: Query<&mut Transform, (With<XrTrackedStage>, Without<XrTrackingRoot>)>, mut stage_query: Query<&mut Transform, (With<XrTrackedStage>, Without<XrTrackingRoot>)>,
) { ) {
if let Ok(root) = root_query.get_single() { if let Ok(root) = root_query.single() {
for mut transform in &mut stage_query { for mut transform in &mut stage_query {
*transform = *root; *transform = *root;
} }
@@ -129,7 +129,7 @@ fn update_view(
mut head_query: Query<&mut Transform, (With<HeadXRSpace>, Without<XrTrackedView>)>, mut head_query: Query<&mut Transform, (With<HeadXRSpace>, Without<XrTrackedView>)>,
mut view_query: Query<&mut Transform, (With<XrTrackedView>, Without<HeadXRSpace>)>, mut view_query: Query<&mut Transform, (With<XrTrackedView>, Without<HeadXRSpace>)>,
) { ) {
let head_transform = head_query.get_single_mut(); let head_transform = head_query.single_mut();
if let Ok(root) = head_transform { if let Ok(root) = head_transform {
for mut transform in &mut view_query { for mut transform in &mut view_query {
*transform = *root; *transform = *root;
@@ -142,7 +142,7 @@ fn update_local_floor_transforms(
mut head_space: Query<&mut Transform, (With<HeadXRSpace>, Without<XrTrackedLocalFloor>)>, mut head_space: Query<&mut Transform, (With<HeadXRSpace>, Without<XrTrackedLocalFloor>)>,
mut local_floor: Query<&mut Transform, (With<XrTrackedLocalFloor>, Without<HeadXRSpace>)>, mut local_floor: Query<&mut Transform, (With<XrTrackedLocalFloor>, Without<HeadXRSpace>)>,
) { ) {
let head_transform = head_space.get_single_mut(); let head_transform = head_space.single_mut();
if let Ok(head) = head_transform { if let Ok(head) = head_transform {
let mut calc_floor = *head; let mut calc_floor = *head;
calc_floor.translation.y = 0.0; calc_floor.translation.y = 0.0;
@@ -164,7 +164,7 @@ fn update_left_grip(
mut left_grip: Query<&mut Transform, (With<LeftGrip>, Without<XrTrackedLeftGrip>)>, mut left_grip: Query<&mut Transform, (With<LeftGrip>, Without<XrTrackedLeftGrip>)>,
mut tracked_left_grip: Query<&mut Transform, (With<XrTrackedLeftGrip>, Without<LeftGrip>)>, mut tracked_left_grip: Query<&mut Transform, (With<XrTrackedLeftGrip>, Without<LeftGrip>)>,
) { ) {
let head_transform = left_grip.get_single_mut(); let head_transform = left_grip.single_mut();
if let Ok(head) = head_transform { if let Ok(head) = head_transform {
for mut transform in &mut tracked_left_grip { for mut transform in &mut tracked_left_grip {
*transform = *head; *transform = *head;
@@ -180,7 +180,7 @@ fn update_right_grip(
mut right_grip: Query<&mut Transform, (With<RightGrip>, Without<XrTrackedRightGrip>)>, mut right_grip: Query<&mut Transform, (With<RightGrip>, Without<XrTrackedRightGrip>)>,
mut tracked_right_grip: Query<&mut Transform, (With<XrTrackedRightGrip>, Without<RightGrip>)>, mut tracked_right_grip: Query<&mut Transform, (With<XrTrackedRightGrip>, Without<RightGrip>)>,
) { ) {
let head_transform = right_grip.get_single_mut(); let head_transform = right_grip.single_mut();
if let Ok(head) = head_transform { if let Ok(head) = head_transform {
for mut transform in &mut tracked_right_grip { for mut transform in &mut tracked_right_grip {
*transform = *head; *transform = *head;
@@ -229,12 +229,12 @@ pub fn suggest_action_bindings(
actions: Res<ControllerActions>, actions: Res<ControllerActions>,
mut bindings: EventWriter<OxrSuggestActionBinding>, mut bindings: EventWriter<OxrSuggestActionBinding>,
) { ) {
bindings.send(OxrSuggestActionBinding { bindings.write(OxrSuggestActionBinding {
action: actions.left.as_raw(), action: actions.left.as_raw(),
interaction_profile: "/interaction_profiles/oculus/touch_controller".into(), interaction_profile: "/interaction_profiles/oculus/touch_controller".into(),
bindings: vec!["/user/hand/left/input/grip/pose".into()], bindings: vec!["/user/hand/left/input/grip/pose".into()],
}); });
bindings.send(OxrSuggestActionBinding { bindings.write(OxrSuggestActionBinding {
action: actions.right.as_raw(), action: actions.right.as_raw(),
interaction_profile: "/interaction_profiles/oculus/touch_controller".into(), interaction_profile: "/interaction_profiles/oculus/touch_controller".into(),
bindings: vec!["/user/hand/right/input/grip/pose".into()], bindings: vec!["/user/hand/right/input/grip/pose".into()],
@@ -242,11 +242,11 @@ pub fn suggest_action_bindings(
} }
fn sync_actions(actions: Res<ControllerActions>, mut sync: EventWriter<OxrSyncActionSet>) { fn sync_actions(actions: Res<ControllerActions>, mut sync: EventWriter<OxrSyncActionSet>) {
sync.send(OxrSyncActionSet(actions.set.clone())); sync.write(OxrSyncActionSet(actions.set.clone()));
} }
fn attach_set(actions: Res<ControllerActions>, mut attach: EventWriter<OxrAttachActionSet>) { fn attach_set(actions: Res<ControllerActions>, mut attach: EventWriter<OxrAttachActionSet>) {
attach.send(OxrAttachActionSet(actions.set.clone())); attach.write(OxrAttachActionSet(actions.set.clone()));
} }
fn create_actions(instance: Res<OxrInstance>, mut cmds: Commands) { fn create_actions(instance: Res<OxrInstance>, mut cmds: Commands) {

2
crates/bevy_xr_utils/src/transform_utils.rs
View File

@@ -28,7 +28,7 @@ pub fn handle_transform_events(
mut position_reader: EventReader<SnapToPosition>, mut position_reader: EventReader<SnapToPosition>,
mut rotation_reader: EventReader<SnapToRotation>, mut rotation_reader: EventReader<SnapToRotation>,
) { ) {
let result = root_query.get_single_mut(); let result = root_query.single_mut();
match result { match result {
Ok(mut root_transform) => { Ok(mut root_transform) => {
let view = views.first(); let view = views.first();

10
crates/bevy_xr_utils/src/xr_utils_actions.rs
View File

@@ -171,7 +171,7 @@ fn create_openxr_events(
bindings: binding, bindings: binding,
}; };
//finally send the suggestion //finally send the suggestion
binding_writer.send(sugestion); binding_writer.write(sugestion);
} }
} }
bevy_mod_xr::actions::ActionType::Float => { bevy_mod_xr::actions::ActionType::Float => {
@@ -210,7 +210,7 @@ fn create_openxr_events(
bindings: binding, bindings: binding,
}; };
//finally send the suggestion //finally send the suggestion
binding_writer.send(sugestion); binding_writer.write(sugestion);
} }
} }
bevy_mod_xr::actions::ActionType::Vector => { bevy_mod_xr::actions::ActionType::Vector => {
@@ -249,13 +249,13 @@ fn create_openxr_events(
bindings: binding, bindings: binding,
}; };
//finally send the suggestion //finally send the suggestion
binding_writer.send(sugestion); binding_writer.write(sugestion);
} }
} }
}; };
} }
attach_writer.send(OxrAttachActionSet(action_set)); attach_writer.write(OxrAttachActionSet(action_set));
} }
} }
@@ -264,7 +264,7 @@ fn sync_active_action_sets(
active_action_set_query: Query<&XRUtilsActionSetReference, With<ActiveSet>>, active_action_set_query: Query<&XRUtilsActionSetReference, With<ActiveSet>>,
) { ) {
for set in &active_action_set_query { for set in &active_action_set_query {
sync_set.send(OxrSyncActionSet(set.0.clone())); sync_set.write(OxrSyncActionSet(set.0.clone()));
} }
} }