-
Notifications
You must be signed in to change notification settings - Fork 52
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
6 changed files
with
144 additions
and
130 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,129 @@ | ||
| use std::borrow::Cow; | ||
| use std::collections::BTreeMap; | ||
|
|
||
| use serde::{Deserialize, Serialize}; | ||
| use yakui::widgets::{Pad, TextBox}; | ||
| use yakui::{constrained, divider, Color, Constraints, Vec2}; | ||
|
|
||
| use common::saveload::Encoder; | ||
| use goryak::{ | ||
| button_primary, checkbox_value, error, on_secondary_container, outline, textc, Window, | ||
| }; | ||
| use simulation::Simulation; | ||
|
|
||
| use crate::network::NetworkState; | ||
| use crate::uiworld::UiWorld; | ||
|
|
||
| #[derive(Default, Serialize, Deserialize)] | ||
| pub struct NetworkConnectionInfo { | ||
| pub name: String, | ||
| pub ip: String, | ||
| #[serde(skip)] | ||
| pub error: String, | ||
| #[serde(skip)] | ||
| show_hashes: bool, | ||
| #[serde(skip)] | ||
| hashes: BTreeMap<String, u64>, | ||
| #[serde(skip)] | ||
| hashes_tick: u64, | ||
| } | ||
|
|
||
| fn label(x: impl Into<Cow<'static, str>>) { | ||
| textc(on_secondary_container(), x); | ||
| } | ||
|
|
||
| fn text_edit(x: &mut String, placeholder: &str) { | ||
| constrained( | ||
| Constraints { | ||
| min: Vec2::new(100.0, 20.0), | ||
| max: Vec2::new(f32::INFINITY, f32::INFINITY), | ||
| }, | ||
| || { | ||
| let mut text = TextBox::new(x.clone()); | ||
| text.placeholder = placeholder.to_string(); | ||
| text.fill = Some(Color::rgba(0, 0, 0, 50)); | ||
| if let Some(changed) = text.show().into_inner().text { | ||
| *x = changed; | ||
| } | ||
| }, | ||
| ); | ||
| } | ||
|
|
||
| /// Network window | ||
| /// Allows to connect to a server or start a server | ||
| pub fn network(uiworld: &UiWorld, sim: &Simulation, opened: &mut bool) { | ||
| Window { | ||
| title: "Network".into(), | ||
| opened, | ||
| pad: Pad::all(10.0), | ||
| radius: 10.0, | ||
| child_spacing: 10.0, | ||
| } | ||
| .show(|| { | ||
| let mut state = uiworld.write::<NetworkState>(); | ||
| let mut info = uiworld.write::<NetworkConnectionInfo>(); | ||
| common::saveload::JSONPretty::save_silent(&*info, "netinfo"); | ||
|
|
||
| match *state { | ||
| NetworkState::Singleplayer(_) => { | ||
| if !info.error.is_empty() { | ||
| textc(error(), info.error.clone()); | ||
| divider(outline(), 5.0, 1.0); | ||
| } | ||
|
|
||
| text_edit(&mut info.name, "Name"); | ||
|
|
||
| if info.name.is_empty() { | ||
| label("please enter your name"); | ||
| return; | ||
| } | ||
|
|
||
| if button_primary("Start server").show().clicked { | ||
| if let Some(server) = crate::network::start_server(&mut info, sim) { | ||
| *state = NetworkState::Server(server); | ||
| } | ||
| } | ||
|
|
||
| divider(outline(), 5.0, 1.0); | ||
|
|
||
| text_edit(&mut info.ip, "IP"); | ||
|
|
||
| if button_primary("Connect").show().clicked { | ||
| if let Some(c) = crate::network::start_client(&mut info) { | ||
| *state = NetworkState::Client(c); | ||
| } | ||
| } | ||
| } | ||
| NetworkState::Client(ref client) => { | ||
| label(client.lock().unwrap().describe()); | ||
| show_hashes(sim, &mut info); | ||
| } | ||
| NetworkState::Server(ref server) => { | ||
| label("Running server"); | ||
| label(server.lock().unwrap().describe()); | ||
| show_hashes(sim, &mut info); | ||
| } | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| fn show_hashes(sim: &Simulation, info: &mut NetworkConnectionInfo) { | ||
| checkbox_value( | ||
| &mut info.show_hashes, | ||
| on_secondary_container(), | ||
| "show hashes", | ||
| ); | ||
| if !info.show_hashes { | ||
| return; | ||
| } | ||
|
|
||
| if sim.get_tick() % 100 == 0 || info.hashes.is_empty() { | ||
| info.hashes = sim.hashes(); | ||
| info.hashes_tick = sim.get_tick(); | ||
| } | ||
|
|
||
| label(format!("hashes for tick {}", info.hashes_tick)); | ||
| for (name, hash) in &info.hashes { | ||
| label(format!("{name}: {hash}")); | ||
| } | ||
| } |