diff --git a/.cargo/config b/.cargo/config new file mode 100644 index 0000000..ec26773 --- /dev/null +++ b/.cargo/config @@ -0,0 +1,3 @@ +[target.x86_64-unknown-linux-gnu] +linker = "clang" +rustflags = ["-Clink-arg=-fuse-ld=mold"] \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index 3d5fcdf..4b13e5f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -313,6 +313,7 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea370412c322af887c9115442d8f2ec991b652f163a1d8920ecaf08cae63f2bc" dependencies = [ + "bevy_dylib", "bevy_internal", ] @@ -529,6 +530,15 @@ dependencies = [ "sysinfo", ] +[[package]] +name = "bevy_dylib" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2e57c27c2ea4b35a7eb3d8c1ded793139f13607697ee8c60629020d30bd7179" +dependencies = [ + "bevy_internal", +] + [[package]] name = "bevy_ecs" version = "0.13.1" @@ -706,17 +716,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "bevy_gltf_components" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ae31d0e0a111b003f42f44f504ed24153f1341c1989a4e418bdb52da7b6b88" -dependencies = [ - "bevy", - "ron", - "serde", -] - [[package]] name = "bevy_hierarchy" version = "0.13.1" @@ -910,19 +909,6 @@ dependencies = [ "uuid", ] -[[package]] -name = "bevy_registry_export" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c971f8bd4115568455a0f27b4a808d24f600e30d2de7fbc10461d21170058df" -dependencies = [ - "bevy", - "bevy_app", - "bevy_ecs", - "bevy_reflect", - "serde_json", -] - [[package]] name = "bevy_render" version = "0.13.1" @@ -1385,9 +1371,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "calloop" @@ -2400,9 +2386,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.5" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown", @@ -3418,9 +3404,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.3" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", @@ -3673,9 +3659,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" dependencies = [ "serde", ] @@ -4002,9 +3988,8 @@ name = "ttt-ce" version = "0.1.0" dependencies = [ "bevy", + "bevy_dylib", "bevy_editor_pls", - "bevy_gltf_components", - "bevy_registry_export", "bevy_xpbd_3d", ] diff --git a/Cargo.toml b/Cargo.toml index 922d3f0..15e63d8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,8 +15,8 @@ opt-level = 3 [dependencies] -bevy = { version = "0.13.1", features = ["wayland"]} +bevy = { version = "0.13.1", features = ["wayland", "dynamic_linking"]} +bevy_dylib = "0.13.1" bevy_editor_pls = "0.8.1" -bevy_gltf_components = "0.5.1" -bevy_registry_export = "0.3.1" bevy_xpbd_3d = {git = "https://git.opencodebox.com/MikolajG/bevy_xpbd", branch = "reflect-serialize"} + diff --git a/src/main.rs b/src/main.rs index 009a3f7..9042424 100644 --- a/src/main.rs +++ b/src/main.rs @@ -20,14 +20,17 @@ use bevy_xpbd_3d::prelude::*; use bevy_editor_pls::prelude::*; mod charcacter_controller; use charcacter_controller::*; -use bevy_gltf_components::ComponentsFromGltfPlugin; -//use bevy_registry_export::ExportRegistryPlugin; fn main() { let mut app = App::new(); app - .add_plugins((DefaultPlugins, PhysicsPlugins::default(), EditorPlugin::default(), CharacterControllerPlugin, ComponentsFromGltfPlugin::default())) + .add_plugins(( + DefaultPlugins, + PhysicsPlugins::default(), + EditorPlugin::default(), + CharacterControllerPlugin, + )) .add_systems(Startup, setup) .add_systems(Update, spawn_map);