refs #144, fix kb for languages

Author: yjpark

Cargo.lock

@@ -21,4 +21,3 @@ native = [
 [dependencies]
 notation_bevy = { path = "../../crates/notation_bevy" }
 notation_viewer = { path = "../notation_viewer" }
-clap = { version = "3.0.12", features = [ "derive" ] }

apps/notation_kb/Cargo.toml

@@ -29,8 +29,8 @@ impl NotationKnowledgeBase {
                 .with_system(Self::on_window_resized)
         );
     }
-    pub fn run<A: ExtraAssets>() {
-        notation_bevy::prelude::NotationApp::run_with_extra::<A, _>(vec![], Self::extra);
+    pub fn run<A: ExtraAssets>(args: NotationArgs) {
+        notation_bevy::prelude::NotationApp::run_with_extra::<A, _>(args, Self::extra);
     }
     fn setup_state(
         mut state: ResMut<NotationState>,

…notation_viewer/run-viewer_native_cn.ps1 apps/notation_kb/run-kb_native-cn.ps1apps/notation_viewer/run-viewer_native_cn.ps1 renamed to apps/notation_kb/run-kb_native-cn.ps1 apps/notation_viewer/run-viewer_native_cn.ps1 renamed to apps/notation_kb/run-kb_native-cn.ps1

@@ -1,9 +1,10 @@
-use notation_bevy::bevy::prelude::bevy_main;
+use notation_bevy::{bevy::prelude::bevy_main, prelude::NotationArgs};
 
 use notation_kb::assets::NotationKnowledgeBaseAssets;
 
 #[bevy_main]
 fn main() {
-    notation_kb::kb::NotationKnowledgeBase::run::<NotationKnowledgeBaseAssets>();
+    let args = NotationArgs::parse_args();
+    notation_kb::kb::NotationKnowledgeBase::run::<NotationKnowledgeBaseAssets>(args);
 }
 

apps/notation_kb/src/kb.rs

@@ -146,7 +146,7 @@ impl ScalePage {
             ProtoForm{ sections: vec!["notes".to_owned()]},
         )
     }
-    pub fn check_reload(&self, tab: &Tab) -> bool {
+    pub fn check_reload(&self, tab: &notation_bevy::prelude::Tab) -> bool {
         self.scale != tab.meta.scale || self.key != tab.meta.key || tab.bars.len() == 0
     }
 }

apps/notation_kb/src/main.rs

@@ -0,0 +1 @@
+cargo run --features native -- --lang zh-CN

apps/notation_kb/src/theory/scale.rs

@@ -3,6 +3,8 @@
 #[macro_use]
 extern crate lazy_static;
 
+pub use notation_proto;
+
 pub use {proc_macro2, quote, syn};
 
 pub mod context;
@@ -13,6 +15,7 @@ pub mod helper;
 pub mod proto;
 pub mod util;
 
+
 pub mod prelude {
     #[doc(hidden)]
     pub use crate::get_tab::GetTabDsl;
@@ -34,6 +37,4 @@ pub mod prelude {
     pub use crate::proto::track::TrackDsl;
     #[doc(hidden)]
     pub use crate::context::Context;
-    #[doc(hidden)]
-    pub use notation_proto::prelude::*;
 }