tweak preset settings

yjpark · yjpark · commit 9c95d64fccba · 2022-01-14T20:41:34.000+08:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/apps/notation_kb/Cargo.toml b/apps/notation_kb/Cargo.toml
@@ -22,3 +22,4 @@ dev = [
 
 [dependencies]
 notation_bevy = { path = "../../crates/notation_bevy" }
+notation_viewer = { path = "../notation_viewer" }
diff --git a/apps/notation_kb/src/index_panel.rs b/apps/notation_kb/src/index_panel.rs
@@ -119,17 +119,19 @@ impl IndexPanel {
         state: Res<NotationState>,
         mut theme: ResMut<NotationTheme>,
         mut settings: ResMut<NotationSettings>,
-        index: Res<IndexPanel>,
+        _index: Res<IndexPanel>,
     ) {
+        if !state.show_kb {
+            return;
+        }
         theme.sizes.melody.note_height = 8.0;
         theme.sizes.melody.semitone_height = 8.0;
         theme.texts.melody.text_y = -18.0;
-        settings.add_ready_section = false;
         settings.hide_mini_map = true;
         settings.hide_bar_number = true;
         settings.layout.focus_bar_ease_ms = 0;
+        settings.show_melody_pitch = true;
         settings.show_melody_syllable = true;
-        settings.show_syllable_as_pitch = true;
         if state.window_width > 0.0 && state.window_height > 0.0 {
             if state.window_width > state.window_height {
                 let width = state.window_width / 3.0 + theme.sizes.layout.page_margin;
diff --git a/apps/notation_kb/src/kb.rs b/apps/notation_kb/src/kb.rs
@@ -4,6 +4,7 @@ use notation_bevy::bevy::prelude::*;
 use notation_bevy::prelude::*;
 
 use crate::index_panel::IndexPanel;
+use notation_viewer::viewer::NotationViewer;
 
 pub struct NotationKnowledgeBase();
 
@@ -21,6 +22,9 @@ impl NotationKnowledgeBase {
                 .with_system(IndexPanel::index_ui)
                 .with_system(IndexPanel::index_audio)
                 .with_system(IndexPanel::handle_link_evts)
+                .with_system(NotationViewer::handle_keyboard_inputs)
+                .with_system(NotationViewer::handle_mouse_inputs)
+                .with_system(NotationViewer::handle_touch_inputs)
                 .with_system(Self::load_tab)
                 .with_system(Self::on_window_resized)
         );
@@ -39,12 +43,13 @@ impl NotationKnowledgeBase {
         mut windows: ResMut<Windows>,
         mut state: ResMut<NotationState>,
         mut theme: ResMut<NotationTheme>,
-        settings: Res<NotationSettings>,
+        mut settings: ResMut<NotationSettings>,
         mut evts: EventWriter<AddTabEvent>,
         entities: Query<Entity, With<GlobalTransform>>,
         viewer_query: Query<(Entity, &TabViewer), With<TabViewer>>,
         index: Res<IndexPanel>,
     ) {
+        settings.add_ready_section = false;
         NotationApp::load_tab(&mut commands, &time, &mut windows, &mut state, &mut theme, &settings, &mut evts, &entities, &viewer_query, |tab_path| {
             Some(TabAsset::from(index.make_tab(tab_path)))
         })
diff --git a/apps/notation_kb/src/theory/scale.rs b/apps/notation_kb/src/theory/scale.rs
@@ -137,7 +137,7 @@ impl ScalePage {
             new_bar(8),
             new_bar(12),
         ];
-        let section = ProtoSection::new("notes".to_owned(), SectionKind::Ready, bars);
+        let section = ProtoSection::new("notes".to_owned(), SectionKind::Verse, bars);
         ProtoTab::new(
             ProtoTab::new_uuid().as_str(),
             meta,
diff --git a/apps/notation_viewer/src/viewer.rs b/apps/notation_viewer/src/viewer.rs
@@ -47,7 +47,7 @@ impl NotationViewer {
             NotationApp::load_tab_from_assets(&asset_server, &assets, tab_path)
         })
     }
-    fn handle_keyboard_inputs(
+    pub fn handle_keyboard_inputs(
         keyboard_input: Res<Input<KeyCode>>,
         egui_ctx: Res<EguiContext>,
         mut app_state: ResMut<NotationState>,
@@ -111,7 +111,7 @@ impl NotationViewer {
         } else if keyboard_input.just_released(KeyCode::M) {
             Control::toggle_show_melody_syllable(&mut app_state, &mut settings, &mut theme);
         } else if keyboard_input.just_released(KeyCode::P) {
-            Control::toggle_show_syllable_as_pitch(&mut app_state, &mut settings, &mut theme);
+            Control::toggle_show_melody_pitch(&mut app_state, &mut settings, &mut theme);
         } else if keyboard_input.just_released(KeyCode::F) {
             Control::toggle_always_show_fret(&mut app_state, &mut settings, &mut theme);
         } else if keyboard_input.just_released(KeyCode::L) {
@@ -139,7 +139,7 @@ impl NotationViewer {
         }
     }
 
-    fn handle_mouse_inputs(
+    pub fn handle_mouse_inputs(
         windows: Res<Windows>,
         mouse_input: Res<Input<MouseButton>>,
         egui_ctx: Res<EguiContext>,
@@ -193,7 +193,7 @@ impl NotationViewer {
         }
     }
 
-    fn handle_touch_inputs(
+    pub fn handle_touch_inputs(
         windows: Res<Windows>,
         touch_input: Res<Touches>,
         egui_ctx: Res<EguiContext>,
diff --git a/crates/notation_bevy/src/guitar/fret_finger.rs b/crates/notation_bevy/src/guitar/fret_finger.rs
@@ -8,7 +8,6 @@ use notation_model::prelude::{
 
 use crate::chord::chord_note::{ChordNoteData, ChordNoteExtra, ChordNoteValue};
 use crate::prelude::{NotationAssets, NotationSettings, NotationTheme};
-use crate::theme::theme_texts::MelodyTexts;
 
 #[derive(Clone, Debug)]
 pub struct FretFingerExtra {
@@ -179,7 +178,7 @@ impl FretFingerData {
         }
         if settings.show_guitar_syllable && self.value.extra.fret.is_some() {
             let syllable = self.value.calc_syllable();
-            theme.guitar.syllable_text.spawn_scaled_syllable_text(
+            theme.guitar.syllable_text.spawn_scaled_note_text(
                 commands,
                 entity,
                 assets,
diff --git a/crates/notation_bevy/src/notation/control.rs b/crates/notation_bevy/src/notation/control.rs
@@ -10,6 +10,11 @@ pub struct Control();
 
 impl Control {
     pub const PRESET_GUITAR_STRINGS: &'static str = "guitar_strings";
+    pub const PRESET_MELODY: &'static str = "melody";
+    pub const ALL_PRESETS: [&'static str ; 2 ] = [
+        Self::PRESET_GUITAR_STRINGS,
+        Self::PRESET_MELODY,
+    ];
 
     pub fn reload_tab(state: &mut NotationState, theme: &mut NotationTheme) {
         state.reload_tab();
@@ -67,12 +72,12 @@ impl Control {
         settings.show_melody_syllable = !settings.show_melody_syllable;
         Self::reload_tab(state, theme);
     }
-    pub fn toggle_show_syllable_as_pitch(
+    pub fn toggle_show_melody_pitch(
         state: &mut NotationState,
         settings: &mut NotationSettings,
         theme: &mut NotationTheme,
     ) {
-        settings.show_syllable_as_pitch = !settings.show_syllable_as_pitch;
+        settings.show_melody_pitch = !settings.show_melody_pitch;
         Self::reload_tab(state, theme);
     }
     pub fn toggle_always_show_fret(
@@ -105,26 +110,37 @@ impl Control {
         _window_resized_evts: &mut EventWriter<WindowResizedEvent>,
         preset: &'static str,
     ) {
+        state.show_kb = false;
+        state.preset = Some(preset.to_owned());
+        #[cfg(not(target_arch = "wasm32"))]
+        Self::set_primary_window_size(windows, 1080, 1920);
         match preset {
             Self::PRESET_GUITAR_STRINGS => {
-                state.preset = Some(preset.to_owned());
-                settings.add_ready_section = false;
-                settings.hide_indicators = true;
-                settings.hide_guitar_view = true;
-                settings.hide_chords_view = true;
-                settings.hide_shapes_lane = true;
+                settings.hack_for_screenshot();
+                settings.hide_strings_lane = false;
                 settings.always_show_fret = true;
-                settings.override_beat_size = Some(128.0);
+                theme.sizes.layout.page_margin = 24.0;
                 theme.sizes.strings.string_space = 20.0;
                 theme.sizes.strings.note_height = 9.0;
                 theme.texts.strings.fret_font_size = 20.0;
                 theme.texts.strings.text_y = 8.0;
+            },
+            Self::PRESET_MELODY => {
+                settings.hack_for_screenshot();
+                settings.hide_melody_lane = false;
+                settings.show_melody_pitch = true;
+                settings.show_melody_syllable = true;
+                settings.show_syllable_as_num = true;
                 theme.sizes.layout.page_margin = 24.0;
-                #[cfg(not(target_arch = "wasm32"))]
-                Self::set_primary_window_size(windows, 1080, 1920);
-                Self::reload_tab(state, theme);
+                theme.sizes.melody.note_height = 9.0;
+                theme.sizes.melody.semitone_height = 9.0;
+                theme.texts.melody.text_y = -18.0;
+                theme.texts.melody.syllable_font_size = 20.0;
+            },
+            _ => {
+                println!("Control::set_preset() Invalid Preset: {}", preset);
             },
-            _ => {},
         }
+        Self::reload_tab(state, theme);
     }
 }
diff --git a/crates/notation_bevy/src/notation/control_panel.rs b/crates/notation_bevy/src/notation/control_panel.rs
@@ -191,19 +191,19 @@ impl ControlPanel {
                 if show_guitar_syllable != settings.show_guitar_syllable {
                     Control::reload_tab(state, theme);
                 }
+                let show_melody_pitch = settings.show_melody_pitch;
+                ui.checkbox(
+                    &mut settings.show_melody_pitch,
+                    "Show Melody Pitch",
+                );
+                if show_melody_pitch != settings.show_melody_pitch {
+                    Control::reload_tab(state, theme);
+                }
                 let show_melody_syllable = settings.show_melody_syllable;
                 ui.checkbox(&mut settings.show_melody_syllable, "Show Melody Syllable");
                 if show_melody_syllable != settings.show_melody_syllable {
                     Control::reload_tab(state, theme);
                 }
-                let show_syllable_as_pitch = settings.show_syllable_as_pitch;
-                ui.checkbox(
-                    &mut settings.show_syllable_as_pitch,
-                    "Show Syllable as Pitches",
-                );
-                if show_syllable_as_pitch != settings.show_syllable_as_pitch {
-                    Control::reload_tab(state, theme);
-                }
                 let show_syllable_as_num = settings.show_syllable_as_num;
                 ui.checkbox(
                     &mut settings.show_syllable_as_num,
@@ -631,11 +631,11 @@ impl ControlPanel {
         ))
         .default_open(true)
         .show(ui, |ui| {
-            ui.horizontal(|ui| {
-                if ui.button(Control::PRESET_GUITAR_STRINGS).clicked() {
-                    Control::set_preset(state, settings, theme, windows, window_resized_evts, Control::PRESET_GUITAR_STRINGS);
+            for preset in Control::ALL_PRESETS.iter() {
+                if ui.button(*preset).clicked() {
+                    Control::set_preset(state, settings, theme, windows, window_resized_evts, *preset);
                 }
-            });
+            }
         });
     }
     pub fn control_ui(
@@ -697,8 +697,6 @@ impl ControlPanel {
                             );
                             Self::display_ui(ui, &mut state, &mut settings, &mut theme);
                             ui.separator();
-                            Self::presets_ui(ui, &mut state, &mut settings, &mut theme, &mut windows, &mut window_resized_evts);
-                            ui.separator();
                             Self::layout_ui(ui, &mut state, &mut settings, &mut theme);
                             Self::overrides_ui(
                                 ui,
@@ -737,6 +735,8 @@ impl ControlPanel {
                                 *theme = NotationTheme::default();
                                 Control::reload_tab(&mut state, &mut theme);
                             }
+                            ui.separator();
+                            Self::presets_ui(ui, &mut state, &mut settings, &mut theme, &mut windows, &mut window_resized_evts);
                         });
                     });
                 });
diff --git a/crates/notation_bevy/src/notation/ui.rs b/crates/notation_bevy/src/notation/ui.rs
@@ -1,6 +1,6 @@
 //use bevy::app::StartupStage;
 use bevy::prelude::*;
-use bevy_egui::{EguiContext, EguiSettings};
+use bevy_egui::{EguiSettings};
 
 use crate::prelude::{NotationState};
 
diff --git a/crates/notation_bevy/src/settings/notation_settings.rs b/crates/notation_bevy/src/settings/notation_settings.rs
@@ -15,8 +15,8 @@ pub struct NotationSettings {
     pub hide_bar_number: bool,
     pub hide_indicators: bool,
     pub show_guitar_syllable: bool,
+    pub show_melody_pitch: bool,
     pub show_melody_syllable: bool,
-    pub show_syllable_as_pitch: bool,
     pub show_syllable_as_num: bool,
     pub always_show_fret: bool,
     pub melody_piano_mode: bool,
@@ -45,8 +45,8 @@ impl Default for NotationSettings {
             hide_bar_number: false,
             hide_indicators: false,
             show_guitar_syllable: true,
+            show_melody_pitch: false,
             show_melody_syllable: true,
-            show_syllable_as_pitch: false,
             show_syllable_as_num: true,
             always_show_fret: false,
             melody_piano_mode: false,
@@ -66,3 +66,24 @@ impl Default for NotationSettings {
         }
     }
 }
+
+impl NotationSettings {
+    pub fn show_melody_note(&self) -> bool {
+        self.show_melody_pitch || self.show_melody_syllable
+    }
+    pub fn hide_all_lanes(&mut self) {
+        self.hide_shapes_lane = true;
+        self.hide_strings_lane = true;
+        self.hide_melody_lane = true;
+        self.hide_lyrics_lane = true;
+    }
+    pub fn hack_for_screenshot(&mut self) {
+        self.add_ready_section = false;
+        self.hide_indicators = true;
+        self.hide_guitar_view = true;
+        self.hide_chords_view = true;
+        self.hide_mini_map = false;
+        self.override_beat_size = Some(128.0);
+        self.hide_all_lanes();
+    }
+}
diff --git a/crates/notation_bevy/src/theme/theme_texts.rs b/crates/notation_bevy/src/theme/theme_texts.rs
@@ -220,7 +220,7 @@ impl Default for MelodyTexts {
     }
 }
 impl MelodyTexts {
-    pub fn spawn_syllable_text(
+    pub fn spawn_note_text(
         &self,
         commands: &mut Commands,
         entity: Entity,
@@ -230,9 +230,9 @@ impl MelodyTexts {
         key: &Key,
         syllable: &Syllable,
     ) {
-        self.spawn_scaled_syllable_text(commands, entity, assets, settings, scale, key, syllable, 1.0);
+        self.spawn_scaled_note_text(commands, entity, assets, settings, scale, key, syllable, 1.0);
     }
-    pub fn spawn_scaled_syllable_text(
+    pub fn spawn_scaled_note_text(
         &self,
         commands: &mut Commands,
         entity: Entity,
@@ -268,13 +268,25 @@ impl MelodyTexts {
         key: &Key,
         syllable: &Syllable,
     ) -> String {
-        if settings.show_syllable_as_pitch {
-            scale.calc_pitch(key, syllable).to_text()
-        } else if settings.show_syllable_as_num {
-            syllable.to_text()
+        let pitch_text = if settings.show_melody_pitch {
+            Some(scale.calc_pitch(key, syllable).to_text())
         } else {
-            syllable.to_ident()
-        }
+            None
+        };
+        let syllable_text = if settings.show_melody_syllable {
+            Some(if settings.show_syllable_as_num {
+                syllable.to_text()
+            } else {
+                syllable.to_ident()
+            })
+        } else {
+            None
+        };
+        format!("{}{}{}",
+            pitch_text.unwrap_or("".to_owned()),
+            if settings.show_melody_pitch && settings.show_melody_syllable { " " } else { "" },
+            syllable_text.unwrap_or("".to_owned())
+        )
     }
 }
 
diff --git a/crates/notation_bevy/src/tone/tone_systems.rs b/crates/notation_bevy/src/tone/tone_systems.rs
@@ -29,8 +29,8 @@ pub fn create_tone_notes(
         for note in tone.get_notes() {
             let data = ToneNoteData::new(entry, ToneNoteValue::new(&bar, note, mode));
             let note_entity = data.create(commands, theme, entity);
-            if settings.show_melody_syllable && !entry.prev_is_tie() {
-                theme.texts.melody.spawn_syllable_text(
+            if settings.show_melody_note() && !entry.prev_is_tie() {
+                theme.texts.melody.spawn_note_text(
                     commands,
                     note_entity,
                     assets,

Original file line number	Diff line number	Diff line change
`@@ -22,3 +22,4 @@ dev = [`
`22`	`22`
`23`	`23`	`[dependencies]`
`24`	`24`	`notation_bevy = { path = "../../crates/notation_bevy" }`
	`25`	`+notation_viewer = { path = "../notation_viewer" }`