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

Disclaimer

Browse Source 
Former-commit-id: dd115bb1971f066b19c3424c0a1352eb37dcb159
This commit is contained in:
Monty Marz 2019-05-23 22:45:48 +00:00 committed by Joshua Barretto
parent d67efe56eb
commit cc9b028bf1
2 changed files with 322 additions and 247 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/voxygen/element/frames/disclaimer.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

566
voxygen/src/menu/main/ui.rs
View File

@ -11,7 +11,9 @@ use conrod_core::{
color, color,
color::TRANSPARENT, color::TRANSPARENT,
position::Relative, position::Relative,
widget::{text_box::Event as TextBoxEvent, Button, Image, List, Rectangle, Text, TextBox}, widget::{
text_box::Event as TextBoxEvent, Button, Image, List, Rectangle, Scrollbar, Text, TextBox,
},
widget_ids, Borderable, Color, Colorable, Labelable, Positionable, Sizeable, Widget, widget_ids, Borderable, Color, Colorable, Labelable, Positionable, Sizeable, Widget,
}; };
use std::sync::Arc; use std::sync::Arc;
@ -22,6 +24,12 @@ widget_ids! {
bg, bg,
v_logo, v_logo,
alpha_version, alpha_version,
// Disclaimer
disc_window,
disc_text_1,
disc_text_2,
disc_button,
disc_scrollbar,
// Login, Singleplayer // Login, Singleplayer
login_button, login_button,
login_text, login_text,
@ -60,6 +68,7 @@ image_ids! {
button: "voxygen/element/buttons/button.vox", button: "voxygen/element/buttons/button.vox",
button_hover: "voxygen/element/buttons/button_hover.vox", button_hover: "voxygen/element/buttons/button_hover.vox",
button_press: "voxygen/element/buttons/button_press.vox", button_press: "voxygen/element/buttons/button_press.vox",
disclaimer: "voxygen/element/frames/disclaimer.vox",
<ImageGraphic> <ImageGraphic>
bg: "voxygen/background/bg_main.png", bg: "voxygen/background/bg_main.png",
@ -93,6 +102,7 @@ pub struct MainMenuUi {
login_error: Option<String>, login_error: Option<String>,
connecting: Option<std::time::Instant>, connecting: Option<std::time::Instant>,
show_servers: bool, show_servers: bool,
show_disclaimer: bool,
} }
impl MainMenuUi { impl MainMenuUi {
@ -119,6 +129,7 @@ impl MainMenuUi {
login_error: None, login_error: None,
connecting: None, connecting: None,
show_servers: false, show_servers: false,
show_disclaimer: true,
} }
} }
@ -126,6 +137,7 @@ impl MainMenuUi {
let mut events = Vec::new(); let mut events = Vec::new();
let ref mut ui_widgets = self.ui.set_widgets(); let ref mut ui_widgets = self.ui.set_widgets();
let version = env!("CARGO_PKG_VERSION"); let version = env!("CARGO_PKG_VERSION");
const TEXT_COLOR: Color = Color::Rgba(1.0, 1.0, 1.0, 1.0);
// Background image, Veloren logo, Alpha-Version Label // Background image, Veloren logo, Alpha-Version Label
Image::new(self.imgs.bg) Image::new(self.imgs.bg)
.middle_of(ui_widgets.window) .middle_of(ui_widgets.window)
@ -141,282 +153,342 @@ impl MainMenuUi {
.color(TEXT_COLOR) .color(TEXT_COLOR)
.set(self.ids.version, ui_widgets); .set(self.ids.version, ui_widgets);
// TODO: Don't use macros for this? if self.show_disclaimer {
// Input fields Image::new(self.imgs.disclaimer)
// Used when the login button is pressed, or enter is pressed within input field .w_h(1800.0, 800.0)
macro_rules! login { .middle_of(ui_widgets.window)
() => { .scroll_kids()
self.login_error = None; .scroll_kids_vertically()
self.connecting = Some(std::time::Instant::now()); .set(self.ids.disc_window, ui_widgets);
events.push(Event::LoginAttempt {
username: self.username.clone(),
server_address: self.server_address.clone(),
});
};
}
// Singleplayer Text::new("Disclaimer")
// Used when the singleplayer button is pressed .top_left_with_margins_on(self.ids.disc_window, 30.0, 40.0)
macro_rules! singleplayer { .font_id(self.fonts.metamorph)
() => { .font_size(35)
self.login_error = None; .font_id(self.fonts.metamorph)
events.push(Event::StartSingleplayer); .color(TEXT_COLOR)
events.push(Event::LoginAttempt { .set(self.ids.disc_text_1, ui_widgets);
username: "singleplayer".to_string(), Text::new(
server_address: "localhost".to_string(), "Welcome to the alpha version of Veloren!\n\
}); \n\
}; \n\
} Before you dive into the fun, please keep a few things in mind:\n\
\n\
const TEXT_COLOR: Color = Color::Rgba(1.0, 1.0, 1.0, 1.0); - This is a very early alpha. Expect bugs, extremely unfinished gameplay, unpolished mechanics, and missing features. \n\
// Username If you are a reviewer, please DO NOT review this version.\n\
Rectangle::fill_with([320.0, 50.0], color::rgba(0.0, 0.0, 0.0, 0.97)) \n\
.middle_of(ui_widgets.window) - If you have constructive feedback or bug reports, you can contact us via Reddit, GitLab, or our community Discord server.\n\
.set(self.ids.usrnm_bg, ui_widgets); \n\
Image::new(self.imgs.input_bg) - Veloren is licensed under the GPL 3 open-source licence. That means you're free to play, modify, and redistribute the game however you wish \n\
.w_h(337.0, 67.0) (provided derived work is also under GPL 3).
.middle_of(self.ids.usrnm_bg) \n\
.set(self.ids.username_bg, ui_widgets); - Veloren is a non-profit community project, and everybody working on it is a volunteer.\n\
for event in TextBox::new(&self.username) If you like what you see, you're welcome to join the development or art teams!
.w_h(290.0, 30.0) \n\
.mid_bottom_with_margin_on(self.ids.username_bg, 44.0 / 2.0) - 'Voxel RPG' is a genre in its own right. First-person shooters used to be called Doom clones.\n\
.font_size(22) Like them, we're trying to build a niche. This game is not a clone, and its development will diverge from existing games in the future.\n\
\n\
Thanks for taking the time to read this notice, we hope you enjoy the game!\n\
\n\
~ The Veloren Devs")
.top_left_with_margins_on(self.ids.disc_window, 110.0, 40.0)
.font_id(self.fonts.metamorph)
.font_size(26)
.font_id(self.fonts.opensans) .font_id(self.fonts.opensans)
.text_color(TEXT_COLOR) .color(TEXT_COLOR)
// transparent background .set(self.ids.disc_text_2, ui_widgets);
.color(TRANSPARENT)
.border_color(TRANSPARENT)
.set(self.ids.username_field, ui_widgets)
{
match event {
TextBoxEvent::Update(username) => {
// Note: TextBox limits the input string length to what fits in it
self.username = username.to_string();
}
TextBoxEvent::Enter => {
login!();
}
}
}
// Login error
if let Some(msg) = &self.login_error {
let text = Text::new(&msg)
.rgba(1.0, 1.0, 1.0, 1.0)
.font_size(30)
.font_id(self.fonts.opensans);
Rectangle::fill_with([400.0, 100.0], color::TRANSPARENT)
.rgba(0.1, 0.1, 0.1, 1.0)
.parent(ui_widgets.window)
.mid_top_with_margin_on(self.ids.username_bg, -35.0)
.set(self.ids.login_error_bg, ui_widgets);
Image::new(self.imgs.error_frame)
.w_h(400.0, 100.0)
.middle_of(self.ids.login_error_bg)
.set(self.ids.error_frame, ui_widgets);
text.mid_top_with_margin_on(self.ids.error_frame, 10.0)
.set(self.ids.login_error, ui_widgets);
if Button::image(self.imgs.button) if Button::image(self.imgs.button)
.w_h(100.0, 30.0) .w_h(300.0, 50.0)
.mid_bottom_with_margin_on(self.ids.login_error_bg, 5.0) .mid_bottom_with_margin_on(self.ids.disc_window, 30.0)
.hover_image(self.imgs.button_hover) .hover_image(self.imgs.button_hover)
.press_image(self.imgs.button_press) .press_image(self.imgs.button_press)
.label_y(Relative::Scalar(2.0)) .label_y(Relative::Scalar(2.0))
.label("Okay") .label("Accept")
.label_font_size(10) .label_font_size(18)
.label_color(TEXT_COLOR) .label_color(TEXT_COLOR)
.set(self.ids.button_ok, ui_widgets) .set(self.ids.disc_button, ui_widgets)
.was_clicked() .was_clicked()
{ {
self.login_error = None self.show_disclaimer = false
}; };
} } else {
if self.show_servers { // TODO: Don't use macros for this?
Image::new(self.imgs.error_frame) // Input fields
.top_left_with_margins_on(ui_widgets.window, 3.0, 3.0) // Used when the login button is pressed, or enter is pressed within input field
.w_h(400.0, 400.0) macro_rules! login {
.set(self.ids.servers_frame, ui_widgets); () => {
self.login_error = None;
self.connecting = Some(std::time::Instant::now());
events.push(Event::LoginAttempt {
username: self.username.clone(),
server_address: self.server_address.clone(),
});
};
}
let netsettings = &global_state.settings.networking; // Singleplayer
// Used when the singleplayer button is pressed
macro_rules! singleplayer {
() => {
self.login_error = None;
events.push(Event::StartSingleplayer);
events.push(Event::LoginAttempt {
username: "singleplayer".to_string(),
server_address: "localhost".to_string(),
});
};
}
// TODO: Draw scroll bar or remove it. // Username
let (mut items, scrollbar) = List::flow_down(netsettings.servers.len()) Rectangle::fill_with([320.0, 50.0], color::rgba(0.0, 0.0, 0.0, 0.97))
.top_left_with_margins_on(self.ids.servers_frame, 0.0, 5.0) .middle_of(ui_widgets.window)
.w_h(400.0, 300.0) .set(self.ids.usrnm_bg, ui_widgets);
.scrollbar_next_to() Image::new(self.imgs.input_bg)
.scrollbar_thickness(18.0) .w_h(337.0, 67.0)
.scrollbar_color(TEXT_COLOR) .middle_of(self.ids.usrnm_bg)
.set(self.ids.servers_text, ui_widgets); .set(self.ids.username_bg, ui_widgets);
for event in TextBox::new(&self.username)
while let Some(item) = items.next(ui_widgets) { .w_h(290.0, 30.0)
let mut text = "".to_string(); .mid_bottom_with_margin_on(self.ids.username_bg, 44.0 / 2.0)
if &netsettings.servers[item.i] == &self.server_address { .font_size(22)
text.push_str("* ") .font_id(self.fonts.opensans)
} else { .text_color(TEXT_COLOR)
text.push_str(" ") // transparent background
.color(TRANSPARENT)
.border_color(TRANSPARENT)
.set(self.ids.username_field, ui_widgets)
{
match event {
TextBoxEvent::Update(username) => {
// Note: TextBox limits the input string length to what fits in it
self.username = username.to_string();
}
TextBoxEvent::Enter => {
login!();
}
} }
text.push_str(&netsettings.servers[item.i]); }
// Login error
if item if let Some(msg) = &self.login_error {
.set( let text = Text::new(&msg)
Button::image(self.imgs.button) .rgba(1.0, 1.0, 1.0, 1.0)
.w_h(100.0, 53.0) .font_size(30)
.mid_bottom_with_margin_on(self.ids.servers_frame, 5.0) .font_id(self.fonts.opensans);
.hover_image(self.imgs.button_hover) Rectangle::fill_with([400.0, 100.0], color::TRANSPARENT)
.press_image(self.imgs.button_press) .rgba(0.1, 0.1, 0.1, 1.0)
.label_y(Relative::Scalar(2.0)) .parent(ui_widgets.window)
.label(&text) .mid_top_with_margin_on(self.ids.username_bg, -35.0)
.label_font_size(20) .set(self.ids.login_error_bg, ui_widgets);
.label_color(TEXT_COLOR), Image::new(self.imgs.error_frame)
ui_widgets, .w_h(400.0, 100.0)
) .middle_of(self.ids.login_error_bg)
.set(self.ids.error_frame, ui_widgets);
text.mid_top_with_margin_on(self.ids.error_frame, 10.0)
.set(self.ids.login_error, ui_widgets);
if Button::image(self.imgs.button)
.w_h(100.0, 30.0)
.mid_bottom_with_margin_on(self.ids.login_error_bg, 5.0)
.hover_image(self.imgs.button_hover)
.press_image(self.imgs.button_press)
.label_y(Relative::Scalar(2.0))
.label("Okay")
.label_font_size(10)
.label_color(TEXT_COLOR)
.set(self.ids.button_ok, ui_widgets)
.was_clicked() .was_clicked()
{ {
// TODO: Set as current server address self.login_error = None
self.server_address = netsettings.servers[item.i].clone(); };
}
if self.show_servers {
Image::new(self.imgs.error_frame)
.top_left_with_margins_on(ui_widgets.window, 3.0, 3.0)
.w_h(400.0, 400.0)
.set(self.ids.servers_frame, ui_widgets);
let netsettings = &global_state.settings.networking;
// TODO: Draw scroll bar or remove it.
let (mut items, scrollbar) = List::flow_down(netsettings.servers.len())
.top_left_with_margins_on(self.ids.servers_frame, 0.0, 5.0)
.w_h(400.0, 300.0)
.scrollbar_next_to()
.scrollbar_thickness(18.0)
.scrollbar_color(TEXT_COLOR)
.set(self.ids.servers_text, ui_widgets);
while let Some(item) = items.next(ui_widgets) {
let mut text = "".to_string();
if &netsettings.servers[item.i] == &self.server_address {
text.push_str("* ")
} else {
text.push_str(" ")
}
text.push_str(&netsettings.servers[item.i]);
if item
.set(
Button::image(self.imgs.button)
.w_h(100.0, 53.0)
.mid_bottom_with_margin_on(self.ids.servers_frame, 5.0)
.hover_image(self.imgs.button_hover)
.press_image(self.imgs.button_press)
.label_y(Relative::Scalar(2.0))
.label(&text)
.label_font_size(20)
.label_color(TEXT_COLOR),
ui_widgets,
)
.was_clicked()
{
// TODO: Set as current server address
self.server_address = netsettings.servers[item.i].clone();
}
}
if Button::image(self.imgs.button)
.w_h(200.0, 53.0)
.mid_bottom_with_margin_on(self.ids.servers_frame, 5.0)
.hover_image(self.imgs.button_hover)
.press_image(self.imgs.button_press)
.label_y(Relative::Scalar(2.0))
.label("Close")
.label_font_size(20)
.label_color(TEXT_COLOR)
.set(self.ids.servers_close, ui_widgets)
.was_clicked()
{
self.show_servers = false
};
}
// Server address
Rectangle::fill_with([320.0, 50.0], color::rgba(0.0, 0.0, 0.0, 0.97))
.down_from(self.ids.usrnm_bg, 30.0)
.set(self.ids.srvr_bg, ui_widgets);
Image::new(self.imgs.input_bg)
.w_h(337.0, 67.0)
.middle_of(self.ids.srvr_bg)
.set(self.ids.address_bg, ui_widgets);
for event in TextBox::new(&self.server_address)
.w_h(290.0, 30.0)
.mid_bottom_with_margin_on(self.ids.address_bg, 44.0 / 2.0)
.font_size(22)
.font_id(self.fonts.opensans)
.text_color(TEXT_COLOR)
// transparent background
.color(TRANSPARENT)
.border_color(TRANSPARENT)
.set(self.ids.address_field, ui_widgets)
{
match event {
TextBoxEvent::Update(server_address) => {
self.server_address = server_address.to_string();
}
TextBoxEvent::Enter => {
login!();
}
} }
} }
// Login button
if Button::image(self.imgs.button) // Change button text and remove hover/press images if a connection is in progress
.w_h(200.0, 53.0) if let Some(start) = self.connecting {
.mid_bottom_with_margin_on(self.ids.servers_frame, 5.0) Button::image(self.imgs.button)
.hover_image(self.imgs.button_hover) .w_h(258.0, 55.0)
.press_image(self.imgs.button_press) .down_from(self.ids.address_bg, 20.0)
.label_y(Relative::Scalar(2.0)) .align_middle_x_of(self.ids.address_bg)
.label("Close") .label("Connecting...")
.label_font_size(20) .label_color({
.label_color(TEXT_COLOR) let pulse =
.set(self.ids.servers_close, ui_widgets) ((start.elapsed().as_millis() as f32 * 0.008).sin() + 1.0) / 2.0;
.was_clicked() Color::Rgba(
{ TEXT_COLOR.red() * (pulse / 2.0 + 0.5),
self.show_servers = false TEXT_COLOR.green() * (pulse / 2.0 + 0.5),
}; TEXT_COLOR.blue() * (pulse / 2.0 + 0.5),
} pulse / 4.0 + 0.75,
// Server address )
Rectangle::fill_with([320.0, 50.0], color::rgba(0.0, 0.0, 0.0, 0.97)) })
.down_from(self.ids.usrnm_bg, 30.0) .label_font_size(22)
.set(self.ids.srvr_bg, ui_widgets); .label_y(Relative::Scalar(5.0))
Image::new(self.imgs.input_bg) .set(self.ids.login_button, ui_widgets);
.w_h(337.0, 67.0) } else {
.middle_of(self.ids.srvr_bg) if Button::image(self.imgs.button)
.set(self.ids.address_bg, ui_widgets); .hover_image(self.imgs.button_hover)
for event in TextBox::new(&self.server_address) .press_image(self.imgs.button_press)
.w_h(290.0, 30.0) .w_h(258.0, 55.0)
.mid_bottom_with_margin_on(self.ids.address_bg, 44.0 / 2.0) .down_from(self.ids.address_bg, 20.0)
.font_size(22) .align_middle_x_of(self.ids.address_bg)
.font_id(self.fonts.opensans) .label("Login")
.text_color(TEXT_COLOR) .label_color(TEXT_COLOR)
// transparent background .label_font_size(24)
.color(TRANSPARENT) .label_y(Relative::Scalar(5.0))
.border_color(TRANSPARENT) .set(self.ids.login_button, ui_widgets)
.set(self.ids.address_field, ui_widgets) .was_clicked()
{ {
match event {
TextBoxEvent::Update(server_address) => {
self.server_address = server_address.to_string();
}
TextBoxEvent::Enter => {
login!(); login!();
} }
} };
}
// Login button // Singleplayer button
// Change button text and remove hover/press images if a connection is in progress
if let Some(start) = self.connecting {
Button::image(self.imgs.button)
.w_h(258.0, 55.0)
.down_from(self.ids.address_bg, 20.0)
.align_middle_x_of(self.ids.address_bg)
.label("Connecting...")
.label_color({
let pulse = ((start.elapsed().as_millis() as f32 * 0.008).sin() + 1.0) / 2.0;
Color::Rgba(
TEXT_COLOR.red() * (pulse / 2.0 + 0.5),
TEXT_COLOR.green() * (pulse / 2.0 + 0.5),
TEXT_COLOR.blue() * (pulse / 2.0 + 0.5),
pulse / 4.0 + 0.75,
)
})
.label_font_size(22)
.label_y(Relative::Scalar(5.0))
.set(self.ids.login_button, ui_widgets);
} else {
if Button::image(self.imgs.button) if Button::image(self.imgs.button)
.hover_image(self.imgs.button_hover) .hover_image(self.imgs.button_hover)
.press_image(self.imgs.button_press) .press_image(self.imgs.button_press)
.w_h(258.0, 55.0) .w_h(258.0, 55.0)
.down_from(self.ids.address_bg, 20.0) .down_from(self.ids.login_button, 20.0)
.align_middle_x_of(self.ids.address_bg) .align_middle_x_of(self.ids.address_bg)
.label("Login") .label("Singleplayer")
.label_color(TEXT_COLOR) .label_color(TEXT_COLOR)
.label_font_size(24) .label_font_size(22)
.label_y(Relative::Scalar(5.0)) .label_y(Relative::Scalar(5.0))
.set(self.ids.login_button, ui_widgets) .label_x(Relative::Scalar(2.0))
.set(self.ids.singleplayer_button, ui_widgets)
.was_clicked() .was_clicked()
{ {
login!(); singleplayer!();
} }
}; // Quit
if Button::image(self.imgs.button)
// Singleplayer button .w_h(190.0, 40.0)
if Button::image(self.imgs.button) .bottom_left_with_margins_on(ui_widgets.window, 60.0, 30.0)
.hover_image(self.imgs.button_hover) .hover_image(self.imgs.button_hover)
.press_image(self.imgs.button_press) .press_image(self.imgs.button_press)
.w_h(258.0, 55.0) .label("Quit")
.down_from(self.ids.login_button, 20.0) .label_color(TEXT_COLOR)
.align_middle_x_of(self.ids.address_bg) .label_font_size(20)
.label("Singleplayer") .label_y(Relative::Scalar(3.0))
.label_color(TEXT_COLOR) .set(self.ids.quit_button, ui_widgets)
.label_font_size(22) .was_clicked()
.label_y(Relative::Scalar(5.0)) {
.label_x(Relative::Scalar(2.0)) events.push(Event::Quit);
.set(self.ids.singleplayer_button, ui_widgets) };
.was_clicked() // Settings
{ if Button::image(self.imgs.button)
singleplayer!(); .w_h(190.0, 40.0)
.up_from(self.ids.quit_button, 8.0)
.hover_image(self.imgs.button_hover)
.press_image(self.imgs.button_press)
.label("Settings")
.label_color(TEXT_COLOR)
.label_font_size(20)
.label_y(Relative::Scalar(3.0))
.set(self.ids.settings_button, ui_widgets)
.was_clicked()
{};
// Servers
if Button::image(self.imgs.button)
.w_h(190.0, 40.0)
.up_from(self.ids.settings_button, 8.0)
.hover_image(self.imgs.button_hover)
.press_image(self.imgs.button_press)
.label("Servers")
.label_color(TEXT_COLOR)
.label_font_size(20)
.label_y(Relative::Scalar(3.0))
.set(self.ids.servers_button, ui_widgets)
.was_clicked()
{
self.show_servers = true;
};
} }
// Quit
if Button::image(self.imgs.button)
.w_h(190.0, 40.0)
.bottom_left_with_margins_on(ui_widgets.window, 60.0, 30.0)
.hover_image(self.imgs.button_hover)
.press_image(self.imgs.button_press)
.label("Quit")
.label_color(TEXT_COLOR)
.label_font_size(20)
.label_y(Relative::Scalar(3.0))
.set(self.ids.quit_button, ui_widgets)
.was_clicked()
{
events.push(Event::Quit);
};
// Settings
if Button::image(self.imgs.button)
.w_h(190.0, 40.0)
.up_from(self.ids.quit_button, 8.0)
.hover_image(self.imgs.button_hover)
.press_image(self.imgs.button_press)
.label("Settings")
.label_color(TEXT_COLOR)
.label_font_size(20)
.label_y(Relative::Scalar(3.0))
.set(self.ids.settings_button, ui_widgets)
.was_clicked()
{};
// Servers
if Button::image(self.imgs.button)
.w_h(190.0, 40.0)
.up_from(self.ids.settings_button, 8.0)
.hover_image(self.imgs.button_hover)
.press_image(self.imgs.button_press)
.label("Servers")
.label_color(TEXT_COLOR)
.label_font_size(20)
.label_y(Relative::Scalar(3.0))
.set(self.ids.servers_button, ui_widgets)
.was_clicked()
{
self.show_servers = true;
};
events events
} }