diff --git a/Cargo.lock b/Cargo.lock index 19afcde9..dcfa42f0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -185,18 +185,16 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "bevy" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97342ea2f3bad36be2ded1d1fbd569ff83147b70697f12f1579e87a7480afa36" +version = "0.7.0-dev" +source = "git+https://github.com/Indy2222/bevy?branch=de#66bef9e39aa8dce46effc98d036408bfd08ffd5f" dependencies = [ "bevy_internal", ] [[package]] name = "bevy-crevice-derive" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4cf594c9277eb1e426f45a00eaf70aa9ffdf479268d7e4538270263811e20bc" +version = "0.7.0-dev" +source = "git+https://github.com/Indy2222/bevy?branch=de#66bef9e39aa8dce46effc98d036408bfd08ffd5f" dependencies = [ "bevy_macro_utils", "proc-macro2", @@ -204,11 +202,26 @@ dependencies = [ "syn", ] +[[package]] +name = "bevy_animation" +version = "0.7.0-dev" +source = "git+https://github.com/Indy2222/bevy?branch=de#66bef9e39aa8dce46effc98d036408bfd08ffd5f" +dependencies = [ + "bevy_app", + "bevy_asset", + "bevy_core", + "bevy_ecs", + "bevy_hierarchy", + "bevy_math", + "bevy_reflect", + "bevy_transform", + "bevy_utils", +] + [[package]] name = "bevy_app" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fe3d3f4140fb11cd294f43be7cb66a5783d9277ba0270743e2860e32b25ab5" +version = "0.7.0-dev" +source = "git+https://github.com/Indy2222/bevy?branch=de#66bef9e39aa8dce46effc98d036408bfd08ffd5f" dependencies = [ "bevy_derive", "bevy_ecs", @@ -220,9 +233,8 @@ dependencies = [ [[package]] name = "bevy_asset" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb68a0259e2f857a32c4f05eb9b9447db1072297c61864ad07d02fea1838bde9" +version = "0.7.0-dev" +source = "git+https://github.com/Indy2222/bevy?branch=de#66bef9e39aa8dce46effc98d036408bfd08ffd5f" dependencies = [ "anyhow", "bevy_app", @@ -248,9 +260,8 @@ dependencies = [ [[package]] name = "bevy_audio" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0291276cf0dd1dbbf3393112d0e0276e4110f633965542123b830d8dae44fff3" +version = "0.7.0-dev" +source = "git+https://github.com/Indy2222/bevy?branch=de#66bef9e39aa8dce46effc98d036408bfd08ffd5f" dependencies = [ "anyhow", "bevy_app", @@ -264,9 +275,8 @@ dependencies = [ [[package]] name = "bevy_core" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c156430a5312c04a1b25fa434eeeab6349a41c6bb96ea0385406d53b3c43658" +version = "0.7.0-dev" +source = "git+https://github.com/Indy2222/bevy?branch=de#66bef9e39aa8dce46effc98d036408bfd08ffd5f" dependencies = [ "bevy_app", "bevy_derive", @@ -280,22 +290,21 @@ dependencies = [ [[package]] name = "bevy_core_pipeline" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b422dca94195c904964ab21bc4557fbd11f692c299d46e38364715ac931841e" +version = "0.7.0-dev" +source = "git+https://github.com/Indy2222/bevy?branch=de#66bef9e39aa8dce46effc98d036408bfd08ffd5f" dependencies = [ "bevy_app", "bevy_asset", "bevy_core", "bevy_ecs", "bevy_render", + "bevy_utils", ] [[package]] name = "bevy_crevice" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c684de72f710da0a701d1d2fe2a481241709d66f43215bcc9d7f9f0818d1cb15" +version = "0.7.0-dev" +source = "git+https://github.com/Indy2222/bevy?branch=de#66bef9e39aa8dce46effc98d036408bfd08ffd5f" dependencies = [ "bevy-crevice-derive", "bytemuck", @@ -305,9 +314,8 @@ dependencies = [ [[package]] name = "bevy_derive" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "918dc0dff01e8b4e8f989db89d74fd4042810ea80a70642d0459b3c265995e59" +version = "0.7.0-dev" +source = "git+https://github.com/Indy2222/bevy?branch=de#66bef9e39aa8dce46effc98d036408bfd08ffd5f" dependencies = [ "bevy_macro_utils", "quote", @@ -316,9 +324,8 @@ dependencies = [ [[package]] name = "bevy_diagnostic" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adbe98f48873d4b20f6479723de18d957f4bc00c653efd36c245e6a66d6e8b71" +version = "0.7.0-dev" +source = "git+https://github.com/Indy2222/bevy?branch=de#66bef9e39aa8dce46effc98d036408bfd08ffd5f" dependencies = [ "bevy_app", "bevy_core", @@ -329,9 +336,8 @@ dependencies = [ [[package]] name = "bevy_ecs" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6daf05da2680a14b17a4b669879fa7186abb80e7fbe400fb02c0c62628d1e200" +version = "0.7.0-dev" +source = "git+https://github.com/Indy2222/bevy?branch=de#66bef9e39aa8dce46effc98d036408bfd08ffd5f" dependencies = [ "async-channel", "bevy_ecs_macros", @@ -347,9 +353,8 @@ dependencies = [ [[package]] name = "bevy_ecs_macros" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7e9e664b3ea45cfc9ab3251ee0255dfa6410f675b3a405e7bac8e59b2d76aa9" +version = "0.7.0-dev" +source = "git+https://github.com/Indy2222/bevy?branch=de#66bef9e39aa8dce46effc98d036408bfd08ffd5f" dependencies = [ "bevy_macro_utils", "proc-macro2", @@ -359,9 +364,8 @@ dependencies = [ [[package]] name = "bevy_gilrs" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b457f720b1c54ede34afd6007beae3708503c0dd7a4ab4b416e36cb8bbd05ac1" +version = "0.7.0-dev" +source = "git+https://github.com/Indy2222/bevy?branch=de#66bef9e39aa8dce46effc98d036408bfd08ffd5f" dependencies = [ "bevy_app", "bevy_ecs", @@ -372,16 +376,17 @@ dependencies = [ [[package]] name = "bevy_gltf" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34e4711f4f77542dccd59eec249c98f02e34e28a25ee079c14cd351061d08e5c" +version = "0.7.0-dev" +source = "git+https://github.com/Indy2222/bevy?branch=de#66bef9e39aa8dce46effc98d036408bfd08ffd5f" dependencies = [ "anyhow", "base64", + "bevy_animation", "bevy_app", "bevy_asset", "bevy_core", "bevy_ecs", + "bevy_hierarchy", "bevy_log", "bevy_math", "bevy_pbr", @@ -395,11 +400,22 @@ dependencies = [ "thiserror", ] +[[package]] +name = "bevy_hierarchy" +version = "0.7.0-dev" +source = "git+https://github.com/Indy2222/bevy?branch=de#66bef9e39aa8dce46effc98d036408bfd08ffd5f" +dependencies = [ + "bevy_app", + "bevy_ecs", + "bevy_reflect", + "bevy_utils", + "smallvec", +] + [[package]] name = "bevy_input" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33989693efa636960dd40e540029ed7b7bc1af2f3eef26c009555b5e2a4e185a" +version = "0.7.0-dev" +source = "git+https://github.com/Indy2222/bevy?branch=de#66bef9e39aa8dce46effc98d036408bfd08ffd5f" dependencies = [ "bevy_app", "bevy_ecs", @@ -409,10 +425,10 @@ dependencies = [ [[package]] name = "bevy_internal" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92af28d95bba80d11840c24fa4ce8ff84ae27af1def2f5cf8a6891acce5d714" +version = "0.7.0-dev" +source = "git+https://github.com/Indy2222/bevy?branch=de#66bef9e39aa8dce46effc98d036408bfd08ffd5f" dependencies = [ + "bevy_animation", "bevy_app", "bevy_asset", "bevy_audio", @@ -423,6 +439,7 @@ dependencies = [ "bevy_ecs", "bevy_gilrs", "bevy_gltf", + "bevy_hierarchy", "bevy_input", "bevy_log", "bevy_math", @@ -443,9 +460,8 @@ dependencies = [ [[package]] name = "bevy_log" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bf0083e72bf76cbfa6607311ac6baef2f4f7c9306c35942cece8c0589cd3e5e" +version = "0.7.0-dev" +source = "git+https://github.com/Indy2222/bevy?branch=de#66bef9e39aa8dce46effc98d036408bfd08ffd5f" dependencies = [ "android_log-sys", "bevy_app", @@ -458,9 +474,8 @@ dependencies = [ [[package]] name = "bevy_macro_utils" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57cf90b3b67606d0818cdac6c9134eb66fa174959977a4abba893364a571a7cd" +version = "0.7.0-dev" +source = "git+https://github.com/Indy2222/bevy?branch=de#66bef9e39aa8dce46effc98d036408bfd08ffd5f" dependencies = [ "cargo-manifest", "quote", @@ -469,9 +484,8 @@ dependencies = [ [[package]] name = "bevy_math" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b0f9ebf2ef80a8fff3e5dca817594071004048cd089e72b9a1bf4e494b66112" +version = "0.7.0-dev" +source = "git+https://github.com/Indy2222/bevy?branch=de#66bef9e39aa8dce46effc98d036408bfd08ffd5f" dependencies = [ "bevy_reflect", "glam", @@ -479,9 +493,8 @@ dependencies = [ [[package]] name = "bevy_pbr" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41724d89746d54f7f8c8e522f9d0b1232a8a289e0d270482175d23774dc2362a" +version = "0.7.0-dev" +source = "git+https://github.com/Indy2222/bevy?branch=de#66bef9e39aa8dce46effc98d036408bfd08ffd5f" dependencies = [ "bevy_app", "bevy_asset", @@ -496,13 +509,13 @@ dependencies = [ "bevy_window", "bitflags", "bytemuck", + "smallvec", ] [[package]] name = "bevy_reflect" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d84ce8cbd484a39d67171831eaf72c20d2684de71f1e9d79333c8dd6d6f3ebca" +version = "0.7.0-dev" +source = "git+https://github.com/Indy2222/bevy?branch=de#66bef9e39aa8dce46effc98d036408bfd08ffd5f" dependencies = [ "bevy_reflect_derive", "bevy_utils", @@ -517,9 +530,8 @@ dependencies = [ [[package]] name = "bevy_reflect_derive" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7af3100febf44583a7c052d1469fbdb411f56aa85729333a0ac106a016bd379c" +version = "0.7.0-dev" +source = "git+https://github.com/Indy2222/bevy?branch=de#66bef9e39aa8dce46effc98d036408bfd08ffd5f" dependencies = [ "bevy_macro_utils", "proc-macro2", @@ -530,9 +542,8 @@ dependencies = [ [[package]] name = "bevy_render" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac0d5409e5e3d48f3192f78e37bedea29aa0c674083e51aaa7e945496913d2c2" +version = "0.7.0-dev" +source = "git+https://github.com/Indy2222/bevy?branch=de#66bef9e39aa8dce46effc98d036408bfd08ffd5f" dependencies = [ "anyhow", "bevy_app", @@ -566,16 +577,15 @@ dependencies = [ [[package]] name = "bevy_scene" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21eb2b01e4d1b074c75ea59a92409739cac24b56b1c723491ef80936d50e95df" +version = "0.7.0-dev" +source = "git+https://github.com/Indy2222/bevy?branch=de#66bef9e39aa8dce46effc98d036408bfd08ffd5f" dependencies = [ "anyhow", "bevy_app", "bevy_asset", "bevy_ecs", + "bevy_hierarchy", "bevy_reflect", - "bevy_transform", "bevy_utils", "ron", "serde", @@ -585,9 +595,8 @@ dependencies = [ [[package]] name = "bevy_sprite" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66439831ff57c11c7fb2692e7ccf8d0551f4368a9908908d3c38f2da53115b33" +version = "0.7.0-dev" +source = "git+https://github.com/Indy2222/bevy?branch=de#66bef9e39aa8dce46effc98d036408bfd08ffd5f" dependencies = [ "bevy_app", "bevy_asset", @@ -611,9 +620,8 @@ dependencies = [ [[package]] name = "bevy_tasks" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dc4bce7f4cddbb489636092f52478b103dc26ee8526c585289bbdd9c0d0a99f" +version = "0.7.0-dev" +source = "git+https://github.com/Indy2222/bevy?branch=de#66bef9e39aa8dce46effc98d036408bfd08ffd5f" dependencies = [ "async-channel", "async-executor", @@ -625,9 +633,8 @@ dependencies = [ [[package]] name = "bevy_text" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233c4bb933435e8e6c34a1310317fd7f8c6617526270de572e643816070b236a" +version = "0.7.0-dev" +source = "git+https://github.com/Indy2222/bevy?branch=de#66bef9e39aa8dce46effc98d036408bfd08ffd5f" dependencies = [ "ab_glyph", "anyhow", @@ -649,23 +656,20 @@ dependencies = [ [[package]] name = "bevy_transform" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9974c494f9cc721df46d2ba27c6a8df2a955ed8360a23adabd2bd66d1f73fa8f" +version = "0.7.0-dev" +source = "git+https://github.com/Indy2222/bevy?branch=de#66bef9e39aa8dce46effc98d036408bfd08ffd5f" dependencies = [ "bevy_app", "bevy_ecs", + "bevy_hierarchy", "bevy_math", "bevy_reflect", - "bevy_utils", - "smallvec", ] [[package]] name = "bevy_ui" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbdb34595bd7be349fba8038b970acbe632f70b98737318b2327c7c7cd557767" +version = "0.7.0-dev" +source = "git+https://github.com/Indy2222/bevy?branch=de#66bef9e39aa8dce46effc98d036408bfd08ffd5f" dependencies = [ "bevy_app", "bevy_asset", @@ -673,6 +677,7 @@ dependencies = [ "bevy_core_pipeline", "bevy_derive", "bevy_ecs", + "bevy_hierarchy", "bevy_input", "bevy_log", "bevy_math", @@ -691,13 +696,13 @@ dependencies = [ [[package]] name = "bevy_utils" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "252f6674aa3ba68bacfec506b91570a3cc206ad09b7ef4b23661959ef0246396" +version = "0.7.0-dev" +source = "git+https://github.com/Indy2222/bevy?branch=de#66bef9e39aa8dce46effc98d036408bfd08ffd5f" dependencies = [ "ahash", "bevy_derive", "getrandom", + "hashbrown", "instant", "tracing", "uuid", @@ -705,11 +710,11 @@ dependencies = [ [[package]] name = "bevy_window" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f4b52b766baf565e96f24f61dbc51bc85151f23202fed2b3650769f2edd0b21" +version = "0.7.0-dev" +source = "git+https://github.com/Indy2222/bevy?branch=de#66bef9e39aa8dce46effc98d036408bfd08ffd5f" dependencies = [ "bevy_app", + "bevy_ecs", "bevy_math", "bevy_utils", "raw-window-handle", @@ -718,9 +723,8 @@ dependencies = [ [[package]] name = "bevy_winit" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0d4a4bed46200615e070897a551d2389d49cdaff048e825e7fa6caef4dc57c6" +version = "0.7.0-dev" +source = "git+https://github.com/Indy2222/bevy?branch=de#66bef9e39aa8dce46effc98d036408bfd08ffd5f" dependencies = [ "approx", "bevy_app", @@ -1562,9 +1566,9 @@ dependencies = [ [[package]] name = "gltf" -version = "0.16.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff38b75359a0096dd0a8599b6e4f37a6ee41d5df300cc7669e62aafa697f7a2" +checksum = "00e0a0eace786193fc83644907097285396360e9e82e30f81a21e9b1ba836a3e" dependencies = [ "byteorder", "gltf-json", @@ -1573,9 +1577,9 @@ dependencies = [ [[package]] name = "gltf-derive" -version = "0.16.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f2a9333e0f9c7bca94dfc20bcf44fa12a61eeec662d6e007563ff748aa59c70" +checksum = "bdd53d6e284bb2bf02a6926e4cc4984978c1990914d6cd9deae4e31cf37cd113" dependencies = [ "inflections", "proc-macro2", @@ -1585,9 +1589,9 @@ dependencies = [ [[package]] name = "gltf-json" -version = "0.16.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1414d3a98cbaabdb2f134328b1f6036d14b282febc1df51952a435d2ca17fb6" +checksum = "9949836a9ec5e7f83f76fb9bbcbc77f254a577ebbdb0820867bc11979ef97cad" dependencies = [ "gltf-derive", "serde", @@ -1668,6 +1672,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" dependencies = [ "ahash", + "serde", ] [[package]] @@ -1687,9 +1692,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hexasphere" -version = "6.1.0" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b219bdb56b14905fa5429636bfc4df0043626642d4586d069a82019130846f5" +checksum = "04ab9d20ba513ff1582a7d885e91839f62cf28bef7c56b1b0428ca787315979b" dependencies = [ "glam", "lazy_static", @@ -2654,9 +2659,9 @@ checksum = "f1382d1f0a252c4bf97dc20d979a2fdd05b024acd7c2ed0f7595d7817666a157" [[package]] name = "rodio" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d98f5e557b61525057e2bc142c8cd7f0e70d75dc32852309bec440e6e046bf9" +checksum = "ec0939e9f626e6c6f1989adb6226a039c855ca483053f0ee7c98b90e41cf731e" dependencies = [ "cpal", "lewton", diff --git a/Cargo.toml b/Cargo.toml index 7d1b4fd3..89b7e1c0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ repository = "https://github.com/Indy2222/Digital-Extinction" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -bevy = "^0.6.1" +bevy = { git = "https://github.com/Indy2222/bevy", branch = "de" } anyhow = "^1.0" tar = "0.4" serde = "1.0" diff --git a/benches/ray_intersection.rs b/benches/ray_intersection.rs index 2282db70..36f16116 100644 --- a/benches/ray_intersection.rs +++ b/benches/ray_intersection.rs @@ -41,9 +41,9 @@ fn generate_mesh(grid_size: usize) -> Mesh { let indices = Indices::U32((0..positions.len()).map(|i| i as u32).collect()); let mut mesh = Mesh::new(PrimitiveTopology::TriangleList); mesh.set_indices(Some(indices)); - mesh.set_attribute(Mesh::ATTRIBUTE_POSITION, positions); - mesh.set_attribute(Mesh::ATTRIBUTE_NORMAL, normals); - mesh.set_attribute(Mesh::ATTRIBUTE_UV_0, uvs); + mesh.insert_attribute(Mesh::ATTRIBUTE_POSITION, positions); + mesh.insert_attribute(Mesh::ATTRIBUTE_NORMAL, normals); + mesh.insert_attribute(Mesh::ATTRIBUTE_UV_0, uvs); mesh }