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

Change macro to make single struct

Browse Source 
Former-commit-id: ed7876d49fccdc7fb11317c13b59b2b4776daef9
This commit is contained in:
timokoesters 2019-04-28 17:20:08 +02:00 committed by Imbris
parent f028aa5a2c
commit b83d45c464
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,35 +30,35 @@ impl UiId for DotVoxData {
/// Example usage:
/// ```
/// image_ids! {
/// struct<DotVoxData> Voxs {
/// pub struct Ids {
/// <DotVoxData>
/// button1: "filename1.vox",
/// button2: "filename2.vox",
/// }
/// struct<DynamicImage> Voxs {
///
/// <DynamicImage>
/// background: "background.png",
/// }
/// }
/// ```
macro_rules! image_ids {
($(pub struct<$T:ty> $Ids:ident { $( $name:ident: $file:expr ), *$(,)? } )*) => {
$(
pub struct $Ids {
$( $name: ImgId, )*
}
(pub struct $Ids:ident { $( <$T:ty> $( $name:ident: $file:expr ),* $(,)? )* }) => {
pub struct $Ids {
$($( $name: ImgId, )*)*
}
impl $Ids {
pub fn load(ui: &mut Ui) -> Result<Self, std::io::Error> {
Ok(Self {
$( $name: UiId::to_ui_asset(<$T>::load($file)?, ui), )*
})
}
impl $Ids {
pub fn load(ui: &mut Ui) -> Result<Self, std::io::Error> {
Ok(Self {
$($( $name: UiId::to_ui_asset(<$T>::load($file)?, ui), )*)*
})
}
)*
}
};
}
image_ids! {
pub struct<DotVoxData> Voxs {
pub struct Ids {
<DotVoxData>
// Bag
bag_contents: "element/frames/bag.vox",
inv_grid: "element/frames/inv_grid.vox",
@ -102,9 +102,8 @@ image_ids! {
window_frame: "element/frames/window2.vox",
map_frame_l: "element/frames/map_l.vox",
map_frame_r: "element/frames/map_r.vox",
}
pub struct<DynamicImage> Imgs {
<DynamicImage>
// Bag
bag: "element/buttons/bag/closed.png",
bag_hover: "element/buttons/bag/closed_hover.png",