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

Fixed rolling angles

Browse Source
This commit is contained in:
Joshua Barretto 2023-10-12 15:12:23 +01:00
parent 1c6aa4a53e
commit 148069b4ad
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
voxygen/anim/src/character/roll.rs
View File

@ -265,17 +265,18 @@ impl Animation for RollAnimation {
// This is *slightly* hacky. Because rolling is not strafed movement, we
// actually correct for the entity orientation to make sure that our
// rolling motion is correct with respect to our original orientation
let move_dir = Quaternion::<f32>::from_vec4(
Dir::new(orientation.into_array().into())
.rotation()
.into_vec4()
.into_array()
.into(),
);
let aim_dir = Quaternion::<f32>::from_vec4(
prev_aimed_dir.rotation().into_vec4().into_array().into(),
);
roll_spin * move_dir.inverse() * aim_dir
roll_spin
* Dir::from_unnormalized(orientation.into_array().into())
.zip(prev_aimed_dir.to_horizontal())
.map(|(ori, prev_aimed_dir)| {
Quaternion::<f32>::from_vec4(
ori.rotation_between(prev_aimed_dir)
.into_vec4()
.into_array()
.into(),
)
})
.unwrap_or_default()
} else {
roll_spin * Quaternion::rotation_z(tilt * -10.0)
};