M server/src/component.rs => server/src/component.rs +1 -1
@@ 13,7 13,7 @@
//
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>.
-use std::{net::SocketAddr};
+use std::net::SocketAddr;
use bevy::prelude::*;
use serde::{Deserialize, Serialize};
M server/src/main.rs => server/src/main.rs +9 -2
@@ 214,7 214,9 @@ fn module_spawn(
part_query: Query<&PartType, Without<Attach>>,
mut packet_send: EventWriter<WsEvent>,
) {
- 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::<f32>() * 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;
}
M starkingdoms-client/src/rendering.ts => starkingdoms-client/src/rendering.ts +41 -0
@@ 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;
});
}