From f68c68f167f152736c23224c675d697bec63f9af Mon Sep 17 00:00:00 2001 From: Kristofers Solo Date: Sat, 4 Jan 2025 20:10:16 +0200 Subject: [PATCH] feat(dev): add floor display --- Cargo.lock | 51 +++++-------------------------- Cargo.toml | 2 +- justfile | 2 +- src/constants.rs | 1 + src/dev_tools/ui/maze_controls.rs | 10 ++++++ src/floor/systems/clear_events.rs | 1 + 6 files changed, 21 insertions(+), 46 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 80fa240..0c917b4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2299,21 +2299,6 @@ dependencies = [ "libc", ] -[[package]] -name = "futures" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - [[package]] name = "futures-channel" version = "0.3.31" @@ -2321,7 +2306,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", - "futures-sink", ] [[package]] @@ -2330,17 +2314,6 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" -[[package]] -name = "futures-executor" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - [[package]] name = "futures-io" version = "0.3.31" @@ -2371,12 +2344,6 @@ dependencies = [ "syn", ] -[[package]] -name = "futures-sink" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" - [[package]] name = "futures-task" version = "0.3.31" @@ -2395,13 +2362,9 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ - "futures-channel", "futures-core", - "futures-io", "futures-macro", - "futures-sink", "futures-task", - "memchr", "pin-project-lite", "pin-utils", "slab", @@ -2675,9 +2638,9 @@ checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" [[package]] name = "hexlab" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd7c21f4e2c11d40473d1ae673905f4deae3b12104fa6d70eeef9ef385aceb6" +checksum = "7d2fbc6c41965686841aa5ea0e1af448730d0902274e49251c7d1fb7c78fffb9" dependencies = [ "bevy", "bevy_reflect", @@ -4168,21 +4131,21 @@ checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" [[package]] name = "rstest" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2c585be59b6b5dd66a9d2084aa1d8bd52fbdb806eafdeffb52791147862035" +checksum = "03e905296805ab93e13c1ec3a03f4b6c4f35e9498a3d5fa96dc626d22c03cd89" dependencies = [ - "futures", "futures-timer", + "futures-util", "rstest_macros", "rustc_version", ] [[package]] name = "rstest_macros" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "825ea780781b15345a146be27eaefb05085e337e869bff01b4306a4fd4a9ad5a" +checksum = "ef0053bbffce09062bee4bcc499b0fbe7a57b879f1efe088d6d8d4c7adcdef9b" dependencies = [ "cfg-if", "glob", diff --git a/Cargo.toml b/Cargo.toml index 51fdb63..5ca5609 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,7 +26,7 @@ anyhow = "1" strum = { version = "0.26", features = ["derive"] } [dev-dependencies] -rstest = "0.23" +rstest = "0.24" rstest_reuse = "0.7" test-log = { version = "0.2.16", default-features = false, features = [ "trace", diff --git a/justfile b/justfile index 2d1d43f..1af2c54 100644 --- a/justfile +++ b/justfile @@ -4,7 +4,7 @@ default: # Run native dev native-dev: - RUST_BACKTRACE=full cargo run + RUSTC_WRAPPER=sccache RUST_BACKTRACE=full cargo run # Run native release native-release: diff --git a/src/constants.rs b/src/constants.rs index 5e5fb5b..d603828 100644 --- a/src/constants.rs +++ b/src/constants.rs @@ -1,3 +1,4 @@ pub const MOVEMENT_THRESHOLD: f32 = 0.01; pub const WALL_OVERLAP_MODIFIER: f32 = 1.25; pub const FLOOR_Y_OFFSET: u8 = 100; +pub const MOVEMENT_COOLDOWN: f32 = 1.0; // one second cooldown diff --git a/src/dev_tools/ui/maze_controls.rs b/src/dev_tools/ui/maze_controls.rs index 6c94755..6f68b9a 100644 --- a/src/dev_tools/ui/maze_controls.rs +++ b/src/dev_tools/ui/maze_controls.rs @@ -40,6 +40,16 @@ pub fn maze_controls_ui(world: &mut World) { if let Some(mut global_config) = world.get_resource_mut::() { ui.heading("Maze Configuration"); + // Display current floor as non-editable text + ui.horizontal(|ui| { + ui.label("Current floor:"); + let mut floor_text = floor_value.to_string(); + ui.add_enabled( + false, + TextEdit::singleline(&mut floor_text).desired_width(10.), + ); + }); + changed |= add_seed_control(ui, &mut maze_config.seed); changed |= add_drag_value_control(ui, "Radius:", &mut maze_config.radius, 1.0, 1..=100); changed |= diff --git a/src/floor/systems/clear_events.rs b/src/floor/systems/clear_events.rs index e69de29..8b13789 100644 --- a/src/floor/systems/clear_events.rs +++ b/src/floor/systems/clear_events.rs @@ -0,0 +1 @@ +