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

Merge branch 'master' into 'master'

Browse Source 
Closable Minimap

See merge request veloren/veloren!83

Former-commit-id: fa681ef8a4fcbb7fc4d8a520bf154c7abb819654
This commit is contained in:
Dominik Broński
2019-04-28 15:36:24 +00:00
parent 60017a4f99 3773653072
commit b930043041
18 changed files with 275 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/voxygen

Submodule assets/voxygen updated: 25346c1ead...cff10b010d

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

@ -6,9 +6,7 @@ use crate::{
window::{Event as WinEvent, Key, Window},
GlobalState,
};
use common::{
assets,
figure::Segment};
use common::{assets, figure::Segment};
use conrod_core::{
color,
@ -29,8 +27,8 @@ widget_ids! {
debug_button,
debug_button_label,
fps_counter,
// Logo
v_logo,
// Game Version
version,
// Bag and Inventory
bag,
@ -56,6 +54,7 @@ widget_ids! {
character_button_bg,
qlog_button_bg,
bag_text,
mmap_button,
//help
help,
help_bg,
@ -172,6 +171,14 @@ pub(self) struct Imgs {
inv_slot: ImgId,
// 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_hover: ImgId,
settings_press: ImgId,
@ -210,7 +217,7 @@ pub(self) struct Imgs {
// MiniMap
mmap_frame: ImgId,
mmap_frame_bg: ImgId,
mmap_frame_closed: ImgId,
// SkillBar Module
sb_grid: ImgId,
@ -266,10 +273,10 @@ pub(self) struct Imgs {
progress: ImgId,
// Buttons
mmap_button: ImgId,
mmap_button_hover: ImgId,
mmap_button_press: ImgId,
mmap_button_open: ImgId,
grid_button: ImgId,
grid_button_hover: ImgId,
grid_button_press: ImgId,
grid_button_open: ImgId,
// Quest-Log Window
questlog_bg: ImgId,
@ -315,6 +322,12 @@ impl Imgs {
inv_slot: load_vox("element/buttons/inv_slot.vox", ui),
// 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_hover: load_vox("element/buttons/settings_hover.vox", ui),
@ -340,10 +353,10 @@ impl Imgs {
qlog_hover: load_vox("element/buttons/qlog_hover.vox", ui),
qlog_press: load_vox("element/buttons/qlog_press.vox", ui),
mmap_button: load_img("element/buttons/border.png", ui),
mmap_button_hover: load_img("element/buttons/border_mo.png", ui),
mmap_button_press: load_img("element/buttons/border_press.png", ui),
mmap_button_open: load_img("element/buttons/border_pressed.png", ui),
grid_button: load_img("element/buttons/border.png", ui),
grid_button_hover: load_img("element/buttons/border_mo.png", ui),
grid_button_press: load_img("element/buttons/border_press.png", ui),
grid_button_open: load_img("element/buttons/border_pressed.png", ui),
// Close button
close_button: load_vox("element/buttons/x.vox", ui),
@ -359,8 +372,7 @@ impl Imgs {
// MiniMap
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
sb_grid: load_img("element/skill_bar/sbar_grid.png", ui),
@ -424,7 +436,6 @@ impl Imgs {
chat_arrow: load_img("element/buttons/arrow/chat_arrow.png", ui),
chat_arrow_mo: load_img("element/buttons/arrow/chat_arrow_mo.png", ui),
chat_arrow_press: load_img("element/buttons/arrow/chat_arrow_press.png", ui),
}
}
}
@ -472,6 +483,7 @@ pub struct Hud {
menu_open: bool,
open_windows: Windows,
map_open: bool,
mmap_open: bool,
show_ui: bool,
inventory_space: u32,
xp_percentage: f64,
@ -521,6 +533,7 @@ impl Hud {
bag_open: false,
menu_open: false,
map_open: false,
mmap_open: true,
show_ui: true,
inventorytest_button: false,
inventory_space: 0,
@ -550,27 +563,30 @@ impl Hud {
// Display debug window
if self.show_debug {
Image::new(self.imgs.window_frame_2)
.down_from(self.ids.mmap_frame, 20.0)
.w_h(300.0, 350.0)
.set(self.ids.debug_bg, ui_widgets);
// Alpha Version
Text::new(version)
.top_left_with_margins_on(ui_widgets.window, 5.0, 5.0)
.font_size(14)
.font_id(self.font_opensans)
.color(TEXT_COLOR)
.set(self.ids.version, ui_widgets);
Text::new(&format!("FPS: {:.1}", tps))
.color(TEXT_COLOR)
.top_left_with_margins_on(self.ids.debug_bg, 20.0, 20.0)
.down_from(self.ids.version, 5.0)
.font_id(self.font_opensans)
.font_size(18)
.font_size(14)
.set(self.ids.fps_counter, ui_widgets);
}
// Add Bag-Space 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)
.middle_of(ui_widgets.window)
.label("1 Up!")
.label_font_size(20)
.hover_image(self.imgs.mmap_button_hover)
.press_image(self.imgs.mmap_button_press)
.hover_image(self.imgs.grid_button_hover)
.press_image(self.imgs.grid_button_press)
.set(self.ids.bag_space_add, ui_widgets)
.was_clicked()
{
@ -586,13 +602,6 @@ impl Hud {
events.push(Event::SendMessage(msg));
}
// Alpha Version
Text::new(version)
.top_left_with_margins_on(ui_widgets.window, 5.0, 5.0)
.font_size(14)
.color(TEXT_COLOR)
.set(self.ids.v_logo, ui_widgets);
// Help Text
if self.show_help {
Image::new(self.imgs.window_frame_2)
@ -608,7 +617,7 @@ impl Hud {
F2 = Toggle Interface \n\
\n\
Enter = Open Chat \n\
Mouse Wheel = Scroll Chat"
Mouse Wheel = Scroll Chat",
)
.color(TEXT_COLOR)
.top_left_with_margins_on(self.ids.help_bg, 20.0, 20.0)
@ -629,21 +638,40 @@ impl Hud {
};
}
// Minimap frame and bg
//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);
// Minimap
if self.mmap_open {
Image::new(self.imgs.mmap_frame)
.w_h(1750.0 / 8.0, 1650.0 / 8.0)
.w_h(100.0 * 2.0, 100.0 * 2.0)
.top_right_with_margins_on(ui_widgets.window, 5.0, 5.0)
.set(self.ids.mmap_frame, ui_widgets);
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)
.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
// Make it display the actual location
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)
.color(TEXT_COLOR)
.set(self.ids.mmap_location, ui_widgets);
@ -658,6 +686,8 @@ impl Hud {
.press_image(self.imgs.settings_press)
.label("N")
.label_font_size(10)
.label_font_id(self.font_metamorph)
.color(TEXT_COLOR)
.label_color(TEXT_COLOR)
.label_y(conrod_core::position::Relative::Scalar(-7.0))
.label_x(conrod_core::position::Relative::Scalar(10.0))
@ -679,6 +709,7 @@ impl Hud {
.press_image(self.imgs.map_press)
.label("M")
.label_font_size(10)
.label_font_id(self.font_metamorph)
.label_color(TEXT_COLOR)
.label_y(conrod_core::position::Relative::Scalar(-7.0))
.label_x(conrod_core::position::Relative::Scalar(10.0))
@ -712,7 +743,8 @@ impl Hud {
if match self.open_windows {
Windows::Settings => false,
_ => true,
} && self.map_open == false {
} && self.map_open == false
{
// 1 Social
if Button::image(self.imgs.social_button)
.w_h(25.0, 25.0)
@ -721,6 +753,7 @@ impl Hud {
.press_image(self.imgs.social_press)
.label("O")
.label_font_size(10)
.label_font_id(self.font_metamorph)
.label_color(TEXT_COLOR)
.label_y(conrod_core::position::Relative::Scalar(-7.0))
.label_x(conrod_core::position::Relative::Scalar(10.0))
@ -746,6 +779,7 @@ impl Hud {
.press_image(self.imgs.spellbook_press)
.label("P")
.label_font_size(10)
.label_font_id(self.font_metamorph)
.label_color(TEXT_COLOR)
.label_y(conrod_core::position::Relative::Scalar(-7.0))
.label_x(conrod_core::position::Relative::Scalar(10.0))
@ -771,6 +805,7 @@ impl Hud {
.press_image(self.imgs.character_press)
.label("C")
.label_font_size(10)
.label_font_id(self.font_metamorph)
.label_color(TEXT_COLOR)
.label_y(conrod_core::position::Relative::Scalar(-7.0))
.label_x(conrod_core::position::Relative::Scalar(10.0))
@ -796,6 +831,7 @@ impl Hud {
.press_image(self.imgs.qlog_press)
.label("L")
.label_font_size(10)
.label_font_id(self.font_metamorph)
.label_color(TEXT_COLOR)
.label_y(conrod_core::position::Relative::Scalar(-7.0))
.label_x(conrod_core::position::Relative::Scalar(10.0))
@ -814,7 +850,6 @@ impl Hud {
}
}
// Skillbar Module
// Experience-Bar
@ -970,6 +1005,7 @@ impl Hud {
Text::new("B")
.bottom_right_with_margins_on(self.ids.bag, 0.0, 0.0)
.font_size(10)
.font_id(self.font_metamorph)
.color(TEXT_COLOR)
.set(self.ids.bag_text, ui_widgets);
} else {
@ -980,9 +1016,8 @@ impl Hud {
Text::new("B")
.bottom_right_with_margins_on(self.ids.bag, 0.0, 0.0)
.font_size(10)
.color(TEXT_COLOR)
.font_id(self.font_metamorph)
.set(self.ids.bag_text, ui_widgets);
}
//Windows
@ -994,7 +1029,7 @@ impl Hud {
if let Windows::Settings = self.open_windows {
// BG
Image::new(self.imgs.settings_bg)
Image::new(self.imgs.window_frame)
.middle_of(ui_widgets.window)
.w_h(1648.0 / 2.5, 1952.0 / 2.5)
.set(self.ids.settings_bg, ui_widgets);
@ -1082,11 +1117,8 @@ impl Hud {
.color(TEXT_COLOR)
.set(self.ids.inventorytest_button_label, ui_widgets);
self.show_debug = ToggleButton::new(
self.show_debug,
self.imgs.check,
self.imgs.check_checked
)
self.show_debug =
ToggleButton::new(self.show_debug, self.imgs.check, self.imgs.check_checked)
.w_h(288.0 / 24.0, 288.0 / 24.0)
.top_left_with_margins_on(self.ids.rectangle, 65.0, 15.0)
.hover_images(self.imgs.check_checked_mo, self.imgs.check_mo)
@ -1100,7 +1132,6 @@ impl Hud {
.graphics_for(self.ids.debug_button)
.color(TEXT_COLOR)
.set(self.ids.debug_button_label, ui_widgets);
}
// 2 Gameplay////////////////
@ -1108,8 +1139,7 @@ impl Hud {
self.imgs.button_blue_mo
} else {
self.imgs.button_blank
}
)
})
.w_h(304.0 / 2.5, 80.0 / 2.5)
.hover_image(self.imgs.button_blue_mo)
.press_image(self.imgs.button_blue_press)
@ -1128,8 +1158,7 @@ impl Hud {
self.imgs.button_blue_mo
} else {
self.imgs.button_blank
}
)
})
.w_h(304.0 / 2.5, 80.0 / 2.5)
.hover_image(self.imgs.button_blue_mo)
.press_image(self.imgs.button_blue_press)
@ -1148,8 +1177,7 @@ impl Hud {
self.imgs.button_blue_mo
} else {
self.imgs.button_blank
}
)
})
.w_h(304.0 / 2.5, 80.0 / 2.5)
.hover_image(self.imgs.button_blue_mo)
.press_image(self.imgs.button_blue_press)
@ -1168,8 +1196,7 @@ impl Hud {
self.imgs.button_blue_mo
} else {
self.imgs.button_blank
}
)
})
.w_h(304.0 / 2.5, 80.0 / 2.5)
.hover_image(self.imgs.button_blue_mo)
.press_image(self.imgs.button_blue_press)
@ -1201,7 +1228,7 @@ impl Hud {
} else {
Image::new(self.imgs.window_frame)
.top_left_with_margins_on(ui_widgets.window, 200.0, 10.0)
.w_h(1648.0 / 4.0, 1952.0 / 4.0)
.w_h(107.0 * 4.0, 125.0 * 4.0)
.set(self.ids.social_frame, ui_widgets);
}
@ -1218,7 +1245,6 @@ impl Hud {
.scroll_kids_vertically()
.set(self.ids.social_bg, ui_widgets);
// X-Button
if Button::image(self.imgs.close_button)
.w_h(20.0, 20.0)
@ -1236,7 +1262,7 @@ impl Hud {
}
// Title
Text::new("Social")
.mid_top_with_margin_on(self.ids.social_frame, 16.0)
.mid_top_with_margin_on(self.ids.social_frame, 17.0)
.font_id(self.font_metamorph)
.font_size(14)
.color(TEXT_COLOR)
@ -1247,33 +1273,34 @@ impl Hud {
if char_window_open {
Image::new(self.imgs.window_frame)
.right_from(self.ids.charwindow_frame, 20.0)
.w_h(1648.0 / 4.0, 1952.0 / 4.0)
.w_h(107.0 * 4.0, 125.0 * 4.0)
.set(self.ids.spellbook_frame, ui_widgets);
} else {
Image::new(self.imgs.window_frame)
.top_left_with_margins_on(ui_widgets.window, 200.0, 90.0)
.w_h(1648.0 / 4.0, 1952.0 / 4.0)
.top_left_with_margins_on(ui_widgets.window, 200.0, 10.0)
.w_h(107.0 * 4.0, 125.0 * 4.0)
.set(self.ids.spellbook_frame, ui_widgets);
}
// BG
Image::new(self.imgs.spellbook_bg)
.w_h(1648.0 / 4.0, 1952.0 / 4.0)
.middle_of(self.ids.spellbook_frame)
.set(self.ids.spellbook_bg, ui_widgets);
// Icon
Image::new(self.imgs.spellbook_icon)
.w_h(224.0 / 3.0, 224.0 / 3.0)
.top_left_with_margins_on(self.ids.spellbook_frame, -10.0, -10.0)
.w_h(40.0, 40.0)
.top_left_with_margins_on(self.ids.spellbook_frame, 4.0, 4.0)
.set(self.ids.spellbook_icon, ui_widgets);
// Content alignment
Rectangle::fill_with([362.0, 418.0], color::TRANSPARENT)
.bottom_right_with_margins_on(self.ids.spellbook_frame, 17.0, 17.0)
.scroll_kids()
.scroll_kids_vertically()
.set(self.ids.spellbook_bg, ui_widgets);
// X-Button
if Button::image(self.imgs.close_button)
.w_h(244.0 * 0.22 / 4.0, 244.0 * 0.22 / 4.0)
.w_h(20.0, 20.0)
.hover_image(self.imgs.close_button_hover)
.press_image(self.imgs.close_button_press)
.top_right_with_margins_on(self.ids.spellbook_frame, 4.0, 4.0)
.top_right_with_margins_on(self.ids.spellbook_frame, 17.0, 5.0)
.set(self.ids.spellbook_close, ui_widgets)
.was_clicked()
{
@ -1285,7 +1312,8 @@ impl Hud {
}
// Title
Text::new("Spellbook")
.mid_top_with_margin_on(self.ids.spellbook_frame, 7.0)
.mid_top_with_margin_on(self.ids.spellbook_frame, 17.0)
.font_size(14)
.color(TEXT_COLOR)
.set(self.ids.spellbook_title, ui_widgets);
}
@ -1294,33 +1322,33 @@ impl Hud {
if char_window_open {
Image::new(self.imgs.window_frame)
.right_from(self.ids.charwindow_frame, 20.0)
.w_h(1648.0 / 4.0, 1952.0 / 4.0)
.w_h(107.0 * 4.0, 125.0 * 4.0)
.set(self.ids.questlog_frame, ui_widgets);
} else {
Image::new(self.imgs.window_frame)
.top_left_with_margins_on(ui_widgets.window, 200.0, 90.0)
.w_h(1648.0 / 4.0, 1952.0 / 4.0)
.top_left_with_margins_on(ui_widgets.window, 200.0, 10.0)
.w_h(107.0 * 4.0, 125.0 * 4.0)
.set(self.ids.questlog_frame, ui_widgets);
}
// BG
Image::new(self.imgs.questlog_bg)
.w_h(1648.0 / 4.0, 1952.0 / 4.0)
.middle_of(self.ids.questlog_frame)
.set(self.ids.questlog_bg, ui_widgets);
// Icon
Image::new(self.imgs.questlog_icon)
.w_h(224.0 / 3.0, 224.0 / 3.0)
.top_left_with_margins_on(self.ids.questlog_frame, -10.0, -10.0)
.w_h(40.0, 40.0)
.top_left_with_margins_on(self.ids.questlog_frame, 4.0, 4.0)
.set(self.ids.questlog_icon, ui_widgets);
// Content alignment
Rectangle::fill_with([362.0, 418.0], color::TRANSPARENT)
.bottom_right_with_margins_on(self.ids.questlog_frame, 17.0, 17.0)
.scroll_kids()
.scroll_kids_vertically()
.set(self.ids.questlog_bg, ui_widgets);
// X-Button
if Button::image(self.imgs.close_button)
.w_h(244.0 * 0.22 / 4.0, 244.0 * 0.22 / 4.0)
.hover_image(self.imgs.close_button_hover)
.w_h(20.0, 20.0)
.press_image(self.imgs.close_button_press)
.top_right_with_margins_on(self.ids.questlog_frame, 4.0, 4.0)
.top_right_with_margins_on(self.ids.questlog_frame, 17.0, 5.0)
.set(self.ids.questlog_close, ui_widgets)
.was_clicked()
{
@ -1332,8 +1360,9 @@ impl Hud {
}
// Title
Text::new("Quest-Log")
.mid_top_with_margin_on(self.ids.questlog_frame, 7.0)
.mid_top_with_margin_on(self.ids.questlog_frame, 17.0)
.color(TEXT_COLOR)
.font_size(14)
.set(self.ids.questlog_title, ui_widgets);
}
}
@ -1348,15 +1377,15 @@ impl Hud {
.set(self.ids.charwindow_frame, ui_widgets);
// BG
Image::new(self.imgs.window_bg)
.w_h(348.0, 404.0)
.mid_top_with_margin_on(self.ids.charwindow_frame, 48.0)
.set(self.ids.charwindow_bg, ui_widgets);
//Image::new(self.imgs.window_bg)
//.w_h(348.0, 404.0)
//.mid_top_with_margin_on(self.ids.charwindow_frame, 48.0)
//.set(self.ids.charwindow_bg, ui_widgets);
// Overlay
Image::new(self.imgs.charwindow)
.middle_of(self.ids.charwindow_bg)
.set(self.ids.charwindow, ui_widgets);
//Image::new(self.imgs.charwindow)
//.middle_of(self.ids.charwindow_bg)
//.set(self.ids.charwindow, ui_widgets);
// Icon
//Image::new(self.imgs.charwindow_icon)
@ -1466,7 +1495,7 @@ impl Hud {
// BG
Image::new(self.imgs.map_bg)
.w_h(824.0, 488.0)
.middle_of(ui_widgets.window)
.mid_top_with_margin_on(ui_widgets.window, 200.0)
.set(self.ids.map_bg, ui_widgets);
// Frame
Image::new(self.imgs.map_frame_l)
@ -1486,10 +1515,10 @@ impl Hud {
// X-Button
if Button::image(self.imgs.close_button)
.w_h(4.0*2.0, 4.0*2.0)
.w_h(20.0, 20.0)
.hover_image(self.imgs.close_button_hover)
.press_image(self.imgs.close_button_press)
.top_right_with_margins_on(self.ids.map_frame_r, 1.0, 1.0)
.top_right_with_margins_on(self.ids.map_frame_r, 17.0, 5.0)
.set(self.ids.map_close, ui_widgets)
.was_clicked()
{
@ -1498,12 +1527,11 @@ impl Hud {
// Title
Text::new("Map")
.mid_top_with_margin_on(self.ids.map_bg, -7.0)
.font_size(50)
.font_size(14)
.color(TEXT_COLOR)
.set(self.ids.map_title, ui_widgets);
}
// ESC-MENU
// Background
if self.menu_open {

BIN
voxygen/test_assets/body.vox
View File

Binary file not shown.

BIN
voxygen/test_assets/dragon_body.vox
View File

Binary file not shown.

BIN
voxygen/test_assets/dragon_lfoot.vox
View File

Binary file not shown.

BIN
voxygen/test_assets/dragon_rfoot.vox
View File

Binary file not shown.

BIN
voxygen/test_assets/dragon_tail.vox
View File

Binary file not shown.

BIN
voxygen/test_assets/dragon_wingL_in.vox
View File

Binary file not shown.

BIN
voxygen/test_assets/dragon_wingL_out.vox
View File

Binary file not shown.

BIN
voxygen/test_assets/dragon_wingR_in.vox
View File

Binary file not shown.

BIN
voxygen/test_assets/dragon_wingR_out.vox
View File

Binary file not shown.

BIN
voxygen/test_assets/dragonhead.vox
View File

Binary file not shown.

BIN
voxygen/test_assets/foot_BL.vox
View File

Binary file not shown.

BIN
voxygen/test_assets/foot_BR.vox
View File

Binary file not shown.

BIN
voxygen/test_assets/foot_FL.vox
View File

Binary file not shown.

BIN
voxygen/test_assets/foot_FR.vox
View File

Binary file not shown.

BIN
voxygen/test_assets/lionhead.vox
View File

Binary file not shown.

BIN
voxygen/test_assets/sabremale.vox
View File

Binary file not shown.