From cc7f0f3ac291489327d3e352c262155476954caa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludvig=20B=C3=B6klin?= Date: Fri, 30 Apr 2021 13:58:11 +0200 Subject: [PATCH] Fix ori --- common/src/states/glide.rs | 8 ++++---- common/src/states/utils.rs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/src/states/glide.rs b/common/src/states/glide.rs index 93be892c14..383d4747df 100644 --- a/common/src/states/glide.rs +++ b/common/src/states/glide.rs @@ -44,7 +44,7 @@ fn tgt_dir(data: &JoinData) -> Dir { let look_ori = Ori::from(data.inputs.look_dir); look_ori .yawed_right(PI / 3.0 * look_ori.right().xy().dot(data.inputs.move_dir)) - .pitched_up(PI * 0.05) + .pitched_up(PI * 0.04) .pitched_down( data.inputs .look_dir @@ -81,7 +81,7 @@ impl CharacterBehavior for Data { let slerp_s = { let angle = self.ori.look_dir().angle_between(*data.inputs.look_dir); let rate = 0.4 * PI / angle; - (data.dt.0 * rate).min(0.1) + (data.dt.0 * rate).min(1.0) }; Dir::from_unnormalized(air_flow.0) @@ -123,8 +123,8 @@ impl CharacterBehavior for Data { update.ori = { let slerp_s = { let angle = data.ori.look_dir().angle_between(*data.inputs.look_dir); - let rate = data.body.base_ori_rate() * PI / angle; - (data.dt.0 * rate).min(0.1) + let rate = 0.2 * data.body.base_ori_rate() * PI / angle; + (data.dt.0 * rate).min(1.0) }; let rot_from_drag = { diff --git a/common/src/states/utils.rs b/common/src/states/utils.rs index 72e497601b..e43ecc461f 100644 --- a/common/src/states/utils.rs +++ b/common/src/states/utils.rs @@ -320,7 +320,7 @@ pub fn handle_orientation(data: &JoinData, update: &mut StateUpdate, efficiency: }; update.ori = update .ori - .slerped_towards(dir.into(), (data.dt.0 * rate).min(0.1)); + .slerped_towards(dir.into(), (data.dt.0 * rate).min(1.0)); }; }