wip: "multiple cascading refactors"

https://loglog.games/blog/leaving-rust-gamedev/#orphan-rule-should-be-optional is on point
This commit is contained in:
🪞👃🪞 2024-09-09 21:25:04 +03:00
parent 20afc397ea
commit fa8282a9d5
18 changed files with 175 additions and 222 deletions

View file

@ -1,6 +1,6 @@
use crate::*;
impl Sequencer {
impl Sequencer<Tui> {
const H_KEYS_OFFSET: usize = 5;
@ -43,15 +43,13 @@ const STYLE_VALUE: Option<Style> = Some(Style {
sub_modifier: Modifier::DIM,
});
struct SequenceName<'a>(&'a Sequencer);
struct SequenceName<'a>(&'a Sequencer<Tui>);
impl<'a> Layout<Tui> for SequenceName<'a> {
impl<'a> Widget for SequenceName<'a> {
type Engine = Tui;
fn layout (&self, area: [u16;4]) -> Perhaps<[u16;4]> {
todo!()
}
}
impl<'a> Render<Tui> for SequenceName<'a> {
fn render (&self, to: &mut Tui) -> Perhaps<[u16;4]> {
let [x, y, ..] = to.area();
let frame = [x, y, 10, 4];
@ -64,13 +62,11 @@ impl<'a> Render<Tui> for SequenceName<'a> {
struct SequenceRange;
impl Layout<Tui> for SequenceRange {
impl Widget for SequenceRange {
type Engine = Tui;
fn layout (&self, area: [u16;4]) -> Perhaps<[u16;4]> {
todo!()
}
}
impl<'a> Render<Tui> for SequenceRange {
fn render (&self, to: &mut Tui) -> Perhaps<[u16;4]> {
let [x, y, ..] = to.area();
let frame = [x, y, 10, 6];
@ -85,13 +81,11 @@ impl<'a> Render<Tui> for SequenceRange {
struct SequenceLoopRange;
impl Layout<Tui> for SequenceLoopRange {
impl Widget for SequenceLoopRange {
type Engine = Tui;
fn layout (&self, area: [u16;4]) -> Perhaps<[u16;4]> {
todo!()
}
}
impl<'a> Render<Tui> for SequenceLoopRange {
fn render (&self, to: &mut Tui) -> Perhaps<[u16;4]> {
let [x, y, ..] = to.area();
let range = [x, y, 10, 7];
@ -107,13 +101,11 @@ impl<'a> Render<Tui> for SequenceLoopRange {
struct SequenceNoteRange;
impl Layout<Tui> for SequenceNoteRange {
impl Widget for SequenceNoteRange {
type Engine = Tui;
fn layout (&self, area: [u16;4]) -> Perhaps<[u16;4]> {
todo!()
}
}
impl<'a> Render<Tui> for SequenceNoteRange {
fn render (&self, to: &mut Tui) -> Perhaps<[u16;4]> {
let [x, y, ..] = to.area();
let range = [x, y, 10, 9];
@ -129,15 +121,13 @@ impl<'a> Render<Tui> for SequenceNoteRange {
}
}
struct SequenceKeys<'a>(&'a Sequencer);
struct SequenceKeys<'a>(&'a Sequencer<Tui>);
impl<'a> Layout<Tui> for SequenceKeys<'a> {
impl<'a> Widget for SequenceKeys<'a> {
type Engine = Tui;
fn layout (&self, area: [u16;4]) -> Perhaps<[u16;4]> {
todo!()
}
}
impl<'a> Render<Tui> for SequenceKeys<'a> {
fn render (&self, to: &mut Tui) -> Perhaps<[u16;4]> {
let area = to.area();
if area.h() < 2 {
@ -154,15 +144,13 @@ impl<'a> Render<Tui> for SequenceKeys<'a> {
}
}
struct SequenceNotes<'a>(&'a Sequencer);
struct SequenceNotes<'a>(&'a Sequencer<Tui>);
impl<'a> Layout<Tui> for SequenceNotes<'a> {
impl<'a> Widget for SequenceNotes<'a> {
type Engine = Tui;
fn layout (&self, area: [u16;4]) -> Perhaps<[u16;4]> {
todo!()
}
}
impl<'a> Render<Tui> for SequenceNotes<'a> {
fn render (&self, to: &mut Tui) -> Perhaps<[u16;4]> {
let area = to.area();
if area.h() < 2 {
@ -189,15 +177,13 @@ impl<'a> Render<Tui> for SequenceNotes<'a> {
}
}
struct SequenceCursor<'a>(&'a Sequencer);
struct SequenceCursor<'a>(&'a Sequencer<Tui>);
impl<'a> Layout<Tui> for SequenceCursor<'a> {
impl<'a> Widget for SequenceCursor<'a> {
type Engine = Tui;
fn layout (&self, area: [u16;4]) -> Perhaps<[u16;4]> {
todo!()
}
}
impl<'a> Render<Tui> for SequenceCursor<'a> {
fn render (&self, to: &mut Tui) -> Perhaps<[u16;4]> {
let area = to.area();
if let (Some(time), Some(note)) = (self.0.time_axis.point, self.0.note_axis.point) {
@ -211,15 +197,13 @@ impl<'a> Render<Tui> for SequenceCursor<'a> {
}
}
struct SequenceZoom<'a>(&'a Sequencer);
struct SequenceZoom<'a>(&'a Sequencer<Tui>);
impl<'a> Layout<Tui> for SequenceZoom<'a> {
impl<'a> Widget for SequenceZoom<'a> {
type Engine = Tui;
fn layout (&self, area: [u16;4]) -> Perhaps<[u16;4]> {
todo!()
}
}
impl<'a> Render<Tui> for SequenceZoom<'a> {
fn render (&self, to: &mut Tui) -> Perhaps<[u16;4]> {
let area = to.area();
let quant = ppq_to_name(self.0.time_axis.scale);
@ -229,15 +213,13 @@ impl<'a> Render<Tui> for SequenceZoom<'a> {
}
}
struct SequenceTimer<'a>(&'a Sequencer, Arc<RwLock<Phrase>>);
struct SequenceTimer<'a>(&'a Sequencer<Tui>, Arc<RwLock<Phrase>>);
impl<'a> Layout<Tui> for SequenceTimer<'a> {
impl<'a> Widget for SequenceTimer<'a> {
type Engine = Tui;
fn layout (&self, area: [u16;4]) -> Perhaps<[u16;4]> {
todo!()
}
}
impl<'a> Render<Tui> for SequenceTimer<'a> {
fn render (&self, to: &mut Tui) -> Perhaps<[u16;4]> {
let area = to.area();
let phrase = self.1.read().unwrap();
@ -250,7 +232,7 @@ impl<'a> Render<Tui> for SequenceTimer<'a> {
for x in x2..x3 {
let step = (time0 + x2) * time_z;
let next_step = (time0 + x2 + 1) * time_z;
let style = Sequencer::style_timer_step(now, step as usize, next_step as usize);
let style = Sequencer::<Tui>::style_timer_step(now, step as usize, next_step as usize);
to.blit(&"-", x as u16, area.y(), Some(style))?;
}
return Ok(Some([area.x(), area.y(), area.w(), 1]))