From 5ffc4550a4039505c8c48f1d7e1a773e8129f94d Mon Sep 17 00:00:00 2001 From: ghostlyzsh Date: Sun, 7 Apr 2024 11:20:33 -0500 Subject: [PATCH] usernames added --- server/src/component.rs | 2 +- server/src/main.rs | 11 ++++++-- starkingdoms-client/src/rendering.ts | 41 ++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 3 deletions(-) diff --git a/server/src/component.rs b/server/src/component.rs index 87f733bf63b7a6d683845b11c53804f1e7da7c8c..1d62396b511b8600e7065ee05ce6be87d99cc887 100644 --- a/server/src/component.rs +++ b/server/src/component.rs @@ -13,7 +13,7 @@ // // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -use std::{net::SocketAddr}; +use std::net::SocketAddr; use bevy::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/server/src/main.rs b/server/src/main.rs index c50eceaf437192d43082dd22dae00410b0ee83f5..74aa16bf4f4e5b459ea8bc55042e2b3fcc36807f 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -214,7 +214,9 @@ fn module_spawn( part_query: Query<&PartType, Without>, mut packet_send: EventWriter, ) { - if module_timer.0.tick(time.delta()).just_finished() && part_query.iter().count() < part::FREE_MODULE_CAP { + if module_timer.0.tick(time.delta()).just_finished() + && part_query.iter().count() < part::FREE_MODULE_CAP + { let angle: f32 = { let mut rng = rand::thread_rng(); rng.gen::() * std::f32::consts::PI * 2. @@ -704,7 +706,12 @@ fn on_message( bound = [-0.375, 0.375, -0.5, 0.4375]; } - if bound[0] < x && x < bound[1] && bound[2] < y && y < bound[3] && m_attach.associated_player.unwrap() == entity { + if bound[0] < x + && x < bound[1] + && bound[2] < y + && y < bound[3] + && m_attach.associated_player.unwrap() == entity + { q_player.selected = Some(m_entity); break; } diff --git a/starkingdoms-client/src/rendering.ts b/starkingdoms-client/src/rendering.ts index 81561a1e972403d52e5fc9ea7c8d9afb08c5a9a7..f4c3e5a7de1976b8e3165725de9ed02d900bca0d 100644 --- a/starkingdoms-client/src/rendering.ts +++ b/starkingdoms-client/src/rendering.ts @@ -157,5 +157,46 @@ export function startRender() { planet_sprite.y = planet.transform.y; planet_sprite.rotation = planet.transform.rot; } + for (let [id, username] of global.players_map) { + let username_text; + if (global.rendering!.player_text_map.has(id)) { + username_text = global.rendering!.player_text_map.get(id)!; + } else { + username_text = new PIXI.Text(username); + username_text.alpha = 0.6; + username_text.style = new PIXI.TextStyle({ + fontFamily: 'sans-serif', + fontSize: 27, + fill: '#ffffff', + }); + global.rendering!.player_text_map.set(id, username_text); + global.rendering!.app.stage.addChild(username_text); + } + let player_transform = global.parts_map.get(id)!.transform; + + username_text.anchor.set(0.5); + username_text.x = player_transform.x; + username_text.y = player_transform.y - 50; + } + let username_text; + if (global.rendering!.player_text_map.has(global.me!.part_id)) { + username_text = global.rendering!.player_text_map.get(global.me!.part_id)!; + } else { + username_text = new PIXI.Text(global.me!.username); + username_text.alpha = 0.6; + username_text.style = new PIXI.TextStyle({ + fontFamily: 'sans-serif', + fontSize: 27, + fill: '#ffffff', + stroke: '#000000', + strokeThickness: 2, + }); + global.rendering!.player_text_map.set(global.me!.part_id, username_text); + global.rendering!.app.stage.addChild(username_text); + } + let player_transform = global.parts_map.get(global.me!.part_id)!.transform; + username_text.anchor.set(0.5); + username_text.x = player_transform.x; + username_text.y = player_transform.y - 50; }); }