fixes #89, update play buttons properly

Author: yjpark

crates/notation_bevy/src/bar/bar_playing.rs

@@ -14,7 +14,8 @@ impl BarPlaying {
     ) {
         for (_entity, mut bar_playing) in query.iter_mut() {
             let bar_ordinal = bar_playing.bar_props.bar_ordinal;
-            if tab_state.is_bar_in_range(bar_ordinal) {
+            // Hacky way to allow click on not selected bar, might do proper fix in the future
+            if true || tab_state.is_bar_in_range(bar_ordinal) {
                 if bar_ordinal == playing_bar_ordinal {
                     if bar_playing.value != PlayingState::Current {
                         bar_playing.value = PlayingState::Current;

crates/notation_bevy/src/entry/entry_playing.rs

@@ -37,7 +37,8 @@ impl EntryPlaying {
         let playing_bar_ordinal = new_position.bar.bar_ordinal;
         for (_entity, entry, mut entry_playing) in query.iter_mut() {
             let bar_ordinal = entry_playing.bar_props.bar_ordinal;
-            if tab_state.is_bar_in_range(bar_ordinal) {
+            // Hacky way to allow click on not selected bar, might do proper fix in the future
+            if true || tab_state.is_bar_in_range(bar_ordinal) {
                 if entry_playing.value.is_current()
                     && new_position.is_passed_with(
                         entry.pass_mode(),

crates/notation_bevy/src/play/play_button.rs

@@ -1,19 +1,21 @@
 use std::fmt::Display;
+use std::sync::Arc;
 
 use bevy::prelude::*;
 use bevy_utils::prelude::{BevyUtil, GridCell, LayoutAnchor, LayoutChangedWithChildrenQuery, ShapeOp, FillPath, View, ViewBundle};
+use notation_model::prelude::{PlayState, Tab};
 
-use crate::prelude::{NotationAssets, NotationTheme};
+use crate::prelude::{NotationAssets, NotationSettings, NotationTheme};
 use crate::ui::layout::NotationLayout;
 
 #[derive(Copy, Clone, PartialEq, Eq, Debug)]
 pub enum PlayButtonAction {
     PlayPause,
     Stop,
-    Settings,
+    LoopMode,
     SetBegin,
     SetEnd,
-    LoopMode,
+    Clear,
 }
 impl Display for PlayButtonAction {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
@@ -25,10 +27,10 @@ impl PlayButtonAction {
         match self {
             PlayButtonAction::PlayPause => 0,
             PlayButtonAction::Stop => 1,
-            PlayButtonAction::Settings => 2,
+            PlayButtonAction::LoopMode => 2,
             PlayButtonAction::SetBegin => 3,
             PlayButtonAction::SetEnd => 4,
-            PlayButtonAction::LoopMode => 5,
+            PlayButtonAction::Clear => 5,
         }
     }
     pub fn size(&self) -> Vec2 {
@@ -41,18 +43,18 @@ impl PlayButtonAction {
                 if playing {
                     "M832 1184v-576q0-14-9-23t-23-9h-256q-14 0-23 9t-9 23v576q0 14 9 23t23 9h256q14 0 23-9t9-23zm448 0v-576q0-14-9-23t-23-9h-256q-14 0-23 9t-9 23v576q0 14 9 23t23 9h256q14 0 23-9t9-23zm384-288q0 209-103 385.5t-279.5 279.5-385.5 103-385.5-103-279.5-279.5-103-385.5 103-385.5 279.5-279.5 385.5-103 385.5 103 279.5 279.5 103 385.5z"
                 } else {
-                    "M1312 896q0 37-32 55l-544 320q-15 9-32 9-16 0-32-8-32-19-32-56v-640q0-37 32-56 33-18 64 1l544 320q32 18 32 55zm128 0q0-148-73-273t-198-198-273-73-273 73-198 198-73 273 73 273 198 198 273 73 273-73 198-198 73-273zm224 0q0 209-103 385.5t-279.5 279.5-385.5 103-385.5-103-279.5-279.5-103-385.5 103-385.5 279.5-279.5 385.5-103 385.5 103 279.5 279.5 103 385.5z"
+                    "M896 128q209 0 385.5 103t279.5 279.5 103 385.5-103 385.5-279.5 279.5-385.5 103-385.5-103-279.5-279.5-103-385.5 103-385.5 279.5-279.5 385.5-103zm384 823q32-18 32-55t-32-55l-544-320q-31-19-64-1-32 19-32 56v640q0 37 32 56 16 8 32 8 17 0 32-9z"
                 }
             PlayButtonAction::Stop =>
                 "M1216 1184v-576q0-14-9-23t-23-9h-576q-14 0-23 9t-9 23v576q0 14 9 23t23 9h576q14 0 23-9t9-23zm448-288q0 209-103 385.5t-279.5 279.5-385.5 103-385.5-103-279.5-279.5-103-385.5 103-385.5 279.5-279.5 385.5-103 385.5 103 279.5 279.5 103 385.5z",
-            PlayButtonAction::Settings =>
-                "M1152 896q0-106-75-181t-181-75-181 75-75 181 75 181 181 75 181-75 75-181zm512-109v222q0 12-8 23t-20 13l-185 28q-19 54-39 91 35 50 107 138 10 12 10 25t-9 23q-27 37-99 108t-94 71q-12 0-26-9l-138-108q-44 23-91 38-16 136-29 186-7 28-36 28h-222q-14 0-24.5-8.5t-11.5-21.5l-28-184q-49-16-90-37l-141 107q-10 9-25 9-14 0-25-11-126-114-165-168-7-10-7-23 0-12 8-23 15-21 51-66.5t54-70.5q-27-50-41-99l-183-27q-13-2-21-12.5t-8-23.5v-222q0-12 8-23t19-13l186-28q14-46 39-92-40-57-107-138-10-12-10-24 0-10 9-23 26-36 98.5-107.5t94.5-71.5q13 0 26 10l138 107q44-23 91-38 16-136 29-186 7-28 36-28h222q14 0 24.5 8.5t11.5 21.5l28 184q49 16 90 37l142-107q9-9 24-9 13 0 25 10 129 119 165 170 7 8 7 22 0 12-8 23-15 21-51 66.5t-54 70.5q26 50 41 98l183 28q13 2 21 12.5t8 23.5z",
+            PlayButtonAction::LoopMode =>
+                "M1664 256v448q0 26-19 45t-45 19h-448q-42 0-59-40-17-39 14-69l138-138q-148-137-349-137-104 0-198.5 40.5t-163.5 109.5-109.5 163.5-40.5 198.5 40.5 198.5 109.5 163.5 163.5 109.5 198.5 40.5q119 0 225-52t179-147q7-10 23-12 15 0 25 9l137 138q9 8 9.5 20.5t-7.5 22.5q-109 132-264 204.5t-327 72.5q-156 0-298-61t-245-164-164-245-61-298 61-298 164-245 245-164 298-61q147 0 284.5 55.5t244.5 156.5l130-129q29-31 70-14 39 17 39 59z",
             PlayButtonAction::SetBegin =>
                 "M1203 544q0 13-10 23l-393 393 393 393q10 10 10 23t-10 23l-50 50q-10 10-23 10t-23-10l-466-466q-10-10-10-23t10-23l466-466q10-10 23-10t23 10l50 50q10 10 10 23z",
             PlayButtonAction::SetEnd =>
                 "M1171 960q0 13-10 23l-466 466q-10 10-23 10t-23-10l-50-50q-10-10-10-23t10-23l393-393-393-393q-10-10-10-23t10-23l50-50q10-10 23-10t23 10l466 466q10 10 10 23z",
-            PlayButtonAction::LoopMode =>
-                "M1664 256v448q0 26-19 45t-45 19h-448q-42 0-59-40-17-39 14-69l138-138q-148-137-349-137-104 0-198.5 40.5t-163.5 109.5-109.5 163.5-40.5 198.5 40.5 198.5 109.5 163.5 163.5 109.5 198.5 40.5q119 0 225-52t179-147q7-10 23-12 15 0 25 9l137 138q9 8 9.5 20.5t-7.5 22.5q-109 132-264 204.5t-327 72.5q-156 0-298-61t-245-164-164-245-61-298 61-298 164-245 245-164 298-61q147 0 284.5 55.5t244.5 156.5l130-129q29-31 70-14 39 17 39 59z",
+            PlayButtonAction::Clear =>
+                "M1792 896q0 26-19 45l-256 256q-19 19-45 19t-45-19-19-45v-128h-1024v128q0 26-19 45t-45 19-45-19l-256-256q-19-19-19-45t19-45l256-256q19-19 45-19t45 19 19 45v128h1024v-128q0-26 19-45t45-19 45 19l256 256q19 19 19 45z",
         }.to_owned()
     }
 }
@@ -62,10 +64,10 @@ impl From<usize> for PlayButtonAction {
         match v {
             0 => Self::PlayPause,
             1 => Self::Stop,
-            2 => Self::Settings,
+            2 => Self::LoopMode,
             3 => Self::SetBegin,
             4 => Self::SetEnd,
-            _ => Self::LoopMode,
+            _ => Self::Clear,
         }
     }
 }
@@ -85,20 +87,41 @@ pub struct PlayButtonShape {
     pub action: PlayButtonAction,
     pub width: f32,
     pub height: f32,
+    pub play_state: PlayState,
+    pub should_loop: bool,
+    pub bars: usize,
+    pub begin_bar_ordinal: usize,
+    pub end_bar_ordinal: usize,
 }
 impl Display for PlayButtonShape {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(f, "{:?}", self)
     }
 }
+impl PlayButtonShape {
+    pub fn get_color(&self, theme: &NotationTheme) -> Color {
+        match self.action {
+            PlayButtonAction::PlayPause =>
+                theme.colors.ui.button_on,
+            PlayButtonAction::Stop =>
+                theme.colors.ui.of_button(!self.play_state.is_stopped()),
+            PlayButtonAction::LoopMode =>
+                theme.colors.ui.of_button(self.should_loop),
+            PlayButtonAction::SetBegin |
+            PlayButtonAction::SetEnd |
+            PlayButtonAction::Clear =>
+                theme.colors.ui.of_button(self.begin_bar_ordinal != 1 || self.end_bar_ordinal != self.bars),
+        }
+    }
+}
 
 impl ShapeOp<NotationTheme, FillPath> for PlayButtonShape {
     fn get_shape(&self, theme: &NotationTheme) -> FillPath {
         let scale = self.height / 1792.0;
         FillPath {
             size: self.action.size(),
-            path: self.action.path(true),
-            color: theme.shapes.shape_color,
+            path: self.action.path(self.play_state.is_playing()),
+            color: self.get_color(theme),
             //line_width: theme.shapes.shape_line_width,
             offset: Vec3::new(0.0, 0.0, theme.core.mini_map_z),
             scale: scale,
@@ -123,7 +146,9 @@ impl PlayButton {
         commands: &mut Commands,
         _assets: &NotationAssets,
         theme: &NotationTheme,
+        settings: &NotationSettings,
         entity: Entity,
+        tab: &Arc<Tab>,
         action: PlayButtonAction,
     ) -> Entity {
         let button_entity = BevyUtil::spawn_child_bundle(
@@ -135,6 +160,11 @@ impl PlayButton {
             action,
             width: 32.0,
             height: 32.0,
+            play_state: PlayState::Stopped,
+            should_loop: settings.should_loop,
+            bars: tab.bars.len(),
+            begin_bar_ordinal: 1,
+            end_bar_ordinal: tab.bars.len(),
         };
         button_shape.create(commands, theme, button_entity);
         button_entity
@@ -155,4 +185,48 @@ impl PlayButton {
             }
         }
     }
+    pub fn on_play_state(
+        commands: &mut Commands,
+        theme: &NotationTheme,
+        shape_query: &mut Query<(Entity, &mut PlayButtonShape)>,
+        play_state: &PlayState,
+    ) {
+        for (entity, mut shape) in shape_query.iter_mut() {
+            shape.play_state = play_state.clone();
+            if shape.action == PlayButtonAction::PlayPause
+                || shape.action == PlayButtonAction::Stop {
+                shape.update(commands, theme, entity);
+            }
+        }
+    }
+    pub fn on_should_loop(
+        commands: &mut Commands,
+        theme: &NotationTheme,
+        shape_query: &mut Query<(Entity, &mut PlayButtonShape)>,
+        should_loop: bool,
+    ) {
+        for (entity, mut shape) in shape_query.iter_mut() {
+            shape.should_loop = should_loop;
+            if shape.action == PlayButtonAction::LoopMode {
+                shape.update(commands, theme, entity);
+            }
+        }
+    }
+    pub fn on_begin_end(
+        commands: &mut Commands,
+        theme: &NotationTheme,
+        shape_query: &mut Query<(Entity, &mut PlayButtonShape)>,
+        begin_bar_ordinal: usize,
+        end_bar_ordinal: usize,
+    ) {
+        for (entity, mut shape) in shape_query.iter_mut() {
+            shape.begin_bar_ordinal = begin_bar_ordinal;
+            shape.end_bar_ordinal = end_bar_ordinal;
+            if shape.action == PlayButtonAction::SetBegin
+                || shape.action == PlayButtonAction::SetEnd
+                || shape.action == PlayButtonAction::Clear {
+                shape.update(commands, theme, entity);
+            }
+        }
+    }
 }

crates/notation_bevy/src/play/play_panel.rs

@@ -1,11 +1,13 @@
-use std::fmt::Display;
+use std::{fmt::Display, sync::Arc};
 
 use bevy::prelude::*;
 use bevy_utils::prelude::{BevyUtil, GridData, GridView, LayoutAnchor, LayoutQuery, LayoutSize, View, ViewBundle, ViewQuery};
+use notation_midi::prelude::PlayControlEvent;
+use notation_model::prelude::{PlayState, Tab};
 
 use crate::{prelude::{NotationAppState, NotationAssets, NotationSettings, NotationTheme}, ui::layout::NotationLayout};
 
-use super::{play_button::{PlayButton}, play_plugin::PlayPanelDoLayoutEvent};
+use super::{play_button::{PlayButton, PlayButtonShape}, play_plugin::PlayPanelDoLayoutEvent};
 
 pub struct PlayPanel {
     pub playing: bool,
@@ -49,13 +51,15 @@ impl PlayPanel {
         commands: &mut Commands,
         assets: &NotationAssets,
         theme: &NotationTheme,
+        settings: &NotationSettings,
         entity: Entity,
+        tab: &Arc<Tab>,
     ) -> Entity {
         let panel = PlayPanel::default();
         let panel_entity =
             BevyUtil::spawn_child_bundle(commands, entity, ViewBundle::from(panel));
         for i in 0..=5 {
-            PlayButton::spawn(commands, assets, theme, panel_entity, (i as usize).into());
+            PlayButton::spawn(commands, assets, theme, settings, panel_entity, tab, (i as usize).into());
         }
         panel_entity
     }
@@ -80,4 +84,31 @@ impl PlayPanel {
             )
         }
     }
+    pub fn on_play_control_evt(
+        mut commands: Commands,
+        theme: Res<NotationTheme>,
+        mut evts: EventReader<PlayControlEvent>,
+        mut shape_query: Query<(Entity, &mut PlayButtonShape)>,
+    ) {
+        for evt in evts.iter() {
+            match evt {
+                PlayControlEvent::OnTick {position: _, tick_result} => {
+                    if tick_result.stopped {
+                        let play_state = PlayState::Stopped;
+                        PlayButton::on_play_state(&mut commands, &theme, &mut shape_query, &play_state);
+                    }
+                }
+                PlayControlEvent::OnPlayState(play_state) => {
+                    PlayButton::on_play_state(&mut commands, &theme, &mut shape_query, play_state);
+                }
+                PlayControlEvent::OnShouldLoop(should_loop) => {
+                    PlayButton::on_should_loop(&mut commands, &theme, &mut shape_query, *should_loop);
+                }
+                PlayControlEvent::OnBeginEnd(begin_bar_ordinal, end_bar_ordinal) => {
+                    PlayButton::on_begin_end(&mut commands, &theme, &mut shape_query, *begin_bar_ordinal, *end_bar_ordinal)
+                }
+                PlayControlEvent::OnSpeedFactor(_) => {}
+            }
+        }
+    }
 }

crates/notation_bevy/src/play/play_plugin.rs

@@ -36,6 +36,7 @@ impl Plugin for PlayPlugin {
         app.add_system_set(
             SystemSet::on_update(NotationAssetsStates::Loaded)
                 .with_system(PlayPanel::do_layout.system())
+                .with_system(PlayPanel::on_play_control_evt.system())
                 .with_system(PlayButton::on_layout_changed.system())
                 .with_system(on_bar_playing_changed.system())
                 .with_system(on_tab_play_state_changed.system())
@@ -323,6 +324,10 @@ fn on_play_control_evt(
                     tab_state.set_begin_end(*begin_bar_ordinal, *end_bar_ordinal);
                     BarBeatData::update_all(&mut commands, &theme, &tab_state, &mut beat_query);
                 }
+                PlayControlEvent::OnShouldLoop(should_loop) => {
+                    tab_state.set_should_loop(*should_loop);
+
+                }
             }
         }
     }

crates/notation_bevy/src/settings/notation_settings.rs

@@ -9,6 +9,7 @@ use super::layout_settings::LayoutSettings;
 #[cfg_attr(feature = "inspector", derive(Inspectable))]
 pub struct NotationSettings {
     pub layout: LayoutSettings,
+    pub should_loop: bool,
     pub speed_factor: f32,
     pub always_show_fret: bool,
     pub melody_piano_mode: bool,
@@ -19,6 +20,7 @@ impl Default for NotationSettings {
     fn default() -> Self {
         Self {
             layout: LayoutSettings::default(),
+            should_loop: false,
             speed_factor: 1.0,
             always_show_fret: false,
             melody_piano_mode: false,

crates/notation_bevy/src/tab/tab_control.rs

@@ -63,6 +63,7 @@ impl TabControl {
         commands: &mut Commands,
         assets: &NotationAssets,
         theme: &NotationTheme,
+        settings: &NotationSettings,
         entity: Entity,
         tab: &Arc<Tab>,
     ) -> Entity {
@@ -86,7 +87,9 @@ impl TabControl {
             commands,
             assets,
             theme,
+            settings,
             control_entity,
+            tab,
         );
         control_entity
     }

crates/notation_bevy/src/tab/tab_header.rs

@@ -62,13 +62,14 @@ impl TabHeader {
         commands: &mut Commands,
         assets: &NotationAssets,
         theme: &NotationTheme,
+        settings: &NotationSettings,
         entity: Entity,
         tab: &Arc<Tab>,
     ) -> Entity {
         let view_bundle = ViewBundle::from(TabHeader::new(tab.clone()));
         let view = view_bundle.view.clone();
         let header_entity = BevyUtil::spawn_child_bundle(commands, entity, view_bundle);
-        TabControl::spawn(commands, assets, theme, header_entity, &tab);
+        TabControl::spawn(commands, assets, theme, settings, header_entity, &tab);
         TabChords::spawn(commands, theme, header_entity, &tab, &view.chords);
         header_entity
     }