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

Fix issue with nonsensical glider roll

Browse Source
This commit is contained in:
Ludvig Böklin 2021-06-06 13:27:43 +02:00
parent 1c1b0b0a8e
commit 798f4b76b0
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,14 +84,15 @@ impl Data {
.map_or(0.0, |moving_dir| moving_dir.dot(flow_dir.to_vec()).max(0.0)), .map_or(0.0, |moving_dir| moving_dir.dot(flow_dir.to_vec()).max(0.0)),
) )
}) })
.and_then(|d| { .and_then(|dir| {
if d.dot(*char_up) > max_roll.cos() { if dir.dot(*char_up) > max_roll.cos() {
Some(d) Some(dir)
} else { } else {
char_up char_up
.cross(*d) .cross(*dir)
.try_normalized() .try_normalized()
.map(|axis| Quaternion::rotation_3d(max_roll, axis) * char_up) .map(|axis| Quaternion::rotation_3d(max_roll, axis) * char_up)
.filter(|dir| dir.dot(*self.glider.ori.up()).is_sign_positive())
} }
}) })
.unwrap_or(char_up) .unwrap_or(char_up)
@ -113,12 +114,12 @@ impl CharacterBehavior for Data {
update.character = CharacterState::Idle; update.character = CharacterState::Idle;
} else if !handle_climb(&data, &mut update) { } else if !handle_climb(&data, &mut update) {
// Tweaks // Tweaks
let def_pitch = MAX_LIFT_DRAG_RATIO_AOA * tweak!(1.0); let def_pitch = MAX_LIFT_DRAG_RATIO_AOA * tweak!(2.0);
let max_pitch = tweak!(0.3) * PI; let max_pitch = tweak!(0.3) * PI;
let max_roll = tweak!(0.2) * PI; let max_roll = tweak!(0.2) * PI;
let inputs_rate = tweak!(5.0); let inputs_rate = tweak!(5.0);
let look_pitch_rate = tweak!(5.0); let look_pitch_rate = tweak!(8.0);
let autoroll_rate = tweak!(5.0); let autoroll_rate = tweak!(8.0);
let yaw_correction_rate = tweak!(1.0); let yaw_correction_rate = tweak!(1.0);
let char_yaw_follow_rate = tweak!(2.0); let char_yaw_follow_rate = tweak!(2.0);
// ---- // ----