Rename piano-math to piano-layout

Cargo.toml

@@ -1,6 +1,6 @@
 [workspace]
 members = [
-  "piano-math",
+  "piano-layout",
   "wgpu-jumpstart",
   "neothesia",
   "neothesia-cli",
@@ -30,7 +30,7 @@ neothesia-iced-widgets = { path = "./neothesia-iced-widgets" }
 
 midi-file = { path = "./midi-file" }
 midi-io = { path = "./midi-io" }
-piano-math = { path = "./piano-math" }
+piano-layout = { path = "./piano-layout" }
 nuon = { path = "./nuon" }
 
 profiling = "1.0"

neothesia-cli/Cargo.toml

@@ -10,7 +10,6 @@ build-ffmpeg = ["mpeg_encoder/build"]
 [dependencies]
 neothesia-core.workspace = true
 midi-file.workspace = true
-piano-math.workspace = true
 wgpu-jumpstart.workspace = true
 env_logger.workspace = true
 futures.workspace = true

neothesia-cli/src/main.rs

@@ -2,6 +2,7 @@ use std::{default::Default, time::Duration};
 
 use neothesia_core::{
     config::Config,
+    piano_layout,
     render::{GuidelineRenderer, KeyboardRenderer, QuadPipeline, TextRenderer, WaterfallRenderer},
 };
 use wgpu_jumpstart::{wgpu, Gpu, TransformUniform, Uniform};
@@ -26,13 +27,13 @@ struct Recorder {
 fn get_layout(
     width: f32,
     height: f32,
-    range: piano_math::KeyboardRange,
-) -> piano_math::KeyboardLayout {
+    range: piano_layout::KeyboardRange,
+) -> piano_layout::KeyboardLayout {
     let white_count = range.white_count();
     let neutral_width = width / white_count as f32;
     let neutral_height = height * 0.2;
 
-    piano_math::KeyboardLayout::from_range(neutral_width, neutral_height, range)
+    piano_layout::KeyboardLayout::from_range(neutral_width, neutral_height, range)
 }
 
 fn time_without_lead_in(playback: &midi_file::PlaybackState) -> f32 {
@@ -82,7 +83,7 @@ impl Recorder {
         let keyboard_layout = get_layout(
             width as f32,
             height as f32,
-            piano_math::KeyboardRange::new(config.piano_range()),
+            piano_layout::KeyboardRange::new(config.piano_range()),
         );
 
         let mut keyboard = KeyboardRenderer::new(keyboard_layout.clone());

neothesia-core/Cargo.toml

@@ -12,7 +12,7 @@ bytemuck.workspace = true
 wgpu.workspace = true
 glyphon.workspace = true
 wgpu-jumpstart.workspace = true
-piano-math.workspace = true
+piano-layout.workspace = true
 midi-file.workspace = true
 profiling.workspace = true
 euclid.workspace = true

neothesia-core/src/lib.rs

@@ -1,5 +1,6 @@
 #![allow(clippy::collapsible_match, clippy::single_match)]
 
+pub use piano_layout;
 pub use wgpu_jumpstart::{Color, Gpu, TransformUniform, Uniform};
 
 pub mod config;

neothesia-core/src/render/guidelines.rs

@@ -8,7 +8,7 @@ use crate::{
 pub struct GuidelineRenderer {
     pos: Point<f32>,
 
-    layout: piano_math::KeyboardLayout,
+    layout: piano_layout::KeyboardLayout,
     vertical_guidelines: bool,
     horizontal_guidelines: bool,
 
@@ -18,7 +18,7 @@ pub struct GuidelineRenderer {
 
 impl GuidelineRenderer {
     pub fn new(
-        layout: piano_math::KeyboardLayout,
+        layout: piano_layout::KeyboardLayout,
         pos: Point<f32>,
         vertical_guidelines: bool,
         horizontal_guidelines: bool,
@@ -39,7 +39,7 @@ impl GuidelineRenderer {
         self.cache.clear();
     }
 
-    pub fn set_layout(&mut self, layout: piano_math::KeyboardLayout) {
+    pub fn set_layout(&mut self, layout: piano_layout::KeyboardLayout) {
         self.layout = layout;
         self.cache.clear();
     }

neothesia-core/src/render/keyboard/key_state.rs

@@ -63,12 +63,12 @@ pub fn border_radius(w: f32, is_sharp: bool) -> f32 {
     radius * kind_multiplier
 }
 
-pub fn to_quad(key: &piano_math::Key, color: Color, origin: Point<f32>) -> QuadInstance {
+pub fn to_quad(key: &piano_layout::Key, color: Color, origin: Point<f32>) -> QuadInstance {
     let position = [origin.x + key.x(), origin.y];
 
     let mut size: Size<f32> = key.size().into();
 
-    if let piano_math::KeyKind::Neutral = key.kind() {
+    if let piano_layout::KeyKind::Neutral = key.kind() {
         size.width -= 1.0;
     }
 

neothesia-core/src/render/keyboard/mod.rs

@@ -3,7 +3,7 @@ use crate::{
     utils::Point,
 };
 
-use piano_math::range::KeyboardRange;
+use piano_layout::range::KeyboardRange;
 
 mod key_state;
 pub use key_state::KeyState;
@@ -15,14 +15,14 @@ pub struct KeyboardRenderer {
 
     key_states: Vec<KeyState>,
 
-    layout: piano_math::KeyboardLayout,
+    layout: piano_layout::KeyboardLayout,
 
     cache: Vec<QuadInstance>,
     text_cache: Vec<super::text::TextArea>,
 }
 
 impl KeyboardRenderer {
-    pub fn new(layout: piano_math::KeyboardLayout) -> Self {
+    pub fn new(layout: piano_layout::KeyboardLayout) -> Self {
         let key_states: Vec<KeyState> = layout
             .range
             .iter()
@@ -73,11 +73,11 @@ impl KeyboardRenderer {
         self.invalidate_cache();
     }
 
-    pub fn layout(&self) -> &piano_math::KeyboardLayout {
+    pub fn layout(&self) -> &piano_layout::KeyboardLayout {
         &self.layout
     }
 
-    pub fn set_layout(&mut self, layout: piano_math::KeyboardLayout) {
+    pub fn set_layout(&mut self, layout: piano_layout::KeyboardLayout) {
         self.layout = layout;
         self.invalidate_cache();
     }

neothesia-core/src/render/waterfall/mod.rs

@@ -21,7 +21,7 @@ impl WaterfallRenderer {
         hidden_tracks: &[usize],
         config: &Config,
         transform_uniform: &Uniform<TransformUniform>,
-        layout: piano_math::KeyboardLayout,
+        layout: piano_layout::KeyboardLayout,
     ) -> Self {
         let mut notes: Vec<_> = tracks
             .iter()
@@ -52,7 +52,7 @@ impl WaterfallRenderer {
         device: &wgpu::Device,
         queue: &wgpu::Queue,
         config: &Config,
-        layout: piano_math::KeyboardLayout,
+        layout: piano_layout::KeyboardLayout,
     ) {
         let range_start = layout.range.start() as usize;
 

neothesia-iced-widgets/Cargo.toml

@@ -9,4 +9,4 @@ iced_core.workspace = true
 iced_wgpu.workspace = true
 iced_widget.workspace = true
 
-piano-math = { workspace = true }
+piano-layout = { workspace = true }

neothesia-iced-widgets/src/piano_range.rs

@@ -38,14 +38,14 @@ impl<M, R: iced_core::Renderer> Widget<M, Theme, R> for PianoRange {
     ) {
         let bounds = layout.bounds();
         renderer.with_translation(Vector::new(bounds.x, bounds.y), |renderer| {
-            let range = piano_math::KeyboardRange::new(self.0.clone());
+            let range = piano_layout::KeyboardRange::new(self.0.clone());
 
             let white_count = range.white_count();
             let neutral_width = bounds.width / white_count as f32;
             let neutral_height = bounds.height;
 
             let layout =
-                piano_math::KeyboardLayout::from_range(neutral_width, neutral_height, range);
+                piano_layout::KeyboardLayout::from_range(neutral_width, neutral_height, range);
 
             let mut neutral = layout
                 .keys

neothesia/Cargo.toml

@@ -21,7 +21,6 @@ wgpu.workspace = true
 wgpu-jumpstart.workspace = true
 neothesia-core.workspace = true
 neothesia-iced-widgets.workspace = true
-piano-math.workspace = true
 midi-file.workspace = true
 midi-io.workspace = true
 nuon.workspace = true

neothesia/src/scene/playing_scene/keyboard.rs

@@ -1,9 +1,10 @@
 use midi_file::midly::MidiMessage;
 use neothesia_core::{
+    piano_layout,
     render::{QuadPipeline, TextRenderer},
     utils::Point,
 };
-use piano_math::KeyboardRange;
+use piano_layout::KeyboardRange;
 
 use crate::{config::Config, context::Context, render::KeyboardRenderer, song::SongConfig};
 
@@ -15,21 +16,21 @@ pub struct Keyboard {
 fn get_layout(
     width: f32,
     height: f32,
-    range: piano_math::KeyboardRange,
-) -> piano_math::KeyboardLayout {
+    range: piano_layout::KeyboardRange,
+) -> piano_layout::KeyboardLayout {
     let white_count = range.white_count();
     let neutral_width = width / white_count as f32;
     let neutral_height = height * 0.2;
 
-    piano_math::KeyboardLayout::from_range(neutral_width, neutral_height, range)
+    piano_layout::KeyboardLayout::from_range(neutral_width, neutral_height, range)
 }
 
 impl Keyboard {
     pub fn new(ctx: &Context, song_config: SongConfig) -> Self {
         let layout = get_layout(
             ctx.window_state.logical_size.width,
             ctx.window_state.logical_size.height,
-            piano_math::KeyboardRange::new(ctx.config.piano_range()),
+            piano_layout::KeyboardRange::new(ctx.config.piano_range()),
         );
 
         let mut renderer = KeyboardRenderer::new(layout);
@@ -41,11 +42,11 @@ impl Keyboard {
         }
     }
 
-    pub fn layout(&self) -> &piano_math::KeyboardLayout {
+    pub fn layout(&self) -> &piano_layout::KeyboardLayout {
         self.renderer.layout()
     }
 
-    fn set_layout(&mut self, layout: piano_math::KeyboardLayout) {
+    fn set_layout(&mut self, layout: piano_layout::KeyboardLayout) {
         self.renderer.set_layout(layout)
     }
 

neothesia/src/scene/playing_scene/midi_player.rs

@@ -4,6 +4,7 @@ use crate::{
     output_manager::OutputConnection,
     song::{PlayerConfig, Song},
 };
+use neothesia_core::piano_layout;
 use std::{
     collections::{HashMap, HashSet},
     time::{Duration, Instant},
@@ -20,7 +21,7 @@ impl MidiPlayer {
     pub fn new(
         output: OutputConnection,
         song: Song,
-        user_keyboard_range: piano_math::KeyboardRange,
+        user_keyboard_range: piano_layout::KeyboardRange,
     ) -> Self {
         let mut player = Self {
             playback: midi_file::PlaybackState::new(
@@ -245,7 +246,7 @@ struct NotePress {
 
 #[derive(Debug)]
 pub struct PlayAlong {
-    user_keyboard_range: piano_math::KeyboardRange,
+    user_keyboard_range: piano_layout::KeyboardRange,
 
     /// Notes required to proggres further in the song
     required_notes: HashMap<NoteId, NotePress>,
@@ -259,7 +260,7 @@ pub struct PlayAlong {
 }
 
 impl PlayAlong {
-    fn new(user_keyboard_range: piano_math::KeyboardRange) -> Self {
+    fn new(user_keyboard_range: piano_layout::KeyboardRange) -> Self {
         Self {
             user_keyboard_range,
             required_notes: Default::default(),

piano-math/Cargo.toml → piano-layout/Cargo.toml

@@ -1,4 +1,4 @@
 [package]
-name = "piano-math"
+name = "piano-layout"
 version = "0.1.0"
 edition = "2021"

piano-layout/README.md

@@ -0,0 +1 @@
+Piano layout calculations crate