fixes #148, pass args for wasm usage

Author: yjpark

Cargo.lock

@@ -12,14 +12,13 @@ resources = ["assets"]
 default = [
     "notation_bevy/midi",
 ]
+
 native = [
     "notation_bevy/native",
-]
-dev = [
-    "notation_bevy/dev",
-    "native",
+    "notation_bevy/dsl",
 ]
 
 [dependencies]
 notation_bevy = { path = "../../crates/notation_bevy" }
 notation_viewer = { path = "../notation_viewer" }
+clap = { version = "3.0.12", features = [ "derive" ] }

apps/notation_kb/Cargo.toml

@@ -17,10 +17,6 @@ native = [
     "notation_bevy/native",
     "notation_bevy/dsl",
 ]
-dev = [
-    "notation_bevy/dev",
-    "native",
-]
 
 [dependencies]
-notation_bevy = { path = "../../crates/notation_bevy" }
+notation_bevy = { path = "../../crates/notation_bevy" }

apps/notation_viewer/Cargo.toml

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

apps/notation_viewer/run-viewer_native_cn.ps1

@@ -1,16 +1,8 @@
-use notation_bevy::bevy::prelude::bevy_main;
+use notation_bevy::{bevy::prelude::bevy_main, prelude::NotationArgs};
 use notation_viewer::assets::NotationViewerAssets;
 
 #[bevy_main]
 fn main() {
-    #[cfg(target_arch = "wasm32")]
-    let tabs = vec![notation_bevy::prelude::NotationApp::get_tab_from_url()
-        .unwrap_or("tabs/scarborough_fair.ron".to_owned())];
-
-    #[cfg(not(target_arch = "wasm32"))]
-    let tabs = vec![
-        "tabs/test.ron".to_owned(),
-        "tabs/scarborough_fair.ron".to_owned(),
-    ];
-    notation_viewer::viewer::NotationViewer::run::<NotationViewerAssets>(tabs);
+    let args = NotationArgs::parse_args();
+    notation_viewer::viewer::NotationViewer::run::<NotationViewerAssets>(args);
 }

apps/notation_viewer/src/main.rs

@@ -5,7 +5,6 @@ use notation_bevy::bevy_egui::EguiContext;
 use notation_bevy::prelude::*;
 use notation_bevy::settings::layout_settings::LayoutMode;
 
-use crate::assets::NotationViewerAssets;
 use crate::help_panel::HelpPanel;
 
 pub struct NotationViewer();
@@ -24,8 +23,8 @@ impl NotationViewer {
                 .with_system(HelpPanel::handle_link_evts)
         );
     }
-    pub fn run<A: ExtraAssets>(tabs: Vec<String>) {
-        notation_bevy::prelude::NotationApp::run_with_extra::<A, _>(tabs, Self::extra);
+    pub fn run<A: ExtraAssets>(args: NotationArgs) {
+        notation_bevy::prelude::NotationApp::run_with_extra::<A, _>(args, Self::extra);
     }
 }
 

apps/notation_viewer/src/viewer.rs

@@ -19,13 +19,8 @@ default = [
     "bevy/png",
 ]
 
-dev = [
-    #"bevy/dynamic",
-    "notation_bevy_utils/dev",
-]
-
 native = [
-#    "bevy/bevy_wgpu",
+    "clap",
 ]
 
 midi = [
@@ -67,13 +62,15 @@ rfd = "0.6.3"
 lazy_static = "1.4.0"
 unic-langid = { version = "0.9", features = [ "macros" ] }
 
+clap = { version = "3.0.12", features = [ "derive" ], optional = true }
+
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 wasm-bindgen = "0.2.78"
 console_error_panic_hook = "0.1"
 gloo-events = "0.1.1"
 futures = "0.3"
 web-sys = { version = "0.3.55", features = [
-    "Element", "Document", "Window", "Location", "console", "TouchEvent",
+    "Element", "Document", "Window", "Location", "Url", "UrlSearchParams", "console", "TouchEvent",
     #https://rustwasm.github.io/docs/wasm-bindgen/examples/web-audio.html
     "AudioContext", "AudioDestinationNode", "AudioNode", "AudioParam", "GainNode", "OscillatorNode", "OscillatorType",
 ]}

crates/notation_bevy/Cargo.toml

@@ -3,7 +3,7 @@ use std::sync::RwLock;
 use bevy::prelude::*;
 use bevy_egui::{egui::{FontDefinitions, FontData, FontFamily, TextStyle}, EguiContext};
 
-use crate::{notation::assets::{ExtraAssets, NotationAssets}, settings::notation_settings::NotationSettings};
+use crate::prelude::{ExtraAssets, NotationSettings};
 
 lazy_static! {
     static ref EGUI_FONT: RwLock<EguiFont> = RwLock::new(EguiFont::default());

crates/notation_bevy/src/egui/egui_fonts.rs

@@ -141,9 +141,11 @@ pub mod prelude {
     #[doc(hidden)]
     pub use crate::notation::app::{NotationApp, NotationPlugins};
     #[doc(hidden)]
+    pub use crate::notation::args::{NotationArgs};
+    #[doc(hidden)]
     pub use crate::notation::events::*;
     #[doc(hidden)]
-    pub use crate::notation::state::{NotationState, TabPathes};
+    pub use crate::notation::state::{NotationState};
     #[doc(hidden)]
     pub use crate::notation::assets::{NotationAssets, NotationAssetsStates, ExtraAssets, NoExtraAssets};
     #[doc(hidden)]

crates/notation_bevy/src/lib.rs

@@ -14,8 +14,6 @@ use notation_midi::prelude::{
     MidiPlugin,
 };
 
-use super::state::{NotationState, TabPathes};
-
 pub struct NotationPlugins;
 impl PluginGroup for NotationPlugins {
     fn build(&mut self, group: &mut PluginGroupBuilder) {
@@ -47,8 +45,9 @@ pub struct NotationApp;
 impl NotationApp {
     pub const TITLE: &'static str = "Fun Notation";
 
-    pub fn new_app<A: ExtraAssets>(title: &str) -> App {
+    pub fn new_app<A: ExtraAssets>(args: NotationArgs, title: &str) -> App {
         let mut app = App::new();
+        app.insert_resource(args);
         AssetLoader::new(NotationAssetsStates::Loading)
             .continue_to_state(NotationAssetsStates::Loaded)
             .with_collection::<NotationAssets>()
@@ -89,24 +88,13 @@ impl NotationApp {
         app
     }
 
-    #[cfg(target_arch = "wasm32")]
-    pub fn get_tab_from_url() -> Result<String, String> {
-        web_sys::window()
-            .ok_or("No_Window".to_owned())
-            .and_then(|x| x.document().ok_or("No_Document".to_owned()))
-            .and_then(|x| x.location().ok_or("No_Location".to_owned()))
-            .and_then(|x| x.search().map_err(|e| format!("No_Search:{:?}", e)))
-            .map(|x| x.trim_start_matches('?').to_owned())
-    }
-
-    pub fn run_with_extra<A, F>(tab_pathes: Vec<String>, extra: F)
+    pub fn run_with_extra<A, F>(args: NotationArgs, extra: F)
     where
         A: ExtraAssets,
         F: Fn(&mut App),
     {
-        let mut app = NotationApp::new_app::<A>(Self::TITLE);
+        let mut app = NotationApp::new_app::<A>(args, Self::TITLE);
 
-        app.insert_resource(TabPathes(tab_pathes));
         app.init_resource::<NotationState>();
 
         app.add_startup_system(Self::setup_camera);
@@ -135,8 +123,8 @@ impl NotationApp {
         extra(&mut app);
         app.run();
     }
-    pub fn run<A: ExtraAssets>(tab_pathes: Vec<String>) {
-        Self::run_with_extra::<A, _>(tab_pathes, |_app|{})
+    pub fn run<A: ExtraAssets>(args: NotationArgs) {
+        Self::run_with_extra::<A, _>(args, |_app|{})
     }
 }