mirror of
https://git.ngram.ca/OpenJam/rc-servers
synced 2026-08-23 23:08:52 +00:00
Readability fixes for cargo clippy
This commit is contained in:
NG (Graham) committed
1 parent
9dcb12131b
commit
0e35aced01
77 files changed
+725
-735
No files matched your search
+162
-162
@@ -49,21 +49,21 @@ pub enum MovementCategorySpecificData {
|
||||
Ski,
|
||||
}
|
||||
|
||||
impl std::convert::Into<crate::data::movement_list::MovementCategorySpecificData> for MovementCategorySpecificData {
|
||||
fn into(self) -> crate::data::movement_list::MovementCategorySpecificData {
|
||||
match self {
|
||||
Self::Wheel => crate::data::movement_list::MovementCategorySpecificData::Wheel,
|
||||
Self::Hover(x) => crate::data::movement_list::MovementCategorySpecificData::Hover(x.into()),
|
||||
Self::Wing => crate::data::movement_list::MovementCategorySpecificData::Wing,
|
||||
Self::Rudder => crate::data::movement_list::MovementCategorySpecificData::Rudder,
|
||||
Self::Thruster => crate::data::movement_list::MovementCategorySpecificData::Thruster,
|
||||
Self::Propeller => crate::data::movement_list::MovementCategorySpecificData::Propeller,
|
||||
Self::InsectLeg => crate::data::movement_list::MovementCategorySpecificData::InsectLeg,
|
||||
Self::MechLeg(x) => crate::data::movement_list::MovementCategorySpecificData::MechLeg(x.into()),
|
||||
Self::SprinterLeg(x) => crate::data::movement_list::MovementCategorySpecificData::SprinterLeg(x.into()),
|
||||
Self::TankTrack => crate::data::movement_list::MovementCategorySpecificData::TankTrack,
|
||||
Self::Rotor(x) => crate::data::movement_list::MovementCategorySpecificData::Rotor(x.into()),
|
||||
Self::Ski => crate::data::movement_list::MovementCategorySpecificData::Ski,
|
||||
impl std::convert::From<MovementCategorySpecificData> for crate::data::movement_list::MovementCategorySpecificData {
|
||||
fn from(val: MovementCategorySpecificData) -> Self {
|
||||
match val {
|
||||
MovementCategorySpecificData::Wheel => crate::data::movement_list::MovementCategorySpecificData::Wheel,
|
||||
MovementCategorySpecificData::Hover(x) => crate::data::movement_list::MovementCategorySpecificData::Hover(x.into()),
|
||||
MovementCategorySpecificData::Wing => crate::data::movement_list::MovementCategorySpecificData::Wing,
|
||||
MovementCategorySpecificData::Rudder => crate::data::movement_list::MovementCategorySpecificData::Rudder,
|
||||
MovementCategorySpecificData::Thruster => crate::data::movement_list::MovementCategorySpecificData::Thruster,
|
||||
MovementCategorySpecificData::Propeller => crate::data::movement_list::MovementCategorySpecificData::Propeller,
|
||||
MovementCategorySpecificData::InsectLeg => crate::data::movement_list::MovementCategorySpecificData::InsectLeg,
|
||||
MovementCategorySpecificData::MechLeg(x) => crate::data::movement_list::MovementCategorySpecificData::MechLeg(x.into()),
|
||||
MovementCategorySpecificData::SprinterLeg(x) => crate::data::movement_list::MovementCategorySpecificData::SprinterLeg(x.into()),
|
||||
MovementCategorySpecificData::TankTrack => crate::data::movement_list::MovementCategorySpecificData::TankTrack,
|
||||
MovementCategorySpecificData::Rotor(x) => crate::data::movement_list::MovementCategorySpecificData::Rotor(x.into()),
|
||||
MovementCategorySpecificData::Ski => crate::data::movement_list::MovementCategorySpecificData::Ski,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -79,16 +79,16 @@ pub struct HoverCategoryData {
|
||||
pub deceleration_multiplier: f32,
|
||||
}
|
||||
|
||||
impl std::convert::Into<crate::data::movement_list::HoverCategoryData> for HoverCategoryData {
|
||||
fn into(self) -> crate::data::movement_list::HoverCategoryData {
|
||||
impl std::convert::From<HoverCategoryData> for crate::data::movement_list::HoverCategoryData {
|
||||
fn from(val: HoverCategoryData) -> Self {
|
||||
crate::data::movement_list::HoverCategoryData {
|
||||
height_tolerance: self.height_tolerance,
|
||||
force_y_offset: self.force_y_offset,
|
||||
turning_scale: self.turning_scale,
|
||||
small_angle_turning_scale: self.small_angle_turning_scale,
|
||||
hover_damping: self.hover_damping,
|
||||
angular_damping: self.angular_damping,
|
||||
deceleration_multiplier: self.deceleration_multiplier,
|
||||
height_tolerance: val.height_tolerance,
|
||||
force_y_offset: val.force_y_offset,
|
||||
turning_scale: val.turning_scale,
|
||||
small_angle_turning_scale: val.small_angle_turning_scale,
|
||||
hover_damping: val.hover_damping,
|
||||
angular_damping: val.angular_damping,
|
||||
deceleration_multiplier: val.deceleration_multiplier,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -98,10 +98,10 @@ pub struct MechLegCategoryData {
|
||||
pub deceleration_multiplier: f32,
|
||||
}
|
||||
|
||||
impl std::convert::Into<crate::data::movement_list::MechLegCategoryData> for MechLegCategoryData {
|
||||
fn into(self) -> crate::data::movement_list::MechLegCategoryData {
|
||||
impl std::convert::From<MechLegCategoryData> for crate::data::movement_list::MechLegCategoryData {
|
||||
fn from(val: MechLegCategoryData) -> Self {
|
||||
crate::data::movement_list::MechLegCategoryData {
|
||||
deceleration_multiplier: self.deceleration_multiplier,
|
||||
deceleration_multiplier: val.deceleration_multiplier,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -111,10 +111,10 @@ pub struct RotorCategoryData {
|
||||
pub max_turn_rate: f32,
|
||||
}
|
||||
|
||||
impl std::convert::Into<crate::data::movement_list::RotorCategoryData> for RotorCategoryData {
|
||||
fn into(self) -> crate::data::movement_list::RotorCategoryData {
|
||||
impl std::convert::From<RotorCategoryData> for crate::data::movement_list::RotorCategoryData {
|
||||
fn from(val: RotorCategoryData) -> Self {
|
||||
crate::data::movement_list::RotorCategoryData {
|
||||
max_turn_rate: self.max_turn_rate,
|
||||
max_turn_rate: val.max_turn_rate,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -129,14 +129,14 @@ pub struct MovementData {
|
||||
pub specifics: MovementSpecificData,
|
||||
}
|
||||
|
||||
impl std::convert::Into<crate::data::movement_list::MovementData> for MovementData {
|
||||
fn into(self) -> crate::data::movement_list::MovementData {
|
||||
impl std::convert::From<MovementData> for crate::data::movement_list::MovementData {
|
||||
fn from(val: MovementData) -> Self {
|
||||
crate::data::movement_list::MovementData {
|
||||
speed_boost: self.speed_boost,
|
||||
max_carry_mass: self.max_carry_mass,
|
||||
horizontal_top_speed: self.horizontal_top_speed,
|
||||
vertical_top_speed: self.vertical_top_speed,
|
||||
specifics: self.specifics.into(),
|
||||
speed_boost: val.speed_boost,
|
||||
max_carry_mass: val.max_carry_mass,
|
||||
horizontal_top_speed: val.horizontal_top_speed,
|
||||
vertical_top_speed: val.vertical_top_speed,
|
||||
specifics: val.specifics.into(),
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -158,21 +158,21 @@ pub enum MovementSpecificData {
|
||||
Ski,
|
||||
}
|
||||
|
||||
impl std::convert::Into<crate::data::movement_list::MovementSpecificData> for MovementSpecificData {
|
||||
fn into(self) -> crate::data::movement_list::MovementSpecificData {
|
||||
match self {
|
||||
Self::Wheel(x) => crate::data::movement_list::MovementSpecificData::Wheel(x.into()),
|
||||
Self::Hover(x) => crate::data::movement_list::MovementSpecificData::Hover(x.into()),
|
||||
Self::Wing(x) => crate::data::movement_list::MovementSpecificData::Wing(x.into()),
|
||||
Self::Rudder(x) => crate::data::movement_list::MovementSpecificData::Rudder(x.into()),
|
||||
Self::Thruster(x) => crate::data::movement_list::MovementSpecificData::Thruster(x.into()),
|
||||
Self::Propeller(x) => crate::data::movement_list::MovementSpecificData::Propeller(x.into()),
|
||||
Self::InsectLeg(x) => crate::data::movement_list::MovementSpecificData::InsectLeg(x.into()),
|
||||
Self::MechLeg(x) => crate::data::movement_list::MovementSpecificData::MechLeg(x.into()),
|
||||
Self::SprinterLeg(x) => crate::data::movement_list::MovementSpecificData::SprinterLeg(x.into()),
|
||||
Self::TankTrack(x) => crate::data::movement_list::MovementSpecificData::TankTrack(x.into()),
|
||||
Self::Rotor(x) => crate::data::movement_list::MovementSpecificData::Rotor(x.into()),
|
||||
Self::Ski=> crate::data::movement_list::MovementSpecificData::Ski,
|
||||
impl std::convert::From<MovementSpecificData> for crate::data::movement_list::MovementSpecificData {
|
||||
fn from(val: MovementSpecificData) -> Self {
|
||||
match val {
|
||||
MovementSpecificData::Wheel(x) => crate::data::movement_list::MovementSpecificData::Wheel(x.into()),
|
||||
MovementSpecificData::Hover(x) => crate::data::movement_list::MovementSpecificData::Hover(x.into()),
|
||||
MovementSpecificData::Wing(x) => crate::data::movement_list::MovementSpecificData::Wing(x.into()),
|
||||
MovementSpecificData::Rudder(x) => crate::data::movement_list::MovementSpecificData::Rudder(x.into()),
|
||||
MovementSpecificData::Thruster(x) => crate::data::movement_list::MovementSpecificData::Thruster(x.into()),
|
||||
MovementSpecificData::Propeller(x) => crate::data::movement_list::MovementSpecificData::Propeller(x.into()),
|
||||
MovementSpecificData::InsectLeg(x) => crate::data::movement_list::MovementSpecificData::InsectLeg(x.into()),
|
||||
MovementSpecificData::MechLeg(x) => crate::data::movement_list::MovementSpecificData::MechLeg(x.into()),
|
||||
MovementSpecificData::SprinterLeg(x) => crate::data::movement_list::MovementSpecificData::SprinterLeg(x.into()),
|
||||
MovementSpecificData::TankTrack(x) => crate::data::movement_list::MovementSpecificData::TankTrack(x.into()),
|
||||
MovementSpecificData::Rotor(x) => crate::data::movement_list::MovementSpecificData::Rotor(x.into()),
|
||||
MovementSpecificData::Ski=> crate::data::movement_list::MovementSpecificData::Ski,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -191,19 +191,19 @@ pub struct WheelData {
|
||||
pub brake_force_heavy: f32,
|
||||
}
|
||||
|
||||
impl std::convert::Into<crate::data::movement_list::WheelData> for WheelData {
|
||||
fn into(self) -> crate::data::movement_list::WheelData {
|
||||
impl std::convert::From<WheelData> for crate::data::movement_list::WheelData {
|
||||
fn from(val: WheelData) -> Self {
|
||||
crate::data::movement_list::WheelData {
|
||||
steering_speed_light: self.steering_speed_light,
|
||||
steering_speed_heavy: self.steering_speed_heavy,
|
||||
steering_force_multiplier_light: self.steering_force_multiplier_light,
|
||||
steering_force_multiplier_heavy: self.steering_force_multiplier_heavy,
|
||||
lateral_acceleration_light: self.lateral_acceleration_light,
|
||||
lateral_acceleration_heavy: self.lateral_acceleration_heavy,
|
||||
time_to_max_acceleration_light: self.time_to_max_acceleration_light,
|
||||
time_to_max_acceleration_heavy: self.time_to_max_acceleration_heavy,
|
||||
brake_force_light: self.brake_force_light,
|
||||
brake_force_heavy: self.brake_force_heavy,
|
||||
steering_speed_light: val.steering_speed_light,
|
||||
steering_speed_heavy: val.steering_speed_heavy,
|
||||
steering_force_multiplier_light: val.steering_force_multiplier_light,
|
||||
steering_force_multiplier_heavy: val.steering_force_multiplier_heavy,
|
||||
lateral_acceleration_light: val.lateral_acceleration_light,
|
||||
lateral_acceleration_heavy: val.lateral_acceleration_heavy,
|
||||
time_to_max_acceleration_light: val.time_to_max_acceleration_light,
|
||||
time_to_max_acceleration_heavy: val.time_to_max_acceleration_heavy,
|
||||
brake_force_light: val.brake_force_light,
|
||||
brake_force_heavy: val.brake_force_heavy,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -224,21 +224,21 @@ pub struct HoverData {
|
||||
pub lateral_damping_heavy: f32,
|
||||
}
|
||||
|
||||
impl std::convert::Into<crate::data::movement_list::HoverData> for HoverData {
|
||||
fn into(self) -> crate::data::movement_list::HoverData {
|
||||
impl std::convert::From<HoverData> for crate::data::movement_list::HoverData {
|
||||
fn from(val: HoverData) -> Self {
|
||||
crate::data::movement_list::HoverData {
|
||||
max_hover_height_light: self.max_hover_height_light,
|
||||
max_hover_height_heavy: self.max_hover_height_heavy,
|
||||
height_change_speed_light: self.height_change_speed_light,
|
||||
height_change_speed_heavy: self.height_change_speed_heavy,
|
||||
turn_torque_light: self.turn_torque_light,
|
||||
turn_torque_heavy: self.turn_torque_heavy,
|
||||
acceleration_light: self.acceleration_light,
|
||||
acceleration_heavy: self.acceleration_heavy,
|
||||
max_angular_velocity_light: self.max_angular_velocity_light,
|
||||
max_angular_velocity_heavy: self.max_angular_velocity_heavy,
|
||||
lateral_damping_light: self.lateral_damping_light,
|
||||
lateral_damping_heavy: self.lateral_damping_heavy,
|
||||
max_hover_height_light: val.max_hover_height_light,
|
||||
max_hover_height_heavy: val.max_hover_height_heavy,
|
||||
height_change_speed_light: val.height_change_speed_light,
|
||||
height_change_speed_heavy: val.height_change_speed_heavy,
|
||||
turn_torque_light: val.turn_torque_light,
|
||||
turn_torque_heavy: val.turn_torque_heavy,
|
||||
acceleration_light: val.acceleration_light,
|
||||
acceleration_heavy: val.acceleration_heavy,
|
||||
max_angular_velocity_light: val.max_angular_velocity_light,
|
||||
max_angular_velocity_heavy: val.max_angular_velocity_heavy,
|
||||
lateral_damping_light: val.lateral_damping_light,
|
||||
lateral_damping_heavy: val.lateral_damping_heavy,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -259,21 +259,21 @@ pub struct AerofoilData {
|
||||
pub vtol_velocity_heavy: f32,
|
||||
}
|
||||
|
||||
impl std::convert::Into<crate::data::movement_list::AerofoilData> for AerofoilData {
|
||||
fn into(self) -> crate::data::movement_list::AerofoilData {
|
||||
impl std::convert::From<AerofoilData> for crate::data::movement_list::AerofoilData {
|
||||
fn from(val: AerofoilData) -> Self {
|
||||
crate::data::movement_list::AerofoilData {
|
||||
barrel_speed_light: self.barrel_speed_light,
|
||||
barrel_speed_heavy: self.barrel_speed_heavy,
|
||||
bank_speed_light: self.bank_speed_light,
|
||||
bank_speed_heavy: self.bank_speed_heavy,
|
||||
elevation_speed_light: self.elevation_speed_light,
|
||||
elevation_speed_heavy: self.elevation_speed_heavy,
|
||||
rudder_speed_light: self.rudder_speed_light,
|
||||
rudder_speed_heavy: self.rudder_speed_heavy,
|
||||
thrust_light: self.thrust_light,
|
||||
thrust_heavy: self.thrust_heavy,
|
||||
vtol_velocity_light: self.vtol_velocity_light,
|
||||
vtol_velocity_heavy: self.vtol_velocity_heavy,
|
||||
barrel_speed_light: val.barrel_speed_light,
|
||||
barrel_speed_heavy: val.barrel_speed_heavy,
|
||||
bank_speed_light: val.bank_speed_light,
|
||||
bank_speed_heavy: val.bank_speed_heavy,
|
||||
elevation_speed_light: val.elevation_speed_light,
|
||||
elevation_speed_heavy: val.elevation_speed_heavy,
|
||||
rudder_speed_light: val.rudder_speed_light,
|
||||
rudder_speed_heavy: val.rudder_speed_heavy,
|
||||
thrust_light: val.thrust_light,
|
||||
thrust_heavy: val.thrust_heavy,
|
||||
vtol_velocity_light: val.vtol_velocity_light,
|
||||
vtol_velocity_heavy: val.vtol_velocity_heavy,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -284,11 +284,11 @@ pub struct ThrusterData {
|
||||
pub acceleration_delay_heavy: f32,
|
||||
}
|
||||
|
||||
impl std::convert::Into<crate::data::movement_list::ThrusterData> for ThrusterData {
|
||||
fn into(self) -> crate::data::movement_list::ThrusterData {
|
||||
impl std::convert::From<ThrusterData> for crate::data::movement_list::ThrusterData {
|
||||
fn from(val: ThrusterData) -> Self {
|
||||
crate::data::movement_list::ThrusterData {
|
||||
acceleration_delay_light: self.acceleration_delay_light,
|
||||
acceleration_delay_heavy: self.acceleration_delay_heavy,
|
||||
acceleration_delay_light: val.acceleration_delay_light,
|
||||
acceleration_delay_heavy: val.acceleration_delay_heavy,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -323,35 +323,35 @@ pub struct InsectLegData {
|
||||
pub swagger_force_heavy: f32,
|
||||
}
|
||||
|
||||
impl std::convert::Into<crate::data::movement_list::InsectLegData> for InsectLegData {
|
||||
fn into(self) -> crate::data::movement_list::InsectLegData {
|
||||
impl std::convert::From<InsectLegData> for crate::data::movement_list::InsectLegData {
|
||||
fn from(val: InsectLegData) -> Self {
|
||||
crate::data::movement_list::InsectLegData {
|
||||
ideal_height_light: self.ideal_height_light,
|
||||
ideal_height_heavy: self.ideal_height_heavy,
|
||||
ideal_crouching_height_light: self.ideal_crouching_height_light,
|
||||
ideal_crouching_height_heavy: self.ideal_crouching_height_heavy,
|
||||
ideal_height_range_light: self.ideal_height_range_light,
|
||||
ideal_height_range_heavy: self.ideal_height_range_heavy,
|
||||
jump_height_light: self.jump_height_light,
|
||||
jump_height_heavy: self.jump_height_heavy,
|
||||
max_upwards_force_light: self.max_upwards_force_light,
|
||||
max_upwards_force_heavy: self.max_upwards_force_heavy,
|
||||
max_lateral_force_light: self.max_lateral_force_light,
|
||||
max_lateral_force_heavy: self.max_lateral_force_heavy,
|
||||
max_turning_force_light: self.max_turning_force_light,
|
||||
max_turning_force_heavy: self.max_turning_force_heavy,
|
||||
max_damping_force_light: self.max_damping_force_light,
|
||||
max_damping_force_heavy: self.max_damping_force_heavy,
|
||||
max_stopped_force_light: self.max_stopped_force_light,
|
||||
max_stopped_force_heavy: self.max_stopped_force_heavy,
|
||||
max_new_stopped_force_light: self.max_new_stopped_force_light,
|
||||
max_new_stopped_force_heavy: self.max_new_stopped_force_heavy,
|
||||
upwards_damping_force_light: self.upwards_damping_force_light,
|
||||
upwards_damping_force_heavy: self.upwards_damping_force_heavy,
|
||||
lateral_damp_force_light: self.lateral_damp_force_light,
|
||||
lateral_damp_force_heavy: self.lateral_damp_force_heavy,
|
||||
swagger_force_light: self.swagger_force_light,
|
||||
swagger_force_heavy: self.swagger_force_heavy,
|
||||
ideal_height_light: val.ideal_height_light,
|
||||
ideal_height_heavy: val.ideal_height_heavy,
|
||||
ideal_crouching_height_light: val.ideal_crouching_height_light,
|
||||
ideal_crouching_height_heavy: val.ideal_crouching_height_heavy,
|
||||
ideal_height_range_light: val.ideal_height_range_light,
|
||||
ideal_height_range_heavy: val.ideal_height_range_heavy,
|
||||
jump_height_light: val.jump_height_light,
|
||||
jump_height_heavy: val.jump_height_heavy,
|
||||
max_upwards_force_light: val.max_upwards_force_light,
|
||||
max_upwards_force_heavy: val.max_upwards_force_heavy,
|
||||
max_lateral_force_light: val.max_lateral_force_light,
|
||||
max_lateral_force_heavy: val.max_lateral_force_heavy,
|
||||
max_turning_force_light: val.max_turning_force_light,
|
||||
max_turning_force_heavy: val.max_turning_force_heavy,
|
||||
max_damping_force_light: val.max_damping_force_light,
|
||||
max_damping_force_heavy: val.max_damping_force_heavy,
|
||||
max_stopped_force_light: val.max_stopped_force_light,
|
||||
max_stopped_force_heavy: val.max_stopped_force_heavy,
|
||||
max_new_stopped_force_light: val.max_new_stopped_force_light,
|
||||
max_new_stopped_force_heavy: val.max_new_stopped_force_heavy,
|
||||
upwards_damping_force_light: val.upwards_damping_force_light,
|
||||
upwards_damping_force_heavy: val.upwards_damping_force_heavy,
|
||||
lateral_damp_force_light: val.lateral_damp_force_light,
|
||||
lateral_damp_force_heavy: val.lateral_damp_force_heavy,
|
||||
swagger_force_light: val.swagger_force_light,
|
||||
swagger_force_heavy: val.swagger_force_heavy,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -374,23 +374,23 @@ pub struct MechLegData {
|
||||
pub max_damping_force_heavy: f32,
|
||||
}
|
||||
|
||||
impl std::convert::Into<crate::data::movement_list::MechLegData> for MechLegData {
|
||||
fn into(self) -> crate::data::movement_list::MechLegData {
|
||||
impl std::convert::From<MechLegData> for crate::data::movement_list::MechLegData {
|
||||
fn from(val: MechLegData) -> Self {
|
||||
crate::data::movement_list::MechLegData {
|
||||
time_grounded_after_jump_light: self.time_grounded_after_jump_light,
|
||||
time_grounded_after_jump_heavy: self.time_grounded_after_jump_heavy,
|
||||
jump_height_light: self.jump_height_light,
|
||||
jump_height_heavy: self.jump_height_heavy,
|
||||
turn_acceleration_light: self.turn_acceleration_light,
|
||||
turn_acceleration_heavy: self.turn_acceleration_heavy,
|
||||
legacy_turn_acceleration_light: self.legacy_turn_acceleration_light,
|
||||
legacy_turn_acceleration_heavy: self.legacy_turn_acceleration_heavy,
|
||||
long_jump_speed_scale_light: self.long_jump_speed_scale_light,
|
||||
long_jump_speed_scale_heavy: self.long_jump_speed_scale_heavy,
|
||||
max_lateral_force_light: self.max_lateral_force_light,
|
||||
max_lateral_force_heavy: self.max_lateral_force_heavy,
|
||||
max_damping_force_light: self.max_damping_force_light,
|
||||
max_damping_force_heavy: self.max_damping_force_heavy,
|
||||
time_grounded_after_jump_light: val.time_grounded_after_jump_light,
|
||||
time_grounded_after_jump_heavy: val.time_grounded_after_jump_heavy,
|
||||
jump_height_light: val.jump_height_light,
|
||||
jump_height_heavy: val.jump_height_heavy,
|
||||
turn_acceleration_light: val.turn_acceleration_light,
|
||||
turn_acceleration_heavy: val.turn_acceleration_heavy,
|
||||
legacy_turn_acceleration_light: val.legacy_turn_acceleration_light,
|
||||
legacy_turn_acceleration_heavy: val.legacy_turn_acceleration_heavy,
|
||||
long_jump_speed_scale_light: val.long_jump_speed_scale_light,
|
||||
long_jump_speed_scale_heavy: val.long_jump_speed_scale_heavy,
|
||||
max_lateral_force_light: val.max_lateral_force_light,
|
||||
max_lateral_force_heavy: val.max_lateral_force_heavy,
|
||||
max_damping_force_light: val.max_damping_force_light,
|
||||
max_damping_force_heavy: val.max_damping_force_heavy,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -407,17 +407,17 @@ pub struct TankTrackData {
|
||||
pub lateral_acceleration_heavy: f32,
|
||||
}
|
||||
|
||||
impl std::convert::Into<crate::data::movement_list::TankTrackData> for TankTrackData {
|
||||
fn into(self) -> crate::data::movement_list::TankTrackData {
|
||||
impl std::convert::From<TankTrackData> for crate::data::movement_list::TankTrackData {
|
||||
fn from(val: TankTrackData) -> Self {
|
||||
crate::data::movement_list::TankTrackData {
|
||||
max_turn_rate_moving_light: self.max_turn_rate_moving_light,
|
||||
max_turn_rate_moving_heavy: self.max_turn_rate_moving_heavy,
|
||||
max_turn_rate_stopped_light: self.max_turn_rate_stopped_light,
|
||||
max_turn_rate_stopped_heavy: self.max_turn_rate_stopped_heavy,
|
||||
turn_acceleration_light: self.turn_acceleration_light,
|
||||
turn_acceleration_heavy: self.turn_acceleration_heavy,
|
||||
lateral_acceleration_light: self.lateral_acceleration_light,
|
||||
lateral_acceleration_heavy: self.lateral_acceleration_heavy,
|
||||
max_turn_rate_moving_light: val.max_turn_rate_moving_light,
|
||||
max_turn_rate_moving_heavy: val.max_turn_rate_moving_heavy,
|
||||
max_turn_rate_stopped_light: val.max_turn_rate_stopped_light,
|
||||
max_turn_rate_stopped_heavy: val.max_turn_rate_stopped_heavy,
|
||||
turn_acceleration_light: val.turn_acceleration_light,
|
||||
turn_acceleration_heavy: val.turn_acceleration_heavy,
|
||||
lateral_acceleration_light: val.lateral_acceleration_light,
|
||||
lateral_acceleration_heavy: val.lateral_acceleration_heavy,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -436,19 +436,19 @@ pub struct RotorData {
|
||||
pub level_acceleration_heavy: f32,
|
||||
}
|
||||
|
||||
impl std::convert::Into<crate::data::movement_list::RotorData> for RotorData {
|
||||
fn into(self) -> crate::data::movement_list::RotorData {
|
||||
impl std::convert::From<RotorData> for crate::data::movement_list::RotorData {
|
||||
fn from(val: RotorData) -> Self {
|
||||
crate::data::movement_list::RotorData {
|
||||
height_acceleration_light: self.height_acceleration_light,
|
||||
height_acceleration_heavy: self.height_acceleration_heavy,
|
||||
strafe_acceleration_light: self.strafe_acceleration_light,
|
||||
strafe_acceleration_heavy: self.strafe_acceleration_heavy,
|
||||
turn_acceleration_light: self.turn_acceleration_light,
|
||||
turn_acceleration_heavy: self.turn_acceleration_heavy,
|
||||
height_max_change_speed_light: self.height_max_change_speed_light,
|
||||
height_max_change_speed_heavy: self.height_max_change_speed_heavy,
|
||||
level_acceleration_light: self.level_acceleration_light,
|
||||
level_acceleration_heavy: self.level_acceleration_heavy,
|
||||
height_acceleration_light: val.height_acceleration_light,
|
||||
height_acceleration_heavy: val.height_acceleration_heavy,
|
||||
strafe_acceleration_light: val.strafe_acceleration_light,
|
||||
strafe_acceleration_heavy: val.strafe_acceleration_heavy,
|
||||
turn_acceleration_light: val.turn_acceleration_light,
|
||||
turn_acceleration_heavy: val.turn_acceleration_heavy,
|
||||
height_max_change_speed_light: val.height_max_change_speed_light,
|
||||
height_max_change_speed_heavy: val.height_max_change_speed_heavy,
|
||||
level_acceleration_light: val.level_acceleration_light,
|
||||
level_acceleration_heavy: val.level_acceleration_heavy,
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user