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

background images

Browse Source
This commit is contained in:
Pfauenauge90 2020-03-18 01:43:55 +01:00
parent 04c8ed9a3c
commit 70511e0f4e
15 changed files with 153 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/voxygen/element/icons/back.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/element/icons/belt.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/element/icons/chest.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/element/icons/feet.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/element/icons/hands.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/element/icons/head.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/element/icons/legs.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/element/icons/mainhand.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/element/icons/necklace.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/element/icons/offhand.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/element/icons/ring.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/element/icons/shoulders.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/element/icons/tabard.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

109
voxygen/src/hud/bag.rs
View File

@ -56,7 +56,7 @@ widget_ids! {
chest_bg,
shoulder_bg,
hands_bg,
pants_bg,
legs_bg,
belt_bg,
ring_r_bg,
ring_l_bg,
@ -65,6 +65,20 @@ widget_ids! {
tabard_bg,
mainhand_bg,
offhand_bg,
head_ico,
neck_ico,
chest_ico,
shoulder_ico,
hands_ico,
legs_ico,
belt_ico,
ring_r_ico,
ring_l_ico,
foot_ico,
back_ico,
tabard_ico,
mainhand_ico,
offhand_ico,
}
}
@ -278,91 +292,168 @@ impl<'a> Widget for Bag<'a> {
.mid_top_with_margin_on(state.ids.bg_frame, 60.0)
.color(Some(UI_HIGHLIGHT_0))
.set(state.ids.head_bg, ui);
Button::image(self.imgs.head_bg)
.w_h(32.0, 40.0)
.image_color(UI_MAIN)
.middle_of(state.ids.head_bg)
.with_tooltip(self.tooltip_manager, "Helmet", "", &item_tooltip)
.set(state.ids.head_ico, ui);
//Necklace
Image::new(self.imgs.armor_slot)
.w_h(45.0, 45.0)
.mid_bottom_with_margin_on(state.ids.head_bg, -55.0)
.color(Some(UI_HIGHLIGHT_0))
.set(state.ids.neck_bg, ui);
Button::image(self.imgs.necklace_bg)
.w_h(40.0, 31.0)
.image_color(UI_MAIN)
.middle_of(state.ids.neck_bg)
.with_tooltip(self.tooltip_manager, "Neck", "", &item_tooltip)
.set(state.ids.neck_ico, ui);
//Chest
Image::new(self.imgs.armor_slot) // different graphics for empty/non empty
.w_h(85.0, 85.0)
.mid_bottom_with_margin_on(state.ids.neck_bg, -95.0)
.color(Some(UI_HIGHLIGHT_0))
.set(state.ids.chest_bg, ui);
Button::image(self.imgs.skull)
.w_h(80.0, 80.0)
Button::image(self.imgs.chest_bg)
.w_h(64.0, 42.0)
.image_color(UI_MAIN)
.middle_of(state.ids.chest_bg)
.set(state.ids.test, ui);
.with_tooltip(self.tooltip_manager, "Chest", "", &item_tooltip)
.set(state.ids.chest_ico, ui);
//Shoulder
Image::new(self.imgs.armor_slot)
.w_h(70.0, 70.0)
.bottom_left_with_margins_on(state.ids.chest_bg, 0.0, -80.0)
.color(Some(UI_HIGHLIGHT_0))
.set(state.ids.shoulder_bg, ui);
Button::image(self.imgs.shoulders_bg)
.w_h(60.0, 36.0)
.image_color(UI_MAIN)
.middle_of(state.ids.shoulder_bg)
.with_tooltip(self.tooltip_manager, "Shoulders", "", &item_tooltip)
.set(state.ids.shoulder_ico, ui);
//Hands
Image::new(self.imgs.armor_slot)
.w_h(70.0, 70.0)
.bottom_right_with_margins_on(state.ids.chest_bg, 0.0, -80.0)
.color(Some(UI_HIGHLIGHT_0))
.set(state.ids.hands_bg, ui);
Button::image(self.imgs.hands_bg)
.w_h(55.0, 60.0)
.image_color(UI_MAIN)
.middle_of(state.ids.hands_bg)
.with_tooltip(self.tooltip_manager, "Hands", "", &item_tooltip)
.set(state.ids.hands_ico, ui);
//Belt
Image::new(self.imgs.armor_slot)
.w_h(45.0, 45.0)
.mid_bottom_with_margin_on(state.ids.chest_bg, -55.0)
.color(Some(UI_HIGHLIGHT_0))
.set(state.ids.belt_bg, ui);
//Pants
Button::image(self.imgs.belt_bg)
.w_h(40.0, 23.0)
.image_color(UI_MAIN)
.middle_of(state.ids.belt_bg)
.with_tooltip(self.tooltip_manager, "Belt", "", &item_tooltip)
.set(state.ids.belt_ico, ui);
//Legs
Image::new(self.imgs.armor_slot)
.w_h(85.0, 85.0)
.mid_bottom_with_margin_on(state.ids.belt_bg, -95.0)
.color(Some(UI_HIGHLIGHT_0))
.set(state.ids.pants_bg, ui);
.set(state.ids.legs_bg, ui);
Button::image(self.imgs.legs_bg)
.w_h(48.0, 70.0)
.image_color(UI_MAIN)
.middle_of(state.ids.legs_bg)
.with_tooltip(self.tooltip_manager, "Legs", "", &item_tooltip)
.set(state.ids.legs_ico, ui);
//Ring-L
Image::new(self.imgs.armor_slot)
.w_h(45.0, 45.0)
.bottom_right_with_margins_on(state.ids.shoulder_bg, -55.0, 0.0)
.color(Some(UI_HIGHLIGHT_0))
.set(state.ids.ring_l_bg, ui);
Button::image(self.imgs.ring_l_bg)
.w_h(36.0, 40.0)
.image_color(UI_MAIN)
.middle_of(state.ids.ring_l_bg)
.with_tooltip(self.tooltip_manager, "Left Ring", "", &item_tooltip)
.set(state.ids.ring_l_ico, ui);
//Ring-R
Image::new(self.imgs.armor_slot)
.w_h(45.0, 45.0)
.bottom_left_with_margins_on(state.ids.hands_bg, -55.0, 0.0)
.color(Some(UI_HIGHLIGHT_0))
.set(state.ids.ring_r_bg, ui);
Button::image(self.imgs.ring_r_bg)
.w_h(36.0, 40.0)
.image_color(UI_MAIN)
.middle_of(state.ids.ring_r_bg)
.with_tooltip(self.tooltip_manager, "Right Ring", "", &item_tooltip)
.set(state.ids.ring_r_ico, ui);
//Back
Image::new(self.imgs.armor_slot)
.w_h(45.0, 45.0)
.down_from(state.ids.ring_l_bg, 10.0)
.color(Some(UI_HIGHLIGHT_0))
.set(state.ids.back_bg, ui);
Button::image(self.imgs.back_bg)
.w_h(33.0, 40.0)
.image_color(UI_MAIN)
.middle_of(state.ids.back_bg)
.with_tooltip(self.tooltip_manager, "Back", "", &item_tooltip)
.set(state.ids.back_ico, ui);
//Foot
Image::new(self.imgs.armor_slot)
.w_h(45.0, 45.0)
.down_from(state.ids.ring_r_bg, 10.0)
.color(Some(UI_HIGHLIGHT_0))
.set(state.ids.foot_bg, ui);
Button::image(self.imgs.feet_bg)
.w_h(32.0, 40.0)
.image_color(UI_MAIN)
.middle_of(state.ids.foot_bg)
.with_tooltip(self.tooltip_manager, "Feet", "", &item_tooltip)
.set(state.ids.foot_ico, ui);
//Tabard
Image::new(self.imgs.armor_slot)
.w_h(70.0, 70.0)
.top_right_with_margins_on(state.ids.bg_frame, 80.5, 53.0)
.color(Some(UI_HIGHLIGHT_0))
.set(state.ids.tabard_bg, ui);
Button::image(self.imgs.tabard_bg)
.w_h(60.0, 60.0)
.image_color(UI_MAIN)
.middle_of(state.ids.tabard_bg)
.with_tooltip(self.tooltip_manager, "Tabard", "", &item_tooltip)
.set(state.ids.tabard_ico, ui);
//Mainhand/Left-Slot
Image::new(self.imgs.armor_slot)
.w_h(85.0, 85.0)
.bottom_right_with_margins_on(state.ids.back_bg, -95.0, 0.0)
.color(Some(UI_HIGHLIGHT_0))
.set(state.ids.mainhand_bg, ui);
Button::image(self.imgs.mainhand_bg)
.w_h(75.0, 75.0)
.image_color(UI_MAIN)
.middle_of(state.ids.mainhand_bg)
.with_tooltip(self.tooltip_manager, "Mainhand", "", &item_tooltip)
.set(state.ids.mainhand_ico, ui);
//Offhand/Right-Slot
Image::new(self.imgs.armor_slot)
.w_h(85.0, 85.0)
.bottom_left_with_margins_on(state.ids.foot_bg, -95.0, 0.0)
.color(Some(UI_HIGHLIGHT_0))
.set(state.ids.offhand_bg, ui);
Button::image(self.imgs.offhand_bg)
.w_h(75.0, 75.0)
.image_color(UI_MAIN)
.middle_of(state.ids.offhand_bg)
.with_tooltip(self.tooltip_manager, "Offhand", "", &item_tooltip)
.set(state.ids.offhand_ico, ui);
} else {
// Stats
// Title

29
voxygen/src/hud/img_ids.rs
View File

@ -185,21 +185,6 @@ image_ids! {
// Charwindow
xp_charwindow: "voxygen.element.frames.xp_charwindow",
divider: "voxygen.element.frames.divider_charwindow",
head_bg: "voxygen.element.icons.head",
shoulders_bg: "voxygen.element.icons.shoulders",
hands_bg: "voxygen.element.icons.hands",
belt_bg: "voxygen.element.icons.belt",
legs_bg: "voxygen.element.icons.legs",
feet_bg: "voxygen.element.icons.feet",
ring_r_bg: "voxygen.element.icons.ring",
ring_l_bg: "voxygen.element.icons.ring",
tabard_bg: "voxygen.element.icons.tabard",
chest_bg: "voxygen.element.icons.chest",
back_bg: "voxygen.element.icons.back",
gem_bg: "voxygen.element.icons.gem",
necklace_bg: "voxygen.element.icons.necklace",
mainhand_bg: "voxygen.element.icons.mainhand",
offhand_bg: "voxygen.element.icons.offhand",
// Close button
close_button: "voxygen.element.buttons.x",
@ -258,6 +243,20 @@ image_ids! {
inv_slots: "voxygen.element.misc_bg.inv_slots",
inv_runes: "voxygen.element.misc_bg.inv_runes",
armor_slot: "voxygen.element.buttons.armor_slot",
head_bg: "voxygen.element.icons.head",
shoulders_bg: "voxygen.element.icons.shoulders",
hands_bg: "voxygen.element.icons.hands",
belt_bg: "voxygen.element.icons.belt",
legs_bg: "voxygen.element.icons.legs",
feet_bg: "voxygen.element.icons.feet",
ring_r_bg: "voxygen.element.icons.ring",
ring_l_bg: "voxygen.element.icons.ring",
tabard_bg: "voxygen.element.icons.tabard",
chest_bg: "voxygen.element.icons.chest",
back_bg: "voxygen.element.icons.back",
necklace_bg: "voxygen.element.icons.necklace",
mainhand_bg: "voxygen.element.icons.mainhand",
offhand_bg: "voxygen.element.icons.offhand",