fixes #143, load egui font from assets

Author: yjpark

Cargo.lock

@@ -21,4 +21,10 @@ impl ExtraAssets for NotationKnowledgeBaseAssets {
             self.kb_scale.clone_untyped(),
         ]
     }
+    fn get_latin_font() -> &'static str {
+        "fonts/FiraMono-Medium.ttf.egui"
+    }
+    fn get_lyrics_font() -> &'static str {
+        "fonts/FiraMono-Medium.ttf.egui"
+    }
 }

apps/notation_kb/assets/fonts/FiraMono-Medium.font

@@ -5,7 +5,6 @@ use notation_bevy::bevy::prelude::*;
 
 use notation_bevy::prelude::*;
 
-use crate::assets::NotationKnowledgeBaseAssets;
 use crate::index_panel::IndexPanel;
 
 pub struct NotationKnowledgeBase();
@@ -28,8 +27,8 @@ impl NotationKnowledgeBase {
                 .with_system(Self::on_window_resized)
         );
     }
-    pub fn run() {
-        notation_bevy::prelude::NotationApp::run_with_extra::<NotationKnowledgeBaseAssets, _>(vec![], Self::extra);
+    pub fn run<A: ExtraAssets>() {
+        notation_bevy::prelude::NotationApp::run_with_extra::<A, _>(vec![], Self::extra);
     }
     fn setup_state(
         mut state: ResMut<NotationState>,

apps/notation_kb/assets/fonts/FiraMono-Medium.ttf.egui

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

apps/notation_kb/src/assets.rs

@@ -10,7 +10,6 @@ resources = ["assets"]
 
 [features]
 default = [
-    "notation_bevy/chinese",
 ]
 native = [
     "notation_kb/native",