diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs index bbbbffc1fb..05c9fe128a 100644 --- a/voxygen/src/hud/mod.rs +++ b/voxygen/src/hud/mod.rs @@ -250,7 +250,7 @@ pub(self) struct Imgs { } impl Imgs { fn new(ui: &mut Ui, renderer: &mut Renderer) -> Imgs { - let mut load = |filename, ui: &mut Ui| { + let load = |filename, ui: &mut Ui| { let fullpath: String = ["/voxygen/", filename].concat(); let image = image::load_from_memory( assets::load(fullpath.as_str()) @@ -438,22 +438,18 @@ impl Hud { // Load images let imgs = Imgs::new(&mut ui, window.renderer_mut()); // Load fonts - let font_opensans = ui.new_font( - conrod_core::text::font::from_file(concat!( - env!("CARGO_MANIFEST_DIR"), - "/../assets/voxygen/font/OpenSans-Regular.ttf" - )) - .unwrap(), - ); - let font_metamorph = ui.new_font( - conrod_core::text::font::from_file(concat!( - env!("CARGO_MANIFEST_DIR"), - "/../assets/voxygen/font/Metamorphous-Regular.ttf" - )) - .unwrap(), - ); + let load_font = |filename, ui: &mut Ui| { + let fullpath: String = ["/voxygen/font", filename].concat(); + ui.new_font(conrod_core::text::Font::from_bytes( + assets::load(fullpath.as_str()) + .expect("Error loading file") + ).unwrap()) + }; + let font_opensans = load_font("/OpenSans-Regular.ttf", &mut ui); + let font_metamorph = load_font("/Metamorphous-Regular.ttf", &mut ui); // Chat box let chat = chat::Chat::new(&mut ui); + Self { ui, imgs, diff --git a/voxygen/src/menu/char_selection/ui.rs b/voxygen/src/menu/char_selection/ui.rs index 1a2be0245e..47c156e452 100644 --- a/voxygen/src/menu/char_selection/ui.rs +++ b/voxygen/src/menu/char_selection/ui.rs @@ -377,20 +377,16 @@ impl CharSelectionUi { // Load images let imgs = Imgs::new(&mut ui, window.renderer_mut()); // Load fonts - let font_opensans = ui.new_font( - conrod_core::text::font::from_file(concat!( - env!("CARGO_MANIFEST_DIR"), - "/../assets/voxygen/font/OpenSans-Regular.ttf" - )) - .unwrap(), - ); - let font_metamorph = ui.new_font( - conrod_core::text::font::from_file(concat!( - env!("CARGO_MANIFEST_DIR"), - "/../assets/voxygen/font/Metamorphous-Regular.ttf" - )) - .unwrap(), - ); + let load_font = |filename, ui: &mut Ui| { + let fullpath: String = ["/voxygen/font", filename].concat(); + ui.new_font(conrod_core::text::Font::from_bytes( + assets::load(fullpath.as_str()) + .expect("Error loading file") + ).unwrap()) + }; + let font_opensans = load_font("/OpenSans-Regular.ttf", &mut ui); + let font_metamorph = load_font("/Metamorphous-Regular.ttf", &mut ui); + Self { ui, imgs, diff --git a/voxygen/src/menu/main/ui.rs b/voxygen/src/menu/main/ui.rs index 1ab24d8c63..d14e75686e 100644 --- a/voxygen/src/menu/main/ui.rs +++ b/voxygen/src/menu/main/ui.rs @@ -68,7 +68,7 @@ struct Imgs { } impl Imgs { fn new(ui: &mut Ui, renderer: &mut Renderer) -> Imgs { - let mut load_img = |filename, ui: &mut Ui| { + let load_img = |filename, ui: &mut Ui| { let fullpath: String = ["/voxygen/", filename].concat(); let image = image::load_from_memory( assets::load(fullpath.as_str()) @@ -78,7 +78,7 @@ impl Imgs { .unwrap(); ui.new_graphic(ui::Graphic::Image(image)) }; - let mut load_vox = |filename, ui: &mut Ui| { + let load_vox = |filename, ui: &mut Ui| { let fullpath: String = ["/voxygen/", filename].concat(); let dot_vox = dot_vox::load_bytes( assets::load(fullpath.as_str()) @@ -146,20 +146,16 @@ impl MainMenuUi { // Load images let imgs = Imgs::new(&mut ui, window.renderer_mut()); // Load fonts - let font_opensans = ui.new_font( - conrod_core::text::font::from_file(concat!( - env!("CARGO_MANIFEST_DIR"), - "/../assets/voxygen/font/OpenSans-Regular.ttf" - )) - .unwrap(), - ); - let font_metamorph = ui.new_font( - conrod_core::text::font::from_file(concat!( - env!("CARGO_MANIFEST_DIR"), - "/../assets/voxygen/font/Metamorphous-Regular.ttf" - )) - .unwrap(), - ); + let load_font = |filename, ui: &mut Ui| { + let fullpath: String = ["/voxygen/font", filename].concat(); + ui.new_font(conrod_core::text::Font::from_bytes( + assets::load(fullpath.as_str()) + .expect("Error loading file") + ).unwrap()) + }; + let font_opensans = load_font("/OpenSans-Regular.ttf", &mut ui); + let font_metamorph = load_font("/Metamorphous-Regular.ttf", &mut ui); + Self { ui, imgs, diff --git a/voxygen/src/scene/figure.rs b/voxygen/src/scene/figure.rs index 66f1a65b27..849e865686 100644 --- a/voxygen/src/scene/figure.rs +++ b/voxygen/src/scene/figure.rs @@ -8,7 +8,8 @@ use client::Client; use common::{ comp, figure::Segment, - msg + msg, + assets, }; use crate::{ Error, @@ -43,7 +44,12 @@ impl Figures { pub fn new(renderer: &mut Renderer) -> Self { // TODO: Make a proper asset loading system fn load_segment(filename: &'static str) -> Segment { - Segment::from(dot_vox::load(&(concat!(env!("CARGO_MANIFEST_DIR"), "/../assets/voxygen/voxel/").to_string() + filename)).unwrap()) + let fullpath: String = ["/voxygen/voxel/", filename].concat(); + Segment::from(dot_vox::load_bytes( + assets::load(fullpath.as_str()) + .expect("Error loading file") + .as_slice(), + ).unwrap()) } let bone_meshes = [