szymon/checkers
1
0
Fork 0
mirror of https://github.com/szymon-jozef/checkers.git synced 2026-10-27 19:20:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: add some basic settings

Browse Source
This commit is contained in:
szymon
2026-09-05 15:38:22 +02:00
parent 92fa5d0d86
commit c90b9b6f46
5 changed files with 87 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ui/macroquad/menu_builder.rs
View File

@@ -24,8 +24,8 @@ impl MenuBuilder {
}
}
pub fn text_input(&mut self, ui: &mut Ui, buffer: &mut String) {
InputText::new(hash!())
pub fn text_input(&mut self, ui: &mut Ui, id: &str, buffer: &mut String) {
InputText::new(hash!(id))
.position(vec2(self.center_x, self.current_y))
.size(self.button_size)
.ui(ui, buffer);

2
src/ui/macroquad/server_selection.rs
View File

@@ -47,7 +47,7 @@ pub async fn draw_server_selection(state: &mut GuiState, context: &mut GameConte
menu_builder.label(ui, "Server selection");
menu_builder.text_input(ui, &mut context.server_url_buffer);
menu_builder.text_input(ui, "server url", &mut context.server_url_buffer);
//context.normalise_url();
if menu_builder.button(ui, "Connect") {

62
src/ui/macroquad/settings.rs
View File

@@ -1,3 +1,4 @@
use log::error;
use macroquad::{
color::GRAY,
math::vec2,
@@ -6,9 +7,23 @@ use macroquad::{
window::{screen_height, screen_width},
};
use crate::ui::{macroquad::menu_builder::MenuBuilder, state::GuiState};
use crate::{
settings::{
client_settings::ClientSettings, general_settings::SettingsLike,
server_settings::ServerSettings,
},
ui::{
macroquad::menu_builder::MenuBuilder,
state::{GameContext, GuiState},
},
};
pub async fn draw_settings(state: &mut GuiState) {
pub async fn draw_settings(
state: &mut GuiState,
context: &mut GameContext,
client_settings: &mut ClientSettings,
server_settings: &mut ServerSettings,
) {
let menu_size = vec2(screen_width() * 0.5, screen_height() * 0.5);
let menu_pos = vec2(
screen_width() / 2.0 - menu_size.x / 2.0,
@@ -21,11 +36,50 @@ pub async fn draw_settings(state: &mut GuiState) {
Group::new(hash!(), menu_size)
.position(menu_pos)
.ui(&mut root_ui(), |ui| {
// Client
menu_builder.label(ui, "Game settings");
menu_builder.label(ui, "Server settings");
menu_builder.label(ui, "Name");
menu_builder.text_input(ui, "name input", &mut client_settings.name);
if menu_builder.button(ui, "Go back") {
menu_builder.label(ui, "Default server url");
menu_builder.text_input(ui, "url input", &mut context.server_url_buffer);
menu_builder.label(ui, "");
// Server
menu_builder.label(ui, "Server settings");
menu_builder.label(ui, "TODO");
if let Some(error_msg) = &context.latest_error_message {
menu_builder.label(ui, &error_msg);
}
// Exit
if menu_builder.button(ui, "Save and back") {
client_settings.server_url = match context.server_url_buffer.parse() {
Ok(result) => result,
Err(e) => {
context.latest_error_message =
Some(format!("Error while parsing url: {}", e));
return;
}
};
if let Err(e) = client_settings.save_to_file() {
context.latest_error_message = Some(format!("Error: {}", e));
error!("Error while saving client settings to file: {}", e);
return;
}
if let Err(e) = server_settings.save_to_file() {
context.latest_error_message = Some(format!("Error: {}", e));
error!("Error while saving server settings to file: {}", e);
return;
}
context.latest_error_message = None;
*state = GuiState::MainMenu;
}
});