Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'lboklin/fix-ori' into 'master'

Browse Source 
Fix ori rate cap

See merge request veloren/veloren!2230
This commit is contained in:
Samuel Keiffer 2021-04-30 18:24:49 +00:00
commit a37174d6f2
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/src/states/glide.rs
View File

@ -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 = {

2
common/src/states/utils.rs
View File

@ -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));
};
}