From 92e5afb37eb3b85df8d841630faab659c281b8a2 Mon Sep 17 00:00:00 2001 From: Charlotte McElwain Date: Wed, 8 May 2024 20:05:24 -0700 Subject: [PATCH] Egui. --- Cargo.lock | 1882 +++++++---------- Cargo.toml | 2 +- bevy_nannou/src/lib.rs | 1 + bevy_nannou_draw/src/draw/background.rs | 2 +- bevy_nannou_draw/src/draw/mod.rs | 2 +- bevy_nannou_draw/src/draw/properties/color.rs | 4 +- bevy_nannou_draw/src/draw/theme.rs | 4 +- bevy_nannou_draw/src/lib.rs | 6 +- bevy_nannou_draw/src/render.rs | 6 +- examples/Cargo.toml | 14 +- examples/audio/feedback.rs | 4 +- examples/audio/hrtf-noise.rs | 8 +- examples/audio/record_wav.rs | 8 +- examples/audio/simple_audio.rs | 8 +- examples/audio/simple_audio_file.rs | 6 +- examples/communication/osc_receiver.rs | 6 +- examples/communication/osc_sender.rs | 4 +- examples/draw/draw_blend.rs | 2 +- examples/draw/draw_capture.rs | 8 +- examples/draw/draw_capture_hi_res.rs | 2 +- examples/draw/draw_mesh.rs | 6 +- examples/draw/draw_polygon.rs | 6 +- examples/draw/draw_polyline.rs | 6 +- examples/draw/draw_text_path.rs | 6 +- examples/draw/draw_texture.rs | 6 +- examples/draw/draw_texture_sampler.rs | 6 +- examples/draw/draw_textured_mesh.rs | 6 +- examples/draw/draw_textured_path.rs | 6 +- examples/draw/draw_textured_polygon.rs | 6 +- examples/draw/draw_transform.rs | 8 +- examples/isf/isf_demo.rs | 6 +- examples/laser/laser_frame_stream.rs | 14 +- examples/laser/laser_frame_stream_gui.rs | 12 +- examples/laser/laser_ilda_idtf.rs | 2 +- examples/laser/laser_raw_stream.rs | 4 +- examples/nannou_basics/all_functions.rs | 2 +- examples/nannou_basics/multi_window.rs | 6 +- examples/nannou_basics/multi_window_draw.rs | 4 +- examples/nannou_basics/simple_window.rs | 2 +- examples/nannou_basics/window_coordinates.rs | 6 +- examples/offline/tree.rs | 10 +- examples/rust_basics/1_nannou_events.rs | 2 +- .../rust_basics/2_variables_window_console.rs | 2 +- examples/rust_basics/3_variable_scope.rs | 2 +- examples/rust_basics/4_conditionals.rs | 4 +- examples/rust_basics/5_loops.rs | 2 +- examples/rust_basics/6_functions.rs | 2 +- examples/rust_basics/7_modules/7_modules.rs | 8 +- examples/rust_basics/7_modules/ball.rs | 2 +- examples/templates/template_app.rs | 4 +- examples/templates/template_sketch.rs | 4 +- examples/ui/egui/circle_packing.rs | 4 +- examples/ui/egui/simple_ui.rs | 36 +- examples/ui/egui/tune_color.rs | 6 +- guide/src/changelog.md | 2 +- guide/src/getting_started/create_a_project.md | 2 +- guide/src/tutorials/basics/draw-a-sketch.md | 12 +- guide/src/tutorials/basics/sketch-vs-app.md | 12 +- .../src/tutorials/draw/animating-a-circle.md | 8 +- guide/src/tutorials/draw/drawing-2d-shapes.md | 4 +- guide/src/tutorials/draw/drawing-images.md | 12 +- guide/src/tutorials/osc/osc-sender.md | 4 +- nannou/Cargo.toml | 6 +- nannou/src/app.rs | 88 +- nannou/src/prelude.rs | 1 + nannou/src/window.rs | 13 + .../1_10_motion101_acceleration.rs | 6 +- .../1_11_motion101_acceleration_array.rs | 6 +- .../1_1_bouncingball_novectors.rs | 8 +- .../1_2_bouncingball_vectors.rs | 6 +- .../1_2_bouncingball_vectors_object.rs | 6 +- .../chp_01_vectors/1_3_vector_subtraction.rs | 6 +- .../1_4_vector_multiplication.rs | 6 +- .../chp_01_vectors/1_5_vector_magnitude.rs | 6 +- .../chp_01_vectors/1_6_vector_normalize.rs | 6 +- .../chp_01_vectors/1_7_motion101.rs | 6 +- .../1_8_motion101_acceleration.rs | 6 +- .../1_9_motion101_acceleration.rs | 6 +- .../2_10_exercise_attract_repel.rs | 8 +- nature_of_code/chp_02_forces/2_1_forces.rs | 6 +- .../chp_02_forces/2_2_forces_many.rs | 6 +- .../2_3_forces_many_real_gravity.rs | 6 +- .../chp_02_forces/2_4_forces_friction.rs | 6 +- .../chp_02_forces/2_4_forces_no_friction.rs | 6 +- .../chp_02_forces/2_5_fluid_resistance.rs | 8 +- .../chp_02_forces/2_6_attraction.rs | 8 +- .../chp_02_forces/2_7_attraction_many.rs | 8 +- .../chp_02_forces/2_8_mutual_attraction.rs | 6 +- .../2_forces_many_mutual_boundaries.rs | 6 +- .../chp_03_oscillation/3_01_angular_motion.rs | 8 +- .../3_02_forces_angular_motion.rs | 8 +- .../3_04_exercise_spiral.rs | 8 +- .../3_04_polar_to_cartesian.rs | 8 +- .../3_04_polar_to_cartesian_trail.rs | 8 +- .../3_05_simple_harmonic_motion.rs | 6 +- .../3_06_simple_harmonic_motion.rs | 8 +- .../3_07_oscillating_objects.rs | 6 +- .../3_08_static_wave_lines.rs | 8 +- .../3_09_exercise_additive_wave.rs | 4 +- .../chp_03_oscillation/3_09_wave.rs | 8 +- .../chp_03_oscillation/3_09_wave_a.rs | 8 +- .../chp_03_oscillation/3_09_wave_b.rs | 8 +- .../chp_03_oscillation/3_09_wave_c.rs | 8 +- .../3_10_exercise_oop_wave.rs | 6 +- .../3_10_pendulum_example.rs | 6 +- .../3_10_pendulum_example_simplified.rs | 6 +- .../3_11_exercise_additive_wave.rs | 4 +- .../chp_03_oscillation/3_11_spring.rs | 10 +- .../3_16_exercise_springs.rs | 8 +- .../3_16_exercise_springs_array.rs | 8 +- .../3_exercise_spring_sine.rs | 8 +- .../3_extra_oscillating_body.rs | 8 +- .../3_extra_oscillating_up_and_down.rs | 8 +- .../3_multiple_oscillations.rs | 8 +- .../3_oop_wave_particles.rs | 8 +- .../chp_04_systems/4_01_single_particle.rs | 6 +- .../4_01_single_particle_trail.rs | 6 +- .../chp_04_systems/4_02_vector_particle.rs | 6 +- .../4_03_exercise_moving_particle_system.rs | 8 +- .../4_03_particle_system_type.rs | 8 +- .../chp_04_systems/4_04_system_of_systems.rs | 8 +- ...article_system_inheritance_polymorphism.rs | 8 +- .../chp_04_systems/4_06_exercise_shatter.rs | 8 +- .../4_06_particle_system_forces.rs | 8 +- .../4_07_particle_system_forces_repeller.rs | 10 +- .../4_10_exercise_particle_intersection.rs | 8 +- .../4_10_exercise_particle_repel.rs | 8 +- nature_of_code/chp_06_agents/6_01_seek.rs | 6 +- .../chp_06_agents/6_01_seek_trail.rs | 4 +- nature_of_code/chp_06_agents/6_02_arrive.rs | 6 +- .../chp_06_agents/6_03_stay_within_walls.rs | 6 +- .../6_03_stay_within_walls_trail.rs | 6 +- .../7_01_wolfram_ca_figures.rs | 6 +- .../7_01_wolfram_ca_simple.rs | 6 +- .../7_02_game_of_life_simple.rs | 6 +- .../7_03_game_of_life_oop.rs | 8 +- .../7_04_exercise_wolfram_ca_scrolling.rs | 6 +- .../7_game_of_life_wrap_around.rs | 6 +- .../7_hexagon_cells.rs | 8 +- .../chp_08_fractals/8_1_recursion.rs | 8 +- .../chp_08_fractals/8_2_recursion.rs | 8 +- .../chp_08_fractals/8_3_recursion.rs | 8 +- .../chp_08_fractals/8_4_cantor_set.rs | 8 +- nature_of_code/chp_08_fractals/8_4_tree.rs | 12 +- .../9_1_ga_shakespeare.rs | 10 +- .../10_01_simple_perceptron.rs | 4 +- .../10_02_seeking_neural.rs | 6 +- .../10_03_network_viz.rs | 12 +- 148 files changed, 1242 insertions(+), 1691 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 81ac54750..0f0325fdf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "ab_glyph" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80179d7dd5d7e8c285d67c4a1e652972a92de7475beddfb92028c76463b13225" +checksum = "6f90148830dac590fac7ccfe78ec4a8ea404c60f75a24e16407a71f0f40de775" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -68,7 +68,7 @@ dependencies = [ "accesskit", "accesskit_macos", "accesskit_windows", - "raw-window-handle 0.6.0", + "raw-window-handle 0.6.1", "winit", ] @@ -100,10 +100,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if 1.0.0", - "getrandom 0.2.12", + "getrandom 0.2.15", "once_cell", "version_check", - "zerocopy 0.7.32", + "zerocopy 0.7.34", ] [[package]] @@ -126,9 +126,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "alsa" @@ -251,7 +251,7 @@ dependencies = [ "objc2 0.5.1", "objc2-app-kit", "objc2-foundation", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "windows-sys 0.48.0", "x11rb", ] @@ -330,13 +330,13 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" +checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928" dependencies = [ "concurrent-queue", - "event-listener 5.2.0", - "event-listener-strategy 0.5.0", + "event-listener 5.3.0", + "event-listener-strategy 0.5.2", "futures-core", "pin-project-lite", ] @@ -356,9 +356,9 @@ dependencies = [ [[package]] name = "async-fs" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc19683171f287921f2405677dd2ed2549c3b3bda697a563ebc3a121ace2aba1" +checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" dependencies = [ "async-lock", "blocking", @@ -378,9 +378,9 @@ dependencies = [ [[package]] name = "async-task" -version = "4.7.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "atomic-waker" @@ -420,20 +420,20 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", ] [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", @@ -477,23 +477,16 @@ checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" - -[[package]] -name = "bevy" -version = "0.14.0-dev" -dependencies = [ - "bevy_internal 0.14.0-dev", -] +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bevy" version = "0.14.0-dev" -source = "git+https://github.com/bevyengine/bevy#fd4589d8dfd3da3683b2d6e0fafe3c678ac19038" +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" dependencies = [ - "bevy_internal 0.14.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_internal", ] [[package]] @@ -501,22 +494,22 @@ name = "bevy-inspector-egui" version = "0.24.0" dependencies = [ "bevy-inspector-egui-derive", - "bevy_app 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_asset 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_color 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_core 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_core_pipeline 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_ecs 0.14.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_app", + "bevy_asset", + "bevy_color", + "bevy_core", + "bevy_core_pipeline", + "bevy_ecs", "bevy_egui", - "bevy_hierarchy 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_log 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_math 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_pbr 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_reflect 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_render 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_time 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_utils 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_window 0.14.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_hierarchy", + "bevy_log", + "bevy_math", + "bevy_pbr", + "bevy_reflect", + "bevy_render", + "bevy_time", + "bevy_utils", + "bevy_window", "bytemuck", "egui", "egui-dropdown", @@ -531,53 +524,44 @@ dependencies = [ name = "bevy-inspector-egui-derive" version = "0.24.0" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.82", + "quote 1.0.36", + "syn 2.0.61", ] [[package]] name = "bevy_a11y" version = "0.14.0-dev" +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" dependencies = [ "accesskit", - "bevy_app 0.14.0-dev", - "bevy_derive 0.14.0-dev", - "bevy_ecs 0.14.0-dev", -] - -[[package]] -name = "bevy_a11y" -version = "0.14.0-dev" -source = "git+https://github.com/bevyengine/bevy#fd4589d8dfd3da3683b2d6e0fafe3c678ac19038" -dependencies = [ - "accesskit", - "bevy_app 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_derive 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_ecs 0.14.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_app", + "bevy_derive", + "bevy_ecs", ] [[package]] name = "bevy_animation" version = "0.14.0-dev" -dependencies = [ - "bevy_app 0.14.0-dev", - "bevy_asset 0.14.0-dev", - "bevy_color 0.14.0-dev", - "bevy_core 0.14.0-dev", - "bevy_derive 0.14.0-dev", - "bevy_ecs 0.14.0-dev", - "bevy_hierarchy 0.14.0-dev", - "bevy_log 0.14.0-dev", - "bevy_math 0.14.0-dev", - "bevy_reflect 0.14.0-dev", - "bevy_render 0.14.0-dev", - "bevy_time 0.14.0-dev", - "bevy_transform 0.14.0-dev", - "bevy_utils 0.14.0-dev", +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" +dependencies = [ + "bevy_app", + "bevy_asset", + "bevy_color", + "bevy_core", + "bevy_derive", + "bevy_ecs", + "bevy_hierarchy", + "bevy_log", + "bevy_math", + "bevy_reflect", + "bevy_render", + "bevy_time", + "bevy_transform", + "bevy_utils", "blake3", - "fixedbitset 0.5.6", - "petgraph 0.6.4", + "fixedbitset 0.5.7", + "petgraph 0.6.5", "ron", "serde", "thiserror", @@ -588,12 +572,13 @@ dependencies = [ [[package]] name = "bevy_app" version = "0.14.0-dev" +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" dependencies = [ - "bevy_derive 0.14.0-dev", - "bevy_ecs 0.14.0-dev", - "bevy_reflect 0.14.0-dev", - "bevy_tasks 0.14.0-dev", - "bevy_utils 0.14.0-dev", + "bevy_derive", + "bevy_ecs", + "bevy_reflect", + "bevy_tasks", + "bevy_utils", "console_error_panic_hook", "downcast-rs", "thiserror", @@ -601,75 +586,28 @@ dependencies = [ "web-sys", ] -[[package]] -name = "bevy_app" -version = "0.14.0-dev" -source = "git+https://github.com/bevyengine/bevy#fd4589d8dfd3da3683b2d6e0fafe3c678ac19038" -dependencies = [ - "bevy_derive 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_ecs 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_reflect 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_tasks 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_utils 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "console_error_panic_hook", - "downcast-rs", - "thiserror", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "bevy_asset" -version = "0.14.0-dev" -dependencies = [ - "async-broadcast", - "async-fs", - "async-lock", - "bevy_app 0.14.0-dev", - "bevy_asset_macros 0.14.0-dev", - "bevy_ecs 0.14.0-dev", - "bevy_reflect 0.14.0-dev", - "bevy_tasks 0.14.0-dev", - "bevy_utils 0.14.0-dev", - "bevy_winit 0.14.0-dev", - "blake3", - "crossbeam-channel", - "downcast-rs", - "futures-io", - "futures-lite", - "js-sys", - "parking_lot 0.12.1", - "ron", - "serde", - "thiserror", - "uuid 1.8.0", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - [[package]] name = "bevy_asset" version = "0.14.0-dev" -source = "git+https://github.com/bevyengine/bevy#fd4589d8dfd3da3683b2d6e0fafe3c678ac19038" +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" dependencies = [ "async-broadcast", "async-fs", "async-lock", - "bevy_app 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_asset_macros 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_ecs 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_reflect 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_tasks 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_utils 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_winit 0.14.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_app", + "bevy_asset_macros", + "bevy_ecs", + "bevy_reflect", + "bevy_tasks", + "bevy_utils", + "bevy_winit", "blake3", "crossbeam-channel", "downcast-rs", "futures-io", "futures-lite", "js-sys", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "ron", "serde", "thiserror", @@ -682,37 +620,28 @@ dependencies = [ [[package]] name = "bevy_asset_macros" version = "0.14.0-dev" +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" dependencies = [ - "bevy_macro_utils 0.14.0-dev", - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", -] - -[[package]] -name = "bevy_asset_macros" -version = "0.14.0-dev" -source = "git+https://github.com/bevyengine/bevy#fd4589d8dfd3da3683b2d6e0fafe3c678ac19038" -dependencies = [ - "bevy_macro_utils 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "bevy_macro_utils", + "proc-macro2 1.0.82", + "quote 1.0.36", + "syn 2.0.61", ] [[package]] name = "bevy_audio" version = "0.14.0-dev" -dependencies = [ - "bevy_app 0.14.0-dev", - "bevy_asset 0.14.0-dev", - "bevy_derive 0.14.0-dev", - "bevy_ecs 0.14.0-dev", - "bevy_hierarchy 0.14.0-dev", - "bevy_math 0.14.0-dev", - "bevy_reflect 0.14.0-dev", - "bevy_transform 0.14.0-dev", - "bevy_utils 0.14.0-dev", +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" +dependencies = [ + "bevy_app", + "bevy_asset", + "bevy_derive", + "bevy_ecs", + "bevy_hierarchy", + "bevy_math", + "bevy_reflect", + "bevy_transform", + "bevy_utils", "cpal 0.15.3", "rodio", ] @@ -720,23 +649,10 @@ dependencies = [ [[package]] name = "bevy_color" version = "0.14.0-dev" +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" dependencies = [ - "bevy_math 0.14.0-dev", - "bevy_reflect 0.14.0-dev", - "bytemuck", - "encase", - "serde", - "thiserror", - "wgpu-types", -] - -[[package]] -name = "bevy_color" -version = "0.14.0-dev" -source = "git+https://github.com/bevyengine/bevy#fd4589d8dfd3da3683b2d6e0fafe3c678ac19038" -dependencies = [ - "bevy_math 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_reflect 0.14.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_math", + "bevy_reflect", "bytemuck", "encase", "serde", @@ -747,43 +663,32 @@ dependencies = [ [[package]] name = "bevy_core" version = "0.14.0-dev" +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" dependencies = [ - "bevy_app 0.14.0-dev", - "bevy_ecs 0.14.0-dev", - "bevy_reflect 0.14.0-dev", - "bevy_tasks 0.14.0-dev", - "bevy_utils 0.14.0-dev", - "uuid 1.8.0", -] - -[[package]] -name = "bevy_core" -version = "0.14.0-dev" -source = "git+https://github.com/bevyengine/bevy#fd4589d8dfd3da3683b2d6e0fafe3c678ac19038" -dependencies = [ - "bevy_app 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_ecs 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_reflect 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_tasks 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_utils 0.14.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_app", + "bevy_ecs", + "bevy_reflect", + "bevy_tasks", + "bevy_utils", "uuid 1.8.0", ] [[package]] name = "bevy_core_pipeline" version = "0.14.0-dev" -dependencies = [ - "bevy_app 0.14.0-dev", - "bevy_asset 0.14.0-dev", - "bevy_color 0.14.0-dev", - "bevy_core 0.14.0-dev", - "bevy_derive 0.14.0-dev", - "bevy_ecs 0.14.0-dev", - "bevy_math 0.14.0-dev", - "bevy_reflect 0.14.0-dev", - "bevy_render 0.14.0-dev", - "bevy_transform 0.14.0-dev", - "bevy_utils 0.14.0-dev", +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" +dependencies = [ + "bevy_app", + "bevy_asset", + "bevy_color", + "bevy_core", + "bevy_derive", + "bevy_ecs", + "bevy_math", + "bevy_reflect", + "bevy_render", + "bevy_transform", + "bevy_utils", "bitflags 2.5.0", "nonmax", "radsort", @@ -791,139 +696,68 @@ dependencies = [ "thiserror", ] -[[package]] -name = "bevy_core_pipeline" -version = "0.14.0-dev" -source = "git+https://github.com/bevyengine/bevy#fd4589d8dfd3da3683b2d6e0fafe3c678ac19038" -dependencies = [ - "bevy_app 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_asset 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_color 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_core 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_derive 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_ecs 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_math 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_reflect 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_render 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_transform 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_utils 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bitflags 2.5.0", - "nonmax", - "radsort", - "serde", -] - -[[package]] -name = "bevy_derive" -version = "0.14.0-dev" -dependencies = [ - "bevy_macro_utils 0.14.0-dev", - "quote 1.0.35", - "syn 2.0.53", -] - [[package]] name = "bevy_derive" version = "0.14.0-dev" -source = "git+https://github.com/bevyengine/bevy#fd4589d8dfd3da3683b2d6e0fafe3c678ac19038" +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" dependencies = [ - "bevy_macro_utils 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "quote 1.0.35", - "syn 2.0.53", + "bevy_macro_utils", + "quote 1.0.36", + "syn 2.0.61", ] [[package]] name = "bevy_diagnostic" version = "0.14.0-dev" +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" dependencies = [ - "bevy_app 0.14.0-dev", - "bevy_core 0.14.0-dev", - "bevy_ecs 0.14.0-dev", - "bevy_time 0.14.0-dev", - "bevy_utils 0.14.0-dev", + "bevy_app", + "bevy_core", + "bevy_ecs", + "bevy_time", + "bevy_utils", "const-fnv1a-hash", "sysinfo", ] -[[package]] -name = "bevy_diagnostic" -version = "0.14.0-dev" -source = "git+https://github.com/bevyengine/bevy#fd4589d8dfd3da3683b2d6e0fafe3c678ac19038" -dependencies = [ - "bevy_app 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_core 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_ecs 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_time 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_utils 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "const-fnv1a-hash", -] - [[package]] name = "bevy_ecs" version = "0.14.0-dev" +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" dependencies = [ "arrayvec 0.7.4", - "bevy_ecs_macros 0.14.0-dev", - "bevy_ptr 0.14.0-dev", - "bevy_reflect 0.14.0-dev", - "bevy_tasks 0.14.0-dev", - "bevy_utils 0.14.0-dev", + "bevy_ecs_macros", + "bevy_ptr", + "bevy_reflect", + "bevy_tasks", + "bevy_utils", "bitflags 2.5.0", "concurrent-queue", - "fixedbitset 0.5.6", + "fixedbitset 0.5.7", "nonmax", - "petgraph 0.6.4", + "petgraph 0.6.5", "serde", "thiserror", ] -[[package]] -name = "bevy_ecs" -version = "0.14.0-dev" -source = "git+https://github.com/bevyengine/bevy#fd4589d8dfd3da3683b2d6e0fafe3c678ac19038" -dependencies = [ - "bevy_ecs_macros 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_ptr 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_reflect 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_tasks 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_utils 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bitflags 2.5.0", - "concurrent-queue", - "fixedbitset 0.5.6", - "nonmax", - "petgraph 0.6.4", - "serde", - "thiserror", -] - -[[package]] -name = "bevy_ecs_macros" -version = "0.14.0-dev" -dependencies = [ - "bevy_macro_utils 0.14.0-dev", - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", -] - [[package]] name = "bevy_ecs_macros" version = "0.14.0-dev" -source = "git+https://github.com/bevyengine/bevy#fd4589d8dfd3da3683b2d6e0fafe3c678ac19038" +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" dependencies = [ - "bevy_macro_utils 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "bevy_macro_utils", + "proc-macro2 1.0.82", + "quote 1.0.36", + "syn 2.0.61", ] [[package]] name = "bevy_egui" version = "0.26.0" -source = "git+https://github.com/tychedelia/bevy_egui#b8d21a0c06229aae481fda4e502bfaba6270d30c" +source = "git+https://github.com/tychedelia/bevy_egui#c4efb724832e32590f1d06a48d1e0df4c847fe76" dependencies = [ "arboard", - "bevy 0.14.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy", "bytemuck", "console_log", "crossbeam-channel", @@ -941,29 +775,22 @@ dependencies = [ [[package]] name = "bevy_encase_derive" version = "0.14.0-dev" +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" dependencies = [ - "bevy_macro_utils 0.14.0-dev", - "encase_derive_impl", -] - -[[package]] -name = "bevy_encase_derive" -version = "0.14.0-dev" -source = "git+https://github.com/bevyengine/bevy#fd4589d8dfd3da3683b2d6e0fafe3c678ac19038" -dependencies = [ - "bevy_macro_utils 0.14.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_macro_utils", "encase_derive_impl", ] [[package]] name = "bevy_gilrs" version = "0.14.0-dev" +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" dependencies = [ - "bevy_app 0.14.0-dev", - "bevy_ecs 0.14.0-dev", - "bevy_input 0.14.0-dev", - "bevy_time 0.14.0-dev", - "bevy_utils 0.14.0-dev", + "bevy_app", + "bevy_ecs", + "bevy_input", + "bevy_time", + "bevy_utils", "gilrs", "thiserror", ] @@ -971,55 +798,58 @@ dependencies = [ [[package]] name = "bevy_gizmos" version = "0.14.0-dev" +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" dependencies = [ - "bevy_app 0.14.0-dev", - "bevy_asset 0.14.0-dev", - "bevy_color 0.14.0-dev", - "bevy_core_pipeline 0.14.0-dev", - "bevy_ecs 0.14.0-dev", + "bevy_app", + "bevy_asset", + "bevy_color", + "bevy_core_pipeline", + "bevy_ecs", "bevy_gizmos_macros", - "bevy_math 0.14.0-dev", - "bevy_pbr 0.14.0-dev", - "bevy_reflect 0.14.0-dev", - "bevy_render 0.14.0-dev", + "bevy_math", + "bevy_pbr", + "bevy_reflect", + "bevy_render", "bevy_sprite", - "bevy_time 0.14.0-dev", - "bevy_transform 0.14.0-dev", - "bevy_utils 0.14.0-dev", + "bevy_time", + "bevy_transform", + "bevy_utils", "bytemuck", ] [[package]] name = "bevy_gizmos_macros" version = "0.14.0-dev" +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" dependencies = [ - "bevy_macro_utils 0.14.0-dev", - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "bevy_macro_utils", + "proc-macro2 1.0.82", + "quote 1.0.36", + "syn 2.0.61", ] [[package]] name = "bevy_gltf" version = "0.14.0-dev" +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" dependencies = [ - "base64 0.22.0", + "base64 0.22.1", "bevy_animation", - "bevy_app 0.14.0-dev", - "bevy_asset 0.14.0-dev", - "bevy_color 0.14.0-dev", - "bevy_core 0.14.0-dev", - "bevy_core_pipeline 0.14.0-dev", - "bevy_ecs 0.14.0-dev", - "bevy_hierarchy 0.14.0-dev", - "bevy_math 0.14.0-dev", - "bevy_pbr 0.14.0-dev", - "bevy_reflect 0.14.0-dev", - "bevy_render 0.14.0-dev", - "bevy_scene 0.14.0-dev", - "bevy_tasks 0.14.0-dev", - "bevy_transform 0.14.0-dev", - "bevy_utils 0.14.0-dev", + "bevy_app", + "bevy_asset", + "bevy_color", + "bevy_core", + "bevy_core_pipeline", + "bevy_ecs", + "bevy_hierarchy", + "bevy_math", + "bevy_pbr", + "bevy_reflect", + "bevy_render", + "bevy_scene", + "bevy_tasks", + "bevy_transform", + "bevy_utils", "gltf", "percent-encoding 2.3.1", "serde", @@ -1031,51 +861,26 @@ dependencies = [ [[package]] name = "bevy_hierarchy" version = "0.14.0-dev" +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" dependencies = [ - "bevy_app 0.14.0-dev", - "bevy_core 0.14.0-dev", - "bevy_ecs 0.14.0-dev", - "bevy_reflect 0.14.0-dev", - "bevy_utils 0.14.0-dev", - "smallvec 1.13.2", -] - -[[package]] -name = "bevy_hierarchy" -version = "0.14.0-dev" -source = "git+https://github.com/bevyengine/bevy#fd4589d8dfd3da3683b2d6e0fafe3c678ac19038" -dependencies = [ - "bevy_app 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_core 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_ecs 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_reflect 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_utils 0.14.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_app", + "bevy_core", + "bevy_ecs", + "bevy_reflect", + "bevy_utils", "smallvec 1.13.2", ] [[package]] name = "bevy_input" version = "0.14.0-dev" +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" dependencies = [ - "bevy_app 0.14.0-dev", - "bevy_ecs 0.14.0-dev", - "bevy_math 0.14.0-dev", - "bevy_reflect 0.14.0-dev", - "bevy_utils 0.14.0-dev", - "smol_str", - "thiserror", -] - -[[package]] -name = "bevy_input" -version = "0.14.0-dev" -source = "git+https://github.com/bevyengine/bevy#fd4589d8dfd3da3683b2d6e0fafe3c678ac19038" -dependencies = [ - "bevy_app 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_ecs 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_math 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_reflect 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_utils 0.14.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_app", + "bevy_ecs", + "bevy_math", + "bevy_reflect", + "bevy_utils", "smol_str", "thiserror", ] @@ -1083,91 +888,51 @@ dependencies = [ [[package]] name = "bevy_internal" version = "0.14.0-dev" +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" dependencies = [ - "bevy_a11y 0.14.0-dev", + "bevy_a11y", "bevy_animation", - "bevy_app 0.14.0-dev", - "bevy_asset 0.14.0-dev", + "bevy_app", + "bevy_asset", "bevy_audio", - "bevy_color 0.14.0-dev", - "bevy_core 0.14.0-dev", - "bevy_core_pipeline 0.14.0-dev", - "bevy_derive 0.14.0-dev", - "bevy_diagnostic 0.14.0-dev", - "bevy_ecs 0.14.0-dev", + "bevy_color", + "bevy_core", + "bevy_core_pipeline", + "bevy_derive", + "bevy_diagnostic", + "bevy_ecs", "bevy_gilrs", "bevy_gizmos", "bevy_gltf", - "bevy_hierarchy 0.14.0-dev", - "bevy_input 0.14.0-dev", - "bevy_log 0.14.0-dev", - "bevy_math 0.14.0-dev", - "bevy_pbr 0.14.0-dev", - "bevy_ptr 0.14.0-dev", - "bevy_reflect 0.14.0-dev", - "bevy_render 0.14.0-dev", - "bevy_scene 0.14.0-dev", + "bevy_hierarchy", + "bevy_input", + "bevy_log", + "bevy_math", + "bevy_pbr", + "bevy_ptr", + "bevy_reflect", + "bevy_render", + "bevy_scene", "bevy_sprite", - "bevy_tasks 0.14.0-dev", + "bevy_tasks", "bevy_text", - "bevy_time 0.14.0-dev", - "bevy_transform 0.14.0-dev", + "bevy_time", + "bevy_transform", "bevy_ui", - "bevy_utils 0.14.0-dev", - "bevy_window 0.14.0-dev", - "bevy_winit 0.14.0-dev", -] - -[[package]] -name = "bevy_internal" -version = "0.14.0-dev" -source = "git+https://github.com/bevyengine/bevy#fd4589d8dfd3da3683b2d6e0fafe3c678ac19038" -dependencies = [ - "bevy_a11y 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_app 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_asset 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_color 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_core 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_derive 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_diagnostic 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_ecs 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_hierarchy 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_input 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_log 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_math 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_ptr 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_reflect 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_render 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_scene 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_tasks 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_time 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_transform 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_utils 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_window 0.14.0-dev (git+https://github.com/bevyengine/bevy)", -] - -[[package]] -name = "bevy_log" -version = "0.14.0-dev" -dependencies = [ - "android_log-sys", - "bevy_app 0.14.0-dev", - "bevy_ecs 0.14.0-dev", - "bevy_utils 0.14.0-dev", - "tracing-log", - "tracing-subscriber", - "tracing-wasm", + "bevy_utils", + "bevy_window", + "bevy_winit", ] [[package]] name = "bevy_log" version = "0.14.0-dev" -source = "git+https://github.com/bevyengine/bevy#fd4589d8dfd3da3683b2d6e0fafe3c678ac19038" +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" dependencies = [ "android_log-sys", - "bevy_app 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_ecs 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_utils 0.14.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_app", + "bevy_ecs", + "bevy_utils", "tracing-log", "tracing-subscriber", "tracing-wasm", @@ -1176,38 +941,18 @@ dependencies = [ [[package]] name = "bevy_macro_utils" version = "0.14.0-dev" +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", - "toml_edit 0.22.9", -] - -[[package]] -name = "bevy_macro_utils" -version = "0.14.0-dev" -source = "git+https://github.com/bevyengine/bevy#fd4589d8dfd3da3683b2d6e0fafe3c678ac19038" -dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", - "toml_edit 0.22.9", -] - -[[package]] -name = "bevy_math" -version = "0.14.0-dev" -dependencies = [ - "glam", - "rand 0.8.5", - "serde", - "thiserror", + "proc-macro2 1.0.82", + "quote 1.0.36", + "syn 2.0.61", + "toml_edit 0.22.12", ] [[package]] name = "bevy_math" version = "0.14.0-dev" -source = "git+https://github.com/bevyengine/bevy#fd4589d8dfd3da3683b2d6e0fafe3c678ac19038" +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" dependencies = [ "glam", "rand 0.8.5", @@ -1218,14 +963,7 @@ dependencies = [ [[package]] name = "bevy_mikktspace" version = "0.14.0-dev" -dependencies = [ - "glam", -] - -[[package]] -name = "bevy_mikktspace" -version = "0.14.0-dev" -source = "git+https://github.com/bevyengine/bevy#fd4589d8dfd3da3683b2d6e0fafe3c678ac19038" +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" dependencies = [ "glam", ] @@ -1234,7 +972,7 @@ dependencies = [ name = "bevy_nannou" version = "0.1.0" dependencies = [ - "bevy 0.14.0-dev", + "bevy", "bevy_nannou_draw", ] @@ -1242,7 +980,7 @@ dependencies = [ name = "bevy_nannou_draw" version = "0.1.0" dependencies = [ - "bevy 0.14.0-dev", + "bevy", "bytemuck", "lyon", "nannou_core", @@ -1255,48 +993,23 @@ dependencies = [ [[package]] name = "bevy_pbr" version = "0.14.0-dev" -dependencies = [ - "bevy_app 0.14.0-dev", - "bevy_asset 0.14.0-dev", - "bevy_color 0.14.0-dev", - "bevy_core_pipeline 0.14.0-dev", - "bevy_derive 0.14.0-dev", - "bevy_ecs 0.14.0-dev", - "bevy_math 0.14.0-dev", - "bevy_reflect 0.14.0-dev", - "bevy_render 0.14.0-dev", - "bevy_transform 0.14.0-dev", - "bevy_utils 0.14.0-dev", - "bevy_window 0.14.0-dev", - "bitflags 2.5.0", - "bytemuck", - "fixedbitset 0.5.6", - "nonmax", - "radsort", - "smallvec 1.13.2", - "static_assertions", -] - -[[package]] -name = "bevy_pbr" -version = "0.14.0-dev" -source = "git+https://github.com/bevyengine/bevy#fd4589d8dfd3da3683b2d6e0fafe3c678ac19038" -dependencies = [ - "bevy_app 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_asset 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_color 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_core_pipeline 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_derive 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_ecs 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_math 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_reflect 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_render 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_transform 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_utils 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_window 0.14.0-dev (git+https://github.com/bevyengine/bevy)", +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" +dependencies = [ + "bevy_app", + "bevy_asset", + "bevy_color", + "bevy_core_pipeline", + "bevy_derive", + "bevy_ecs", + "bevy_math", + "bevy_reflect", + "bevy_render", + "bevy_transform", + "bevy_utils", + "bevy_window", "bitflags 2.5.0", "bytemuck", - "fixedbitset 0.5.6", + "fixedbitset 0.5.7", "nonmax", "radsort", "smallvec 1.13.2", @@ -1306,43 +1019,21 @@ dependencies = [ [[package]] name = "bevy_ptr" version = "0.14.0-dev" - -[[package]] -name = "bevy_ptr" -version = "0.14.0-dev" -source = "git+https://github.com/bevyengine/bevy#fd4589d8dfd3da3683b2d6e0fafe3c678ac19038" - -[[package]] -name = "bevy_reflect" -version = "0.14.0-dev" -dependencies = [ - "bevy_math 0.14.0-dev", - "bevy_ptr 0.14.0-dev", - "bevy_reflect_derive 0.14.0-dev", - "bevy_utils 0.14.0-dev", - "downcast-rs", - "erased-serde", - "glam", - "petgraph 0.6.4", - "serde", - "smallvec 1.13.2", - "smol_str", - "thiserror", - "uuid 1.8.0", -] +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" [[package]] name = "bevy_reflect" version = "0.14.0-dev" -source = "git+https://github.com/bevyengine/bevy#fd4589d8dfd3da3683b2d6e0fafe3c678ac19038" +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" dependencies = [ - "bevy_math 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_ptr 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_reflect_derive 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_utils 0.14.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_math", + "bevy_ptr", + "bevy_reflect_derive", + "bevy_utils", "downcast-rs", "erased-serde", "glam", + "petgraph 0.6.5", "serde", "smallvec 1.13.2", "smol_str", @@ -1353,49 +1044,39 @@ dependencies = [ [[package]] name = "bevy_reflect_derive" version = "0.14.0-dev" +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" dependencies = [ - "bevy_macro_utils 0.14.0-dev", - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", - "uuid 1.8.0", -] - -[[package]] -name = "bevy_reflect_derive" -version = "0.14.0-dev" -source = "git+https://github.com/bevyengine/bevy#fd4589d8dfd3da3683b2d6e0fafe3c678ac19038" -dependencies = [ - "bevy_macro_utils 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "bevy_macro_utils", + "proc-macro2 1.0.82", + "quote 1.0.36", + "syn 2.0.61", "uuid 1.8.0", ] [[package]] name = "bevy_render" version = "0.14.0-dev" +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" dependencies = [ "async-channel", - "bevy_app 0.14.0-dev", - "bevy_asset 0.14.0-dev", - "bevy_color 0.14.0-dev", - "bevy_core 0.14.0-dev", - "bevy_derive 0.14.0-dev", - "bevy_diagnostic 0.14.0-dev", - "bevy_ecs 0.14.0-dev", - "bevy_encase_derive 0.14.0-dev", - "bevy_hierarchy 0.14.0-dev", - "bevy_math 0.14.0-dev", - "bevy_mikktspace 0.14.0-dev", - "bevy_reflect 0.14.0-dev", - "bevy_render_macros 0.14.0-dev", - "bevy_tasks 0.14.0-dev", - "bevy_time 0.14.0-dev", - "bevy_transform 0.14.0-dev", - "bevy_utils 0.14.0-dev", - "bevy_window 0.14.0-dev", + "bevy_app", + "bevy_asset", + "bevy_color", + "bevy_core", + "bevy_derive", + "bevy_diagnostic", + "bevy_ecs", + "bevy_encase_derive", + "bevy_hierarchy", + "bevy_math", + "bevy_mikktspace", + "bevy_reflect", + "bevy_render_macros", + "bevy_tasks", + "bevy_time", + "bevy_transform", + "bevy_utils", + "bevy_window", "bitflags 2.5.0", "bytemuck", "codespan-reporting", @@ -1419,104 +1100,31 @@ dependencies = [ "wgpu", ] -[[package]] -name = "bevy_render" -version = "0.14.0-dev" -source = "git+https://github.com/bevyengine/bevy#fd4589d8dfd3da3683b2d6e0fafe3c678ac19038" -dependencies = [ - "async-channel", - "bevy_app 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_asset 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_color 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_core 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_derive 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_diagnostic 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_ecs 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_encase_derive 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_hierarchy 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_math 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_mikktspace 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_reflect 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_render_macros 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_tasks 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_time 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_transform 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_utils 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_window 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bitflags 2.5.0", - "bytemuck", - "codespan-reporting", - "downcast-rs", - "encase", - "futures-lite", - "hexasphere", - "image 0.25.1", - "js-sys", - "naga 0.19.2", - "naga_oil", - "nonmax", - "send_wrapper", - "serde", - "smallvec 1.13.2", - "thiserror", - "wasm-bindgen", - "web-sys", - "wgpu", -] - -[[package]] -name = "bevy_render_macros" -version = "0.14.0-dev" -dependencies = [ - "bevy_macro_utils 0.14.0-dev", - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", -] - [[package]] name = "bevy_render_macros" version = "0.14.0-dev" -source = "git+https://github.com/bevyengine/bevy#fd4589d8dfd3da3683b2d6e0fafe3c678ac19038" +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" dependencies = [ - "bevy_macro_utils 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "bevy_macro_utils", + "proc-macro2 1.0.82", + "quote 1.0.36", + "syn 2.0.61", ] [[package]] name = "bevy_scene" version = "0.14.0-dev" -dependencies = [ - "bevy_app 0.14.0-dev", - "bevy_asset 0.14.0-dev", - "bevy_derive 0.14.0-dev", - "bevy_ecs 0.14.0-dev", - "bevy_hierarchy 0.14.0-dev", - "bevy_reflect 0.14.0-dev", - "bevy_render 0.14.0-dev", - "bevy_transform 0.14.0-dev", - "bevy_utils 0.14.0-dev", - "serde", - "thiserror", - "uuid 1.8.0", -] - -[[package]] -name = "bevy_scene" -version = "0.14.0-dev" -source = "git+https://github.com/bevyengine/bevy#fd4589d8dfd3da3683b2d6e0fafe3c678ac19038" -dependencies = [ - "bevy_app 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_asset 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_derive 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_ecs 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_hierarchy 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_reflect 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_render 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_transform 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_utils 0.14.0-dev (git+https://github.com/bevyengine/bevy)", +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" +dependencies = [ + "bevy_app", + "bevy_asset", + "bevy_derive", + "bevy_ecs", + "bevy_hierarchy", + "bevy_reflect", + "bevy_render", + "bevy_transform", + "bevy_utils", "serde", "thiserror", "uuid 1.8.0", @@ -1525,21 +1133,22 @@ dependencies = [ [[package]] name = "bevy_sprite" version = "0.14.0-dev" -dependencies = [ - "bevy_app 0.14.0-dev", - "bevy_asset 0.14.0-dev", - "bevy_color 0.14.0-dev", - "bevy_core_pipeline 0.14.0-dev", - "bevy_derive 0.14.0-dev", - "bevy_ecs 0.14.0-dev", - "bevy_math 0.14.0-dev", - "bevy_reflect 0.14.0-dev", - "bevy_render 0.14.0-dev", - "bevy_transform 0.14.0-dev", - "bevy_utils 0.14.0-dev", +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" +dependencies = [ + "bevy_app", + "bevy_asset", + "bevy_color", + "bevy_core_pipeline", + "bevy_derive", + "bevy_ecs", + "bevy_math", + "bevy_reflect", + "bevy_render", + "bevy_transform", + "bevy_utils", "bitflags 2.5.0", "bytemuck", - "fixedbitset 0.5.6", + "fixedbitset 0.5.7", "guillotiere", "radsort", "rectangle-pack", @@ -1549,6 +1158,7 @@ dependencies = [ [[package]] name = "bevy_tasks" version = "0.14.0-dev" +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" dependencies = [ "async-channel", "async-executor", @@ -1557,32 +1167,23 @@ dependencies = [ "wasm-bindgen-futures", ] -[[package]] -name = "bevy_tasks" -version = "0.14.0-dev" -source = "git+https://github.com/bevyengine/bevy#fd4589d8dfd3da3683b2d6e0fafe3c678ac19038" -dependencies = [ - "async-executor", - "futures-lite", - "wasm-bindgen-futures", -] - [[package]] name = "bevy_text" version = "0.14.0-dev" +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" dependencies = [ "ab_glyph", - "bevy_app 0.14.0-dev", - "bevy_asset 0.14.0-dev", - "bevy_color 0.14.0-dev", - "bevy_ecs 0.14.0-dev", - "bevy_math 0.14.0-dev", - "bevy_reflect 0.14.0-dev", - "bevy_render 0.14.0-dev", + "bevy_app", + "bevy_asset", + "bevy_color", + "bevy_ecs", + "bevy_math", + "bevy_reflect", + "bevy_render", "bevy_sprite", - "bevy_transform 0.14.0-dev", - "bevy_utils 0.14.0-dev", - "bevy_window 0.14.0-dev", + "bevy_transform", + "bevy_utils", + "bevy_window", "glyph_brush_layout", "serde", "thiserror", @@ -1591,74 +1192,51 @@ dependencies = [ [[package]] name = "bevy_time" version = "0.14.0-dev" +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" dependencies = [ - "bevy_app 0.14.0-dev", - "bevy_ecs 0.14.0-dev", - "bevy_reflect 0.14.0-dev", - "bevy_utils 0.14.0-dev", + "bevy_app", + "bevy_ecs", + "bevy_reflect", + "bevy_utils", "crossbeam-channel", "thiserror", ] -[[package]] -name = "bevy_time" -version = "0.14.0-dev" -source = "git+https://github.com/bevyengine/bevy#fd4589d8dfd3da3683b2d6e0fafe3c678ac19038" -dependencies = [ - "bevy_app 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_ecs 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_reflect 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_utils 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "crossbeam-channel", - "thiserror", -] - -[[package]] -name = "bevy_transform" -version = "0.14.0-dev" -dependencies = [ - "bevy_app 0.14.0-dev", - "bevy_ecs 0.14.0-dev", - "bevy_hierarchy 0.14.0-dev", - "bevy_math 0.14.0-dev", - "bevy_reflect 0.14.0-dev", - "thiserror", -] - [[package]] name = "bevy_transform" version = "0.14.0-dev" -source = "git+https://github.com/bevyengine/bevy#fd4589d8dfd3da3683b2d6e0fafe3c678ac19038" +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" dependencies = [ - "bevy_app 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_ecs 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_hierarchy 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_math 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_reflect 0.14.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_app", + "bevy_ecs", + "bevy_hierarchy", + "bevy_math", + "bevy_reflect", "thiserror", ] [[package]] name = "bevy_ui" version = "0.14.0-dev" -dependencies = [ - "bevy_a11y 0.14.0-dev", - "bevy_app 0.14.0-dev", - "bevy_asset 0.14.0-dev", - "bevy_color 0.14.0-dev", - "bevy_core_pipeline 0.14.0-dev", - "bevy_derive 0.14.0-dev", - "bevy_ecs 0.14.0-dev", - "bevy_hierarchy 0.14.0-dev", - "bevy_input 0.14.0-dev", - "bevy_math 0.14.0-dev", - "bevy_reflect 0.14.0-dev", - "bevy_render 0.14.0-dev", +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" +dependencies = [ + "bevy_a11y", + "bevy_app", + "bevy_asset", + "bevy_color", + "bevy_core_pipeline", + "bevy_derive", + "bevy_ecs", + "bevy_hierarchy", + "bevy_input", + "bevy_math", + "bevy_reflect", + "bevy_render", "bevy_sprite", "bevy_text", - "bevy_transform 0.14.0-dev", - "bevy_utils 0.14.0-dev", - "bevy_window 0.14.0-dev", + "bevy_transform", + "bevy_utils", + "bevy_window", "bytemuck", "nonmax", "smallvec 1.13.2", @@ -1669,25 +1247,12 @@ dependencies = [ [[package]] name = "bevy_utils" version = "0.14.0-dev" +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" dependencies = [ "ahash", - "bevy_utils_proc_macros 0.14.0-dev", - "getrandom 0.2.12", - "hashbrown 0.14.3", - "thread_local", - "tracing", - "web-time", -] - -[[package]] -name = "bevy_utils" -version = "0.14.0-dev" -source = "git+https://github.com/bevyengine/bevy#fd4589d8dfd3da3683b2d6e0fafe3c678ac19038" -dependencies = [ - "ahash", - "bevy_utils_proc_macros 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "getrandom 0.2.12", - "hashbrown 0.14.3", + "bevy_utils_proc_macros", + "getrandom 0.2.15", + "hashbrown 0.14.5", "thread_local", "tracing", "web-time", @@ -1696,99 +1261,50 @@ dependencies = [ [[package]] name = "bevy_utils_proc_macros" version = "0.14.0-dev" +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", -] - -[[package]] -name = "bevy_utils_proc_macros" -version = "0.14.0-dev" -source = "git+https://github.com/bevyengine/bevy#fd4589d8dfd3da3683b2d6e0fafe3c678ac19038" -dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.82", + "quote 1.0.36", + "syn 2.0.61", ] [[package]] name = "bevy_window" version = "0.14.0-dev" -dependencies = [ - "bevy_a11y 0.14.0-dev", - "bevy_app 0.14.0-dev", - "bevy_ecs 0.14.0-dev", - "bevy_math 0.14.0-dev", - "bevy_reflect 0.14.0-dev", - "bevy_utils 0.14.0-dev", - "raw-window-handle 0.6.0", +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" +dependencies = [ + "bevy_a11y", + "bevy_app", + "bevy_ecs", + "bevy_math", + "bevy_reflect", + "bevy_utils", + "raw-window-handle 0.6.1", "smol_str", ] -[[package]] -name = "bevy_window" -version = "0.14.0-dev" -source = "git+https://github.com/bevyengine/bevy#fd4589d8dfd3da3683b2d6e0fafe3c678ac19038" -dependencies = [ - "bevy_a11y 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_app 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_ecs 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_math 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_reflect 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_utils 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "raw-window-handle 0.6.0", - "smol_str", -] - -[[package]] -name = "bevy_winit" -version = "0.14.0-dev" -dependencies = [ - "accesskit_winit", - "approx 0.5.1", - "bevy_a11y 0.14.0-dev", - "bevy_app 0.14.0-dev", - "bevy_derive 0.14.0-dev", - "bevy_ecs 0.14.0-dev", - "bevy_hierarchy 0.14.0-dev", - "bevy_input 0.14.0-dev", - "bevy_log 0.14.0-dev", - "bevy_math 0.14.0-dev", - "bevy_reflect 0.14.0-dev", - "bevy_tasks 0.14.0-dev", - "bevy_utils 0.14.0-dev", - "bevy_window 0.14.0-dev", - "cfg-if 1.0.0", - "crossbeam-channel", - "raw-window-handle 0.6.0", - "wasm-bindgen", - "web-sys", - "winit", -] - [[package]] name = "bevy_winit" version = "0.14.0-dev" -source = "git+https://github.com/bevyengine/bevy#fd4589d8dfd3da3683b2d6e0fafe3c678ac19038" +source = "git+https://github.com/bevyengine/bevy#d9d305dab5b3b7a12a634ea7adb5c5a4c6406ec1" dependencies = [ "accesskit_winit", "approx 0.5.1", - "bevy_a11y 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_app 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_derive 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_ecs 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_hierarchy 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_input 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_log 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_math 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_reflect 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_tasks 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_utils 0.14.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_window 0.14.0-dev (git+https://github.com/bevyengine/bevy)", + "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 1.0.0", "crossbeam-channel", - "raw-window-handle 0.6.0", + "raw-window-handle 0.6.1", "wasm-bindgen", "web-sys", "winit", @@ -1808,12 +1324,12 @@ dependencies = [ "lazycell", "log", "prettyplease", - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.82", + "quote 1.0.36", "regex", "rustc-hash", "shlex", - "syn 2.0.53", + "syn 2.0.61", "which", ] @@ -1933,18 +1449,16 @@ dependencies = [ [[package]] name = "blocking" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +checksum = "495f7104e962b7356f0aeb34247aca1fe7d2e783b346582db7f2904cb5717e88" dependencies = [ "async-channel", "async-lock", "async-task", - "fastrand", "futures-io", "futures-lite", "piper", - "tracing", ] [[package]] @@ -1968,9 +1482,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.15.4" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytecount" @@ -1993,9 +1507,9 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.82", + "quote 1.0.36", + "syn 2.0.61", ] [[package]] @@ -2017,9 +1531,9 @@ dependencies = [ [[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 = "bytesize" @@ -2173,12 +1687,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.90" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] @@ -2225,7 +1740,7 @@ dependencies = [ "js-sys", "num-traits", "wasm-bindgen", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -2310,7 +1825,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d375883580a668c7481ea6631fc1a8863e33cc335bf56bfad8d7e6d4b04b13a5" dependencies = [ "com_macros_support", - "proc-macro2 1.0.79", + "proc-macro2 1.0.82", "syn 1.0.109", ] @@ -2320,8 +1835,8 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.82", + "quote 1.0.36", "syn 1.0.109", ] @@ -2340,11 +1855,11 @@ dependencies = [ [[package]] name = "combine" -version = "4.6.6" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" dependencies = [ - "bytes 1.5.0", + "bytes 1.6.0", "memchr", ] @@ -2368,9 +1883,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils 0.8.19", ] @@ -2661,7 +2176,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", "cfg-if 0.1.10", "crossbeam-utils 0.7.2", "lazy_static", @@ -2696,7 +2211,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", "cfg-if 0.1.10", "lazy_static", ] @@ -2785,8 +2300,8 @@ checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.82", + "quote 1.0.36", "strsim 0.10.0", "syn 1.0.109", ] @@ -2798,7 +2313,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ "darling_core", - "quote 1.0.35", + "quote 1.0.36", "syn 1.0.109", ] @@ -2819,9 +2334,9 @@ checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f" [[package]] name = "data-encoding" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] name = "deflate" @@ -2839,8 +2354,8 @@ version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.82", + "quote 1.0.36", "syn 1.0.109", ] @@ -2861,9 +2376,9 @@ dependencies = [ [[package]] name = "downcast-rs" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] name = "dtoa" @@ -2902,9 +2417,9 @@ dependencies = [ [[package]] name = "either" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" [[package]] name = "emath" @@ -2942,9 +2457,9 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd31dbbd9743684d339f907a87fe212cb7b51d75b9e8e74181fe363199ee9b47" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.82", + "quote 1.0.36", + "syn 2.0.61", ] [[package]] @@ -2981,7 +2496,7 @@ dependencies = [ "ecolor", "emath", "nohash-hasher", - "parking_lot 0.12.1", + "parking_lot 0.12.2", ] [[package]] @@ -3001,9 +2516,9 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -3083,9 +2598,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "5.2.0" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" +checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" dependencies = [ "concurrent-queue", "parking", @@ -3104,11 +2619,11 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 5.2.0", + "event-listener 5.3.0", "pin-project-lite", ] @@ -3117,16 +2632,18 @@ name = "examples" version = "0.1.0" dependencies = [ "audrey", - "bevy_nannou", "futures 0.3.30", "hotglsl", "hound", "hrtf", "nannou", + "nannou_audio", + "nannou_laser", + "nannou_osc", "pitch_calc", "ringbuf", "time_calc", - "tokio 1.36.0", + "tokio 1.37.0", "walkdir", ] @@ -3146,17 +2663,17 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.82", + "quote 1.0.36", "syn 1.0.109", "synstructure", ] [[package]] name = "fastrand" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fdeflate" @@ -3199,15 +2716,15 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "fixedbitset" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a73ce1c73b7c2bae1da2d2881eadd020bafb406731036ad248e8a7c2df392c" +checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99" [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "libz-sys", @@ -3263,9 +2780,9 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.82", + "quote 1.0.36", + "syn 2.0.61", ] [[package]] @@ -3413,9 +2930,9 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.82", + "quote 1.0.36", + "syn 2.0.61", ] [[package]] @@ -3499,9 +3016,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -3522,9 +3039,9 @@ dependencies = [ [[package]] name = "gilrs" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "499067aa54af19f88732dc418f61f23d5912de1518665bb0eca034ca0d07574c" +checksum = "b54e5e39844ab5cddaf3bbbdfdc2923a6cb34e36818b95618da4e3f26302c24c" dependencies = [ "fnv", "gilrs-core", @@ -3626,7 +3143,7 @@ dependencies = [ "bstr", "log", "regex-automata 0.4.6", - "regex-syntax 0.8.2", + "regex-syntax 0.8.3", ] [[package]] @@ -3660,9 +3177,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "438ffe1a5540d75403feaf23636b164e816e93f6f03131674722b3886ce32a57" dependencies = [ "inflections", - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.82", + "quote 1.0.36", + "syn 2.0.61", ] [[package]] @@ -3737,7 +3254,7 @@ checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" dependencies = [ "bitflags 2.5.0", "gpu-descriptor-types", - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] @@ -3791,9 +3308,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", "allocator-api2", @@ -4140,18 +3657,18 @@ version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", "hashbrown 0.12.3", ] [[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 0.14.3", + "hashbrown 0.14.5", ] [[package]] @@ -4236,9 +3753,9 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jni" @@ -4247,7 +3764,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" dependencies = [ "cesu8", - "combine 4.6.6", + "combine 4.6.7", "jni-sys", "log", "thiserror", @@ -4262,7 +3779,7 @@ checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" dependencies = [ "cesu8", "cfg-if 1.0.0", - "combine 4.6.6", + "combine 4.6.7", "jni-sys", "log", "thiserror", @@ -4278,9 +3795,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.28" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] @@ -4410,9 +3927,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.153" +version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "libflate" @@ -4457,7 +3974,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if 1.0.0", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -4546,11 +4063,11 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", "scopeguard", ] @@ -4671,9 +4188,9 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memmap2" @@ -4690,7 +4207,7 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", ] [[package]] @@ -4699,7 +4216,7 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", ] [[package]] @@ -4755,7 +4272,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" dependencies = [ "adler", - "autocfg 1.1.0", + "autocfg 1.3.0", ] [[package]] @@ -4850,7 +4367,7 @@ checksum = "ae585df4b6514cf8842ac0f1ab4992edc975892704835b549cf818dc0191249e" dependencies = [ "bit-set", "bitflags 2.5.0", - "indexmap 2.2.5", + "indexmap 2.2.6", "log", "num-traits", "pp-rs", @@ -4869,7 +4386,7 @@ dependencies = [ "bitflags 2.5.0", "codespan-reporting", "hexf-parse", - "indexmap 2.2.5", + "indexmap 2.2.6", "log", "num-traits", "pp-rs", @@ -4889,11 +4406,11 @@ dependencies = [ "bit-set", "codespan-reporting", "data-encoding", - "indexmap 2.2.5", + "indexmap 2.2.6", "naga 0.19.2", "once_cell", "regex", - "regex-syntax 0.8.2", + "regex-syntax 0.8.3", "rustc-hash", "thiserror", "tracing", @@ -4913,12 +4430,13 @@ dependencies = [ name = "nannou" version = "0.19.0" dependencies = [ - "bevy 0.14.0-dev", + "bevy", "bevy-inspector-egui", + "bevy_egui", "bevy_nannou", "find_folder", "futures 0.3.30", - "getrandom 0.2.12", + "getrandom 0.2.15", "image 0.23.14", "instant", "lyon", @@ -4931,7 +4449,7 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "tokio 1.36.0", + "tokio 1.37.0", "toml", "walkdir", "web-sys", @@ -5040,7 +4558,7 @@ dependencies = [ "log", "ndk-sys 0.5.0+25.2.9519653", "num_enum 0.7.2", - "raw-window-handle 0.6.0", + "raw-window-handle 0.6.1", "thiserror", ] @@ -5073,8 +4591,8 @@ checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c" dependencies = [ "darling", "proc-macro-crate 1.3.1", - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.82", + "quote 1.0.36", "syn 1.0.109", ] @@ -5266,8 +4784,8 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.82", + "quote 1.0.36", "syn 1.0.109", ] @@ -5277,9 +4795,9 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.82", + "quote 1.0.36", + "syn 2.0.61", ] [[package]] @@ -5293,11 +4811,11 @@ dependencies = [ [[package]] name = "num-iter" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", "num-integer", "num-traits", ] @@ -5320,18 +4838,18 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", "num-integer", "num-traits", ] [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", "libm", ] @@ -5370,8 +4888,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ "proc-macro-crate 1.3.1", - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.82", + "quote 1.0.36", "syn 1.0.109", ] @@ -5382,9 +4900,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ "proc-macro-crate 3.1.0", - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.82", + "quote 1.0.36", + "syn 2.0.61", ] [[package]] @@ -5612,9 +5130,9 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.82", + "quote 1.0.36", + "syn 2.0.61", ] [[package]] @@ -5692,18 +5210,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", - "lock_api 0.4.11", + "lock_api 0.4.12", "parking_lot_core 0.8.6", ] [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" dependencies = [ - "lock_api 0.4.11", - "parking_lot_core 0.9.9", + "lock_api 0.4.12", + "parking_lot_core 0.9.10", ] [[package]] @@ -5737,15 +5255,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.4.1", + "redox_syscall 0.5.1", "smallvec 1.13.2", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] @@ -5759,9 +5277,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pennereq" @@ -5796,12 +5314,12 @@ dependencies = [ [[package]] name = "petgraph" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset 0.4.2", - "indexmap 2.2.5", + "indexmap 2.2.6", "serde", "serde_derive", ] @@ -5826,9 +5344,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -5897,9 +5415,9 @@ checksum = "b18befed8bc2b61abc79a457295e7e838417326da1586050b919414073977f19" [[package]] name = "polling" -version = "3.6.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6" +checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" dependencies = [ "cfg-if 1.0.0", "concurrent-queue", @@ -5939,12 +5457,12 @@ checksum = "f0f73cdaf19b52e6143685c3606206e114a4dfa969d6b14ec3894c88eb38bd4b" [[package]] name = "prettyplease" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7" +checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" dependencies = [ - "proc-macro2 1.0.79", - "syn 2.0.53", + "proc-macro2 1.0.82", + "syn 2.0.61", ] [[package]] @@ -5977,9 +5495,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" dependencies = [ "unicode-ident", ] @@ -6035,11 +5553,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ - "proc-macro2 1.0.79", + "proc-macro2 1.0.82", ] [[package]] @@ -6174,7 +5692,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.12", + "getrandom 0.2.15", ] [[package]] @@ -6280,9 +5798,9 @@ checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" [[package]] name = "raw-window-handle" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544" +checksum = "8cc3bcbdb1ddfc11e700e62968e6b4cc9c75bb466464ad28fb61c5b2c964418b" [[package]] name = "rayon" @@ -6367,16 +5885,25 @@ dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "redox_syscall" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +dependencies = [ + "bitflags 2.5.0", +] + [[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", "regex-automata 0.4.6", - "regex-syntax 0.8.2", + "regex-syntax 0.8.3", ] [[package]] @@ -6396,7 +5923,7 @@ checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax 0.8.3", ] [[package]] @@ -6407,9 +5934,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "remove_dir_all" @@ -6551,9 +6078,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -6609,9 +6136,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ "bitflags 2.5.0", "errno", @@ -6649,9 +6176,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "safemem" @@ -6710,11 +6237,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.10.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "core-foundation 0.9.4", "core-foundation-sys 0.8.6", "libc", @@ -6723,9 +6250,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.10.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" dependencies = [ "core-foundation-sys 0.8.6", "libc", @@ -6755,22 +6282,22 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.201" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.201" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.82", + "quote 1.0.36", + "syn 2.0.61", ] [[package]] @@ -6784,11 +6311,11 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ - "itoa 1.0.10", + "itoa 1.0.11", "ryu", "serde", ] @@ -6845,9 +6372,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -6900,7 +6427,7 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", ] [[package]] @@ -6963,9 +6490,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", @@ -7099,19 +6626,19 @@ version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.82", + "quote 1.0.36", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.53" +version = "2.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032" +checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.82", + "quote 1.0.36", "unicode-ident", ] @@ -7121,17 +6648,17 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.82", + "quote 1.0.36", "syn 1.0.109", "unicode-xid 0.2.4", ] [[package]] name = "sysinfo" -version = "0.30.10" +version = "0.30.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d7c217777061d5a2d652aea771fb9ba98b6dade657204b08c4b9604d11555b" +checksum = "732ffa00f53e6b2af46208fba5718d9662a421049204e156328b66791ffa15ae" dependencies = [ "cfg-if 1.0.0", "core-foundation-sys 0.8.6", @@ -7212,22 +6739,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.82", + "quote 1.0.36", + "syn 2.0.61", ] [[package]] @@ -7345,16 +6872,16 @@ dependencies = [ [[package]] name = "tokio" -version = "1.36.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", - "bytes 1.5.0", + "bytes 1.6.0", "libc", "mio 0.8.11", "num_cpus", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "pin-project-lite", "signal-hook-registry", "socket2", @@ -7410,9 +6937,9 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.82", + "quote 1.0.36", + "syn 2.0.61", ] [[package]] @@ -7519,7 +7046,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.2.5", + "indexmap 2.2.6", "toml_datetime", "winnow 0.5.40", ] @@ -7530,20 +7057,20 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.2.5", + "indexmap 2.2.6", "toml_datetime", "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.22.9" +version = "0.22.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" +checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" dependencies = [ - "indexmap 2.2.5", + "indexmap 2.2.6", "toml_datetime", - "winnow 0.6.6", + "winnow 0.6.8", ] [[package]] @@ -7563,9 +7090,9 @@ version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.82", + "quote 1.0.36", + "syn 2.0.61", ] [[package]] @@ -7703,9 +7230,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" [[package]] name = "unicode-xid" @@ -7786,7 +7313,7 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ - "getrandom 0.2.12", + "getrandom 0.2.15", "serde", ] @@ -7837,8 +7364,8 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.82", + "quote 1.0.36", ] [[package]] @@ -7899,9 +7426,9 @@ dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.82", + "quote 1.0.36", + "syn 2.0.61", "wasm-bindgen-shared", ] @@ -7923,7 +7450,7 @@ version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ - "quote 1.0.35", + "quote 1.0.36", "wasm-bindgen-macro-support", ] @@ -7933,9 +7460,9 @@ version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.82", + "quote 1.0.36", + "syn 2.0.61", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -8038,9 +7565,9 @@ version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283" dependencies = [ - "proc-macro2 1.0.79", + "proc-macro2 1.0.82", "quick-xml", - "quote 1.0.35", + "quote 1.0.36", ] [[package]] @@ -8100,9 +7627,9 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wgpu" -version = "0.19.3" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4b1213b52478a7631d6e387543ed8f642bc02c578ef4e3b49aca2a29a7df0cb" +checksum = "cbd7311dbd2abcfebaabf1841a2824ed7c8be443a0f29166e5d3c6a53a762c01" dependencies = [ "arrayvec 0.7.4", "cfg-if 1.0.0", @@ -8110,9 +7637,9 @@ dependencies = [ "js-sys", "log", "naga 0.19.2", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "profiling", - "raw-window-handle 0.6.0", + "raw-window-handle 0.6.1", "smallvec 1.13.2", "static_assertions", "wasm-bindgen", @@ -8125,22 +7652,22 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.19.3" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9f6b033c2f00ae0bc8ea872c5989777c60bc241aac4e58b24774faa8b391f78" +checksum = "28b94525fc99ba9e5c9a9e24764f2bc29bad0911a7446c12f446a8277369bf3a" dependencies = [ "arrayvec 0.7.4", "bit-vec", "bitflags 2.5.0", "cfg_aliases", "codespan-reporting", - "indexmap 2.2.5", + "indexmap 2.2.6", "log", "naga 0.19.2", "once_cell", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "profiling", - "raw-window-handle 0.6.0", + "raw-window-handle 0.6.1", "rustc-hash", "smallvec 1.13.2", "thiserror", @@ -8151,9 +7678,9 @@ dependencies = [ [[package]] name = "wgpu-hal" -version = "0.19.3" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f972c280505ab52ffe17e94a7413d9d54b58af0114ab226b9fc4999a47082e" +checksum = "fc1a4924366df7ab41a5d8546d6534f1f33231aa5b3f72b9930e300f254e39c3" dependencies = [ "android_system_properties", "arrayvec 0.7.4", @@ -8180,10 +7707,10 @@ dependencies = [ "ndk-sys 0.5.0+25.2.9519653", "objc", "once_cell", - "parking_lot 0.12.1", + "parking_lot 0.12.2", "profiling", "range-alloc", - "raw-window-handle 0.6.0", + "raw-window-handle 0.6.1", "renderdoc-sys", "rustc-hash", "smallvec 1.13.2", @@ -8219,9 +7746,9 @@ dependencies = [ [[package]] name = "widestring" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" [[package]] name = "wikipedia" @@ -8265,11 +7792,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi 0.3.9", + "windows-sys 0.52.0", ] [[package]] @@ -8296,7 +7823,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ "windows-core 0.52.0", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -8306,7 +7833,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" dependencies = [ "windows-core 0.54.0", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -8315,7 +7842,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -8325,7 +7852,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" dependencies = [ "windows-result", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -8334,8 +7861,8 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.82", + "quote 1.0.36", "syn 1.0.109", ] @@ -8345,18 +7872,18 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.82", + "quote 1.0.36", "syn 1.0.109", ] [[package]] name = "windows-result" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd19df78e5168dfb0aedc343d1d1b8d422ab2db6756d2dc3fef75035402a3f64" +checksum = "749f0da9cc72d82e600d8d2e44cadd0b9eedb9038f71a1c58556ac1c5791813b" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -8383,7 +7910,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -8418,17 +7945,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -8445,9 +7973,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -8463,9 +7991,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -8481,9 +8009,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -8499,9 +8033,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -8517,9 +8051,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -8535,9 +8069,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -8553,9 +8087,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winit" @@ -8584,7 +8118,7 @@ dependencies = [ "once_cell", "orbclient", "percent-encoding 2.3.1", - "raw-window-handle 0.6.0", + "raw-window-handle 0.6.1", "redox_syscall 0.3.5", "rustix", "sctk-adwaita", @@ -8616,9 +8150,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c976aaaa0e1f90dbb21e9587cdaf1d9679a1cde8875c0d6bd83ab96a208352" +checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" dependencies = [ "memchr", ] @@ -8655,9 +8189,9 @@ dependencies = [ [[package]] name = "x11rb" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a" +checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" dependencies = [ "as-raw-xcb-connection", "gethostname", @@ -8670,9 +8204,9 @@ dependencies = [ [[package]] name = "x11rb-protocol" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34" +checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" [[package]] name = "xcursor" @@ -8707,9 +8241,9 @@ checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" [[package]] name = "xml-rs" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" +checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" [[package]] name = "xmlparser" @@ -8729,11 +8263,11 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" dependencies = [ - "zerocopy-derive 0.7.32", + "zerocopy-derive 0.7.34", ] [[package]] @@ -8742,20 +8276,20 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d498dbd1fd7beb83c86709ae1c33ca50942889473473d287d56ce4770a18edfb" dependencies = [ - "proc-macro2 1.0.79", + "proc-macro2 1.0.82", "syn 1.0.109", "synstructure", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.82", + "quote 1.0.36", + "syn 2.0.61", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 0a1b81c72..0509c9b4e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,4 +21,4 @@ members = [ resolver = "2" [workspace.dependencies] -bevy = { path = "../../bevyengine/bevy" } +bevy = { git = "https://github.com/bevyengine/bevy" } diff --git a/bevy_nannou/src/lib.rs b/bevy_nannou/src/lib.rs index 30564509f..d6c8bcab8 100644 --- a/bevy_nannou/src/lib.rs +++ b/bevy_nannou/src/lib.rs @@ -5,6 +5,7 @@ pub mod prelude { pub use bevy::prelude::*; pub use bevy_nannou_draw::render::blend::*; pub use bevy_nannou_draw::*; + pub use bevy_nannou_draw::draw::*; } pub struct NannouPlugin; diff --git a/bevy_nannou_draw/src/draw/background.rs b/bevy_nannou_draw/src/draw/background.rs index f20162704..181cc8949 100644 --- a/bevy_nannou_draw/src/draw/background.rs +++ b/bevy_nannou_draw/src/draw/background.rs @@ -48,7 +48,7 @@ where /// Specify the color via red, green, blue and alpha channels. pub fn rgba(self, r: f32, g: f32, b: f32, a: f32) -> Self { - self.color(Color::rgba(r, g, b, a)) + self.color(Color::srgba(r, g, b, a)) } /// Specify the color via hue, saturation and luminance. diff --git a/bevy_nannou_draw/src/draw/mod.rs b/bevy_nannou_draw/src/draw/mod.rs index f532f2b60..486b068e6 100644 --- a/bevy_nannou_draw/src/draw/mod.rs +++ b/bevy_nannou_draw/src/draw/mod.rs @@ -32,7 +32,7 @@ pub mod instanced; pub mod mesh; pub mod primitive; pub mod properties; -pub mod render; +pub(crate) mod render; pub mod theme; /// A simple API for drawing 2D and 3D graphics. diff --git a/bevy_nannou_draw/src/draw/properties/color.rs b/bevy_nannou_draw/src/draw/properties/color.rs index fe4777335..8536addb7 100644 --- a/bevy_nannou_draw/src/draw/properties/color.rs +++ b/bevy_nannou_draw/src/draw/properties/color.rs @@ -30,12 +30,12 @@ pub trait SetColor: Sized { /// Specify the color via red, green, blue and alpha channels. fn rgba(self, r: f32, g: f32, b: f32, a: f32) -> Self { - self.color(Color::rgba(r, g, b, a)) + self.color(Color::srgba(r, g, b, a)) } /// Specify the color via red, green, blue and alpha channels as bytes fn rgba8(self, r: u8, g: u8, b: u8, a: u8) -> Self { - self.color(Color::rgba_u8(r, g, b, a)) + self.color(Color::srgba_u8(r, g, b, a)) } /// Specify the color via hue, saturation and luminance. diff --git a/bevy_nannou_draw/src/draw/theme.rs b/bevy_nannou_draw/src/draw/theme.rs index 70d5e9277..46557e2b6 100644 --- a/bevy_nannou_draw/src/draw/theme.rs +++ b/bevy_nannou_draw/src/draw/theme.rs @@ -61,8 +61,8 @@ impl Theme { impl Default for Theme { fn default() -> Self { // TODO: This should be pub const. - let default_fill = Color::rgba(1.0, 1.0, 1.0, 1.0); - let default_stroke = Color::rgba(0.0, 0.0, 0.0, 1.0); + let default_fill = Color::srgba(1.0, 1.0, 1.0, 1.0); + let default_stroke = Color::srgba(0.0, 0.0, 0.0, 1.0); let fill_color = ThemeColor { default: default_fill, diff --git a/bevy_nannou_draw/src/lib.rs b/bevy_nannou_draw/src/lib.rs index 756c87207..9bc3ddbe1 100644 --- a/bevy_nannou_draw/src/lib.rs +++ b/bevy_nannou_draw/src/lib.rs @@ -19,7 +19,7 @@ impl Plugin for NannouDrawPlugin { } } -fn reset_draw(mut draw_q: Query<&mut Draw>) { +fn reset_draw(mut draw_q: Query<&mut DrawHolder>) { for mut draw in draw_q.iter_mut() { draw.reset(); } @@ -29,9 +29,9 @@ fn spawn_draw(mut commands: Commands, query: Query>) { for entity in query.iter() { commands .entity(entity) - .insert(Draw(draw::Draw::new(entity))); + .insert(DrawHolder(draw::Draw::new(entity))); } } #[derive(Component, Clone, Deref, DerefMut)] -pub struct Draw(pub draw::Draw); +pub struct DrawHolder(pub draw::Draw); diff --git a/bevy_nannou_draw/src/render.rs b/bevy_nannou_draw/src/render.rs index cfeb00158..aad38e072 100644 --- a/bevy_nannou_draw/src/render.rs +++ b/bevy_nannou_draw/src/render.rs @@ -26,7 +26,7 @@ use crate::draw::mesh::MeshExt; use crate::draw::primitive::Primitive; use crate::draw::render::{GlyphCache, RenderContext, RenderPrimitive}; use crate::draw::{DrawCommand, DrawContext}; -use crate::{draw, Draw}; +use crate::{draw, DrawHolder}; pub struct NannouRenderPlugin; @@ -169,7 +169,7 @@ fn setup_default_texture(mut commands: Commands, mut images: ResMut( - draw_q: Query<&Draw>, + draw_q: Query<&DrawHolder>, mut commands: Commands, mut materials: ResMut>, mut materials_q: Query<(Entity, &UntypedMaterialId)>, @@ -197,7 +197,7 @@ fn update_material( fn update_draw_mesh( mut commands: Commands, - draw_q: Query<&Draw>, + draw_q: Query<&DrawHolder>, mut cameras_q: Query<(&mut Camera, &RenderLayers), With>, windows: Query<&Window>, mut glyph_cache: ResMut, diff --git a/examples/Cargo.toml b/examples/Cargo.toml index 8e828f4ab..4b31b4a61 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -18,24 +18,25 @@ audrey = "0.3" hotglsl = "0.2" hrtf = "0.2" nannou = { version ="0.19.0", path = "../nannou" } -#nannou_audio = { version ="0.19.0", path = "../nannou_audio" } -#nannou_egui = { version ="0.19.0", path = "../nannou_egui" } -#nannou_isf = { version ="0.1.0", path = "../nannou_isf" } -#nannou_laser = { version ="0.19.0", features = ["ffi", "ilda-idtf"], path = "../nannou_laser" } -#nannou_osc = { version ="0.19.0", path = "../nannou_osc" } +nannou_audio = { version ="0.19.0", path = "../nannou_audio" } +nannou_laser = { version ="0.19.0", features = ["ffi", "ilda-idtf"], path = "../nannou_laser" } +nannou_osc = { version ="0.19.0", path = "../nannou_osc" } pitch_calc = { version = "0.12", features = ["serde"] } time_calc = { version= "0.13", features = ["serde"] } walkdir = "2" hound = "3.4.0" ringbuf = "0.2.2" futures = "0.3" -bevy_nannou = { version = "0.1.0", path = "../bevy_nannou" } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] tokio = { version = "1", features = ["full"]} [target.'cfg(target_arch = "wasm32")'.dependencies] tokio = { version = "1", features = ["rt"]} +[features] +egui = ["nannou/egui"] + + # Audio [[example]] name = "hrtf-noise" @@ -202,6 +203,7 @@ path = "ui/egui/tune_color.rs" [[example]] name = "simple_ui" path = "ui/egui/simple_ui.rs" +required-features = ["egui"] # WebGPU [[example]] diff --git a/examples/audio/feedback.rs b/examples/audio/feedback.rs index f3d70d859..e6b1fce7c 100644 --- a/examples/audio/feedback.rs +++ b/examples/audio/feedback.rs @@ -91,7 +91,7 @@ fn pass_out(model: &mut OutputModel, buffer: &mut Buffer) { fn key_pressed(_app: &App, model: &mut Model, key: Key) { match key { - Key::Space => { + KeyCode::Space => { if model.in_stream.is_paused() { model.in_stream.play().unwrap(); model.out_stream.play().unwrap(); @@ -105,5 +105,5 @@ fn key_pressed(_app: &App, model: &mut Model, key: Key) { } fn view(_app: &App, _model: &Model, frame: Frame) { - frame.clear(DIMGRAY); + draw.background().color(DIMGRAY); } diff --git a/examples/audio/hrtf-noise.rs b/examples/audio/hrtf-noise.rs index e1061a770..b7cb5ffb7 100644 --- a/examples/audio/hrtf-noise.rs +++ b/examples/audio/hrtf-noise.rs @@ -159,7 +159,7 @@ fn audio(audio: &mut Audio, output: &mut Buffer) { fn key_pressed(_app: &App, model: &mut Model, key: Key) { // Pause or unpause the audio when Space is pressed. - if let Key::Space = key { + if let KeyCode::Space = key { if model.stream.is_playing() { model.stream.pause().unwrap(); } else { @@ -179,8 +179,8 @@ fn mouse_moved(_app: &App, model: &mut Model, p: Point2) { .ok(); } -fn view(app: &App, model: &Model, frame: Frame) { - frame.clear(rgb(0.1, 0.12, 0.13)); +fn view(app: &App, model: &Model) { + draw.background().color(rgb(0.1, 0.12, 0.13)); let draw = app.draw(); // Listenable area. @@ -199,7 +199,7 @@ fn view(app: &App, model: &Model, frame: Frame) { let text = format!("Noise Source:\n[{:.2}, {:.2}, {:.2}]", x, y, z); draw.text(&text).xy(app.mouse.position() + vec2(0.0, 20.0)); - draw.to_frame(app, &frame).unwrap(); + } // Simple function for determining a gain based on the distance from the listener. diff --git a/examples/audio/record_wav.rs b/examples/audio/record_wav.rs index 8ee69aaa8..9605bc82d 100644 --- a/examples/audio/record_wav.rs +++ b/examples/audio/record_wav.rs @@ -65,7 +65,7 @@ fn capture_fn(audio: &mut CaptureModel, buffer: &Buffer) { fn key_pressed(_app: &App, model: &mut Model, key: Key) { match key { - Key::Space => { + KeyCode::Space => { if model.stream.is_paused() { model.stream.play().unwrap(); } else if model.stream.is_playing() { @@ -76,14 +76,14 @@ fn key_pressed(_app: &App, model: &mut Model, key: Key) { } } -fn view(app: &App, model: &Model, frame: Frame) { - frame.clear(DIMGRAY); +fn view(app: &App, model: &Model) { + draw.background().color(DIMGRAY); if model.stream.is_playing() && app.elapsed_frames() % 30 < 20 { let draw = app.draw(); draw.ellipse().w_h(100.0, 100.0).color(RED); - draw.to_frame(app, &frame).unwrap(); + } } diff --git a/examples/audio/simple_audio.rs b/examples/audio/simple_audio.rs index 851319b4c..624d41ea0 100644 --- a/examples/audio/simple_audio.rs +++ b/examples/audio/simple_audio.rs @@ -62,7 +62,7 @@ fn audio(audio: &mut Audio, buffer: &mut Buffer) { fn key_pressed(_app: &App, model: &mut Model, key: Key) { match key { // Pause or unpause the audio when Space is pressed. - Key::Space => { + KeyCode::Space => { if model.stream.is_playing() { model.stream.pause().unwrap(); } else { @@ -70,7 +70,7 @@ fn key_pressed(_app: &App, model: &mut Model, key: Key) { } } // Raise the frequency when the up key is pressed. - Key::Up => { + KeyCode::Up => { model .stream .send(|audio| { @@ -79,7 +79,7 @@ fn key_pressed(_app: &App, model: &mut Model, key: Key) { .unwrap(); } // Lower the frequency when the down key is pressed. - Key::Down => { + KeyCode::Down => { model .stream .send(|audio| { @@ -92,5 +92,5 @@ fn key_pressed(_app: &App, model: &mut Model, key: Key) { } fn view(_app: &App, _model: &Model, frame: Frame) { - frame.clear(DIMGRAY); + draw.background().color(DIMGRAY); } diff --git a/examples/audio/simple_audio_file.rs b/examples/audio/simple_audio_file.rs index 3ebd4402a..9901dc002 100644 --- a/examples/audio/simple_audio_file.rs +++ b/examples/audio/simple_audio_file.rs @@ -68,10 +68,10 @@ fn audio(audio: &mut Audio, buffer: &mut Buffer) { } } -fn key_pressed(app: &App, model: &mut Model, key: Key) { +fn key_pressed(app: &App, model: &mut Model, key: KeyCode) { match key { // Start playing another instance of the sound. - Key::Space => { + KeyCode::Space => { let assets = app.assets_path().expect("could not find assets directory"); let path = assets.join("sounds").join("thumbpiano.wav"); let sound = audrey::open(path).expect("failed to load sound"); @@ -87,5 +87,5 @@ fn key_pressed(app: &App, model: &mut Model, key: Key) { } fn view(_app: &App, _model: &Model, frame: Frame) { - frame.clear(DIMGRAY); + draw.background().color(DIMGRAY); } diff --git a/examples/communication/osc_receiver.rs b/examples/communication/osc_receiver.rs index 8c71325d1..e7a06d2d9 100644 --- a/examples/communication/osc_receiver.rs +++ b/examples/communication/osc_receiver.rs @@ -34,7 +34,7 @@ fn model(app: &App) -> Model { } } -fn update(_app: &App, model: &mut Model, _update: Update) { +fn update(_app: &App, model: &mut Model) { // Receive any pending osc packets. for (packet, addr) in model.receiver.try_iter() { model.received_packets.push((addr, packet)); @@ -48,7 +48,7 @@ fn update(_app: &App, model: &mut Model, _update: Update) { } // Draw the state of your `Model` into the given `Frame` here. -fn view(app: &App, model: &Model, frame: Frame) { +fn view(app: &App, model: &Model) { let draw = app.draw(); draw.background().color(DARKBLUE); @@ -65,5 +65,5 @@ fn view(app: &App, model: &Model, frame: Frame) { .left_justify() .wh(rect.wh()); - draw.to_frame(app, &frame).unwrap(); + } diff --git a/examples/communication/osc_sender.rs b/examples/communication/osc_sender.rs index 79eebb5b0..134e25692 100644 --- a/examples/communication/osc_sender.rs +++ b/examples/communication/osc_sender.rs @@ -62,7 +62,7 @@ fn event(_app: &App, model: &mut Model, event: WindowEvent) { } } -fn view(app: &App, _model: &Model, frame: Frame) { +fn view(app: &App, _model: &Model) { let draw = app.draw(); draw.background().color(DARKRED); @@ -77,5 +77,5 @@ fn view(app: &App, _model: &Model, frame: Frame) { .line_spacing(10.0) .wh(rect.wh()); - draw.to_frame(app, &frame).unwrap(); + } diff --git a/examples/draw/draw_blend.rs b/examples/draw/draw_blend.rs index 6dce84e7b..aee0639de 100644 --- a/examples/draw/draw_blend.rs +++ b/examples/draw/draw_blend.rs @@ -9,7 +9,7 @@ fn view(app: &App) { let w = app.window_rect(); let lum = map_range(app.mouse().x, w.left(), w.right(), 0.0, 1.0); let clear = gray(lum); - // frame.clear(clear); + // draw.background().color(clear); // Put all the provided blend modes in a list. let blends = [ diff --git a/examples/draw/draw_capture.rs b/examples/draw/draw_capture.rs index 75389a878..994909e56 100644 --- a/examples/draw/draw_capture.rs +++ b/examples/draw/draw_capture.rs @@ -7,7 +7,7 @@ fn main() { nannou::sketch(view).run() } -fn view(app: &App, frame: Frame) { +fn view(app: &App) { let draw = app.draw(); draw.background().color(CORNFLOWERBLUE); @@ -17,7 +17,7 @@ fn view(app: &App, frame: Frame) { .points(win.bottom_left(), win.top_left(), win.top_right()) .color(VIOLET); - let t = frame.nth() as f32 / 60.0; + let t = app.elapsed_frames() as f32 / 60.0; draw.ellipse() .x_y(app.mouse().x * t.cos(), app.mouse().y) .radius(win.w() * 0.125 * t.sin()) @@ -39,7 +39,7 @@ fn view(app: &App, frame: Frame) { .w(app.mouse().x * 0.25) .hsv(t, 1.0, 1.0); - draw.to_frame(app, &frame).unwrap(); + // Capture the frame! let file_path = captured_frame_path(app, &frame); @@ -53,7 +53,7 @@ fn captured_frame_path(app: &App, frame: &Frame) -> std::path::PathBuf { // Capture all frames to a directory called `//nannou/simple_capture`. .join(app.exe_name().unwrap()) // Name each file after the number of the frame. - .join(format!("{:03}", frame.nth())) + .join(format!("{:03}", app.elapsed_frames())) // The extension will be PNG. We also support tiff, bmp, gif, jpeg, webp and some others. .with_extension("png") } diff --git a/examples/draw/draw_capture_hi_res.rs b/examples/draw/draw_capture_hi_res.rs index 79635b97f..4b000bcd1 100644 --- a/examples/draw/draw_capture_hi_res.rs +++ b/examples/draw/draw_capture_hi_res.rs @@ -86,7 +86,7 @@ fn model(app: &App) -> Model { } } -fn update(app: &App, model: &mut Model, _update: Update) { +fn update(app: &App, model: &mut Model) { // First, reset the `draw` state. let draw = &model.draw; draw.reset(); diff --git a/examples/draw/draw_mesh.rs b/examples/draw/draw_mesh.rs index ed576233a..d3b4b6023 100644 --- a/examples/draw/draw_mesh.rs +++ b/examples/draw/draw_mesh.rs @@ -4,7 +4,7 @@ fn main() { nannou::sketch(view).run() } -fn view(app: &App, frame: Frame) { +fn view(app: &App) { // Begin drawing let win = app.window_rect(); let t = app.time; @@ -48,6 +48,6 @@ fn view(app: &App, frame: Frame) { // Draw the mesh! draw.mesh().tris_colored(tris); - // Write the result of our drawing to the window's frame. - draw.to_frame(app, &frame).unwrap(); + + } diff --git a/examples/draw/draw_polygon.rs b/examples/draw/draw_polygon.rs index 3055b4441..6249b1c3e 100644 --- a/examples/draw/draw_polygon.rs +++ b/examples/draw/draw_polygon.rs @@ -4,7 +4,7 @@ fn main() { nannou::sketch(view).run() } -fn view(app: &App, frame: Frame) { +fn view(app: &App) { // Begin drawing let win = app.window_rect(); let t = app.time; @@ -49,6 +49,6 @@ fn view(app: &App, frame: Frame) { .rotate(t * 0.2) .points_colored(points_colored); - // Write the result of our drawing to the window's frame. - draw.to_frame(app, &frame).unwrap(); + + } diff --git a/examples/draw/draw_polyline.rs b/examples/draw/draw_polyline.rs index e736e6506..3d4aa988e 100644 --- a/examples/draw/draw_polyline.rs +++ b/examples/draw/draw_polyline.rs @@ -4,7 +4,7 @@ fn main() { nannou::sketch(view).run() } -fn view(app: &App, frame: Frame) { +fn view(app: &App) { // Begin drawing let draw = app.draw(); @@ -44,6 +44,6 @@ fn view(app: &App, frame: Frame) { .join_round() .points_colored(vertices); - // Write the result of our drawing to the window's frame. - draw.to_frame(app, &frame).unwrap(); + + } diff --git a/examples/draw/draw_text_path.rs b/examples/draw/draw_text_path.rs index ab9364f72..d11aaf611 100644 --- a/examples/draw/draw_text_path.rs +++ b/examples/draw/draw_text_path.rs @@ -9,7 +9,7 @@ fn main() { nannou::sketch(view).run() } -fn view(app: &App, frame: Frame) { +fn view(app: &App) { // Begin drawing. let draw = app.draw(); draw.background().color(WHITE); @@ -47,6 +47,6 @@ fn view(app: &App, frame: Frame) { draw.path().fill().color(BLACK).events(text.path_events()); - // Write the result of our drawing to the window's frame. - draw.to_frame(app, &frame).unwrap(); + + } diff --git a/examples/draw/draw_texture.rs b/examples/draw/draw_texture.rs index 45eb777c7..e800ca7a7 100644 --- a/examples/draw/draw_texture.rs +++ b/examples/draw/draw_texture.rs @@ -21,11 +21,11 @@ fn model(app: &App) -> Model { } // Draw the state of your `Model` into the given `Frame` here. -fn view(app: &App, model: &Model, frame: Frame) { - frame.clear(BLACK); +fn view(app: &App, model: &Model) { + draw.background().color(BLACK); let draw = app.draw(); draw.texture(&model.texture); - draw.to_frame(app, &frame).unwrap(); + } diff --git a/examples/draw/draw_texture_sampler.rs b/examples/draw/draw_texture_sampler.rs index d3deb0bfa..73d8fab17 100644 --- a/examples/draw/draw_texture_sampler.rs +++ b/examples/draw/draw_texture_sampler.rs @@ -21,8 +21,8 @@ fn model(app: &App) -> Model { } // Draw the state of your `Model` into the given `Frame` here. -fn view(app: &App, model: &Model, frame: Frame) { - frame.clear(BLACK); +fn view(app: &App, model: &Model) { + draw.background().color(BLACK); let win = app.main_window(); let win_r = win.rect(); @@ -58,5 +58,5 @@ fn view(app: &App, model: &Model, frame: Frame) { .left_justify() .align_text_bottom(); - draw.to_frame(app, &frame).unwrap(); + } diff --git a/examples/draw/draw_textured_mesh.rs b/examples/draw/draw_textured_mesh.rs index 644c79240..25aca292d 100644 --- a/examples/draw/draw_textured_mesh.rs +++ b/examples/draw/draw_textured_mesh.rs @@ -21,8 +21,8 @@ fn model(app: &App) -> Model { } // Draw the state of your `Model` into the given `Frame` here. -fn view(app: &App, model: &Model, frame: Frame) { - frame.clear(DIMGRAY); +fn view(app: &App, model: &Model) { + draw.background().color(DIMGRAY); let window = app.window(model.window_id).unwrap(); let win_rect = window.rect(); let draw = app.draw(); @@ -52,5 +52,5 @@ fn view(app: &App, model: &Model, frame: Frame) { .y_radians(app.time * 0.25 + app.mouse().x / 100.0); // Draw to the frame! - draw.to_frame(app, &frame).unwrap(); + } diff --git a/examples/draw/draw_textured_path.rs b/examples/draw/draw_textured_path.rs index 00510111f..e99a75a0e 100644 --- a/examples/draw/draw_textured_path.rs +++ b/examples/draw/draw_textured_path.rs @@ -21,8 +21,8 @@ fn model(app: &App) -> Model { } // Draw the state of your `Model` into the given `Frame` here. -fn view(app: &App, model: &Model, frame: Frame) { - frame.clear(DIMGRAY); +fn view(app: &App, model: &Model) { + draw.background().color(DIMGRAY); let window = app.window(model.window_id).unwrap(); let win_rect = window.rect(); let draw = app.draw(); @@ -52,5 +52,5 @@ fn view(app: &App, model: &Model, frame: Frame) { .rotate(app.time * 0.25); // Draw to the frame! - draw.to_frame(app, &frame).unwrap(); + } diff --git a/examples/draw/draw_textured_polygon.rs b/examples/draw/draw_textured_polygon.rs index 533c8be0f..02ee3515e 100644 --- a/examples/draw/draw_textured_polygon.rs +++ b/examples/draw/draw_textured_polygon.rs @@ -21,8 +21,8 @@ fn model(app: &App) -> Model { } // Draw the state of your `Model` into the given `Frame` here. -fn view(app: &App, model: &Model, frame: Frame) { - frame.clear(DIMGRAY); +fn view(app: &App, model: &Model) { + draw.background().color(DIMGRAY); let window = app.window(model.window_id).unwrap(); let win_rect = window.rect(); let draw = app.draw(); @@ -59,5 +59,5 @@ fn view(app: &App, model: &Model, frame: Frame) { .rotate(app.time * 0.25); // Draw to the frame! - draw.to_frame(app, &frame).unwrap(); + } diff --git a/examples/draw/draw_transform.rs b/examples/draw/draw_transform.rs index ded50d265..4eb7f169f 100644 --- a/examples/draw/draw_transform.rs +++ b/examples/draw/draw_transform.rs @@ -11,8 +11,8 @@ fn main() { nannou::sketch(view).run() } -fn view(app: &App, frame: Frame) { - frame.clear(BLACK); +fn view(app: &App) { + draw.background().color(BLACK); // Begin drawing let draw = app.draw(); @@ -54,6 +54,6 @@ fn view(app: &App, frame: Frame) { .font_size(96); } - // Write the result of our drawing to the window's frame. - draw.to_frame(app, &frame).unwrap(); + + } diff --git a/examples/isf/isf_demo.rs b/examples/isf/isf_demo.rs index 3c9636aaf..6df416b6a 100644 --- a/examples/isf/isf_demo.rs +++ b/examples/isf/isf_demo.rs @@ -74,8 +74,8 @@ fn update(app: &App, model: &mut Model, update: Update) { model.isf_time.time_delta = update.since_last.secs() as _; } -fn view(app: &App, model: &Model, frame: Frame) { - frame.clear(BLACK); +fn view(app: &App, model: &Model) { + draw.background().color(BLACK); // Encode a command to draw the render pipeline to the frame's texture. model.isf_pipeline.encode_to_frame(&frame, model.isf_time); @@ -108,5 +108,5 @@ fn view(app: &App, model: &Model, frame: Frame) { .align_text_top() .left_justify() .color(fs_color); - draw.to_frame(app, &frame).unwrap(); + } diff --git a/examples/laser/laser_frame_stream.rs b/examples/laser/laser_frame_stream.rs index ca4d3616e..ccb9c6fe6 100644 --- a/examples/laser/laser_frame_stream.rs +++ b/examples/laser/laser_frame_stream.rs @@ -139,12 +139,12 @@ fn laser(laser: &mut Laser, frame: &mut laser::Frame) { fn key_pressed(_app: &App, model: &mut Model, key: Key) { // Send a new pattern to the laser on keys 1, 2, 3 and 4. let new_pattern = match key { - Key::Key1 => TestPattern::Rectangle, - Key::Key2 => TestPattern::Triangle, - Key::Key3 => TestPattern::Crosshair, - Key::Key4 => TestPattern::ThreeVerticalLines, - Key::Key5 => TestPattern::Circle, - Key::Key6 => TestPattern::Spiral, + KeyCode::Digit1 => TestPattern::Rectangle, + KeyCode::Digit2 => TestPattern::Triangle, + KeyCode::Digit3 => TestPattern::Crosshair, + KeyCode::Digit4 => TestPattern::ThreeVerticalLines, + KeyCode::Digit5 => TestPattern::Circle, + KeyCode::Digit6 => TestPattern::Spiral, _ => return, }; model @@ -156,5 +156,5 @@ fn key_pressed(_app: &App, model: &mut Model, key: Key) { } fn view(_app: &App, _model: &Model, frame: Frame) { - frame.clear(DIMGRAY); + draw.background().color(DIMGRAY); } diff --git a/examples/laser/laser_frame_stream_gui.rs b/examples/laser/laser_frame_stream_gui.rs index e69d8b9b1..0d1d183b4 100644 --- a/examples/laser/laser_frame_stream_gui.rs +++ b/examples/laser/laser_frame_stream_gui.rs @@ -488,12 +488,12 @@ fn update(_app: &App, model: &mut Model, update: Update) { fn key_pressed(_app: &App, model: &mut Model, key: Key) { // Send a new pattern to the laser on keys 1, 2, 3 and 4. let new_pattern = match key { - Key::Key1 => TestPattern::Rectangle, - Key::Key2 => TestPattern::Triangle, - Key::Key3 => TestPattern::Crosshair, - Key::Key4 => TestPattern::ThreeVerticalLines, - Key::Key5 => TestPattern::Circle, - Key::Key6 => TestPattern::Spiral, + KeyCode::Digit1 => TestPattern::Rectangle, + KeyCode::Digit2 => TestPattern::Triangle, + KeyCode::Digit3 => TestPattern::Crosshair, + KeyCode::Digit4 => TestPattern::ThreeVerticalLines, + KeyCode::Digit5 => TestPattern::Circle, + KeyCode::Digit6 => TestPattern::Spiral, _ => return, }; for stream in &model.laser_streams { diff --git a/examples/laser/laser_ilda_idtf.rs b/examples/laser/laser_ilda_idtf.rs index b0c94e197..b70349406 100644 --- a/examples/laser/laser_ilda_idtf.rs +++ b/examples/laser/laser_ilda_idtf.rs @@ -77,7 +77,7 @@ fn model(app: &App) -> Model { } fn view(_app: &App, _model: &Model, frame: Frame) { - frame.clear(DIMGRAY); + draw.background().color(DIMGRAY); } fn laser(laser: &mut Laser, frame: &mut laser::Frame) { diff --git a/examples/laser/laser_raw_stream.rs b/examples/laser/laser_raw_stream.rs index 9afb7594b..cb6da628d 100644 --- a/examples/laser/laser_raw_stream.rs +++ b/examples/laser/laser_raw_stream.rs @@ -76,10 +76,10 @@ fn mouse_moved(app: &App, model: &mut Model, pos: Point2) { .unwrap(); } -fn view(app: &App, _model: &Model, frame: Frame) { +fn view(app: &App, _model: &Model) { // Visualise the point in the window. let draw = app.draw(); draw.background().color(DIMGRAY); draw.ellipse().w_h(5.0, 5.0).xy(app.mouse.position()); - draw.to_frame(app, &frame).unwrap(); + } diff --git a/examples/nannou_basics/all_functions.rs b/examples/nannou_basics/all_functions.rs index 6d6fd7f32..795fefcfc 100644 --- a/examples/nannou_basics/all_functions.rs +++ b/examples/nannou_basics/all_functions.rs @@ -55,7 +55,7 @@ fn event(_app: &App, _model: &mut Model, event: Event) { fn update(_app: &App, _model: &mut Model, _update: Update) {} fn view(_app: &App, _model: &Model, frame: Frame) { - frame.clear(SKYBLUE); + draw.background().color(SKYBLUE); } fn window_event(_app: &App, _model: &mut Model, event: WindowEvent) { diff --git a/examples/nannou_basics/multi_window.rs b/examples/nannou_basics/multi_window.rs index 9d5710db8..287588439 100644 --- a/examples/nannou_basics/multi_window.rs +++ b/examples/nannou_basics/multi_window.rs @@ -48,9 +48,9 @@ fn event_c(_app: &App, _model: &mut Model, event: WindowEvent) { fn view(_app: &App, model: &Model, frame: Frame) { match frame.window_id() { - id if id == model.a => frame.clear(INDIANRED), - id if id == model.b => frame.clear(LIGHTGREEN), - id if id == model.c => frame.clear(CORNFLOWERBLUE), + id if id == model.a => draw.background().color(INDIANRED), + id if id == model.b => draw.background().color(LIGHTGREEN), + id if id == model.c => draw.background().color(CORNFLOWERBLUE), _ => (), } } diff --git a/examples/nannou_basics/multi_window_draw.rs b/examples/nannou_basics/multi_window_draw.rs index 898722824..38b0f7b0d 100644 --- a/examples/nannou_basics/multi_window_draw.rs +++ b/examples/nannou_basics/multi_window_draw.rs @@ -48,7 +48,7 @@ fn event_c(_app: &App, _model: &mut Model, event: WindowEvent) { println!("window c: {:?}", event); } -fn view(app: &App, model: &Model, frame: Frame) { +fn view(app: &App, model: &Model) { let draw = app.draw(); match frame.window_id() { id if id == model.a => { @@ -66,5 +66,5 @@ fn view(app: &App, model: &Model, frame: Frame) { _ => (), } - draw.to_frame(app, &frame).unwrap(); + } diff --git a/examples/nannou_basics/simple_window.rs b/examples/nannou_basics/simple_window.rs index 63707b19e..75deca8e1 100644 --- a/examples/nannou_basics/simple_window.rs +++ b/examples/nannou_basics/simple_window.rs @@ -29,5 +29,5 @@ fn event(_app: &App, _model: &mut Model, event: WindowEvent) { // Draw the state of your `Model` into the given `Frame` here. fn view(_app: &App, _model: &Model, frame: Frame) { - frame.clear(CORNFLOWERBLUE); + draw.background().color(CORNFLOWERBLUE); } diff --git a/examples/nannou_basics/window_coordinates.rs b/examples/nannou_basics/window_coordinates.rs index 04f1c95c4..a4568100c 100644 --- a/examples/nannou_basics/window_coordinates.rs +++ b/examples/nannou_basics/window_coordinates.rs @@ -4,7 +4,7 @@ fn main() { nannou::sketch(view).run() } -fn view(app: &App, frame: Frame) { +fn view(app: &App) { let draw = app.draw(); let window = app.main_window(); let win = window.rect(); @@ -115,10 +115,10 @@ fn view(app: &App, frame: Frame) { .color(WHITE); } - draw.to_frame(app, &frame).unwrap(); + } -fn draw_grid(draw: &Draw, win: &Rect, step: f32, weight: f32) { +fn draw_grid(draw: &DrawHolder, win: &Rect, step: f32, weight: f32) { let step_by = || (0..).map(|i| i as f32 * step); let r_iter = step_by().take_while(|&f| f < win.right()); let l_iter = step_by().map(|f| -f).take_while(|&f| f > win.left()); diff --git a/examples/offline/tree.rs b/examples/offline/tree.rs index 10260ca6d..d1b91c462 100644 --- a/examples/offline/tree.rs +++ b/examples/offline/tree.rs @@ -125,7 +125,7 @@ fn window_event(_app: &App, _model: &mut Model, event: WindowEvent) { } } -fn update(app: &App, model: &mut Model, _update: Update) { +fn update(app: &App, model: &mut Model) { //try to grow each circle until it hits another one //recreate the tree @@ -251,7 +251,7 @@ fn update(app: &App, model: &mut Model, _update: Update) { } } -fn view(app: &App, model: &Model, frame: Frame) { +fn view(app: &App, model: &Model) { // Prepare to draw. let draw = app.draw(); @@ -264,7 +264,7 @@ fn view(app: &App, model: &Model, frame: Frame) { let mut frac_end = (((app.elapsed_frames() + 120) as i32 - LENGTH_FRAME as i32) as f32) / 100.0; frac_end = frac_end.max(0.0).min(1.0); - let c: Rgba = rgba(1.0, 1.0, 1.0, 1.0 - frac_end); + let c: Rgba = Color::srgba(1.0, 1.0, 1.0, 1.0 - frac_end); //draw ALL THE THINGS for k in 0..model.things.len() { @@ -272,7 +272,7 @@ fn view(app: &App, model: &Model, frame: Frame) { let mut c2: Rgba = model.palette.somecolor_frac(model.things[k].frac).into(); // make it fade c2.alpha = 1.0 - frac_end; - let c3 = rgba(0.0, 0.0, 0.0, 1.0 - frac_end); + let c3 = Color::srgba(0.0, 0.0, 0.0, 1.0 - frac_end); //draw in three steps draw.ellipse() @@ -311,7 +311,7 @@ fn view(app: &App, model: &Model, frame: Frame) { } // Write to the window frame. - draw.to_frame(app, &frame).unwrap(); + //TODO add screenshot } diff --git a/examples/rust_basics/1_nannou_events.rs b/examples/rust_basics/1_nannou_events.rs index 8be3921bf..6ce691857 100644 --- a/examples/rust_basics/1_nannou_events.rs +++ b/examples/rust_basics/1_nannou_events.rs @@ -59,5 +59,5 @@ fn event(_app: &App, _model: &mut Model, event: WindowEvent) { // Put your drawing code, called once per frame, per window. fn view(_app: &App, _model: &Model, frame: Frame) { - frame.clear(DIMGRAY); + draw.background().color(DIMGRAY); } diff --git a/examples/rust_basics/2_variables_window_console.rs b/examples/rust_basics/2_variables_window_console.rs index 3610c8e5f..c2857a78e 100644 --- a/examples/rust_basics/2_variables_window_console.rs +++ b/examples/rust_basics/2_variables_window_console.rs @@ -28,5 +28,5 @@ fn model(app: &App) -> Model { } fn view(_app: &App, _model: &Model, frame: Frame) { - frame.clear(DIMGRAY); + draw.background().color(DIMGRAY); } diff --git a/examples/rust_basics/3_variable_scope.rs b/examples/rust_basics/3_variable_scope.rs index 740aedc48..7edc4d3d3 100644 --- a/examples/rust_basics/3_variable_scope.rs +++ b/examples/rust_basics/3_variable_scope.rs @@ -41,5 +41,5 @@ fn event(_app: &App, model: &mut Model, event: WindowEvent) { } fn view(_app: &App, _model: &Model, frame: Frame) { - frame.clear(DIMGRAY); + draw.background().color(DIMGRAY); } diff --git a/examples/rust_basics/4_conditionals.rs b/examples/rust_basics/4_conditionals.rs index b40ccf168..fe2486aca 100644 --- a/examples/rust_basics/4_conditionals.rs +++ b/examples/rust_basics/4_conditionals.rs @@ -4,7 +4,7 @@ fn main() { nannou::sketch(view).run(); } -fn view(app: &App, frame: Frame) { +fn view(app: &App) { // Prepare to draw. let draw = app.draw(); @@ -30,5 +30,5 @@ fn view(app: &App, frame: Frame) { } // Draw to the window frame. - draw.to_frame(app, &frame).unwrap(); + } diff --git a/examples/rust_basics/5_loops.rs b/examples/rust_basics/5_loops.rs index 06605f870..2a98b448c 100644 --- a/examples/rust_basics/5_loops.rs +++ b/examples/rust_basics/5_loops.rs @@ -43,5 +43,5 @@ fn model(_app: &App) -> Model { } fn view(_app: &App, _model: &Model, frame: Frame) { - frame.clear(DIMGRAY); + draw.background().color(DIMGRAY); } diff --git a/examples/rust_basics/6_functions.rs b/examples/rust_basics/6_functions.rs index 482f696ca..c1f43eba9 100644 --- a/examples/rust_basics/6_functions.rs +++ b/examples/rust_basics/6_functions.rs @@ -53,5 +53,5 @@ fn event(_app: &App, _model: &mut Model, event: WindowEvent) { } fn view(_app: &App, _model: &Model, frame: Frame) { - frame.clear(DIMGRAY); + draw.background().color(DIMGRAY); } diff --git a/examples/rust_basics/7_modules/7_modules.rs b/examples/rust_basics/7_modules/7_modules.rs index 027d23b29..852dabc5d 100644 --- a/examples/rust_basics/7_modules/7_modules.rs +++ b/examples/rust_basics/7_modules/7_modules.rs @@ -19,17 +19,17 @@ fn model(_app: &App) -> Model { } // By default, `update` is called right before `view` is called each frame. -fn update(app: &App, model: &mut Model, _update: Update) { +fn update(app: &App, model: &mut Model) { model.ball.position = pt2(app.mouse.x, app.mouse.y); } -fn view(app: &App, model: &Model, frame: Frame) { +fn view(app: &App, model: &Model) { // Begin drawing. let draw = app.draw(); // Draw dark gray for the background draw.background().color(DIMGRAY); // Draw our ball model.ball.display(&draw); - // Write the result of our drawing to the window's frame. - draw.to_frame(app, &frame).unwrap(); + + } diff --git a/examples/rust_basics/7_modules/ball.rs b/examples/rust_basics/7_modules/ball.rs index 91dc43887..a862904c9 100644 --- a/examples/rust_basics/7_modules/ball.rs +++ b/examples/rust_basics/7_modules/ball.rs @@ -11,7 +11,7 @@ impl Ball { Ball { position, color } } - pub fn display(&self, draw: &Draw) { + pub fn display(&self, draw: &DrawHolder) { draw.ellipse() .xy(self.position) .radius(100.0) diff --git a/examples/templates/template_app.rs b/examples/templates/template_app.rs index 9499ff2f5..09c7c8a54 100644 --- a/examples/templates/template_app.rs +++ b/examples/templates/template_app.rs @@ -15,9 +15,9 @@ fn model(app: &App) -> Model { fn update(_app: &App, _model: &mut Model, _update: Update) {} -fn view(app: &App, _model: &Model, frame: Frame) { +fn view(app: &App, _model: &Model) { let draw = app.draw(); draw.background().color(PLUM); draw.ellipse().color(STEELBLUE); - draw.to_frame(app, &frame).unwrap(); + } diff --git a/examples/templates/template_sketch.rs b/examples/templates/template_sketch.rs index bc34f3e1a..43ff06d1e 100644 --- a/examples/templates/template_sketch.rs +++ b/examples/templates/template_sketch.rs @@ -4,9 +4,9 @@ fn main() { nannou::sketch(view).run() } -fn view(app: &App, frame: Frame) { +fn view(app: &App) { let draw = app.draw(); draw.background().color(PLUM); draw.ellipse().color(STEELBLUE); - draw.to_frame(app, &frame).unwrap(); + } diff --git a/examples/ui/egui/circle_packing.rs b/examples/ui/egui/circle_packing.rs index 3a9c0f6d1..cb50d759d 100644 --- a/examples/ui/egui/circle_packing.rs +++ b/examples/ui/egui/circle_packing.rs @@ -82,7 +82,7 @@ fn raw_window_event(_app: &App, model: &mut Model, event: &nannou::winit::event: model.egui.handle_raw_event(event); } -fn view(app: &App, model: &Model, frame: Frame) { +fn view(app: &App, model: &Model) { let draw = app.draw(); draw.background().color(BLACK); @@ -94,7 +94,7 @@ fn view(app: &App, model: &Model, frame: Frame) { .color(circle.color); } - draw.to_frame(app, &frame).unwrap(); + model.egui.draw_to_frame(&frame).unwrap(); } diff --git a/examples/ui/egui/simple_ui.rs b/examples/ui/egui/simple_ui.rs index df77dc26c..858601ce1 100644 --- a/examples/ui/egui/simple_ui.rs +++ b/examples/ui/egui/simple_ui.rs @@ -1,5 +1,4 @@ use nannou::prelude::*; -use nannou_egui::{self, egui, Egui}; fn main() { nannou::app(model).update(update).run(); @@ -9,29 +8,25 @@ struct Settings { resolution: u32, scale: f32, rotation: f32, - color: Srgb, + color: Srgba, position: Vec2, } struct Model { settings: Settings, - egui: Egui, + window: Entity, } fn model(app: &App) -> Model { // Create window - let window_id = app + let window = app .new_window() + .primary() .view(view) - .raw_event(raw_window_event) - .build() - .unwrap(); - let window = app.window(window_id).unwrap(); - - let egui = Egui::from_window(&window); + .build(); Model { - egui, + window, settings: Settings { resolution: 10, scale: 200.0, @@ -42,12 +37,11 @@ fn model(app: &App) -> Model { } } -fn update(_app: &App, model: &mut Model, update: Update) { - let egui = &mut model.egui; +fn update(app: &App, model: &mut Model) { let settings = &mut model.settings; - egui.set_elapsed_time(update.since_start); - let ctx = egui.begin_frame(); + let mut egui_ctx = app.egui_for_window(model.window); + let ctx = egui_ctx.get_mut(); egui::Window::new("Settings").show(&ctx, |ui| { // Resolution slider @@ -66,17 +60,12 @@ fn update(_app: &App, model: &mut Model, update: Update) { let clicked = ui.button("Random color").clicked(); if clicked { - settings.color = rgb(random(), random(), random()); + settings.color = Color::srgb(random(), random(), random()).into(); } }); } -fn raw_window_event(_app: &App, model: &mut Model, event: &nannou::winit::event::WindowEvent) { - // Let egui handle things like keyboard and mouse input. - model.egui.handle_raw_event(event); -} - -fn view(app: &App, model: &Model, frame: Frame) { +fn view(app: &App, model: &Model) { let settings = &model.settings; let draw = app.draw(); @@ -89,7 +78,4 @@ fn view(app: &App, model: &Model, frame: Frame) { .color(settings.color) .rotate(-rotation_radians) .radius(settings.scale); - - draw.to_frame(app, &frame).unwrap(); - model.egui.draw_to_frame(&frame).unwrap(); } diff --git a/examples/ui/egui/tune_color.rs b/examples/ui/egui/tune_color.rs index dc0ceae59..9e4654e13 100644 --- a/examples/ui/egui/tune_color.rs +++ b/examples/ui/egui/tune_color.rs @@ -58,17 +58,17 @@ fn raw_window_event(_app: &App, model: &mut Model, event: &nannou::winit::event: } // Draw the state of your `Model` into the given `Frame` here. -fn view(app: &App, model: &Model, frame: Frame) { +fn view(app: &App, model: &Model) { let draw = app.draw(); - frame.clear(BLACK); + draw.background().color(BLACK); draw.ellipse() .x_y(100.0, 100.0) .radius(model.radius) .color(model.color); - draw.to_frame(app, &frame).unwrap(); + // Do this as the last operation on your frame. model.egui.draw_to_frame(&frame).unwrap(); diff --git a/guide/src/changelog.md b/guide/src/changelog.md index 644e97277..359f10ce3 100644 --- a/guide/src/changelog.md +++ b/guide/src/changelog.md @@ -451,7 +451,7 @@ changelog entry ``` the `view` function signature now must look like: ```rust,ignore - fn view(app: &App, model: &Model, frame: Frame) {} + fn view(app: &App, model: &Model) {} ``` This was necessary to enable ergonomic texture capturing. - `frame.submit()` can now be used to submit the frame to the GPU before the end diff --git a/guide/src/getting_started/create_a_project.md b/guide/src/getting_started/create_a_project.md index 5a6fe24b4..b8950c072 100644 --- a/guide/src/getting_started/create_a_project.md +++ b/guide/src/getting_started/create_a_project.md @@ -62,7 +62,7 @@ create a new project with just a few small steps: } fn view(_app: &App, _model: &Model, frame: Frame) { - frame.clear(PURPLE); + draw.background().color(PURPLE); } ``` diff --git a/guide/src/tutorials/basics/draw-a-sketch.md b/guide/src/tutorials/basics/draw-a-sketch.md index 6d7d10310..8e827167e 100644 --- a/guide/src/tutorials/basics/draw-a-sketch.md +++ b/guide/src/tutorials/basics/draw-a-sketch.md @@ -22,7 +22,7 @@ fn main() { nannou::sketch(view).run(); } -fn view(app: &App, frame: Frame) { +fn view(app: &App) { // get canvas to draw on let draw = app.draw(); @@ -30,7 +30,7 @@ fn view(app: &App, frame: Frame) { draw.background().color(BLUE); // put everything on the frame - draw.to_frame(app, &frame).unwrap(); + } ``` @@ -71,12 +71,12 @@ Within the view() function, what we draw to the Frame will be presented in our w # fn main() { # nannou::sketch(view).run(); # } -fn view(app: &App, frame: Frame) { +fn view(app: &App) { let draw = app.draw(); draw.background().color(BLUE); - draw.to_frame(app, &frame).unwrap(); + } ``` @@ -117,9 +117,9 @@ create a computer graphics frame from it to display in the main window. # fn main() { # nannou::sketch(view).run(); # } -# fn view(app: &App, frame: Frame) { +# fn view(app: &App) { # let draw = app.draw(); -draw.to_frame(app, &frame).unwrap(); + # } ``` diff --git a/guide/src/tutorials/basics/sketch-vs-app.md b/guide/src/tutorials/basics/sketch-vs-app.md index b50b7f5ec..b276a2543 100644 --- a/guide/src/tutorials/basics/sketch-vs-app.md +++ b/guide/src/tutorials/basics/sketch-vs-app.md @@ -39,11 +39,11 @@ fn main() { nannou::sketch(view).run() } -fn view(app: &App, frame: Frame) { +fn view(app: &App) { let draw = app.draw(); draw.background().color(PLUM); draw.ellipse().color(STEELBLUE); - draw.to_frame(app, &frame).unwrap(); + } ``` @@ -78,11 +78,11 @@ fn model(app: &App) -> Model { fn update(_app: &App, _model: &mut Model, _update: Update) {} -fn view(app: &App, _model: &Model, frame: Frame) { +fn view(app: &App, _model: &Model) { let draw = app.draw(); draw.background().color(PLUM); draw.ellipse().color(STEELBLUE); - draw.to_frame(app, &frame).unwrap(); + } ``` @@ -161,7 +161,7 @@ flexibility, you can turn it into an app by following these steps: # #![allow(dead_code, unused_variables)] # use nannou::prelude::*; # fn main() {} - fn view(app: &App, frame: Frame) { + fn view(app: &App) { # } ``` @@ -172,7 +172,7 @@ flexibility, you can turn it into an app by following these steps: # use nannou::prelude::*; # fn main() {} # struct Model {} - fn view(app: &App, _model: &Model, frame: Frame) { + fn view(app: &App, _model: &Model) { # } ``` diff --git a/guide/src/tutorials/draw/animating-a-circle.md b/guide/src/tutorials/draw/animating-a-circle.md index bcce32b94..d8c3190bf 100644 --- a/guide/src/tutorials/draw/animating-a-circle.md +++ b/guide/src/tutorials/draw/animating-a-circle.md @@ -38,7 +38,7 @@ Update the view function of your nannou-app to look like this: # } # fn event(_app: &App, _model: &mut Model, _event: Event) { # } -fn view(app: &App, _model: &Model, frame: Frame) { +fn view(app: &App, _model: &Model) { // Prepare to draw. let draw = app.draw(); @@ -48,7 +48,7 @@ fn view(app: &App, _model: &Model, frame: Frame) { // Draw a blue ellipse with a radius of 10 at the (x,y) coordinates of (0.0, 0.0) draw.ellipse().color(STEELBLUE).x_y(0.0,0.0); - draw.to_frame(app, &frame).unwrap(); + } ``` @@ -196,7 +196,7 @@ Your updated `view` function should now look something like this: # use nannou::prelude::*; # struct Model{} # fn main() {} -fn view(app: &App, _model: &Model, frame: Frame) { +fn view(app: &App, _model: &Model) { // Prepare to draw. let draw = app.draw(); @@ -217,6 +217,6 @@ fn view(app: &App, _model: &Model, frame: Frame) { // Draw a blue ellipse at the x/y coordinates 0.0, 0.0 draw.ellipse().color(STEELBLUE).x_y(x, y); - draw.to_frame(app, &frame).unwrap(); + } ``` diff --git a/guide/src/tutorials/draw/drawing-2d-shapes.md b/guide/src/tutorials/draw/drawing-2d-shapes.md index 7bfa679a7..bf9031405 100644 --- a/guide/src/tutorials/draw/drawing-2d-shapes.md +++ b/guide/src/tutorials/draw/drawing-2d-shapes.md @@ -24,7 +24,7 @@ fn main() { nannou::sketch(view).run(); } -fn view(app: &App, frame: Frame) { +fn view(app: &App) { // Prepare to draw. let draw = app.draw(); @@ -35,7 +35,7 @@ fn view(app: &App, frame: Frame) { draw.ellipse().color(STEELBLUE); // Write to the window frame. - draw.to_frame(app, &frame).unwrap(); + } ``` diff --git a/guide/src/tutorials/draw/drawing-images.md b/guide/src/tutorials/draw/drawing-images.md index 9c3a97fbe..302913dc3 100644 --- a/guide/src/tutorials/draw/drawing-images.md +++ b/guide/src/tutorials/draw/drawing-images.md @@ -129,13 +129,13 @@ Finally, in our `view` function, we can draw the texture stored in our model wit # let texture = wgpu::Texture::from_path(app, img_path).unwrap(); # Model { texture } # } -fn view(app: &App, model: &Model, frame: Frame) { - frame.clear(BLACK); +fn view(app: &App, model: &Model) { + draw.background().color(BLACK); let draw = app.draw(); draw.texture(&model.texture); - draw.to_frame(app, &frame).unwrap(); + } ``` ![A texture](./images/drawing-images-0.png) @@ -163,8 +163,8 @@ A texture can be drawn at any location and any size desired within the frame. Le # let texture = wgpu::Texture::from_path(app, img_path).unwrap(); # Model { texture } # } -fn view(app: &App, model: &Model, frame: Frame) { - frame.clear(BLACK); +fn view(app: &App, model: &Model) { + draw.background().color(BLACK); let win = app.window_rect(); let r = Rect::from_w_h(100.0, 100.0).top_left_of(win); @@ -174,7 +174,7 @@ fn view(app: &App, model: &Model, frame: Frame) { .xy(r.xy()) .wh(r.wh()); - draw.to_frame(app, &frame).unwrap(); + } ``` ![A translated and scaled texture](./images/drawing-images-1.png) diff --git a/guide/src/tutorials/osc/osc-sender.md b/guide/src/tutorials/osc/osc-sender.md index 3daa868f5..36a11ec41 100644 --- a/guide/src/tutorials/osc/osc-sender.md +++ b/guide/src/tutorials/osc/osc-sender.md @@ -178,7 +178,7 @@ fn model(_app: &App) -> Model { Model { sender } } -fn view(app: &App, model: &Model, frame: Frame) { +fn view(app: &App, model: &Model) { // Use app time to progress through a sine wave let sine = app.time.sin(); let slowersine = (app.time / 2.0).sin(); @@ -206,7 +206,7 @@ fn view(app: &App, model: &Model, frame: Frame) { // Draw a blue ellipse at the x/y coordinates 0.0, 0.0 draw.ellipse().color(STEELBLUE).x_y(x, y); - draw.to_frame(app, &frame).unwrap(); + } ``` diff --git a/nannou/Cargo.toml b/nannou/Cargo.toml index f85f513af..916874fcc 100644 --- a/nannou/Cargo.toml +++ b/nannou/Cargo.toml @@ -12,7 +12,8 @@ edition = "2018" [dependencies] bevy = { workspace = true } -bevy-inspector-egui = { path = "../../../jakobhellermann/bevy-inspector-egui/crates/bevy-inspector-egui" } +bevy-inspector-egui = { path = "../../../jakobhellermann/bevy-inspector-egui/crates/bevy-inspector-egui", optional = true } +bevy_egui = { git = "https://github.com/tychedelia/bevy_egui", optional = true } bevy_nannou = { version = "0.1.0", path = "../bevy_nannou" } futures = "0.3" find_folder = "0.3" @@ -40,5 +41,4 @@ tokio = { version = "1", features = ["rt"]} [features] default = ["notosans"] -# Enables experimental WASM compilation for CI-use only -wasm-experimental = ["getrandom/js", "web-sys"] +egui = ["bevy_egui", "bevy-inspector-egui"] \ No newline at end of file diff --git a/nannou/src/app.rs b/nannou/src/app.rs index eee5380f2..108c733c5 100644 --- a/nannou/src/app.rs +++ b/nannou/src/app.rs @@ -7,40 +7,39 @@ //! - [**Proxy**](./struct.Proxy.html) - a handle to an **App** that may be used from a non-main //! thread. //! - [**LoopMode**](./enum.LoopMode.html) - describes the behaviour of the application event loop. +use std::{self}; use std::any::Any; use std::cell::RefCell; -use std::path::Path; use std::rc::Rc; -use std::{self}; use bevy::app::AppExit; use bevy::core::FrameCount; use bevy::diagnostic::{DiagnosticsStore, FrameTimeDiagnosticsPlugin}; -use bevy::ecs::system::lifetimeless::{SQuery, SRes, SResMut}; use bevy::ecs::system::SystemParam; use bevy::ecs::world::unsafe_world_cell::UnsafeWorldCell; +use bevy::input::ButtonState; use bevy::input::keyboard::KeyboardInput; use bevy::input::mouse::{MouseButtonInput, MouseWheel}; -use bevy::input::ButtonState; use bevy::pbr::ExtendedMaterial; use bevy::prelude::*; use bevy::reflect::{DynamicTypePath, GetTypeRegistration}; -use bevy::render::view::screenshot::ScreenshotManager; -use bevy::utils::tracing::instrument::WithSubscriber; use bevy::window::{PrimaryWindow, WindowClosed, WindowFocused, WindowResized}; -use bevy_inspector_egui::quick::ResourceInspectorPlugin; +#[cfg(feature = "egui")] +use bevy_egui::EguiContext; +#[cfg(feature = "egui")] use bevy_inspector_egui::DefaultInspectorConfigPlugin; +#[cfg(feature = "egui")] +use bevy_inspector_egui::quick::ResourceInspectorPlugin; use find_folder; -use bevy_nannou::prelude::{draw, Draw}; use bevy_nannou::NannouPlugin; +use bevy_nannou::prelude::{draw, DrawHolder}; -use crate::prelude::bevy_ecs::system::lifetimeless::Read; +use crate::{geom, window}; use crate::prelude::bevy_ecs::system::SystemState; use crate::prelude::bevy_reflect::{ApplyError, ReflectMut, ReflectOwned, ReflectRef, TypeInfo}; use crate::prelude::render::{NannouMaterial, NannouMesh, NannouPersistentMesh}; use crate::window::WindowUserFunctions; -use crate::{geom, window}; /// The user function type for initialising their model. pub type ModelFn = fn(&App) -> Model; @@ -173,6 +172,8 @@ where primary_window: None, ..default() }), + #[cfg(feature = "egui")] + bevy_egui::EguiPlugin, NannouPlugin, )); @@ -256,8 +257,7 @@ where /// /// If a window is created and its size is not specified, this size will be used. pub fn size(mut self, width: u32, height: u32) -> Self { - self.config.default_window_size = - Some(DefaultWindowSize::Logical([width, height])); + self.config.default_window_size = Some(DefaultWindowSize::Logical([width, height])); self } @@ -318,10 +318,12 @@ impl Builder where M: Reflect + GetTypeRegistration + 'static, { + #[cfg(feature = "egui")] pub fn model_ui(mut self) -> Self { - self.app.register_type::>(); - // .add_plugins(DefaultInspectorConfigPlugin) - // .add_plugins(ResourceInspectorPlugin::>::default()); + self.app + .register_type::>() + .add_plugins(DefaultInspectorConfigPlugin) + .add_plugins(ResourceInspectorPlugin::>::default()); self } } @@ -472,6 +474,16 @@ impl<'w> App<'w> { world.spawn((NannouPersistentMesh,)).id() } + #[cfg(feature = "egui")] + pub fn egui_for_window(&self, window: Entity) -> Mut { + self.world_mut().get_mut::(window).expect("No egui context") + } + + #[cfg(feature = "egui")] + pub fn egui(&self) -> Mut { + self.egui_for_window(self.window_id()) + } + pub fn mouse(&self) -> Vec2 { let window = self.window_id(); let window = self @@ -483,6 +495,11 @@ impl<'w> App<'w> { screen_position - geom::pt2(window.width() / 2.0, window.height() / 2.0) } + pub fn keys(&self) -> &ButtonInput { + let mut keyboard_input = self.world_mut().resource::>(); + keyboard_input + } + pub fn time(&self) -> Time { let time = self.world().get_resource::