note placement

Author: Ivan-1F

src/chart/beat.rs

@@ -1,11 +1,25 @@
-use std::{cmp::Ordering, ops::{Add, Sub}};
+use std::{
+    cmp::Ordering,
+    ops::{Add, Sub},
+};
 
 use num::{FromPrimitive, Rational32};
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Copy, Debug, Serialize, Deserialize)]
 pub struct Beat(i32, Rational32);
 
+impl Beat {
+    pub fn attach_to_beat_line(&mut self, density: u32) {
+        let original_fraction = self.1;
+        let target_denominator = density as i32;
+        let closest_numerator = (original_fraction.numer() * target_denominator
+            + original_fraction.denom() / 2)
+            / original_fraction.denom();
+        self.1 = Rational32::new(closest_numerator, target_denominator);
+    }
+}
+
 impl Beat {
     pub const ZERO: Self = Beat(0, Rational32::ZERO);
     pub const ONE: Self = Beat(1, Rational32::ZERO);
@@ -36,7 +50,7 @@ impl From<Rational32> for Beat {
 }
 
 impl Beat {
-    pub fn new(whole: i32, ratio: Rational32) -> Self{
+    pub fn new(whole: i32, ratio: Rational32) -> Self {
         Self(whole, ratio)
     }
 
@@ -86,7 +100,7 @@ impl PartialOrd for Beat {
         match self.0.partial_cmp(&other.0) {
             Some(core::cmp::Ordering::Equal) => self.1.partial_cmp(&other.1),
             ord => ord,
-        }        
+        }
     }
 }
 

src/editing/create_note.rs

@@ -0,0 +1,74 @@
+use bevy::prelude::*;
+
+use crate::{
+    chart::{
+        beat::Beat,
+        note::{Note, NoteBundle, NoteKind},
+    },
+    constants::CANVAS_WIDTH,
+    selection::SelectedLine,
+    tab::timeline::{Timeline, TimelineSettings, TimelineViewport},
+    timing::BpmList,
+};
+
+pub fn create_note_system(
+    mut commands: Commands,
+    timeline: Timeline,
+    keyboard: Res<ButtonInput<KeyCode>>,
+
+    selected_line: Res<SelectedLine>,
+
+    window_query: Query<&Window>,
+    bpm_list: Res<BpmList>,
+
+    timeline_viewport: Res<TimelineViewport>,
+    timeline_settings: Res<TimelineSettings>,
+) {
+    let window = window_query.single();
+    let Some(cursor_position) = window.cursor_position() else {
+        return;
+    };
+
+    let note_timeline_viewport = timeline_viewport.note_timeline_viewport();
+
+    if !note_timeline_viewport.contains(cursor_position) {
+        return;
+    }
+
+    let mut spawn_note = |kind: NoteKind| {
+        let time = timeline.y_to_time(cursor_position.y);
+        let mut beat = bpm_list.beat_at(time);
+        beat.attach_to_beat_line(timeline_settings.density);
+
+        let x = (cursor_position.x - note_timeline_viewport.min.x) / note_timeline_viewport.width()
+            - 0.5;
+
+        commands.entity(selected_line.0).with_children(|parent| {
+            parent.spawn(NoteBundle::new(Note::new(
+                kind,
+                true,
+                beat,
+                x * CANVAS_WIDTH,
+            )));
+        });
+    };
+
+    if keyboard.just_pressed(KeyCode::KeyQ) {
+        spawn_note(NoteKind::Tap);
+    }
+
+    if keyboard.just_pressed(KeyCode::KeyW) {
+        spawn_note(NoteKind::Drag);
+    }
+
+    if keyboard.just_pressed(KeyCode::KeyE) {
+        spawn_note(NoteKind::Flick);
+    }
+
+    if keyboard.just_pressed(KeyCode::KeyR) {
+        // TODO: make hold placement done with 2 `R` press
+        spawn_note(NoteKind::Hold {
+            hold_beat: Beat::ONE,
+        });
+    }
+}

src/editing/mod.rs

@@ -0,0 +1,15 @@
+use bevy::prelude::*;
+
+use crate::project::project_loaded;
+
+use self::create_note::create_note_system;
+
+mod create_note;
+
+pub struct EditingPlugin;
+
+impl Plugin for EditingPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_systems(Update, create_note_system.run_if(project_loaded()));
+    }
+}

src/main.rs

@@ -2,7 +2,9 @@ mod assets;
 mod audio;
 mod chart;
 mod constants;
+mod editing;
 mod exporter;
+mod file;
 mod hit_sound;
 mod home;
 mod loader;
@@ -15,14 +17,15 @@ mod serialzation;
 mod tab;
 mod timing;
 mod translation;
-mod file;
 
 use crate::assets::AssetsPlugin;
 use crate::audio::AudioPlugin;
 use crate::chart::event::LineEvent;
 use crate::chart::note::Note;
+use crate::editing::EditingPlugin;
 use crate::exporter::phichain::PhiChainExporter;
 use crate::exporter::Exporter;
+use crate::file::FilePickingPlugin;
 use crate::home::HomePlugin;
 use crate::misc::MiscPlugin;
 use crate::misc::WorkingDirectory;
@@ -49,7 +52,6 @@ use bevy_egui::egui::{Color32, Frame};
 use bevy_egui::{EguiContext, EguiPlugin};
 use bevy_mod_picking::prelude::*;
 use egui_dock::{DockArea, DockState, NodeIndex, Style};
-use file::FilePickingPlugin;
 
 fn main() {
     App::new()
@@ -68,6 +70,7 @@ fn main() {
         .add_plugins(crate::selection::SelectionPlugin)
         .add_plugins(MiscPlugin)
         .add_plugins(TabPlugin)
+        .add_plugins(EditingPlugin)
         .add_plugins(FrameTimeDiagnosticsPlugin::default())
         .add_plugins(AssetsPlugin)
         .add_plugins(TranslationPlugin)

src/tab/timeline.rs

@@ -1,5 +1,6 @@
 use bevy::{ecs::system::SystemParam, prelude::*};
 use egui::{Color32, Ui};
+use num::Rational32;
 use url::Url;
 
 use crate::{
@@ -205,14 +206,14 @@ impl TimelineViewport {
 #[derive(Resource)]
 pub struct TimelineSettings {
     pub zoom: f32,
-    pub density: f32,
+    pub density: u32,
 }
 
 impl Default for TimelineSettings {
     fn default() -> Self {
         Self {
             zoom: 2.0,
-            density: 4.0,
+            density: 4,
         }
     }
 }
@@ -243,7 +244,7 @@ impl<'w> Timeline<'w> {
 
         let interval = self
             .bpm_list
-            .time_at(Beat::from(1.0 / self.timeline_settings.density));
+            .time_at(Beat::new(0, Rational32::new(1, self.timeline_settings.density as i32)));
 
         std::iter::repeat(0)
             .take((audio_duration / interval).round() as usize)