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

Closable minimap

Browse Source 
Former-commit-id: bc92efc783adb780c11c507bd4084e09494a7e32
This commit is contained in:
Pfauenauge 2019-04-28 15:56:40 +02:00
parent 9efa17c653
commit 3773653072
2 changed files with 57 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/voxygen

@ -1 +1 @@
Subproject commit b5c4e96c490667d4aef061f5e1792c196b9c88d0 Subproject commit cff10b010db25ce9af5edbdfb5ef0af889dd741a

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

@ -54,6 +54,7 @@ widget_ids! {
character_button_bg, character_button_bg,
qlog_button_bg, qlog_button_bg,
bag_text, bag_text,
mmap_button,
//help //help
help, help,
help_bg, help_bg,
@ -170,6 +171,14 @@ pub(self) struct Imgs {
inv_slot: ImgId, inv_slot: ImgId,
// Buttons // Buttons
mmap_closed: ImgId,
mmap_closed_hover: ImgId,
mmap_closed_press: ImgId,
mmap_open: ImgId,
mmap_open_hover: ImgId,
mmap_open_press: ImgId,
settings: ImgId, settings: ImgId,
settings_hover: ImgId, settings_hover: ImgId,
settings_press: ImgId, settings_press: ImgId,
@ -208,7 +217,7 @@ pub(self) struct Imgs {
// MiniMap // MiniMap
mmap_frame: ImgId, mmap_frame: ImgId,
mmap_frame_bg: ImgId, mmap_frame_closed: ImgId,
// SkillBar Module // SkillBar Module
sb_grid: ImgId, sb_grid: ImgId,
@ -264,10 +273,10 @@ pub(self) struct Imgs {
progress: ImgId, progress: ImgId,
// Buttons // Buttons
mmap_button: ImgId, grid_button: ImgId,
mmap_button_hover: ImgId, grid_button_hover: ImgId,
mmap_button_press: ImgId, grid_button_press: ImgId,
mmap_button_open: ImgId, grid_button_open: ImgId,
// Quest-Log Window // Quest-Log Window
questlog_bg: ImgId, questlog_bg: ImgId,
@ -313,6 +322,13 @@ impl Imgs {
inv_slot: load_vox("element/buttons/inv_slot.vox", ui), inv_slot: load_vox("element/buttons/inv_slot.vox", ui),
// Buttons // Buttons
mmap_closed: load_vox("element/buttons/button_mmap_closed.vox", ui),
mmap_closed_hover: load_vox("element/buttons/button_mmap_closed_hover.vox", ui),
mmap_closed_press: load_vox("element/buttons/button_mmap_closed_press.vox", ui),
mmap_open: load_vox("element/buttons/button_mmap_open.vox", ui),
mmap_open_hover: load_vox("element/buttons/button_mmap_open_hover.vox", ui),
mmap_open_press: load_vox("element/buttons/button_mmap_open_press.vox", ui),
settings: load_vox("element/buttons/settings.vox", ui), settings: load_vox("element/buttons/settings.vox", ui),
settings_hover: load_vox("element/buttons/settings_hover.vox", ui), settings_hover: load_vox("element/buttons/settings_hover.vox", ui),
settings_press: load_vox("element/buttons/settings_press.vox", ui), settings_press: load_vox("element/buttons/settings_press.vox", ui),
@ -337,10 +353,10 @@ impl Imgs {
qlog_hover: load_vox("element/buttons/qlog_hover.vox", ui), qlog_hover: load_vox("element/buttons/qlog_hover.vox", ui),
qlog_press: load_vox("element/buttons/qlog_press.vox", ui), qlog_press: load_vox("element/buttons/qlog_press.vox", ui),
mmap_button: load_img("element/buttons/border.png", ui), grid_button: load_img("element/buttons/border.png", ui),
mmap_button_hover: load_img("element/buttons/border_mo.png", ui), grid_button_hover: load_img("element/buttons/border_mo.png", ui),
mmap_button_press: load_img("element/buttons/border_press.png", ui), grid_button_press: load_img("element/buttons/border_press.png", ui),
mmap_button_open: load_img("element/buttons/border_pressed.png", ui), grid_button_open: load_img("element/buttons/border_pressed.png", ui),
// Close button // Close button
close_button: load_vox("element/buttons/x.vox", ui), close_button: load_vox("element/buttons/x.vox", ui),
@ -356,7 +372,7 @@ impl Imgs {
// MiniMap // MiniMap
mmap_frame: load_vox("element/frames/mmap.vox", ui), mmap_frame: load_vox("element/frames/mmap.vox", ui),
mmap_frame_bg: load_img("element/misc_bg/mmap_bg.png", ui), mmap_frame_closed: load_vox("element/frames/mmap_closed.vox", ui),
// Skillbar Module // Skillbar Module
sb_grid: load_img("element/skill_bar/sbar_grid.png", ui), sb_grid: load_img("element/skill_bar/sbar_grid.png", ui),
@ -467,6 +483,7 @@ pub struct Hud {
menu_open: bool, menu_open: bool,
open_windows: Windows, open_windows: Windows,
map_open: bool, map_open: bool,
mmap_open: bool,
show_ui: bool, show_ui: bool,
inventory_space: u32, inventory_space: u32,
xp_percentage: f64, xp_percentage: f64,
@ -516,6 +533,7 @@ impl Hud {
bag_open: false, bag_open: false,
menu_open: false, menu_open: false,
map_open: false, map_open: false,
mmap_open: true,
show_ui: true, show_ui: true,
inventorytest_button: false, inventorytest_button: false,
inventory_space: 0, inventory_space: 0,
@ -562,13 +580,13 @@ impl Hud {
// Add Bag-Space Button // Add Bag-Space Button
if self.inventorytest_button { if self.inventorytest_button {
if Button::image(self.imgs.mmap_button) if Button::image(self.imgs.grid_button)
.w_h(100.0, 100.0) .w_h(100.0, 100.0)
.middle_of(ui_widgets.window) .middle_of(ui_widgets.window)
.label("1 Up!") .label("1 Up!")
.label_font_size(20) .label_font_size(20)
.hover_image(self.imgs.mmap_button_hover) .hover_image(self.imgs.grid_button_hover)
.press_image(self.imgs.mmap_button_press) .press_image(self.imgs.grid_button_press)
.set(self.ids.bag_space_add, ui_widgets) .set(self.ids.bag_space_add, ui_widgets)
.was_clicked() .was_clicked()
{ {
@ -620,12 +638,9 @@ impl Hud {
}; };
} }
// Minimap frame and bg // Minimap
//Image::new(self.imgs.mmap_frame_bg)
//.w_h(1750.0 / 8.0, 1650.0 / 8.0)
//.top_right_with_margins_on(ui_widgets.window, 5.0, 5.0)
//.set(self.ids.mmap_frame_bg, ui_widgets);
if self.mmap_open {
Image::new(self.imgs.mmap_frame) Image::new(self.imgs.mmap_frame)
.w_h(100.0 * 2.0, 100.0 * 2.0) .w_h(100.0 * 2.0, 100.0 * 2.0)
.top_right_with_margins_on(ui_widgets.window, 5.0, 5.0) .top_right_with_margins_on(ui_widgets.window, 5.0, 5.0)
@ -634,11 +649,29 @@ impl Hud {
Rectangle::fill_with([92.0 * 2.0, 82.0 * 2.0], color::TRANSPARENT) Rectangle::fill_with([92.0 * 2.0, 82.0 * 2.0], color::TRANSPARENT)
.mid_top_with_margin_on(self.ids.mmap_frame, 13.0 * 2.0 + 2.0) .mid_top_with_margin_on(self.ids.mmap_frame, 13.0 * 2.0 + 2.0)
.set(self.ids.mmap_frame_bg, ui_widgets); .set(self.ids.mmap_frame_bg, ui_widgets);
}
else {
Image::new(self.imgs.mmap_frame_closed)
.w_h(100.0 * 2.0, 11.0 * 2.0)
.top_right_with_margins_on(ui_widgets.window, 5.0, 5.0)
.set(self.ids.mmap_frame, ui_widgets);
};
if Button::image(if self.mmap_open {self.imgs.mmap_open} else {self.imgs.mmap_closed})
.w_h(10.0 * 2.0, 10.0 * 2.0)
.hover_image(if self.mmap_open {self.imgs.mmap_open_hover} else {self.imgs.mmap_closed_hover})
.press_image(if self.mmap_open {self.imgs.mmap_open_press} else {self.imgs.mmap_closed_press})
.top_right_with_margins_on(self.ids.mmap_frame, 0.0, 0.0)
.set(self.ids.mmap_button, ui_widgets)
.was_clicked()
{
self.mmap_open = !self.mmap_open;
};
// Title // Title
// Make it display the actual location // Make it display the actual location
Text::new("Uncanny Valley") Text::new("Uncanny Valley")
.mid_top_with_margin_on(self.ids.mmap_frame, 5.0) .mid_top_with_margin_on(self.ids.mmap_frame, 3.0)
.font_size(14) .font_size(14)
.color(TEXT_COLOR) .color(TEXT_COLOR)
.set(self.ids.mmap_location, ui_widgets); .set(self.ids.mmap_location, ui_widgets);