mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
enable split out character window
Former-commit-id: 9018814bd43960b9f0f5f8da03794df9c1eb803c
This commit is contained in:
Imbris
parent
990b42a6b0
commit
9d63253627
@ -1,12 +1,12 @@
|
||||
use conrod_core::{
|
||||
color,
|
||||
image::Id as ImgId,
|
||||
text::font::Id as FontId,
|
||||
widget::{self, Button, Image, Rectangle, Scrollbar, Text},
|
||||
WidgetStyle, WidgetCommon, widget_ids, Color, Colorable, Labelable, Positionable, Sizeable, Widget,
|
||||
text::font,
|
||||
builder_methods,
|
||||
widget::{self, Button, Image, Rectangle, Text},
|
||||
WidgetCommon, widget_ids, Color, Colorable, Labelable, Positionable, Sizeable, Widget,
|
||||
};
|
||||
|
||||
use super::{WindowStyle, TEXT_COLOR, XP_COLOR};
|
||||
use super::{WindowStyle, XP_COLOR, imgs::{Imgs, Voxs}};
|
||||
|
||||
widget_ids! {
|
||||
struct Ids {
|
||||
@ -30,8 +30,10 @@ widget_ids! {
|
||||
}
|
||||
|
||||
#[derive(WidgetCommon)]
|
||||
pub struct CharacterWindow {
|
||||
pub struct CharacterWindow<'a> {
|
||||
xp_percentage: f64,
|
||||
imgs: &'a Imgs,
|
||||
voxs: &'a Voxs,
|
||||
|
||||
#[conrod(common_builder)]
|
||||
common: widget::CommonBuilder,
|
||||
@ -39,26 +41,34 @@ pub struct CharacterWindow {
|
||||
|
||||
}
|
||||
|
||||
impl CharacterWindow {
|
||||
pub fn new() -> Self {
|
||||
impl<'a> CharacterWindow<'a> {
|
||||
pub fn new(imgs: &'a Imgs, voxs: &'a Voxs) -> Self {
|
||||
Self {
|
||||
xp_percentage: 0.4,
|
||||
|
||||
imgs,
|
||||
voxs,
|
||||
common: widget::CommonBuilder::default(),
|
||||
style: WindowStyle::default(),
|
||||
}
|
||||
}
|
||||
pub fn font_id(mut self, font_id: font::Id) -> Self {
|
||||
self.style.font_id = Some(Some(font_id));
|
||||
self
|
||||
}
|
||||
builder_methods! {
|
||||
pub text_color { style.text_color = Some(Color) }
|
||||
}
|
||||
}
|
||||
|
||||
struct State {
|
||||
pub struct State {
|
||||
ids: Ids,
|
||||
}
|
||||
|
||||
enum Event {
|
||||
pub enum Event {
|
||||
Close,
|
||||
}
|
||||
|
||||
impl Widget for CharacterWindow {
|
||||
impl<'a> Widget for CharacterWindow<'a> {
|
||||
type State = State;
|
||||
type Style = WindowStyle;
|
||||
type Event = Option<Event>;
|
||||
@ -72,12 +82,14 @@ impl Widget for CharacterWindow {
|
||||
}
|
||||
|
||||
fn update(self, args: widget::UpdateArgs<Self>) -> Self::Event {
|
||||
let widget::UpdateArgs { id, state, rect, ui, style, .. } = args;
|
||||
let widget::UpdateArgs { id, state, ui, style, .. } = args;
|
||||
|
||||
let font_id = style.font_id(&ui.theme).or(ui.fonts.ids().next());
|
||||
let text_color = style.text_color(&ui.theme);
|
||||
|
||||
// Frame
|
||||
Image::new(self.imgs.window_frame)
|
||||
.top_left_with_margins_on(ui.window, 200.0, 215.0)
|
||||
.w_h(1648.0 / 4.0, 1952.0 / 4.0)
|
||||
Image::new(self.voxs.window_frame)
|
||||
.middle_of(id)
|
||||
.set(state.ids.charwindow_frame, ui);
|
||||
|
||||
// BG
|
||||
@ -98,26 +110,18 @@ impl Widget for CharacterWindow {
|
||||
//.set(state.ids.charwindow_icon, ui);
|
||||
|
||||
// X-Button
|
||||
if Button::image(self.imgs.close_button)
|
||||
let closed = Button::image(self.voxs.close_button)
|
||||
.w_h(244.0 * 0.22 / 4.0, 244.0 * 0.22 / 4.0)
|
||||
.hover_image(self.imgs.close_button_hover)
|
||||
.press_image(self.imgs.close_button_press)
|
||||
.hover_image(self.voxs.close_button_hover)
|
||||
.press_image(self.voxs.close_button_press)
|
||||
.top_right_with_margins_on(state.ids.charwindow_frame, 4.0, 4.0)
|
||||
.set(state.ids.charwindow_close, ui)
|
||||
.was_clicked()
|
||||
{
|
||||
return Some(Event::Close);
|
||||
// TODO: Handle
|
||||
//self.open_windows = match small {
|
||||
// Some(small) => Windows::Small(small),
|
||||
// None => Windows::None,
|
||||
//}
|
||||
}
|
||||
.was_clicked();
|
||||
|
||||
// Title
|
||||
Text::new("Character Name") // Add in actual Character Name
|
||||
.mid_top_with_margin_on(state.ids.charwindow_frame, 7.0)
|
||||
.color(TEXT_COLOR)
|
||||
.color(text_color)
|
||||
.set(state.ids.charwindow_title, ui);
|
||||
// Tab BG
|
||||
Image::new(self.imgs.charwindow_tab_bg)
|
||||
@ -133,15 +137,15 @@ impl Widget for CharacterWindow {
|
||||
.w_h(65.0, 23.0)
|
||||
.top_left_with_margins_on(state.ids.charwindow_tab_bg, -18.0, 2.0)
|
||||
.label("Stats")
|
||||
.label_color(TEXT_COLOR)
|
||||
.label_font_id(self.font_opensans)
|
||||
.label_color(text_color)
|
||||
.and_then(font_id, Button::label_font_id)
|
||||
.label_font_size(14)
|
||||
.set(state.ids.charwindow_tab1, ui);
|
||||
Text::new("1") //Add in actual Character Level
|
||||
.mid_top_with_margin_on(state.ids.charwindow_rectangle, 10.0)
|
||||
.font_id(self.font_opensans)
|
||||
.and_then(font_id, Text::font_id)
|
||||
.font_size(30)
|
||||
.color(TEXT_COLOR)
|
||||
.color(text_color)
|
||||
.set(state.ids.charwindow_tab1_level, ui);
|
||||
// Exp-Bar Background
|
||||
Rectangle::fill_with([170.0, 10.0], color::BLACK)
|
||||
@ -159,9 +163,9 @@ impl Widget for CharacterWindow {
|
||||
// Exp-Text
|
||||
Text::new("120/170") // Shows the Exp / Exp to reach the next level
|
||||
.mid_top_with_margin_on(state.ids.charwindow_tab1_expbar, 10.0)
|
||||
.font_id(self.font_opensans)
|
||||
.and_then(font_id, Text::font_id)
|
||||
.font_size(15)
|
||||
.color(TEXT_COLOR)
|
||||
.color(text_color)
|
||||
.set(state.ids.charwindow_tab1_exp, ui);
|
||||
|
||||
// Stats
|
||||
@ -175,9 +179,9 @@ impl Widget for CharacterWindow {
|
||||
Intelligence",
|
||||
)
|
||||
.top_left_with_margins_on(state.ids.charwindow_rectangle, 100.0, 20.0)
|
||||
.font_id(self.font_opensans)
|
||||
.and_then(font_id, Text::font_id)
|
||||
.font_size(16)
|
||||
.color(TEXT_COLOR)
|
||||
.color(text_color)
|
||||
.set(state.ids.charwindow_tab1_statnames, ui);
|
||||
|
||||
Text::new(
|
||||
@ -190,11 +194,15 @@ impl Widget for CharacterWindow {
|
||||
124124",
|
||||
)
|
||||
.right_from(state.ids.charwindow_tab1_statnames, 10.0)
|
||||
.font_id(self.font_opensans)
|
||||
.and_then(font_id, Text::font_id)
|
||||
.font_size(16)
|
||||
.color(TEXT_COLOR)
|
||||
.color(text_color)
|
||||
.set(state.ids.charwindow_tab1_stats, ui);
|
||||
|
||||
None
|
||||
if closed {
|
||||
Some(Event::Close)
|
||||
} else {
|
||||
None
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
131
voxygen/src/hud/imgs.rs
Normal file
131
voxygen/src/hud/imgs.rs
Normal file
@ -0,0 +1,131 @@
|
||||
image_ids! {
|
||||
pub struct<dot_vox::DotVoxData> Voxs {
|
||||
// Bag
|
||||
bag_contents: "/voxygen/element/frames/bag.vox",
|
||||
inv_grid: "/voxygen/element/frames/inv_grid.vox",
|
||||
inv_slot: "/voxygen/element/buttons/inv_slot.vox",
|
||||
|
||||
// Buttons
|
||||
settings: "/voxygen/element/buttons/settings.vox",
|
||||
settings_hover: "/voxygen/element/buttons/settings_hover.vox",
|
||||
settings_press: "/voxygen/element/buttons/settings_press.vox",
|
||||
|
||||
social_button: "/voxygen/element/buttons/social.vox",
|
||||
social_hover: "/voxygen/element/buttons/social_hover.vox",
|
||||
social_press: "/voxygen/element/buttons/social_press.vox",
|
||||
|
||||
map_button: "/voxygen/element/buttons/map.vox",
|
||||
map_hover: "/voxygen/element/buttons/map_hover.vox",
|
||||
map_press: "/voxygen/element/buttons/map_press.vox",
|
||||
|
||||
spellbook_button: "/voxygen/element/buttons/spellbook.vox",
|
||||
spellbook_hover: "/voxygen/element/buttons/spellbook_hover.vox",
|
||||
spellbook_press: "/voxygen/element/buttons/spellbook_press.vox",
|
||||
|
||||
character_button: "/voxygen/element/buttons/character.vox",
|
||||
character_hover: "/voxygen/element/buttons/character_hover.vox",
|
||||
character_press: "/voxygen/element/buttons/character_press.vox",
|
||||
|
||||
qlog_button: "/voxygen/element/buttons/qlog.vox",
|
||||
qlog_hover: "/voxygen/element/buttons/qlog_hover.vox",
|
||||
qlog_press: "/voxygen/element/buttons/qlog_press.vox",
|
||||
|
||||
close_button: "/voxygen/element/buttons/x.vox",
|
||||
close_button_hover: "/voxygen/element/buttons/x_hover.vox",
|
||||
close_button_press: "/voxygen/element/buttons/x_press.vox",
|
||||
|
||||
// Esc menu
|
||||
fireplace: "/voxygen/element/misc_bg/fireplace.vox",
|
||||
button_dark: "/voxygen/element/buttons/button_dark.vox",
|
||||
|
||||
// Minimap
|
||||
mmap_frame: "/voxygen/element/frames/mmap.vox",
|
||||
window_frame: "/voxygen/element/frames/window2.vox",
|
||||
map_frame_l: "/voxygen/element/frames/map_l.vox",
|
||||
map_frame_r: "/voxygen/element/frames/map_r.vox",
|
||||
}
|
||||
|
||||
pub struct<image::DynamicImage> Imgs {
|
||||
// Bag
|
||||
bag: "/voxygen/element/buttons/bag/closed.png",
|
||||
bag_hover: "/voxygen/element/buttons/bag/closed_hover.png",
|
||||
bag_press: "/voxygen/element/buttons/bag/closed_press.png",
|
||||
bag_open: "/voxygen/element/buttons/bag/open.png",
|
||||
bag_open_hover: "/voxygen/element/buttons/bag/open_hover.png",
|
||||
bag_open_press: "/voxygen/element/buttons/bag/open_press.png",
|
||||
|
||||
// Buttons
|
||||
mmap_button: "/voxygen/element/buttons/border.png",
|
||||
mmap_button_hover: "/voxygen/element/buttons/border_mo.png",
|
||||
mmap_button_press: "/voxygen/element/buttons/border_press.png",
|
||||
mmap_button_open: "/voxygen/element/buttons/border_pressed.png",
|
||||
|
||||
// Esc-Menu
|
||||
esc_bg: "/voxygen/element/frames/menu.png",
|
||||
button_dark_hover: "/voxygen/element/buttons/button_dark_hover.png",
|
||||
button_dark_press: "/voxygen/element/buttons/button_dark_press.png",
|
||||
|
||||
// MiniMap
|
||||
mmap_frame_bg: "/voxygen/element/misc_bg/mmap_bg.png",
|
||||
|
||||
// Skillbar Module
|
||||
sb_grid: "/voxygen/element/skill_bar/sbar_grid.png",
|
||||
sb_grid_bg: "/voxygen/element/skill_bar/sbar_grid_bg.png",
|
||||
l_click: "/voxygen/element/skill_bar/l.png",
|
||||
r_click: "/voxygen/element/skill_bar/r.png",
|
||||
mana_bar: "/voxygen/element/skill_bar/mana_bar.png",
|
||||
health_bar: "/voxygen/element/skill_bar/health_bar.png",
|
||||
xp_bar: "/voxygen/element/skill_bar/xp_bar.png",
|
||||
|
||||
// Missing: Buff Frame Animation (.gif ?!) (we could do animation in ui.maintain(), or in shader?)
|
||||
window_frame_2: "/voxygen/element/frames/window_2.png",
|
||||
|
||||
// Settings Window
|
||||
settings_bg: "/voxygen/element/frames/settings.png",
|
||||
settings_icon: "/voxygen/element/icons/settings.png",
|
||||
settings_button_mo: "/voxygen/element/buttons/blue_mo.png",
|
||||
check: "/voxygen/element/buttons/check/no.png",
|
||||
check_mo: "/voxygen/element/buttons/check/no_mo.png",
|
||||
check_press: "/voxygen/element/buttons/check/press.png",
|
||||
check_checked: "/voxygen/element/buttons/check/yes.png",
|
||||
check_checked_mo: "/voxygen/element/buttons/check/yes_mo.png",
|
||||
slider: "/voxygen/element/slider/track.png",
|
||||
slider_indicator: "/voxygen/element/slider/indicator.png",
|
||||
//button_blank: ui.new_graphic(ui::Graphic::Blank),
|
||||
button_blue_mo: "/voxygen/element/buttons/blue_mo.png",
|
||||
button_blue_press: "/voxygen/element/buttons/blue_press.png",
|
||||
|
||||
// Window BG
|
||||
window_bg: "/voxygen/element/misc_bg/window_bg.png",
|
||||
|
||||
// Social Window
|
||||
social_bg: "/voxygen/element/misc_bg/small_bg.png",
|
||||
social_icon: "/voxygen/element/icons/social.png",
|
||||
|
||||
// Map Window
|
||||
map_bg: "/voxygen/element/misc_bg/small_bg.png",
|
||||
map_icon: "/voxygen/element/icons/map.png",
|
||||
|
||||
// Spell Book Window
|
||||
spellbook_bg: "/voxygen/element/misc_bg/small_bg.png",
|
||||
spellbook_icon: "/voxygen/element/icons/spellbook.png",
|
||||
|
||||
// Char Window
|
||||
charwindow: "/voxygen/element/misc_bg/charwindow.png",
|
||||
charwindow_icon: "/voxygen/element/icons/charwindow.png",
|
||||
charwindow_tab_bg: "/voxygen/element/frames/tab.png",
|
||||
charwindow_tab: "/voxygen/element/buttons/tab.png",
|
||||
charwindow_expbar: "/voxygen/element/misc_bg/small_bg.png",
|
||||
progress_frame: "/voxygen/element/frames/progress_bar.png",
|
||||
progress: "/voxygen/element/misc_bg/progress.png",
|
||||
|
||||
// Quest-Log Window
|
||||
questlog_bg: "/voxygen/element/misc_bg/small_bg.png",
|
||||
questlog_icon: "/voxygen/element/icons/questlog.png",
|
||||
|
||||
// Chat-Arrows
|
||||
chat_arrow: "/voxygen/element/buttons/arrow/chat_arrow.png",
|
||||
chat_arrow_mo: "/voxygen/element/buttons/arrow/chat_arrow_mo.png",
|
||||
chat_arrow_press: "/voxygen/element/buttons/arrow/chat_arrow_press.png",
|
||||
}
|
||||
}
|
||||
@ -1,7 +1,9 @@
|
||||
mod chat;
|
||||
mod character_window;
|
||||
mod imgs;
|
||||
|
||||
use self::character_window::CharacterWindow;
|
||||
use character_window::CharacterWindow;
|
||||
use imgs::{Imgs, Voxs};
|
||||
|
||||
use crate::{
|
||||
render::Renderer,
|
||||
@ -13,7 +15,7 @@ use crate::{
|
||||
use conrod_core::{
|
||||
color,
|
||||
text::font::Id as FontId,
|
||||
widget::{self,Style, Button, Image, Rectangle, Scrollbar, Text},
|
||||
widget::{Button, Image, Rectangle, Scrollbar, Text},
|
||||
WidgetStyle, widget_ids, Color, Colorable, Labelable, Positionable, Sizeable, Widget,
|
||||
};
|
||||
use common::assets;
|
||||
@ -28,18 +30,18 @@ const XP_COLOR: Color = Color::Rgba(0.59, 0.41, 0.67, 1.0);
|
||||
/// Styling for windows
|
||||
#[derive(Copy, Clone, Debug, Default, PartialEq, WidgetStyle)]
|
||||
pub struct WindowStyle {
|
||||
/// Color of the button.
|
||||
#[conrod(default = "theme.shape_color")]
|
||||
pub color: Option<conrod_core::Color>,
|
||||
/// Color of the button's label.
|
||||
/// Color of the text in the window
|
||||
#[conrod(default = "theme.label_color")]
|
||||
pub label_color: Option<conrod_core::Color>,
|
||||
/// Font size of the button's label.
|
||||
#[conrod(default = "theme.font_size_medium")]
|
||||
pub label_font_size: Option<conrod_core::FontSize>,
|
||||
/// Specify a unique font for the label.
|
||||
pub text_color: Option<conrod_core::Color>,
|
||||
/// Specify a unique font for text in the window
|
||||
#[conrod(default = "theme.font_id")]
|
||||
pub label_font_id: Option<Option<conrod_core::text::font::Id>>,
|
||||
pub font_id: Option<Option<FontId>>,
|
||||
// Color of the button.
|
||||
//#[conrod(default = "theme.shape_color")]
|
||||
//pub color: Option<conrod_core::Color>,
|
||||
// Font size of the button's label.
|
||||
//#[conrod(default = "theme.font_size_medium")]
|
||||
//pub label_font_size: Option<conrod_core::FontSize>,
|
||||
}
|
||||
|
||||
widget_ids! {
|
||||
@ -178,24 +180,7 @@ widget_ids! {
|
||||
spellbook_title,
|
||||
|
||||
// 4 Charwindow
|
||||
charwindow_frame,
|
||||
charwindow,
|
||||
charwindow_bg,
|
||||
charwindow_icon,
|
||||
charwindow_close,
|
||||
charwindow_title,
|
||||
charwindow_tab_bg,
|
||||
charwindow_tab1,
|
||||
charwindow_tab1_title,
|
||||
charwindow_tab1_level,
|
||||
charwindow_tab1_exp,
|
||||
charwindow_tab1_stats,
|
||||
charwindow_tab1_statnames,
|
||||
charwindow_tab1_stats_numbers,
|
||||
charwindow_tab1_expbar,
|
||||
charwindow_rectangle,
|
||||
charwindow_exp_rectangle,
|
||||
charwindow_exp_progress_rectangle,
|
||||
character_window,
|
||||
|
||||
// 5 Quest-Log
|
||||
questlog_frame,
|
||||
@ -206,138 +191,6 @@ widget_ids! {
|
||||
}
|
||||
}
|
||||
|
||||
image_ids! {
|
||||
struct<dot_vox::DotVoxData> Voxs {
|
||||
// Bag
|
||||
bag_contents: "/voxygen/element/frames/bag.vox",
|
||||
inv_grid: "/voxygen/element/frames/inv_grid.vox",
|
||||
inv_slot: "/voxygen/element/buttons/inv_slot.vox",
|
||||
|
||||
// Buttons
|
||||
settings: "/voxygen/element/buttons/settings.vox",
|
||||
settings_hover: "/voxygen/element/buttons/settings_hover.vox",
|
||||
settings_press: "/voxygen/element/buttons/settings_press.vox",
|
||||
|
||||
social_button: "/voxygen/element/buttons/social.vox",
|
||||
social_hover: "/voxygen/element/buttons/social_hover.vox",
|
||||
social_press: "/voxygen/element/buttons/social_press.vox",
|
||||
|
||||
map_button: "/voxygen/element/buttons/map.vox",
|
||||
map_hover: "/voxygen/element/buttons/map_hover.vox",
|
||||
map_press: "/voxygen/element/buttons/map_press.vox",
|
||||
|
||||
spellbook_button: "/voxygen/element/buttons/spellbook.vox",
|
||||
spellbook_hover: "/voxygen/element/buttons/spellbook_hover.vox",
|
||||
spellbook_press: "/voxygen/element/buttons/spellbook_press.vox",
|
||||
|
||||
character_button: "/voxygen/element/buttons/character.vox",
|
||||
character_hover: "/voxygen/element/buttons/character_hover.vox",
|
||||
character_press: "/voxygen/element/buttons/character_press.vox",
|
||||
|
||||
qlog_button: "/voxygen/element/buttons/qlog.vox",
|
||||
qlog_hover: "/voxygen/element/buttons/qlog_hover.vox",
|
||||
qlog_press: "/voxygen/element/buttons/qlog_press.vox",
|
||||
|
||||
close_button: "/voxygen/element/buttons/x.vox",
|
||||
close_button_hover: "/voxygen/element/buttons/x_hover.vox",
|
||||
close_button_press: "/voxygen/element/buttons/x_press.vox",
|
||||
|
||||
// Esc menu
|
||||
fireplace: "/voxygen/element/misc_bg/fireplace.vox",
|
||||
button_dark: "/voxygen/element/buttons/button_dark.vox",
|
||||
|
||||
// Minimap
|
||||
mmap_frame: "/voxygen/element/frames/mmap.vox",
|
||||
window_frame: "/voxygen/element/frames/window2.vox",
|
||||
map_frame_l: "/voxygen/element/frames/map_l.vox",
|
||||
map_frame_r: "/voxygen/element/frames/map_r.vox",
|
||||
}
|
||||
|
||||
pub(self) struct<image::DynamicImage> Imgs {
|
||||
// Bag
|
||||
bag: "/voxygen/element/buttons/bag/closed.png",
|
||||
bag_hover: "/voxygen/element/buttons/bag/closed_hover.png",
|
||||
bag_press: "/voxygen/element/buttons/bag/closed_press.png",
|
||||
bag_open: "/voxygen/element/buttons/bag/open.png",
|
||||
bag_open_hover: "/voxygen/element/buttons/bag/open_hover.png",
|
||||
bag_open_press: "/voxygen/element/buttons/bag/open_press.png",
|
||||
|
||||
// Buttons
|
||||
mmap_button: "/voxygen/element/buttons/border.png",
|
||||
mmap_button_hover: "/voxygen/element/buttons/border_mo.png",
|
||||
mmap_button_press: "/voxygen/element/buttons/border_press.png",
|
||||
mmap_button_open: "/voxygen/element/buttons/border_pressed.png",
|
||||
|
||||
// Esc-Menu
|
||||
esc_bg: "/voxygen/element/frames/menu.png",
|
||||
button_dark_hover: "/voxygen/element/buttons/button_dark_hover.png",
|
||||
button_dark_press: "/voxygen/element/buttons/button_dark_press.png",
|
||||
|
||||
// MiniMap
|
||||
mmap_frame_bg: "/voxygen/element/misc_bg/mmap_bg.png",
|
||||
|
||||
// Skillbar Module
|
||||
sb_grid: "/voxygen/element/skill_bar/sbar_grid.png",
|
||||
sb_grid_bg: "/voxygen/element/skill_bar/sbar_grid_bg.png",
|
||||
l_click: "/voxygen/element/skill_bar/l.png",
|
||||
r_click: "/voxygen/element/skill_bar/r.png",
|
||||
mana_bar: "/voxygen/element/skill_bar/mana_bar.png",
|
||||
health_bar: "/voxygen/element/skill_bar/health_bar.png",
|
||||
xp_bar: "/voxygen/element/skill_bar/xp_bar.png",
|
||||
|
||||
// Missing: Buff Frame Animation (.gif ?!) (we could do animation in ui.maintain(), or in shader?)
|
||||
window_frame_2: "/voxygen/element/frames/window_2.png",
|
||||
|
||||
// Settings Window
|
||||
settings_bg: "/voxygen/element/frames/settings.png",
|
||||
settings_icon: "/voxygen/element/icons/settings.png",
|
||||
settings_button_mo: "/voxygen/element/buttons/blue_mo.png",
|
||||
check: "/voxygen/element/buttons/check/no.png",
|
||||
check_mo: "/voxygen/element/buttons/check/no_mo.png",
|
||||
check_press: "/voxygen/element/buttons/check/press.png",
|
||||
check_checked: "/voxygen/element/buttons/check/yes.png",
|
||||
check_checked_mo: "/voxygen/element/buttons/check/yes_mo.png",
|
||||
slider: "/voxygen/element/slider/track.png",
|
||||
slider_indicator: "/voxygen/element/slider/indicator.png",
|
||||
//button_blank: ui.new_graphic(ui::Graphic::Blank),
|
||||
button_blue_mo: "/voxygen/element/buttons/blue_mo.png",
|
||||
button_blue_press: "/voxygen/element/buttons/blue_press.png",
|
||||
|
||||
// Window BG
|
||||
window_bg: "/voxygen/element/misc_bg/window_bg.png",
|
||||
|
||||
// Social Window
|
||||
social_bg: "/voxygen/element/misc_bg/small_bg.png",
|
||||
social_icon: "/voxygen/element/icons/social.png",
|
||||
|
||||
// Map Window
|
||||
map_bg: "/voxygen/element/misc_bg/small_bg.png",
|
||||
map_icon: "/voxygen/element/icons/map.png",
|
||||
|
||||
// Spell Book Window
|
||||
spellbook_bg: "/voxygen/element/misc_bg/small_bg.png",
|
||||
spellbook_icon: "/voxygen/element/icons/spellbook.png",
|
||||
|
||||
// Char Window
|
||||
charwindow: "/voxygen/element/misc_bg/charwindow.png",
|
||||
charwindow_icon: "/voxygen/element/icons/charwindow.png",
|
||||
charwindow_tab_bg: "/voxygen/element/frames/tab.png",
|
||||
charwindow_tab: "/voxygen/element/buttons/tab.png",
|
||||
charwindow_expbar: "/voxygen/element/misc_bg/small_bg.png",
|
||||
progress_frame: "/voxygen/element/frames/progress_bar.png",
|
||||
progress: "/voxygen/element/misc_bg/progress.png",
|
||||
|
||||
// Quest-Log Window
|
||||
questlog_bg: "/voxygen/element/misc_bg/small_bg.png",
|
||||
questlog_icon: "/voxygen/element/icons/questlog.png",
|
||||
|
||||
// Chat-Arrows
|
||||
chat_arrow: "/voxygen/element/buttons/arrow/chat_arrow.png",
|
||||
chat_arrow_mo: "/voxygen/element/buttons/arrow/chat_arrow_mo.png",
|
||||
chat_arrow_press: "/voxygen/element/buttons/arrow/chat_arrow_press.png",
|
||||
}
|
||||
}
|
||||
|
||||
enum SettingsTab {
|
||||
Interface,
|
||||
Video,
|
||||
@ -394,11 +247,6 @@ pub struct Hud {
|
||||
settings: Settings,
|
||||
}
|
||||
|
||||
//#[inline]
|
||||
//pub fn rgba_bytes(r: u8, g: u8, b: u8, a: f32) -> Color {
|
||||
//Color::Rgba(r as f32 / 255.0, g as f32 / 255.0, b as f32 / 255.0, a)
|
||||
//}
|
||||
|
||||
impl Hud {
|
||||
pub fn new(window: &mut Window, settings: Settings) -> Self {
|
||||
let mut ui = Ui::new(window).unwrap();
|
||||
@ -460,11 +308,6 @@ impl Hud {
|
||||
let ref mut ui_widgets = self.ui.set_widgets();
|
||||
let version = env!("CARGO_PKG_VERSION");
|
||||
|
||||
const TEXT_COLOR: Color = Color::Rgba(1.0, 1.0, 1.0, 1.0);
|
||||
const HP_COLOR: Color = Color::Rgba(0.33, 0.63, 0.0, 1.0);
|
||||
const MANA_COLOR: Color = Color::Rgba(0.42, 0.41, 0.66, 1.0);
|
||||
const XP_COLOR: Color = Color::Rgba(0.59, 0.41, 0.67, 1.0);
|
||||
|
||||
// Don't show anything if the ui is toggled off
|
||||
if !self.show_ui {
|
||||
return events;
|
||||
@ -1467,7 +1310,19 @@ impl Hud {
|
||||
}
|
||||
|
||||
if let Windows::CharacterAnd(small) = self.open_windows {
|
||||
CharacterWindow::new();
|
||||
match CharacterWindow::new(&self.imgs, &self.voxs)
|
||||
.font_id(self.font_opensans)
|
||||
.text_color(TEXT_COLOR)
|
||||
.top_left_with_margins_on(ui_widgets.window, 200.0, 215.0)
|
||||
.w_h(103.0 * 4.0, 122.0 * 4.0) // TODO: replace this with default_width() / height() overrides
|
||||
.set(self.ids.character_window, ui_widgets)
|
||||
{
|
||||
Some(character_window::Event::Close) => self.open_windows = match small {
|
||||
Some(small) => Windows::Small(small),
|
||||
None => Windows::None,
|
||||
},
|
||||
None => (),
|
||||
}
|
||||
}
|
||||
|
||||
// 2 Map
|
||||
|
||||
@ -251,7 +251,7 @@ impl Imgs {
|
||||
let load_vox = |filename, ui: &mut Ui| {
|
||||
let fullpath: String = ["/voxygen/", filename].concat();
|
||||
let dot_vox = assets::load::<dot_vox::DotVoxData>(fullpath.as_str())
|
||||
.unwrao();
|
||||
.unwrap();
|
||||
ui.new_graphic(dot_vox.into())
|
||||
};
|
||||
Imgs {
|
||||
|
||||
@ -19,11 +19,11 @@ macro_rules! image_ids {
|
||||
($($v:vis struct<$T:ty> $Ids:ident { $( $name:ident: $specifier:expr ), *$(,)? } )*) => {
|
||||
$(
|
||||
$v struct $Ids {
|
||||
$( $name: conrod_core::image::Id, )*
|
||||
$( $v $name: conrod_core::image::Id, )*
|
||||
}
|
||||
|
||||
impl $Ids {
|
||||
pub fn load(ui: &mut Ui) -> Result<Self, common::assets::Error> {
|
||||
pub fn load(ui: &mut crate::ui::Ui) -> Result<Self, common::assets::Error> {
|
||||
Ok(Self {
|
||||
$( $name: ui.new_graphic(common::assets::load::<$T>($specifier)?.into()), )*
|
||||
})
|
||||
|
||||
Loading…
Reference in New Issue
Block a user