Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

update asset loading to not use env

Browse Source 
Former-commit-id: 1858f3e06a26502c8bb6a3237e216d551377f6c6
This commit is contained in:
Imbris
2019-04-20 18:02:48 -04:00
parent ee087babfa
commit 6b396aa80c
4 changed files with 41 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
voxygen/src/hud/mod.rs
View File

@ -250,7 +250,7 @@ pub(self) struct Imgs {
} }
impl Imgs { impl Imgs {
fn new(ui: &mut Ui, renderer: &mut Renderer) -> 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 fullpath: String = ["/voxygen/", filename].concat();
let image = image::load_from_memory( let image = image::load_from_memory(
assets::load(fullpath.as_str()) assets::load(fullpath.as_str())
@ -438,22 +438,18 @@ impl Hud {
// Load images // Load images
let imgs = Imgs::new(&mut ui, window.renderer_mut()); let imgs = Imgs::new(&mut ui, window.renderer_mut());
// Load fonts // Load fonts
let font_opensans = ui.new_font( let load_font = |filename, ui: &mut Ui| {
conrod_core::text::font::from_file(concat!( let fullpath: String = ["/voxygen/font", filename].concat();
env!("CARGO_MANIFEST_DIR"), ui.new_font(conrod_core::text::Font::from_bytes(
"/../assets/voxygen/font/OpenSans-Regular.ttf" assets::load(fullpath.as_str())
)) .expect("Error loading file")
.unwrap(), ).unwrap())
); };
let font_metamorph = ui.new_font( let font_opensans = load_font("/OpenSans-Regular.ttf", &mut ui);
conrod_core::text::font::from_file(concat!( let font_metamorph = load_font("/Metamorphous-Regular.ttf", &mut ui);
env!("CARGO_MANIFEST_DIR"),
"/../assets/voxygen/font/Metamorphous-Regular.ttf"
))
.unwrap(),
);
// Chat box // Chat box
let chat = chat::Chat::new(&mut ui); let chat = chat::Chat::new(&mut ui);
Self { Self {
ui, ui,
imgs, imgs,

24
voxygen/src/menu/char_selection/ui.rs
View File

@ -377,20 +377,16 @@ impl CharSelectionUi {
// Load images // Load images
let imgs = Imgs::new(&mut ui, window.renderer_mut()); let imgs = Imgs::new(&mut ui, window.renderer_mut());
// Load fonts // Load fonts
let font_opensans = ui.new_font( let load_font = |filename, ui: &mut Ui| {
conrod_core::text::font::from_file(concat!( let fullpath: String = ["/voxygen/font", filename].concat();
env!("CARGO_MANIFEST_DIR"), ui.new_font(conrod_core::text::Font::from_bytes(
"/../assets/voxygen/font/OpenSans-Regular.ttf" assets::load(fullpath.as_str())
)) .expect("Error loading file")
.unwrap(), ).unwrap())
); };
let font_metamorph = ui.new_font( let font_opensans = load_font("/OpenSans-Regular.ttf", &mut ui);
conrod_core::text::font::from_file(concat!( let font_metamorph = load_font("/Metamorphous-Regular.ttf", &mut ui);
env!("CARGO_MANIFEST_DIR"),
"/../assets/voxygen/font/Metamorphous-Regular.ttf"
))
.unwrap(),
);
Self { Self {
ui, ui,
imgs, imgs,

28
voxygen/src/menu/main/ui.rs
View File

@ -68,7 +68,7 @@ struct Imgs {
} }
impl Imgs { impl Imgs {
fn new(ui: &mut Ui, renderer: &mut Renderer) -> 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 fullpath: String = ["/voxygen/", filename].concat();
let image = image::load_from_memory( let image = image::load_from_memory(
assets::load(fullpath.as_str()) assets::load(fullpath.as_str())
@ -78,7 +78,7 @@ impl Imgs {
.unwrap(); .unwrap();
ui.new_graphic(ui::Graphic::Image(image)) 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 fullpath: String = ["/voxygen/", filename].concat();
let dot_vox = dot_vox::load_bytes( let dot_vox = dot_vox::load_bytes(
assets::load(fullpath.as_str()) assets::load(fullpath.as_str())
@ -146,20 +146,16 @@ impl MainMenuUi {
// Load images // Load images
let imgs = Imgs::new(&mut ui, window.renderer_mut()); let imgs = Imgs::new(&mut ui, window.renderer_mut());
// Load fonts // Load fonts
let font_opensans = ui.new_font( let load_font = |filename, ui: &mut Ui| {
conrod_core::text::font::from_file(concat!( let fullpath: String = ["/voxygen/font", filename].concat();
env!("CARGO_MANIFEST_DIR"), ui.new_font(conrod_core::text::Font::from_bytes(
"/../assets/voxygen/font/OpenSans-Regular.ttf" assets::load(fullpath.as_str())
)) .expect("Error loading file")
.unwrap(), ).unwrap())
); };
let font_metamorph = ui.new_font( let font_opensans = load_font("/OpenSans-Regular.ttf", &mut ui);
conrod_core::text::font::from_file(concat!( let font_metamorph = load_font("/Metamorphous-Regular.ttf", &mut ui);
env!("CARGO_MANIFEST_DIR"),
"/../assets/voxygen/font/Metamorphous-Regular.ttf"
))
.unwrap(),
);
Self { Self {
ui, ui,
imgs, imgs,

10
voxygen/src/scene/figure.rs
View File

@ -8,7 +8,8 @@ use client::Client;
use common::{ use common::{
comp, comp,
figure::Segment, figure::Segment,
msg msg,
assets,
}; };
use crate::{ use crate::{
Error, Error,
@ -43,7 +44,12 @@ impl Figures {
pub fn new(renderer: &mut Renderer) -> Self { pub fn new(renderer: &mut Renderer) -> Self {
// TODO: Make a proper asset loading system // TODO: Make a proper asset loading system
fn load_segment(filename: &'static str) -> Segment { 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 = [ let bone_meshes = [