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

accessories tab

Browse Source 
Former-commit-id: 542362e98e908c9ec7c563d7fdcd43c4b8f922fd
This commit is contained in:
Pfauenauge90 2019-03-28 18:25:00 +01:00 committed by Imbris
parent 93897f904a
commit 60df735e3b
43 changed files with 926 additions and 229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
README.md
View File

@ -1,13 +1,3 @@
# Fresh # Fresh
An experiment An experiment
## Compile
```
git clone https://gitlab.com/veloren/fresh.git
cd fresh
git submodule update --init --recursive
rustup default nightly
cargo build
```

78
common/src/net/test.rs Normal file
View File

@ -0,0 +1,78 @@
use std::{
io::Write,
str::FromStr,
net::SocketAddr,
thread,
time::Duration,
};
use mio::{net::TcpStream, Events, Poll, PollOpt, Ready, Token};
use super::{error::PostError, PostBox, PostOffice};
fn new_local_addr(n: u16) -> SocketAddr {
SocketAddr::from(([127, 0, 0, 1], 12345 + n))
}
#[test]
fn basic_run() {
let srv_addr = new_local_addr(0);
let mut server: PostOffice<String, String> = PostOffice::new(srv_addr).unwrap();
let mut client: PostBox<String, String> = PostBox::to_server(srv_addr).unwrap();
std::thread::sleep(std::time::Duration::from_millis(10));
let mut scon = server.new_connections().next().unwrap();
std::thread::sleep(std::time::Duration::from_millis(10));
scon.send(String::from("foo")).unwrap();
client.send(String::from("bar")).unwrap();
std::thread::sleep(std::time::Duration::from_millis(10));
assert_eq!("foo", client.new_messages().next().unwrap());
assert_eq!("bar", scon.new_messages().next().unwrap());
}
#[test]
fn huge_size_header() {
let srv_addr = new_local_addr(1);
let mut server: PostOffice<String, String> = PostOffice::new(srv_addr).unwrap();
let mut client = TcpStream::connect(&srv_addr).unwrap();
std::thread::sleep(std::time::Duration::from_millis(10));
let mut scon = server.new_connections().next().unwrap();
std::thread::sleep(std::time::Duration::from_millis(10));
client.write(&[0xffu8; 64]).unwrap();
std::thread::sleep(std::time::Duration::from_millis(10));
assert_eq!(scon.new_messages().next(), None);
}
#[test]
fn disconnect() {
let srv_addr = new_local_addr(2);
let mut server = PostOffice::<_, String>::new(srv_addr)
.unwrap();
// Create then close client
{
PostBox::<String, String>::to_server(srv_addr).unwrap();
}
std::thread::sleep(std::time::Duration::from_millis(10));
let mut to_client = server
.new_connections()
.next()
.unwrap();
to_client.send(String::from("foo")).unwrap();
thread::sleep(Duration::from_millis(10));
match to_client.new_messages().next() {
None => {},
_ => panic!("Unexpected message!"),
}
match to_client.status() {
Some(PostError::Disconnected) => {},
s => panic!("Did not expect {:?}", s),
}
}

2
voxygen/src/hud/chat.rs
View File

@ -73,7 +73,7 @@ impl Chat {
.restrict_to_height(false) .restrict_to_height(false)
.font_size(14) .font_size(14)
.font_id(font) .font_id(font)
.bottom_left_with_margins_on(ui_widgets.window, 10.0, 30.0); .bottom_left_with_margins_on(ui_widgets.window, 10.0, 10.0);
let dims = match ( let dims = match (
text_edit.get_x_dimension(ui_widgets), text_edit.get_x_dimension(ui_widgets),
text_edit.get_y_dimension(ui_widgets), text_edit.get_y_dimension(ui_widgets),

610
voxygen/src/menu/char_selection/ui.rs
View File

@ -5,6 +5,7 @@ use crate::{
}; };
use conrod_core::{ use conrod_core::{
color, color,
color::TRANSPARENT,
event::Input, event::Input,
image::Id as ImgId, image::Id as ImgId,
text::font::Id as FontId, text::font::Id as FontId,
@ -122,10 +123,30 @@ widget_ids! {
skin_color_slider_indicator, skin_color_slider_indicator,
eye_color_slider_range, eye_color_slider_range,
eye_color_slider_indicator, eye_color_slider_indicator,
hair_color_slider_text,
// Creation Hair Contents
hair_style_text,
hair_style_arrow_l,
hair_style_arrow_r,
hair_color_picker_bg,
hair_color_text,
hair_color_slider_range,
hair_color_slider_indicator,
eyebrow_style_text,
eyebrow_arrow_l,
eyebrow_arrow_r,
beard_style_text,
beard_arrow_l,
beard_arrow_r,
// Creation Accessories Contents
warpaint_text,
warpaint_arrow_l,
warpaint_arrow_r,
warpaint_color_picker_bg,
warpaint_color_text,
warpaint_slider_indicator,
warpaint_slider_range,
warpaint_slider_text,
} }
} }
@ -540,19 +561,17 @@ impl CharSelectionUi {
// Character Name Input // Character Name Input
Button::image(self.imgs.name_input) Button::image(self.imgs.name_input)
.w_h(337.0, 67.0) .w_h(337.0, 67.0)
.label("Character Name")
.label_rgba(220.0, 220.0, 220.0, 0.8)
.label_font_size(20)
.label_y(conrod_core::position::Relative::Scalar(50.0))
.mid_bottom_with_margin_on(self.ids.bg_creation, 10.0) .mid_bottom_with_margin_on(self.ids.bg_creation, 10.0)
.set(self.ids.name_input, ui_widgets); .set(self.ids.name_input, ui_widgets);
for event in TextBox::new(&self.character_name) for event in TextBox::new(&self.character_name)
.w_h(300.0, 60.0) .w_h(300.0, 60.0)
.middle_of(self.ids.name_input) .mid_top_with_margin_on(self.ids.name_input, 2.0)
.font_size(22) .font_size(26)
.font_id(self.font_metamorph) .font_id(self.font_metamorph)
.rgba(220.0, 220.0, 220.0, 0.8)
.center_justify() .center_justify()
.text_color(Color::Rgba(220.0, 220.0, 220.0, 0.8))
.color(TRANSPARENT)
.border_color(TRANSPARENT)
.set(self.ids.name_field, ui_widgets) .set(self.ids.name_field, ui_widgets)
{ {
match event { match event {
@ -564,7 +583,11 @@ impl CharSelectionUi {
} }
// Window(s) // Window(s)
Image::new(if let CreationState::Body(_) = self.creation_state {self.imgs.creation_window_body} else {self.imgs.creation_window}) Image::new(if let CreationState::Body(_) = self.creation_state {
self.imgs.creation_window_body
} else {
self.imgs.creation_window
})
.w_h(628.0, 814.0) .w_h(628.0, 814.0)
.top_left_with_margins_on(self.ids.bg_creation, 60.0, 30.0) .top_left_with_margins_on(self.ids.bg_creation, 60.0, 30.0)
.set(self.ids.creation_window, ui_widgets); .set(self.ids.creation_window, ui_widgets);
@ -834,18 +857,30 @@ impl CharSelectionUi {
Their greatest strengths are their \ Their greatest strengths are their \
adaptability and intelligence, \ adaptability and intelligence, \
which makes them allrounders in many fields."; which makes them allrounders in many fields.";
const ORC_DESC: &str = "They are considered brutal, rude and combative. \ const ORC_DESC: &str =
"They are considered brutal, rude and combative. \
But once you got their trust they will be loyal friends \ But once you got their trust they will be loyal friends \
following a strict code of honor in all of their actions. \ following a strict code of honor in all of their actions. \
Their warriors are masters of melee combat, but their true power \ Their warriors are masters of melee combat, but their true power \
comes from the magical rituals of their powerful shamans."; comes from the magical rituals of their powerful shamans.";
const DWARF_DESC: &str = "Smoking chimneys, the sound of countless hammers and hoes. \ const DWARF_DESC: &str =
"Smoking chimneys, the sound of countless hammers and hoes. \
Infinite tunnel systems to track down even the last chunk of metal \ Infinite tunnel systems to track down even the last chunk of metal \
in the ground. \ in the ground. \
This race of master craftsmen and grim fighters exists almost \ This race of master craftsmen and grim fighters exists almost \
as long as the world itself."; as long as the world itself.";
const UNDEAD_DESC: &str = " MISSING "; const UNDEAD_DESC: &str = " MISSING ";
const ELF_DESC: &str = " MISSING "; const ELF_DESC: &str =
"No matter which shade of elves you encounter, they all have something in common: Magic. \n\
They can be found in many Forms: \n\
\n\
Pale Elves, living in dark fortresses, executing bloody rituals. \n\
\n\
Nature connected Brushwood Elves, that guard ancient powers inside the forests.\n\
\n\
Gold Elves that hunger for political power in their massive city states. \n\
\n\
And many more!";
const DANARI_DESC: &str = " MISSING "; const DANARI_DESC: &str = " MISSING ";
let (race_str, race_desc) = match self.race { let (race_str, race_desc) = match self.race {
@ -1044,9 +1079,6 @@ impl CharSelectionUi {
.wrap_by_word() .wrap_by_word()
.set(self.ids.race_description, ui_widgets); .set(self.ids.race_description, ui_widgets);
// Races Descriptions // Races Descriptions
} }
// 3 states/windows: 1.Skin & Eyes 2.Hair 3.Accessories // 3 states/windows: 1.Skin & Eyes 2.Hair 3.Accessories
// If one state is activated the other ones collapse // If one state is activated the other ones collapse
@ -1079,7 +1111,8 @@ impl CharSelectionUi {
.label_y(conrod_core::position::Relative::Scalar(4.0)) .label_y(conrod_core::position::Relative::Scalar(4.0))
.label_font_size(16) .label_font_size(16)
.set(self.ids.skin_eyes_button, ui_widgets) .set(self.ids.skin_eyes_button, ui_widgets)
.was_clicked() { .was_clicked()
{
self.creation_state = CreationState::Body(BodyPart::SkinEyes); self.creation_state = CreationState::Body(BodyPart::SkinEyes);
} }
// Closed: Hair // Closed: Hair
@ -1092,7 +1125,8 @@ impl CharSelectionUi {
.label_rgba(220.0, 220.0, 220.0, 0.8) .label_rgba(220.0, 220.0, 220.0, 0.8)
.label_font_size(16) .label_font_size(16)
.set(self.ids.hair_button, ui_widgets) .set(self.ids.hair_button, ui_widgets)
.was_clicked() { .was_clicked()
{
self.creation_state = CreationState::Body(BodyPart::Hair); self.creation_state = CreationState::Body(BodyPart::Hair);
} }
// Closed: Accessories // Closed: Accessories
@ -1105,16 +1139,16 @@ impl CharSelectionUi {
.label_rgba(220.0, 220.0, 220.0, 0.8) .label_rgba(220.0, 220.0, 220.0, 0.8)
.label_font_size(16) .label_font_size(16)
.set(self.ids.accessories_button, ui_widgets) .set(self.ids.accessories_button, ui_widgets)
.was_clicked() { .was_clicked()
{
self.creation_state = CreationState::Body(BodyPart::Accessories); self.creation_state = CreationState::Body(BodyPart::Accessories);
} }
} // State 1 fin } // State 1 fin
// Hair Open // Hair Open
BodyPart::Hair => { BodyPart::Hair => {
Image::new(self.imgs.hair_window) Image::new(self.imgs.hair_window)
.w_h(511.0, 500.0) //333.0 .w_h(511.0, 400.0) //333.0
.down_from(self.ids.skin_eyes_button, 5.0) .down_from(self.ids.skin_eyes_button, 5.0)
.set(self.ids.hair_window, ui_widgets); .set(self.ids.hair_window, ui_widgets);
// Closed Window: Skin & Eyes // Closed Window: Skin & Eyes
@ -1127,7 +1161,8 @@ impl CharSelectionUi {
.label_rgba(220.0, 220.0, 220.0, 0.8) .label_rgba(220.0, 220.0, 220.0, 0.8)
.label_font_size(16) .label_font_size(16)
.set(self.ids.skin_eyes_button, ui_widgets) .set(self.ids.skin_eyes_button, ui_widgets)
.was_clicked() { .was_clicked()
{
self.creation_state = CreationState::Body(BodyPart::SkinEyes); self.creation_state = CreationState::Body(BodyPart::SkinEyes);
} }
// Open Window: Hair // Open Window: Hair
@ -1141,7 +1176,8 @@ impl CharSelectionUi {
.label_y(conrod_core::position::Relative::Scalar(4.0)) .label_y(conrod_core::position::Relative::Scalar(4.0))
.label_font_size(16) .label_font_size(16)
.set(self.ids.hair_button, ui_widgets) .set(self.ids.hair_button, ui_widgets)
.was_clicked() { .was_clicked()
{
self.creation_state = CreationState::Body(BodyPart::Hair); self.creation_state = CreationState::Body(BodyPart::Hair);
} }
// Closed: Accessories // Closed: Accessories
@ -1154,10 +1190,10 @@ impl CharSelectionUi {
.label_rgba(220.0, 220.0, 220.0, 0.8) .label_rgba(220.0, 220.0, 220.0, 0.8)
.label_font_size(16) .label_font_size(16)
.set(self.ids.accessories_button, ui_widgets) .set(self.ids.accessories_button, ui_widgets)
.was_clicked() { .was_clicked()
{
self.creation_state = CreationState::Body(BodyPart::Accessories); self.creation_state = CreationState::Body(BodyPart::Accessories);
} }
} // State 2 fin } // State 2 fin
// Open: Accessories // Open: Accessories
@ -1176,7 +1212,8 @@ impl CharSelectionUi {
.label_rgba(220.0, 220.0, 220.0, 0.8) .label_rgba(220.0, 220.0, 220.0, 0.8)
.label_font_size(16) .label_font_size(16)
.set(self.ids.skin_eyes_button, ui_widgets) .set(self.ids.skin_eyes_button, ui_widgets)
.was_clicked() { .was_clicked()
{
self.creation_state = CreationState::Body(BodyPart::SkinEyes); self.creation_state = CreationState::Body(BodyPart::SkinEyes);
} }
// Closed: Hair // Closed: Hair
@ -1189,7 +1226,8 @@ impl CharSelectionUi {
.label_rgba(220.0, 220.0, 220.0, 0.8) .label_rgba(220.0, 220.0, 220.0, 0.8)
.label_font_size(16) .label_font_size(16)
.set(self.ids.hair_button, ui_widgets) .set(self.ids.hair_button, ui_widgets)
.was_clicked() { .was_clicked()
{
self.creation_state = CreationState::Body(BodyPart::Hair); self.creation_state = CreationState::Body(BodyPart::Hair);
} }
// Open: Accessories // Open: Accessories
@ -1203,18 +1241,15 @@ impl CharSelectionUi {
.label_rgba(220.0, 220.0, 220.0, 0.8) .label_rgba(220.0, 220.0, 220.0, 0.8)
.label_font_size(16) .label_font_size(16)
.set(self.ids.accessories_button, ui_widgets) .set(self.ids.accessories_button, ui_widgets)
.was_clicked() { .was_clicked()
{
self.creation_state = CreationState::Body(BodyPart::Accessories); self.creation_state = CreationState::Body(BodyPart::Accessories);
} }
} // State 3 fin } // State 3 fin
} // match fin } // match fin
// Body Customization Window Contents //////////////////////// // Body Customization Window Contents ////////////////////////
match state { match state {
BodyPart::SkinEyes => { BodyPart::SkinEyes => {
// Skin Color: Text, Brightness Slider, Picker // Skin Color: Text, Brightness Slider, Picker
Text::new("Skin Color") Text::new("Skin Color")
@ -1250,7 +1285,6 @@ impl CharSelectionUi {
.font_size(14) .font_size(14)
.set(self.ids.skin_color_slider_text, ui_widgets); .set(self.ids.skin_color_slider_text, ui_widgets);
// Eye Color: Text, Brightness Slider, Picker // Eye Color: Text, Brightness Slider, Picker
Text::new("Eye Color") Text::new("Eye Color")
.top_left_with_margins_on(self.ids.eyes_rect, 0.0, -250.0) .top_left_with_margins_on(self.ids.eyes_rect, 0.0, -250.0)
@ -1284,7 +1318,6 @@ impl CharSelectionUi {
.rgba(220.0, 220.0, 220.0, 0.8) .rgba(220.0, 220.0, 220.0, 0.8)
.font_size(14) .font_size(14)
.set(self.ids.eye_color_slider_text, ui_widgets); .set(self.ids.eye_color_slider_text, ui_widgets);
} }
// Hair /////////////////////////////////////////////////////// // Hair ///////////////////////////////////////////////////////
@ -1293,17 +1326,514 @@ impl CharSelectionUi {
// Hair Color -> Picker // Hair Color -> Picker
// Eye Brow Style -> Arrow // Eye Brow Style -> Arrow
// Facial Hair -> Picker (Only active for males!) // Facial Hair -> Picker (Only active for males!)
BodyPart::Hair => {} BodyPart::Hair => {
// Hair
Text::new("Hair Style")
.mid_top_with_margin_on(self.ids.hair_window, 60.0)
.rgba(220.0, 220.0, 220.0, 0.8)
.font_size(24)
.set(self.ids.hair_style_text, ui_widgets);
if Button::image(self.imgs.arrow_right)
.w_h(986.0 * 0.02, 1024.0 * 0.02)
.hover_image(self.imgs.arrow_right_mo)
.press_image(self.imgs.arrow_right_press)
.right_from(self.ids.hair_style_text, 15.0)
.set(self.ids.hair_style_arrow_r, ui_widgets)
.was_clicked()
{};
if Button::image(self.imgs.arrow_left)
.w_h(986.0 * 0.02, 1024.0 * 0.02)
.hover_image(self.imgs.arrow_left_mo)
.press_image(self.imgs.arrow_left_press)
.left_from(self.ids.hair_style_text, 15.0)
.set(self.ids.hair_style_arrow_l, ui_widgets)
.was_clicked()
{};
Text::new("Hair Color")
.top_left_with_margins_on(self.ids.hair_color_picker_bg, 0.0, -250.0)
.font_size(25)
.rgba(220.0, 220.0, 220.0, 0.8)
.set(self.ids.hair_color_text, ui_widgets);
Rectangle::fill_with([192.0, 116.0], color::WHITE)
.top_right_with_margins_on(self.ids.hair_window, 114.0, 30.0)
.rgba(220.0, 220.0, 220.0, 0.8)
.set(self.ids.hair_color_picker_bg, ui_widgets);
Image::new(self.imgs.slider_range)
.w_h(208.0, 12.0)
.bottom_left_with_margins_on(
self.ids.hair_color_picker_bg,
10.0,
-255.0,
)
.set(self.ids.hair_color_slider_range, ui_widgets);
Image::new(self.imgs.slider_indicator)
.w_h(10.0, 22.0)
.middle_of(self.ids.hair_color_slider_range)
.set(self.ids.hair_color_slider_indicator, ui_widgets);
Text::new("Brightness")
.top_left_with_margins_on(self.ids.hair_color_slider_range, -27.0, 0.0)
.rgba(220.0, 220.0, 220.0, 0.8)
.font_size(14)
.set(self.ids.hair_color_slider_text, ui_widgets);
// Eyebrows
Text::new("Eyebrow Style")
.mid_top_with_margin_on(self.ids.hair_window, 280.0)
.rgba(220.0, 220.0, 220.0, 0.8)
.font_size(24)
.set(self.ids.eyebrow_style_text, ui_widgets);
if Button::image(self.imgs.arrow_right)
.w_h(986.0 * 0.02, 1024.0 * 0.02)
.hover_image(self.imgs.arrow_right_mo)
.press_image(self.imgs.arrow_right_press)
.right_from(self.ids.eyebrow_style_text, 15.0)
.set(self.ids.eyebrow_arrow_r, ui_widgets)
.was_clicked()
{};
if Button::image(self.imgs.arrow_left)
.w_h(986.0 * 0.02, 1024.0 * 0.02)
.hover_image(self.imgs.arrow_left_mo)
.press_image(self.imgs.arrow_left_press)
.left_from(self.ids.eyebrow_style_text, 15.0)
.set(self.ids.eyebrow_arrow_l, ui_widgets)
.was_clicked()
{};
// Beard -> Only active when "male" was chosen
if let Sex::Male = self.sex {
Text::new("Beard Style")
.mid_top_with_margin_on(self.ids.hair_window, 340.0)
.rgba(220.0, 220.0, 220.0, 0.8)
.font_size(24)
.set(self.ids.beard_style_text, ui_widgets);
if Button::image(self.imgs.arrow_right)
.w_h(986.0 * 0.02, 1024.0 * 0.02)
.hover_image(self.imgs.arrow_right_mo)
.press_image(self.imgs.arrow_right_press)
.right_from(self.ids.beard_style_text, 15.0)
.set(self.ids.beard_arrow_r, ui_widgets)
.was_clicked()
{};
if Button::image(self.imgs.arrow_left)
.w_h(986.0 * 0.02, 1024.0 * 0.02)
.hover_image(self.imgs.arrow_left_mo)
.press_image(self.imgs.arrow_left_press)
.left_from(self.ids.beard_style_text, 15.0)
.set(self.ids.beard_arrow_l, ui_widgets)
.was_clicked()
{};
}
}
// Accessories /////////////////////////////// // Accessories ///////////////////////////////
// Accessory Picker -> Arrows (Name Changes with race!) // Accessory Picker -> Arrows (Name Changes with race!)
// Color -> Picker // Color -> Picker
// Brightness -> Slider // Brightness -> Slider
BodyPart::Accessories => {} BodyPart::Accessories => {
// Accessories fin match self.race {
Races::Human => {
Text::new("Head Band")
.mid_top_with_margin_on(self.ids.accessories_window, 60.0)
.rgba(220.0, 220.0, 220.0, 0.8)
.font_size(24)
.set(self.ids.warpaint_text, ui_widgets);
if Button::image(self.imgs.arrow_right)
.w_h(986.0 * 0.02, 1024.0 * 0.02)
.hover_image(self.imgs.arrow_right_mo)
.press_image(self.imgs.arrow_right_press)
.right_from(self.ids.warpaint_text, 15.0)
.set(self.ids.warpaint_arrow_r, ui_widgets)
.was_clicked()
{};
if Button::image(self.imgs.arrow_left)
.w_h(986.0 * 0.02, 1024.0 * 0.02)
.hover_image(self.imgs.arrow_left_mo)
.press_image(self.imgs.arrow_left_press)
.left_from(self.ids.warpaint_text, 15.0)
.set(self.ids.warpaint_arrow_l, ui_widgets)
.was_clicked()
{};
}; // Body Customization Fin Text::new("Color")
.top_left_with_margins_on(
self.ids.warpaint_color_picker_bg,
0.0,
-250.0,
)
.font_size(25)
.rgba(220.0, 220.0, 220.0, 0.8)
.set(self.ids.warpaint_color_text, ui_widgets);
Rectangle::fill_with([192.0, 116.0], color::WHITE)
.top_right_with_margins_on(
self.ids.accessories_window,
114.0,
30.0,
)
.rgba(220.0, 220.0, 220.0, 0.8)
.set(self.ids.warpaint_color_picker_bg, ui_widgets);
Image::new(self.imgs.slider_range)
.w_h(208.0, 12.0)
.bottom_left_with_margins_on(
self.ids.warpaint_color_picker_bg,
10.0,
-255.0,
)
.set(self.ids.warpaint_slider_range, ui_widgets);
Image::new(self.imgs.slider_indicator)
.w_h(10.0, 22.0)
.middle_of(self.ids.warpaint_slider_range)
.set(self.ids.warpaint_slider_indicator, ui_widgets);
Text::new("Brightness")
.top_left_with_margins_on(
self.ids.warpaint_slider_range,
-27.0,
0.0,
)
.rgba(220.0, 220.0, 220.0, 0.8)
.font_size(14)
.set(self.ids.warpaint_slider_text, ui_widgets);
} // Human
Races::Orc => {
Text::new("Head Band")
.mid_top_with_margin_on(self.ids.accessories_window, 60.0)
.rgba(220.0, 220.0, 220.0, 0.8)
.font_size(24)
.set(self.ids.warpaint_text, ui_widgets);
if Button::image(self.imgs.arrow_right)
.w_h(986.0 * 0.02, 1024.0 * 0.02)
.hover_image(self.imgs.arrow_right_mo)
.press_image(self.imgs.arrow_right_press)
.right_from(self.ids.warpaint_text, 15.0)
.set(self.ids.warpaint_arrow_r, ui_widgets)
.was_clicked()
{};
if Button::image(self.imgs.arrow_left)
.w_h(986.0 * 0.02, 1024.0 * 0.02)
.hover_image(self.imgs.arrow_left_mo)
.press_image(self.imgs.arrow_left_press)
.left_from(self.ids.warpaint_text, 15.0)
.set(self.ids.warpaint_arrow_l, ui_widgets)
.was_clicked()
{};
Text::new("Color")
.top_left_with_margins_on(
self.ids.warpaint_color_picker_bg,
0.0,
-250.0,
)
.font_size(25)
.rgba(220.0, 220.0, 220.0, 0.8)
.set(self.ids.warpaint_color_text, ui_widgets);
Rectangle::fill_with([192.0, 116.0], color::WHITE)
.top_right_with_margins_on(
self.ids.accessories_window,
114.0,
30.0,
)
.rgba(220.0, 220.0, 220.0, 0.8)
.set(self.ids.warpaint_color_picker_bg, ui_widgets);
Image::new(self.imgs.slider_range)
.w_h(208.0, 12.0)
.bottom_left_with_margins_on(
self.ids.warpaint_color_picker_bg,
10.0,
-255.0,
)
.set(self.ids.warpaint_slider_range, ui_widgets);
Image::new(self.imgs.slider_indicator)
.w_h(10.0, 22.0)
.middle_of(self.ids.warpaint_slider_range)
.set(self.ids.warpaint_slider_indicator, ui_widgets);
Text::new("Brightness")
.top_left_with_margins_on(
self.ids.warpaint_slider_range,
-27.0,
0.0,
)
.rgba(220.0, 220.0, 220.0, 0.8)
.font_size(14)
.set(self.ids.warpaint_slider_text, ui_widgets);
} // Orc
Races::Elf => {
Text::new("Tribe Markings")
.mid_top_with_margin_on(self.ids.accessories_window, 60.0)
.rgba(220.0, 220.0, 220.0, 0.8)
.font_size(24)
.set(self.ids.warpaint_text, ui_widgets);
if Button::image(self.imgs.arrow_right)
.w_h(986.0 * 0.02, 1024.0 * 0.02)
.hover_image(self.imgs.arrow_right_mo)
.press_image(self.imgs.arrow_right_press)
.right_from(self.ids.warpaint_text, 15.0)
.set(self.ids.warpaint_arrow_r, ui_widgets)
.was_clicked()
{};
if Button::image(self.imgs.arrow_left)
.w_h(986.0 * 0.02, 1024.0 * 0.02)
.hover_image(self.imgs.arrow_left_mo)
.press_image(self.imgs.arrow_left_press)
.left_from(self.ids.warpaint_text, 15.0)
.set(self.ids.warpaint_arrow_l, ui_widgets)
.was_clicked()
{};
Text::new("Color")
.top_left_with_margins_on(
self.ids.warpaint_color_picker_bg,
0.0,
-250.0,
)
.font_size(25)
.rgba(220.0, 220.0, 220.0, 0.8)
.set(self.ids.warpaint_color_text, ui_widgets);
Rectangle::fill_with([192.0, 116.0], color::WHITE)
.top_right_with_margins_on(
self.ids.accessories_window,
114.0,
30.0,
)
.rgba(220.0, 220.0, 220.0, 0.8)
.set(self.ids.warpaint_color_picker_bg, ui_widgets);
Image::new(self.imgs.slider_range)
.w_h(208.0, 12.0)
.bottom_left_with_margins_on(
self.ids.warpaint_color_picker_bg,
10.0,
-255.0,
)
.set(self.ids.warpaint_slider_range, ui_widgets);
Image::new(self.imgs.slider_indicator)
.w_h(10.0, 22.0)
.middle_of(self.ids.warpaint_slider_range)
.set(self.ids.warpaint_slider_indicator, ui_widgets);
Text::new("Brightness")
.top_left_with_margins_on(
self.ids.warpaint_slider_range,
-27.0,
0.0,
)
.rgba(220.0, 220.0, 220.0, 0.8)
.font_size(14)
.set(self.ids.warpaint_slider_text, ui_widgets);
} // Elf
Races::Dwarf => {
Text::new("War Paint")
.mid_top_with_margin_on(self.ids.accessories_window, 60.0)
.rgba(220.0, 220.0, 220.0, 0.8)
.font_size(24)
.set(self.ids.warpaint_text, ui_widgets);
if Button::image(self.imgs.arrow_right)
.w_h(986.0 * 0.02, 1024.0 * 0.02)
.hover_image(self.imgs.arrow_right_mo)
.press_image(self.imgs.arrow_right_press)
.right_from(self.ids.warpaint_text, 15.0)
.set(self.ids.warpaint_arrow_r, ui_widgets)
.was_clicked()
{};
if Button::image(self.imgs.arrow_left)
.w_h(986.0 * 0.02, 1024.0 * 0.02)
.hover_image(self.imgs.arrow_left_mo)
.press_image(self.imgs.arrow_left_press)
.left_from(self.ids.warpaint_text, 15.0)
.set(self.ids.warpaint_arrow_l, ui_widgets)
.was_clicked()
{};
Text::new("Color")
.top_left_with_margins_on(
self.ids.warpaint_color_picker_bg,
0.0,
-250.0,
)
.font_size(25)
.rgba(220.0, 220.0, 220.0, 0.8)
.set(self.ids.warpaint_color_text, ui_widgets);
Rectangle::fill_with([192.0, 116.0], color::WHITE)
.top_right_with_margins_on(
self.ids.accessories_window,
114.0,
30.0,
)
.rgba(220.0, 220.0, 220.0, 0.8)
.set(self.ids.warpaint_color_picker_bg, ui_widgets);
Image::new(self.imgs.slider_range)
.w_h(208.0, 12.0)
.bottom_left_with_margins_on(
self.ids.warpaint_color_picker_bg,
10.0,
-255.0,
)
.set(self.ids.warpaint_slider_range, ui_widgets);
Image::new(self.imgs.slider_indicator)
.w_h(10.0, 22.0)
.middle_of(self.ids.warpaint_slider_range)
.set(self.ids.warpaint_slider_indicator, ui_widgets);
Text::new("Brightness")
.top_left_with_margins_on(
self.ids.warpaint_slider_range,
-27.0,
0.0,
)
.rgba(220.0, 220.0, 220.0, 0.8)
.font_size(14)
.set(self.ids.warpaint_slider_text, ui_widgets);
} // Dwarf
Races::Undead => {
Text::new("Teeth")
.mid_top_with_margin_on(self.ids.accessories_window, 60.0)
.rgba(220.0, 220.0, 220.0, 0.8)
.font_size(24)
.set(self.ids.warpaint_text, ui_widgets);
if Button::image(self.imgs.arrow_right)
.w_h(986.0 * 0.02, 1024.0 * 0.02)
.hover_image(self.imgs.arrow_right_mo)
.press_image(self.imgs.arrow_right_press)
.right_from(self.ids.warpaint_text, 15.0)
.set(self.ids.warpaint_arrow_r, ui_widgets)
.was_clicked()
{};
if Button::image(self.imgs.arrow_left)
.w_h(986.0 * 0.02, 1024.0 * 0.02)
.hover_image(self.imgs.arrow_left_mo)
.press_image(self.imgs.arrow_left_press)
.left_from(self.ids.warpaint_text, 15.0)
.set(self.ids.warpaint_arrow_l, ui_widgets)
.was_clicked()
{};
Text::new("Color")
.top_left_with_margins_on(
self.ids.warpaint_color_picker_bg,
0.0,
-250.0,
)
.font_size(25)
.rgba(220.0, 220.0, 220.0, 0.8)
.set(self.ids.warpaint_color_text, ui_widgets);
Rectangle::fill_with([192.0, 116.0], color::WHITE)
.top_right_with_margins_on(
self.ids.accessories_window,
114.0,
30.0,
)
.rgba(220.0, 220.0, 220.0, 0.8)
.set(self.ids.warpaint_color_picker_bg, ui_widgets);
Image::new(self.imgs.slider_range)
.w_h(208.0, 12.0)
.bottom_left_with_margins_on(
self.ids.warpaint_color_picker_bg,
10.0,
-255.0,
)
.set(self.ids.warpaint_slider_range, ui_widgets);
Image::new(self.imgs.slider_indicator)
.w_h(10.0, 22.0)
.middle_of(self.ids.warpaint_slider_range)
.set(self.ids.warpaint_slider_indicator, ui_widgets);
Text::new("Brightness")
.top_left_with_margins_on(
self.ids.warpaint_slider_range,
-27.0,
0.0,
)
.rgba(220.0, 220.0, 220.0, 0.8)
.font_size(14)
.set(self.ids.warpaint_slider_text, ui_widgets);
} // Undead
Races::Danari => {
Text::new("Horns")
.mid_top_with_margin_on(self.ids.accessories_window, 60.0)
.rgba(220.0, 220.0, 220.0, 0.8)
.font_size(24)
.set(self.ids.warpaint_text, ui_widgets);
if Button::image(self.imgs.arrow_right)
.w_h(986.0 * 0.02, 1024.0 * 0.02)
.hover_image(self.imgs.arrow_right_mo)
.press_image(self.imgs.arrow_right_press)
.right_from(self.ids.warpaint_text, 15.0)
.set(self.ids.warpaint_arrow_r, ui_widgets)
.was_clicked()
{};
if Button::image(self.imgs.arrow_left)
.w_h(986.0 * 0.02, 1024.0 * 0.02)
.hover_image(self.imgs.arrow_left_mo)
.press_image(self.imgs.arrow_left_press)
.left_from(self.ids.warpaint_text, 15.0)
.set(self.ids.warpaint_arrow_l, ui_widgets)
.was_clicked()
{};
Text::new("Color")
.top_left_with_margins_on(
self.ids.warpaint_color_picker_bg,
0.0,
-250.0,
)
.font_size(25)
.rgba(220.0, 220.0, 220.0, 0.8)
.set(self.ids.warpaint_color_text, ui_widgets);
Rectangle::fill_with([192.0, 116.0], color::WHITE)
.top_right_with_margins_on(
self.ids.accessories_window,
114.0,
30.0,
)
.rgba(220.0, 220.0, 220.0, 0.8)
.set(self.ids.warpaint_color_picker_bg, ui_widgets);
Image::new(self.imgs.slider_range)
.w_h(208.0, 12.0)
.bottom_left_with_margins_on(
self.ids.warpaint_color_picker_bg,
10.0,
-255.0,
)
.set(self.ids.warpaint_slider_range, ui_widgets);
Image::new(self.imgs.slider_indicator)
.w_h(10.0, 22.0)
.middle_of(self.ids.warpaint_slider_range)
.set(self.ids.warpaint_slider_indicator, ui_widgets);
Text::new("Brightness")
.top_left_with_margins_on(
self.ids.warpaint_slider_range,
-27.0,
0.0,
)
.rgba(220.0, 220.0, 220.0, 0.8)
.font_size(14)
.set(self.ids.warpaint_slider_text, ui_widgets);
} // Danari
} // match Race fin
} // Accessories fin
} // Body Customization Fin
} // CreationState::Body Fin } // CreationState::Body Fin
} // Char Creation fin } // Char Creation fin

BIN
voxygen/test_assets/font/Whitney-Book.ttf Normal file
View File

Binary file not shown.

5
voxygen/test_assets/ui/char_selection/buttons/desktop.ini Normal file
View File

@ -0,0 +1,5 @@
[.ShellClassInfo]
InfoTip=Dieser Ordner wird online freigegeben.
IconFile=C:\Program Files\Google\Drive\googledrivesync.exe
IconIndex=16

BIN
voxygen/test_assets/ui/char_selection/gender_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 274 B

BIN
voxygen/test_assets/ui/char_selection/races_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 362 B

1
voxygen/test_assets/ui/char_selection/text/.gitattributes vendored Normal file
View File

@ -0,0 +1 @@
*.png filter=lfs diff=lfs merge=lfs -text

1
voxygen/test_assets/ui/char_selection/text/White/.gitattributes vendored Normal file
View File

@ -0,0 +1 @@
*.png filter=lfs diff=lfs merge=lfs -text

BIN
voxygen/test_assets/ui/char_selection/text/White/login.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
voxygen/test_assets/ui/char_selection/text/White/quit.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
voxygen/test_assets/ui/char_selection/text/White/server_address.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
voxygen/test_assets/ui/char_selection/text/White/servers.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
voxygen/test_assets/ui/char_selection/text/White/settings.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
voxygen/test_assets/ui/char_selection/text/White/username.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

1
voxygen/test_assets/ui/char_selection/text/Yellow/.gitattributes vendored Normal file
View File

@ -0,0 +1 @@
*.png filter=lfs diff=lfs merge=lfs -text

BIN
voxygen/test_assets/ui/char_selection/text/Yellow/a01.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
voxygen/test_assets/ui/char_selection/text/Yellow/login.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
voxygen/test_assets/ui/char_selection/text/Yellow/quit.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
voxygen/test_assets/ui/char_selection/text/Yellow/server_address.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
voxygen/test_assets/ui/char_selection/text/Yellow/servers.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
voxygen/test_assets/ui/char_selection/text/Yellow/settings.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
voxygen/test_assets/ui/char_selection/text/Yellow/username.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
voxygen/test_assets/ui/char_selection/text/a01.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
voxygen/test_assets/ui/char_selection/text/login.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
voxygen/test_assets/ui/char_selection/text/quit.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
voxygen/test_assets/ui/char_selection/text/server_address.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
voxygen/test_assets/ui/char_selection/text/servers.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
voxygen/test_assets/ui/char_selection/text/settings.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
voxygen/test_assets/ui/char_selection/text/singleplayer.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
voxygen/test_assets/ui/char_selection/text/username.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
voxygen/test_assets/ui/char_selection/weapons_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 390 B

1
voxygen/test_assets/ui/hud/buttons/.gitattributes vendored Normal file
View File

@ -0,0 +1 @@
*.png filter=lfs diff=lfs merge=lfs -text

BIN
voxygen/test_assets/ui/hud/buttons/chat_arrow_down.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
voxygen/test_assets/ui/hud/buttons/chat_arrow_down_mo.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
voxygen/test_assets/ui/hud/buttons/chat_arrow_down_press.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
voxygen/test_assets/ui/hud/buttons/chat_arrow_tobot.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
voxygen/test_assets/ui/hud/buttons/chat_arrow_tobot_mo.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
voxygen/test_assets/ui/hud/buttons/chat_arrow_tobot_press.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
voxygen/test_assets/ui/hud/buttons/chat_arrow_up.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
voxygen/test_assets/ui/hud/buttons/chat_arrow_up_mo.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
voxygen/test_assets/ui/hud/buttons/chat_arrow_up_press.png (Stored with Git LFS) Normal file
View File

Binary file not shown.