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

Fix asset imports

Browse Source 
Former-commit-id: 57e3f136aa61d4e7431f147a79e8ea29fd992328
This commit is contained in:
timokoesters 2019-04-25 22:19:15 +02:00 committed by Imbris
parent c7dd3e96cc
commit 3f0f8b84d1
3 changed files with 4 additions and 2 deletions
voxygen/src
assets
ids.rs
menu
char_selection
ui.rs
main
ui.rs

2
voxygen/src/assets/ids.rs
View File

@ -49,7 +49,7 @@ macro_rules! image_ids {
impl $Ids {
pub fn load(ui: &mut Ui) -> Result<Self, std::io::Error> {
Ok(Self {
$( $name: Id::to_ui_asset(<$T>::load($file)?, ui), )*
$( $name: UiId::to_ui_asset(<$T>::load($file)?, ui), )*
})
}
}

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

@ -1,4 +1,5 @@
use crate::{
assets,
render::Renderer,
ui::{self, ScaleMode, Ui},
window::Window,

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

@ -1,10 +1,11 @@
use crate::{
assets,
render::Renderer,
ui::{self, ScaleMode, Ui},
window::Window,
GlobalState, DEFAULT_PUBLIC_SERVER,
};
use common::{assets, figure::Segment};
use common::figure::Segment;
use conrod_core::{
color,
color::TRANSPARENT,