From 3637346c1ab5826e069664772be95e46715ae529 Mon Sep 17 00:00:00 2001 From: Funnisimo Date: Tue, 23 Aug 2022 10:01:13 -0500 Subject: [PATCH 1/3] export colors mods separately to aid precise imports --- bracket-color/Cargo.toml | 6 +++--- bracket-color/examples/util/mod.rs | 2 +- bracket-color/src/lib.rs | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/bracket-color/Cargo.toml b/bracket-color/Cargo.toml index 3c5122c0..564d5439 100755 --- a/bracket-color/Cargo.toml +++ b/bracket-color/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bracket-color" -version = "0.8.2" +version = "0.8.3" authors = ["Herbert Wolverson "] edition = "2018" publish = true @@ -17,13 +17,13 @@ palette = [ "lazy_static", "parking_lot" ] [dependencies] serde = { version = "~1.0.110", features = ["derive"], optional = true } -crossterm = { version = "~0.24", optional = true } +crossterm = { version = "~0.25", optional = true } lazy_static = { version = "1.4.0", optional = true } parking_lot = { version = "~0.12", optional = true } bevy = { version = "0.8", optional = true } [dev-dependencies] -crossterm = "~0.24" +crossterm = "~0.25" [[example]] name = "colors" diff --git a/bracket-color/examples/util/mod.rs b/bracket-color/examples/util/mod.rs index cafaf439..b620f9ed 100755 --- a/bracket-color/examples/util/mod.rs +++ b/bracket-color/examples/util/mod.rs @@ -2,7 +2,7 @@ use bracket_color::prelude::*; use crossterm::queue; use crossterm::style::{Print, SetForegroundColor}; use std::convert::TryInto; -use std::io::{stdout, Write}; +use std::io::stdout; pub fn print_color(color: RGB, text: &str) { queue!(stdout(), SetForegroundColor(color.try_into().unwrap())).expect("Command Fail"); diff --git a/bracket-color/src/lib.rs b/bracket-color/src/lib.rs index ab9a0908..84721e17 100755 --- a/bracket-color/src/lib.rs +++ b/bracket-color/src/lib.rs @@ -31,20 +31,20 @@ extern crate lazy_static; /// Import color pair support -mod color_pair; +pub mod color_pair; /// Import HSV color support -mod hsv; +pub mod hsv; /// Import Lerp as an iterator -mod lerpit; +pub mod lerpit; /// Import library of named colors -mod named; +pub mod named; /// Import Palette support #[cfg(feature = "palette")] -mod palette; +pub mod palette; /// Import RGB color support -mod rgb; +pub mod rgb; /// Import RGBA color support -mod rgba; +pub mod rgba; /// Exports the color functions/types in the `prelude` namespace. pub mod prelude { From f74a2a81be46803889adebfe7c6a3edad9c8ced9 Mon Sep 17 00:00:00 2001 From: Funnisimo Date: Tue, 23 Aug 2022 10:02:40 -0500 Subject: [PATCH 2/3] use updated bracket-color --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 992aa165..c1bc8267 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,7 +36,7 @@ webgpu = [ "bracket-terminal/webgpu" ] [dependencies] bracket-algorithm-traits = { path = "./bracket-algorithm-traits", version = "~0.8.2" } -bracket-color = { path = "./bracket-color", version = "~0.8.2", features = [ "palette" ] } +bracket-color = { path = "./bracket-color", version = "~0.8.3", features = [ "palette" ] } bracket-geometry = { path = "./bracket-geometry", version = "~0.8.2" } bracket-noise = { path = "./bracket-noise", version = "~0.8.2" } bracket-pathfinding = { path = "./bracket-pathfinding", version = "~0.8.2" } From 0f50614149a05260c0c312bf2561b01f73572be6 Mon Sep 17 00:00:00 2001 From: Funnisimo Date: Mon, 24 Oct 2022 11:12:15 -0500 Subject: [PATCH 3/3] added mouse_changed bool --- bracket-terminal/src/bterm.rs | 3 +++ bracket-terminal/src/hal/crossterm_be/init.rs | 1 + bracket-terminal/src/hal/crossterm_be/main_loop.rs | 1 + bracket-terminal/src/hal/curses/init.rs | 1 + bracket-terminal/src/hal/curses/main_loop.rs | 1 + bracket-terminal/src/hal/native/init.rs | 1 + bracket-terminal/src/hal/native/mainloop.rs | 1 + bracket-terminal/src/hal/wasm/init.rs | 1 + bracket-terminal/src/hal/wasm/mainloop.rs | 1 + bracket-terminal/src/hal/webgpu/init.rs | 1 + bracket-terminal/src/hal/webgpu/mainloop.rs | 1 + 11 files changed, 13 insertions(+) diff --git a/bracket-terminal/src/bterm.rs b/bracket-terminal/src/bterm.rs index e7af4efb..c31f0c14 100755 --- a/bracket-terminal/src/bterm.rs +++ b/bracket-terminal/src/bterm.rs @@ -70,6 +70,7 @@ pub struct BTerm { pub key: Option, pub mouse_pos: (i32, i32), pub left_click: bool, + pub mouse_changed: bool, pub shift: bool, pub control: bool, pub alt: bool, @@ -357,6 +358,7 @@ impl BTerm { if button_num == 0 { self.left_click = true; } + self.mouse_changed = true; let mut input = INPUT.lock(); if pressed { input.on_mouse_button_down(button_num); @@ -372,6 +374,7 @@ impl BTerm { /// Internal: mark mouse position changes pub(crate) fn on_mouse_position(&mut self, x: f64, y: f64) { let bi = BACKEND_INTERNAL.lock(); + self.mouse_changed = true; self.mouse_pos = (x as i32, y as i32); let mut input = INPUT.lock(); input.on_mouse_pixel_position(x, y); diff --git a/bracket-terminal/src/hal/crossterm_be/init.rs b/bracket-terminal/src/hal/crossterm_be/init.rs index 9a235574..6b304b1d 100755 --- a/bracket-terminal/src/hal/crossterm_be/init.rs +++ b/bracket-terminal/src/hal/crossterm_be/init.rs @@ -37,6 +37,7 @@ pub fn init_raw( frame_time_ms: 0.0, active_console: 0, key: None, + mouse_changed: false, mouse_pos: (0, 0), left_click: false, shift: false, diff --git a/bracket-terminal/src/hal/crossterm_be/main_loop.rs b/bracket-terminal/src/hal/crossterm_be/main_loop.rs index 94444252..d751862b 100755 --- a/bracket-terminal/src/hal/crossterm_be/main_loop.rs +++ b/bracket-terminal/src/hal/crossterm_be/main_loop.rs @@ -131,6 +131,7 @@ pub fn main_loop(mut bterm: BTerm, mut gamestate: GS) -> BResult< } gamestate.tick(&mut bterm); + bterm.mouse_changed = true; if output_buffer.is_none() { output_buffer = Some(full_redraw()?); diff --git a/bracket-terminal/src/hal/curses/init.rs b/bracket-terminal/src/hal/curses/init.rs index b80abc74..795d927b 100755 --- a/bracket-terminal/src/hal/curses/init.rs +++ b/bracket-terminal/src/hal/curses/init.rs @@ -47,6 +47,7 @@ pub fn init_raw( frame_time_ms: 0.0, active_console: 0, key: None, + mouse_changed: false, mouse_pos: (0, 0), left_click: false, shift: false, diff --git a/bracket-terminal/src/hal/curses/main_loop.rs b/bracket-terminal/src/hal/curses/main_loop.rs index 68b37a00..106bf947 100755 --- a/bracket-terminal/src/hal/curses/main_loop.rs +++ b/bracket-terminal/src/hal/curses/main_loop.rs @@ -135,6 +135,7 @@ pub fn main_loop(mut bterm: BTerm, mut gamestate: GS) -> BResult< } gamestate.tick(&mut bterm); + bterm.mouse_changed = true; if output_buffer.is_none() { output_buffer = Some(full_redraw()?); diff --git a/bracket-terminal/src/hal/native/init.rs b/bracket-terminal/src/hal/native/init.rs index 51e05f76..32e9065c 100755 --- a/bracket-terminal/src/hal/native/init.rs +++ b/bracket-terminal/src/hal/native/init.rs @@ -126,6 +126,7 @@ pub fn init_raw( frame_time_ms: 0.0, active_console: 0, key: None, + mouse_changed: false, mouse_pos: (0, 0), left_click: false, shift: false, diff --git a/bracket-terminal/src/hal/native/mainloop.rs b/bracket-terminal/src/hal/native/mainloop.rs index eabc0b50..9436e401 100755 --- a/bracket-terminal/src/hal/native/mainloop.rs +++ b/bracket-terminal/src/hal/native/mainloop.rs @@ -375,6 +375,7 @@ fn tock( // Run the main loop gamestate.tick(bterm); + bterm.mouse_changed = false; // Tell each console to draw itself render_consoles().unwrap(); diff --git a/bracket-terminal/src/hal/wasm/init.rs b/bracket-terminal/src/hal/wasm/init.rs index 26f86451..f01db6f1 100755 --- a/bracket-terminal/src/hal/wasm/init.rs +++ b/bracket-terminal/src/hal/wasm/init.rs @@ -91,6 +91,7 @@ pub fn init_raw( frame_time_ms: 0.0, active_console: 0, key: None, + mouse_changed: false, mouse_pos: (0, 0), left_click: false, shift: false, diff --git a/bracket-terminal/src/hal/wasm/mainloop.rs b/bracket-terminal/src/hal/wasm/mainloop.rs index cba33a38..fbf8ee0f 100755 --- a/bracket-terminal/src/hal/wasm/mainloop.rs +++ b/bracket-terminal/src/hal/wasm/mainloop.rs @@ -107,6 +107,7 @@ fn tock( } gamestate.tick(bterm); + bterm.mouse_changed = false; // Console structure - doesn't really have to be every frame... rebuild_consoles(); diff --git a/bracket-terminal/src/hal/webgpu/init.rs b/bracket-terminal/src/hal/webgpu/init.rs index 095ea868..d3a29717 100644 --- a/bracket-terminal/src/hal/webgpu/init.rs +++ b/bracket-terminal/src/hal/webgpu/init.rs @@ -92,6 +92,7 @@ pub fn init_raw( frame_time_ms: 0.0, active_console: 0, key: None, + mouse_changed: false, mouse_pos: (0, 0), left_click: false, shift: false, diff --git a/bracket-terminal/src/hal/webgpu/mainloop.rs b/bracket-terminal/src/hal/webgpu/mainloop.rs index 8cbfb9ce..5f5f6f96 100644 --- a/bracket-terminal/src/hal/webgpu/mainloop.rs +++ b/bracket-terminal/src/hal/webgpu/mainloop.rs @@ -349,6 +349,7 @@ fn tock( // Run the main loop gamestate.tick(bterm); + bterm.mouse_changed = false; // Tell each console to draw itself render_consoles().unwrap();