randomize arrangement bg color

This commit is contained in:
🪞👃🪞 2024-10-18 20:05:38 +03:00
parent cd2a94d808
commit cc578b0b52
3 changed files with 20 additions and 5 deletions

View file

@ -33,7 +33,9 @@ pub struct Arrangement<E: Engine> {
/// Display mode of arranger /// Display mode of arranger
pub mode: ArrangementViewMode, pub mode: ArrangementViewMode,
/// Whether the arranger is currently focused /// Whether the arranger is currently focused
pub focused: bool pub focused: bool,
/// Background color of arrangement
pub color: Color,
} }
/// Represents a track in the arrangement /// Represents a track in the arrangement
pub struct ArrangementTrack<E: Engine> { pub struct ArrangementTrack<E: Engine> {
@ -149,7 +151,8 @@ impl<E: Engine> Arrangement<E> {
phrases: phrases.clone(), phrases: phrases.clone(),
scenes: vec![], scenes: vec![],
tracks: vec![], tracks: vec![],
focused: false focused: false,
color: Color::Rgb(28, 35, 25),
} }
} }
pub fn activate (&mut self) { pub fn activate (&mut self) {
@ -277,7 +280,7 @@ impl<E: Engine> Arrangement<E> {
} }
pub fn randomize_color (&mut self) { pub fn randomize_color (&mut self) {
match self.selected { match self.selected {
ArrangementFocus::Mix => {}, ArrangementFocus::Mix => { self.color = random_color_dark() },
ArrangementFocus::Track(t) => { self.tracks[t].color = random_color() }, ArrangementFocus::Track(t) => { self.tracks[t].color = random_color() },
ArrangementFocus::Scene(s) => { self.scenes[s].color = random_color() }, ArrangementFocus::Scene(s) => { self.scenes[s].color = random_color() },
ArrangementFocus::Clip(t, s) => if let Some(phrase) = &self.scenes[s].clips[t] { ArrangementFocus::Clip(t, s) => if let Some(phrase) = &self.scenes[s].clips[t] {

View file

@ -53,7 +53,7 @@ impl<'a> Content for VerticalArranger<'a, Tui> {
let tracks: &[ArrangementTrack<Tui>] = state.tracks.as_ref(); let tracks: &[ArrangementTrack<Tui>] = state.tracks.as_ref();
let scenes: &[Scene] = state.scenes.as_ref(); let scenes: &[Scene] = state.scenes.as_ref();
let offset = 3 + Scene::longest_name(scenes) as u16; // x of 1st track let offset = 3 + Scene::longest_name(scenes) as u16; // x of 1st track
let bg = Color::Rgb(28, 35, 25); let bg = state.color;
let clip_bg = Color::Rgb(40, 50, 30); let clip_bg = Color::Rgb(40, 50, 30);
let border_bg = Color::Rgb(40, 50, 30); let border_bg = Color::Rgb(40, 50, 30);
let border_hi = Color::Rgb(100, 110, 40); let border_hi = Color::Rgb(100, 110, 40);

View file

@ -36,11 +36,19 @@ tui_style!(WHITE_NOT_DIM_BOLD =
pub fn random_okhsl () -> Okhsl<f32> { pub fn random_okhsl () -> Okhsl<f32> {
let mut rng = thread_rng(); let mut rng = thread_rng();
UniformOkhsl::new( UniformOkhsl::new(
Okhsl::new(-180.0, 0.01, 0.1), Okhsl::new(-180.0, 0.01, 0.2),
Okhsl::new( 180.0, 0.9, 0.5), Okhsl::new( 180.0, 0.9, 0.5),
).sample(&mut rng) ).sample(&mut rng)
} }
pub fn random_okhsl_dark () -> Okhsl<f32> {
let mut rng = thread_rng();
UniformOkhsl::new(
Okhsl::new(-180.0, 0.01, 0.05),
Okhsl::new( 180.0, 0.5, 0.2),
).sample(&mut rng)
}
pub fn okhsl_to_rgb (color: Okhsl<f32>) -> Color { pub fn okhsl_to_rgb (color: Okhsl<f32>) -> Color {
let Srgb { red, green, blue, .. }: Srgb<f32> = Srgb::from_color_unclamped(color); let Srgb { red, green, blue, .. }: Srgb<f32> = Srgb::from_color_unclamped(color);
Color::Rgb((red * 255.0) as u8, (green * 255.0) as u8, (blue * 255.0) as u8,) Color::Rgb((red * 255.0) as u8, (green * 255.0) as u8, (blue * 255.0) as u8,)
@ -50,6 +58,10 @@ pub fn random_color () -> Color {
okhsl_to_rgb(random_okhsl()) okhsl_to_rgb(random_okhsl())
} }
pub fn random_color_dark () -> Color {
okhsl_to_rgb(random_okhsl_dark())
}
pub fn random_color_near (color: Color, distance: f32) -> Color { pub fn random_color_near (color: Color, distance: f32) -> Color {
let (r, g, b) = if let Color::Rgb(r, g, b) = color { let (r, g, b) = if let Color::Rgb(r, g, b) = color {
(r, g, b) (r, g, b)