From 1362477b192d79a34503613c7331332aa6b4f37c Mon Sep 17 00:00:00 2001 From: core Date: Sat, 6 Jan 2024 15:22:17 -0500 Subject: [PATCH] change one thingy --- server/src/main.rs | 109 +++++++++++++++++++++-------- starkingdoms-backplane/src/main.rs | 4 +- 2 files changed, 81 insertions(+), 32 deletions(-) diff --git a/server/src/main.rs b/server/src/main.rs index d9a5a2eab58a19b2cf5e7480051049df201c4477..59ffb72e5f68052d330663067c93c3909edff5c6 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -23,8 +23,8 @@ use bevy::math::{vec2, vec3}; use bevy::{ecs::event::ManualEventReader, prelude::*}; use bevy_rapier2d::prelude::*; use bevy_twite::{twite::frame::MessageType, ServerEvent, TwiteServerConfig, TwiteServerPlugin}; -use component::*; use component::Input; +use component::*; use packet::*; use rand::Rng; @@ -1274,8 +1274,17 @@ fn on_position_change( } fn player_input_update( - mut player_and_body_query: Query<(Entity, &mut Player, &Attach, &mut ExternalForce, &Transform)>, - mut attached_query: Query<(&Attach, &PartType, &mut ExternalForce, &Transform), Without> + mut player_and_body_query: Query<( + Entity, + &mut Player, + &Attach, + &mut ExternalForce, + &Transform, + )>, + mut attached_query: Query< + (&Attach, &PartType, &mut ExternalForce, &Transform), + Without, + >, ) { for (_, player, attach, mut forces, transform) in &mut player_and_body_query { //forces.torque = 0.0; @@ -1345,14 +1354,22 @@ fn player_input_update( forces.torque += thruster_force.torque; } } - search_thrusters(player.input, attach.clone(), *transform, &mut attached_query); + search_thrusters( + player.input, + attach.clone(), + *transform, + &mut attached_query, + ); } } fn search_thrusters( input: Input, attach: Attach, p_transform: Transform, - attached_query: &mut Query<(&Attach, &PartType, &mut ExternalForce, &Transform), Without> + attached_query: &mut Query< + (&Attach, &PartType, &mut ExternalForce, &Transform), + Without, + >, ) { let p_angle = p_transform.rotation.to_euler(EulerRot::ZYX).0; for child in attach.children { @@ -1362,8 +1379,12 @@ fn search_thrusters( let relative_angle = (p_angle - angle).abs(); let relative_pos = transform.translation - p_transform.translation; let relative_pos = Vec2::new( - relative_pos.x.mul_add((-p_angle).cos(), -relative_pos.y * (-p_angle).sin()), - relative_pos.x.mul_add((-p_angle).sin(), relative_pos.y * (-p_angle).cos()), + relative_pos + .x + .mul_add((-p_angle).cos(), -relative_pos.y * (-p_angle).sin()), + relative_pos + .x + .mul_add((-p_angle).sin(), relative_pos.y * (-p_angle).cos()), ); let mut force_mult = 0.; @@ -1371,10 +1392,12 @@ fn search_thrusters( force_mult = LANDING_THRUSTER_FORCE; } if input.up { - if 3.*PI/4. < relative_angle && relative_angle < 5.*PI/4. { + if 3. * PI / 4. < relative_angle && relative_angle < 5. * PI / 4. { let thruster_force = ExternalForce::at_point( - Vec2::new(-force_mult / SCALE * angle.sin(), - force_mult / SCALE * angle.cos()), + Vec2::new( + -force_mult / SCALE * angle.sin(), + force_mult / SCALE * angle.cos(), + ), transform.translation.xy(), transform.translation.xy(), ); @@ -1383,10 +1406,14 @@ fn search_thrusters( } } if input.down { - if (0. < relative_angle && relative_angle < PI/4.)||(7.*PI/4. < relative_angle && relative_angle < 2.*PI) { + if (0. < relative_angle && relative_angle < PI / 4.) + || (7. * PI / 4. < relative_angle && relative_angle < 2. * PI) + { let thruster_force = ExternalForce::at_point( - Vec2::new(-force_mult / SCALE * angle.sin(), - force_mult / SCALE * angle.cos()), + Vec2::new( + -force_mult / SCALE * angle.sin(), + force_mult / SCALE * angle.cos(), + ), transform.translation.xy(), transform.translation.xy(), ); @@ -1395,11 +1422,13 @@ fn search_thrusters( } } if input.left { - if 3.*PI/4. < relative_angle && relative_angle < 5.*PI/4. { + if 3. * PI / 4. < relative_angle && relative_angle < 5. * PI / 4. { if relative_pos.x > 24. / SCALE { let thruster_force = ExternalForce::at_point( - Vec2::new(-force_mult / SCALE * angle.sin(), - force_mult / SCALE * angle.cos()), + Vec2::new( + -force_mult / SCALE * angle.sin(), + force_mult / SCALE * angle.cos(), + ), transform.translation.xy(), transform.translation.xy(), ); @@ -1407,11 +1436,15 @@ fn search_thrusters( force.torque += thruster_force.torque; } } - if (0. < relative_angle && relative_angle < PI/4.)||(7.*PI/4. < relative_angle && relative_angle < 2.*PI) { + if (0. < relative_angle && relative_angle < PI / 4.) + || (7. * PI / 4. < relative_angle && relative_angle < 2. * PI) + { if relative_pos.x < -24. / SCALE { let thruster_force = ExternalForce::at_point( - Vec2::new(-force_mult / SCALE * angle.sin(), - force_mult / SCALE * angle.cos()), + Vec2::new( + -force_mult / SCALE * angle.sin(), + force_mult / SCALE * angle.cos(), + ), transform.translation.xy(), transform.translation.xy(), ); @@ -1419,11 +1452,13 @@ fn search_thrusters( force.torque += thruster_force.torque; } } - if PI/4. < relative_angle && relative_angle < 3.*PI/4. { + if PI / 4. < relative_angle && relative_angle < 3. * PI / 4. { if relative_pos.y < -24. / SCALE { let thruster_force = ExternalForce::at_point( - Vec2::new(-force_mult / SCALE * angle.sin(), - force_mult / SCALE * angle.cos()), + Vec2::new( + -force_mult / SCALE * angle.sin(), + force_mult / SCALE * angle.cos(), + ), transform.translation.xy(), transform.translation.xy(), ); @@ -1432,8 +1467,10 @@ fn search_thrusters( } if -24. / SCALE < relative_pos.y && relative_pos.y < 24. / SCALE { let thruster_force = ExternalForce::at_point( - Vec2::new(-force_mult / SCALE * angle.sin(), - force_mult / SCALE * angle.cos()), + Vec2::new( + -force_mult / SCALE * angle.sin(), + force_mult / SCALE * angle.cos(), + ), transform.translation.xy(), transform.translation.xy(), ); @@ -1441,11 +1478,13 @@ fn search_thrusters( force.torque += thruster_force.torque; } } - if 5.*PI/4. < relative_angle && relative_angle < 7.*PI/4. { + if 5. * PI / 4. < relative_angle && relative_angle < 7. * PI / 4. { if relative_pos.y > 24. / SCALE { let thruster_force = ExternalForce::at_point( - Vec2::new(-force_mult / SCALE * angle.sin(), - force_mult / SCALE * angle.cos()), + Vec2::new( + -force_mult / SCALE * angle.sin(), + force_mult / SCALE * angle.cos(), + ), transform.translation.xy(), transform.translation.xy(), ); @@ -1454,8 +1493,10 @@ fn search_thrusters( } if -24. / SCALE < relative_pos.y && relative_pos.y < 24. / SCALE { let thruster_force = ExternalForce::at_point( - Vec2::new(-force_mult / SCALE * angle.sin(), - force_mult / SCALE * angle.cos()), + Vec2::new( + -force_mult / SCALE * angle.sin(), + force_mult / SCALE * angle.cos(), + ), transform.translation.xy(), transform.translation.xy(), ); @@ -1473,7 +1514,15 @@ fn search_thrusters( } fn gravity_update( - mut part_query: Query<(&Transform, &ReadMassProperties, &mut ExternalForce, &mut ExternalImpulse), With>, + mut part_query: Query< + ( + &Transform, + &ReadMassProperties, + &mut ExternalForce, + &mut ExternalImpulse, + ), + With, + >, planet_query: Query<(&Transform, &ReadMassProperties), With>, ) { for (part_transform, part_mp, mut forces, mut impulses) in &mut part_query { diff --git a/starkingdoms-backplane/src/main.rs b/starkingdoms-backplane/src/main.rs index 13154527ac3296708cbff70ba2d6bf76cd89dcce..84bfbdbd42ef34fe05efe80e4431804e84becc1a 100644 --- a/starkingdoms-backplane/src/main.rs +++ b/starkingdoms-backplane/src/main.rs @@ -59,7 +59,7 @@ pub const MIGRATIONS: EmbeddedMigrations = embed_migrations!("migrations"); async fn main() { env_logger::init(); info!( - "StarKingdoms API v{} starting up", + "StarKingdoms Backplane v{} starting up", env!("CARGO_PKG_VERSION") ); @@ -67,7 +67,7 @@ async fn main() { let config_path = match args.nth(1) { Some(path) => path, None => { - eprintln!("usage: starkingdoms-api "); + eprintln!("usage: starkingdoms-backplane "); std::process::exit(1); } };