diff --git a/Cargo.lock b/Cargo.lock index 3939c9d..bdd803d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -613,7 +613,7 @@ dependencies = [ [[package]] name = "bevy-mesh-text-3d" version = "0.1.0" -source = "git+https://github.com/terhechte/bevy-mesh-text-3d#77d8ae6935af636bcb85251b1debbc7f3d618f74" +source = "git+https://github.com/Schmarni-Dev/bevy-mesh-text-3d#1215d6195b153b1dcd5f0e5cab2fb6f8ae834aa4" dependencies = [ "bevy", "cosmic-text 0.14.2", @@ -758,7 +758,6 @@ dependencies = [ "bevy_math", "bevy_reflect", "bevy_transform", - "cpal", "rodio", "tracing", ] @@ -835,7 +834,6 @@ dependencies = [ "const-fnv1a-hash", "log", "serde", - "sysinfo", ] [[package]] @@ -889,23 +887,6 @@ dependencies = [ "encase_derive_impl", ] -[[package]] -name = "bevy_gilrs" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97efef87c631949e67d06bb5d7dfd2a5f936b3b379afb6b1485b08edbb219b87" -dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_input", - "bevy_platform", - "bevy_time", - "bevy_utils", - "gilrs", - "thiserror 2.0.12", - "tracing", -] - [[package]] name = "bevy_gizmos" version = "0.16.1" @@ -923,7 +904,6 @@ dependencies = [ "bevy_pbr", "bevy_reflect", "bevy_render", - "bevy_sprite", "bevy_time", "bevy_transform", "bevy_utils", @@ -1056,7 +1036,6 @@ dependencies = [ "bevy_derive", "bevy_diagnostic", "bevy_ecs", - "bevy_gilrs", "bevy_gizmos", "bevy_gltf", "bevy_image", @@ -1065,17 +1044,14 @@ dependencies = [ "bevy_log", "bevy_math", "bevy_pbr", - "bevy_picking", "bevy_platform", "bevy_ptr", "bevy_reflect", "bevy_remote", "bevy_render", "bevy_scene", - "bevy_sprite", "bevy_state", "bevy_tasks", - "bevy_text", "bevy_time", "bevy_transform", "bevy_ui", @@ -1230,31 +1206,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "bevy_picking" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ed04757938655ed8094ea1efb533f99063a8b22abffc22010c694d291522850" -dependencies = [ - "bevy_app", - "bevy_asset", - "bevy_derive", - "bevy_ecs", - "bevy_input", - "bevy_math", - "bevy_mesh", - "bevy_platform", - "bevy_reflect", - "bevy_render", - "bevy_time", - "bevy_transform", - "bevy_utils", - "bevy_window", - "crossbeam-channel", - "tracing", - "uuid", -] - [[package]] name = "bevy_platform" version = "0.16.1" @@ -1453,13 +1404,11 @@ dependencies = [ "bevy_ecs", "bevy_image", "bevy_math", - "bevy_picking", "bevy_platform", "bevy_reflect", "bevy_render", "bevy_transform", "bevy_utils", - "bevy_window", "bitflags 2.9.1", "bytemuck", "derive_more", @@ -1503,13 +1452,11 @@ version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b674242641cab680688fc3b850243b351c1af49d4f3417a576debd6cca8dcf5" dependencies = [ - "async-channel", "async-executor", "async-task", "atomic-waker", "bevy_platform", "cfg-if", - "concurrent-queue", "crossbeam-queue", "derive_more", "futures-channel", @@ -1599,7 +1546,6 @@ dependencies = [ "bevy_image", "bevy_input", "bevy_math", - "bevy_picking", "bevy_platform", "bevy_reflect", "bevy_render", @@ -1659,10 +1605,8 @@ dependencies = [ "approx 0.5.1", "bevy_a11y", "bevy_app", - "bevy_asset", "bevy_derive", "bevy_ecs", - "bevy_image", "bevy_input", "bevy_input_focus", "bevy_log", @@ -1672,7 +1616,6 @@ dependencies = [ "bevy_tasks", "bevy_utils", "bevy_window", - "bytemuck", "cfg-if", "crossbeam-channel", "raw-window-handle", @@ -1680,7 +1623,6 @@ dependencies = [ "tracing", "wasm-bindgen", "web-sys", - "wgpu-types", "winit", ] @@ -2188,16 +2130,6 @@ dependencies = [ "libc", ] -[[package]] -name = "core-foundation" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "core-foundation-sys" version = "0.8.7" @@ -2211,7 +2143,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" dependencies = [ "bitflags 1.3.2", - "core-foundation 0.9.4", + "core-foundation", "core-graphics-types", "foreign-types", "libc", @@ -2224,7 +2156,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" dependencies = [ "bitflags 1.3.2", - "core-foundation 0.9.4", + "core-foundation", "libc", ] @@ -3020,40 +2952,6 @@ dependencies = [ "wasi 0.14.2+wasi-0.2.4", ] -[[package]] -name = "gilrs" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb2c998745a3c1ac90f64f4f7b3a54219fd3612d7705e7798212935641ed18f" -dependencies = [ - "fnv", - "gilrs-core", - "log", - "uuid", - "vec_map", -] - -[[package]] -name = "gilrs-core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6d95ae10ce5aa99543a28cf74e41c11f3b9e3c14f0452bbde46024753cd683e" -dependencies = [ - "core-foundation 0.10.1", - "inotify", - "io-kit-sys", - "js-sys", - "libc", - "libudev-sys", - "log", - "nix 0.29.0", - "uuid", - "vec_map", - "wasm-bindgen", - "web-sys", - "windows 0.61.3", -] - [[package]] name = "gimli" version = "0.31.1" @@ -3520,26 +3418,6 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a257582fdcde896fd96463bf2d40eefea0580021c0712a0e2b028b60b47a837a" -[[package]] -name = "inotify" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3" -dependencies = [ - "bitflags 2.9.1", - "inotify-sys", - "libc", -] - -[[package]] -name = "inotify-sys" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" -dependencies = [ - "libc", -] - [[package]] name = "input-event-codes" version = "6.2.0" @@ -3555,16 +3433,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "io-kit-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "617ee6cf8e3f66f3b4ea67a4058564628cde41901316e19f559e14c7c72c5e7b" -dependencies = [ - "core-foundation-sys", - "mach2", -] - [[package]] name = "is_terminal_polyfill" version = "1.70.1" @@ -3734,17 +3602,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -[[package]] -name = "lewton" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "777b48df9aaab155475a83a7df3070395ea1ac6902f5cd062b8f2b028075c030" -dependencies = [ - "byteorder", - "ogg", - "tinyvec", -] - [[package]] name = "libc" version = "0.2.174" @@ -3778,16 +3635,6 @@ dependencies = [ "redox_syscall 0.5.13", ] -[[package]] -name = "libudev-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324" -dependencies = [ - "libc", - "pkg-config", -] - [[package]] name = "linux-raw-sys" version = "0.4.15" @@ -4210,18 +4057,6 @@ dependencies = [ "libc", ] -[[package]] -name = "nix" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" -dependencies = [ - "bitflags 2.9.1", - "cfg-if", - "cfg_aliases 0.2.1", - "libc", -] - [[package]] name = "nix" version = "0.30.1" @@ -4251,15 +4086,6 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "610a5acd306ec67f907abe5567859a3c693fb9886eb1f012ab8f2a47bef3db51" -[[package]] -name = "ntapi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" -dependencies = [ - "winapi", -] - [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -4411,15 +4237,6 @@ dependencies = [ "objc2-foundation", ] -[[package]] -name = "objc2-core-foundation" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c10c2894a6fed806ade6027bcd50662746363a9589d3ec9d9bef30a4e4bc166" -dependencies = [ - "bitflags 2.9.1", -] - [[package]] name = "objc2-core-image" version = "0.2.2" @@ -4597,15 +4414,6 @@ dependencies = [ "nonmax", ] -[[package]] -name = "ogg" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6951b4e8bf21c8193da321bcce9c9dd2e13c858fe078bf9054a288b419ae5d6e" -dependencies = [ - "byteorder", -] - [[package]] name = "once_cell" version = "1.21.3" @@ -5294,7 +5102,6 @@ checksum = "e7ceb6607dd738c99bc8cb28eff249b7cd5c8ec88b9db96c0608c1480d140fb1" dependencies = [ "cpal", "hound", - "lewton", "symphonia", ] @@ -5984,19 +5791,6 @@ dependencies = [ "libc", ] -[[package]] -name = "sysinfo" -version = "0.34.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4b93974b3d3aeaa036504b8eefd4c039dced109171c1ae973f1dc63b2c7e4b2" -dependencies = [ - "libc", - "memchr", - "ntapi", - "objc2-core-foundation", - "windows 0.57.0", -] - [[package]] name = "taffy" version = "0.7.7" @@ -6606,12 +6400,6 @@ dependencies = [ "syn 2.0.104", ] -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - [[package]] name = "version_check" version = "0.9.5" @@ -7030,16 +6818,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" -dependencies = [ - "windows-core 0.57.0", - "windows-targets 0.52.6", -] - [[package]] name = "windows" version = "0.58.0" @@ -7082,18 +6860,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-core" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" -dependencies = [ - "windows-implement 0.57.0", - "windows-interface 0.57.0", - "windows-result 0.1.2", - "windows-targets 0.52.6", -] - [[package]] name = "windows-core" version = "0.58.0" @@ -7131,17 +6897,6 @@ dependencies = [ "windows-threading", ] -[[package]] -name = "windows-implement" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.104", -] - [[package]] name = "windows-implement" version = "0.58.0" @@ -7164,17 +6919,6 @@ dependencies = [ "syn 2.0.104", ] -[[package]] -name = "windows-interface" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.104", -] - [[package]] name = "windows-interface" version = "0.58.0" @@ -7570,7 +7314,7 @@ dependencies = [ "calloop 0.13.0", "cfg_aliases 0.2.1", "concurrent-queue", - "core-foundation 0.9.4", + "core-foundation", "core-graphics", "cursor-icon", "dpi", diff --git a/Cargo.toml b/Cargo.toml index 14e08a0..a9ccf40 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -79,13 +79,40 @@ mint = "0.5.9" tokio = { version = "1.39.2", features = ["rt-multi-thread", "signal", "time"] } # bevy -bevy = { version = "0.16", features = ["wayland", "mp3", "wav", "animation", "qoi", "png", "hdr", "jpeg"] } +bevy = { version = "0.16", default-features = false, features = [ + "animation", + "bevy_animation", + # default features + "bevy_asset", + "bevy_audio", + "bevy_color", + "bevy_core_pipeline", + "bevy_gizmos", + "bevy_gltf", + "bevy_log", + "bevy_pbr", + "bevy_render", + "bevy_window", + "bevy_winit", + "std", + "x11", + # non default features we need + "wayland", + "mp3", + "wav", + "qoi", + "png", + "hdr", + "jpeg", +] } bevy_mod_xr = "0.3" bevy_mod_openxr = "0.3" # bevy_sk.git = "https://github.com/MalekiRe/bevy_sk" bevy_sk = { git = "https://github.com/Schmarni-Dev/bevy_sk", branch = "fix_mat_stuff" } -# bevy_sk.path = "../bevy_sk" -bevy-mesh-text-3d.git = "https://github.com/terhechte/bevy-mesh-text-3d" + +# bevy-mesh-text-3d.git = "https://github.com/terhechte/bevy-mesh-text-3d" +# use my fork until my pr to use minimal bevy features was merged +bevy-mesh-text-3d.git = "https://github.com/Schmarni-Dev/bevy-mesh-text-3d" openxr = "0.19" diff --git a/src/main.rs b/src/main.rs index 98cc752..ece48ff 100644 --- a/src/main.rs +++ b/src/main.rs @@ -26,7 +26,6 @@ use bevy::pbr::PbrPlugin; use bevy::render::settings::{Backends, RenderCreation, WgpuSettings}; use bevy::render::{RenderDebugFlags, RenderPlugin}; use bevy::scene::ScenePlugin; -use bevy::text::FontLoader; use bevy::winit::{WakeUp, WinitPlugin}; use bevy_mod_openxr::action_set_attaching::OxrActionAttachingPlugin; use bevy_mod_openxr::action_set_syncing::OxrActionSyncingPlugin; @@ -351,7 +350,6 @@ fn bevy_loop( // bevy_sk::skytext::SphericalHarmonicsPlugin, )); // app.add_plugins(HandGizmosPlugin); - app.init_asset::().init_asset_loader::(); app.world_mut().resource_mut::().brightness = 2000.0; if let Some(priority) = args.overlay_priority { app.insert_resource(OxrOverlaySettings {