Skip to content

Commit 70245d7

Browse files
yjparkyjpark
committed
refs #79, cleanup
1 parent adc30d9 commit 70245d7

25 files changed

+37
-37
lines changed

‎crates/notation_bevy/src/app/app.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ fn load_tab(
177177
match Tab::try_parse_arc(asset.tab.clone()) {
178178
Ok(tab) => {
179179
state.tab = Some(tab.clone());
180-
theme.loaded = true;
180+
theme._bypass_systems = false;
181181
evts.send(AddTabEvent(tab));
182182
}
183183
Err(err) => {

‎crates/notation_bevy/src/bar/bar_view.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ impl BarView {
4141
mut sep_query: Query<(Entity, &mut BarSeparatorData)>,
4242
mut beat_query: Query<(Entity, &mut BarBeatData)>,
4343
) {
44-
if !theme.loaded { return; }
44+
//if theme._bypass_systems { return; }
4545
let engine = NotationLayout::new(&theme, &state, &settings);
4646
let mut bars = Vec::new();
4747
for evt in evts.iter() {
@@ -78,7 +78,7 @@ impl BarView {
7878
mut evts: EventReader<BarViewDoLayoutEvent>,
7979
mut text_query: Query<(&Parent, &mut Transform), With<Text>>,
8080
) {
81-
if !theme.loaded { return; }
81+
if theme._bypass_systems { return; }
8282
if !settings.hide_bar_number {
8383
for evt in evts.iter() {
8484
for (parent, mut transform) in text_query.iter_mut() {

‎crates/notation_bevy/src/chord/chord_view.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ impl ChordView {
4646
mut dot_query: Query<(Entity, &mut IntervalDotData)>,
4747
mut text_query: Query<&mut Transform, With<Text>>,
4848
) {
49-
if !theme.loaded { return; }
49+
if theme._bypass_systems { return; }
5050
for (_entity, _view, layout, children) in query.iter() {
5151
let radius = layout.size.width * theme.sizes.chord.diagram_factor;
5252
for child in children.iter() {
@@ -107,7 +107,7 @@ impl ChordView {
107107
>,
108108
mut diagram_query: Query<(Entity, &mut ChordDiagramData)>,
109109
) {
110-
if !theme.loaded { return; }
110+
if theme._bypass_systems { return; }
111111
for (_entity, playing, _view, children) in query.iter_mut() {
112112
for child in children.iter() {
113113
if let Ok((diagram_entity, mut diagram_data)) = diagram_query.get_mut(*child) {

‎crates/notation_bevy/src/entry/entry_plugin.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ fn on_tab_bars_resized(
150150
mut shape_diagram_6_query: Query<(Entity, &mut ShapeDiagramData6), With<ShapeDiagramData6>>,
151151
mut shape_diagram_4_query: Query<(Entity, &mut ShapeDiagramData4), With<ShapeDiagramData4>>,
152152
) {
153-
if !theme.loaded { return; }
153+
if theme._bypass_systems { return; }
154154
for evt in evts.iter() {
155155
let bars = &evt.0;
156156
for (entity, mut data) in tone_note_query.iter_mut() {

‎crates/notation_bevy/src/guitar/guitar_view.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ impl GuitarView {
134134
mut capo_query: Query<(&Parent, Entity, &mut GuitarCapoData), With<GuitarCapoData>>,
135135
mut finger_query: Query<(&Parent, Entity, &mut FretFingerData), With<FretFingerData>>,
136136
) {
137-
if !theme.loaded { return; }
137+
if theme._bypass_systems { return; }
138138
for (entity, _view, layout) in query.iter() {
139139
let guitar_height = layout.size.width * theme.guitar.image_size.1 / theme.guitar.image_size.0;
140140
let guitar_size = LayoutSize::new(layout.size.width, guitar_height);
@@ -179,7 +179,7 @@ impl GuitarView {
179179
if Self::CHECKING_FRETS {
180180
return;
181181
}
182-
if !theme.loaded { return; }
182+
if theme._bypass_systems { return; }
183183
let mut current_entry_pick = None;
184184
let mut string_states = [None; 6];
185185
let mut hit_strings = [(false, Duration::Zero); 6];
@@ -249,7 +249,7 @@ impl GuitarView {
249249
if Self::CHECKING_FRETS {
250250
return;
251251
}
252-
if !theme.loaded { return; }
252+
if theme._bypass_systems { return; }
253253
let mut current_shape = None;
254254
for (entry, shape, playing) in query.iter() {
255255
if playing.value.is_current() {
@@ -329,7 +329,7 @@ impl GuitarView {
329329
capo_query: Query<&GuitarCapoData, Changed<GuitarCapoData>>,
330330
mut guitar_view_query: Query<&mut Transform, With<Arc<GuitarView>>>,
331331
) {
332-
if !theme.loaded { return; }
332+
if theme._bypass_systems { return; }
333333
if settings.override_guitar_y.is_some() {
334334
return;
335335
}

‎crates/notation_bevy/src/play/play_button.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ impl PlayButton {
175175
query: LayoutChangedWithChildrenQuery<PlayButton>,
176176
mut shape_query: Query<(Entity, &mut PlayButtonShape)>,
177177
) {
178-
if !theme.loaded { return; }
178+
if theme._bypass_systems { return; }
179179
for (_entity, _view, layout, children) in query.iter() {
180180
for child in children.iter() {
181181
if let Ok((entity, mut data)) = shape_query.get_mut(*child) {

‎crates/notation_bevy/src/play/play_panel.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ impl PlayPanel {
9898
mut layout_query: LayoutQuery,
9999
cell_query: ViewQuery<PlayButton>,
100100
) {
101-
if !theme.loaded { return; }
101+
if theme._bypass_systems { return; }
102102
let engine = NotationLayout::new(&theme, &state, &settings);
103103
for evt in evts.iter() {
104104
evt.view.do_layout(
@@ -117,7 +117,7 @@ impl PlayPanel {
117117
mut evts: EventReader<PlayControlEvent>,
118118
mut shape_query: Query<(Entity, &mut PlayButtonShape)>,
119119
) {
120-
if !theme.loaded { return; }
120+
if theme._bypass_systems { return; }
121121
for evt in evts.iter() {
122122
match evt {
123123
PlayControlEvent::OnTick {position: _, tick_result} => {

‎crates/notation_bevy/src/play/play_plugin.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ fn on_tab_resized(
114114
&Arc<GridData>,
115115
)>,
116116
) {
117-
if !theme.loaded { return; }
117+
if theme._bypass_systems { return; }
118118
let mut bars = None;
119119
for evt in evts.iter() {
120120
bars = Some(&evt.0);
@@ -168,7 +168,7 @@ fn on_bar_playing_changed(
168168
&Arc<GridData>,
169169
)>,
170170
) {
171-
if !theme.loaded { return; }
171+
if theme._bypass_systems { return; }
172172
for (_entity, playing, _view, layout) in query.iter_mut() {
173173
if playing.value == PlayingState::Current {
174174
update_indicators(
@@ -206,7 +206,7 @@ fn on_tab_play_state_changed(
206206
&Arc<GridData>,
207207
)>,
208208
) {
209-
if !theme.loaded { return; }
209+
if theme._bypass_systems { return; }
210210
for (state_entity, tab_state) in query.iter_mut() {
211211
TabState::clear_play_state_changed(&mut commands, state_entity);
212212
if let Some(pos_data) = PosIndicatorData::update_pos(
@@ -313,7 +313,7 @@ fn on_play_control_evt(
313313
)>,
314314
mut beat_query: Query<(Entity, &mut BarBeatData)>,
315315
) {
316-
if !theme.loaded { return; }
316+
if theme._bypass_systems { return; }
317317
for evt in evts.iter() {
318318
for (state_entity, mut tab_state) in tab_state_query.iter_mut() {
319319
if !tab_state.under_control {

‎crates/notation_bevy/src/rhythm/rhythm_bar.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ impl RhythmBarData {
121121
mut font_query: Query<&mut Text>,
122122
mut indicator_query: Query<(Entity, &mut RhythmIndicatorData)>,
123123
) {
124-
if !theme.loaded { return; }
124+
if theme._bypass_systems { return; }
125125
let mut current_position = None;
126126
let mut current_bar = None;
127127
let mut current_chord = None;

‎crates/notation_bevy/src/rhythm/rhythm_view.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ impl RhythmView {
6262
mut beat_query: Query<(Entity, &mut RhythmBeatData)>,
6363
mut indicator_query: Query<(Entity, &mut RhythmIndicatorData)>,
6464
) {
65-
if !theme.loaded { return; }
65+
if theme._bypass_systems { return; }
6666
for evt in evts.iter() {
6767
if evt.layout.size.width > 0.0 && evt.layout.size.height > 0.0 {
6868
for (parent, bar_entity, mut bar_data, bar_children) in bar_query.iter_mut() {

0 commit comments

Comments
 (0)