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/quat-ori' into 'master'

Browse Source 
Redefine Ori as a quaternion

See merge request veloren/veloren!1755
This commit is contained in:
Joshua Barretto
2021-02-16 22:39:11 +00:00
parent c2af25e1f6 0f1227ca7d
commit 4d19308612
29 changed files with 713 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -188,7 +188,7 @@ pub fn handle_forced_movement(
update.vel.0 += Vec2::broadcast(data.dt.0)
* accel
* (data.inputs.move_dir * efficiency + (*update.ori.0).xy() * strength);
* (data.inputs.move_dir * efficiency + Vec2::from(update.ori) * strength);
},
ForcedMovement::Leap {
vertical,
@ -231,11 +231,11 @@ pub fn handle_orientation(data: &JoinData, update: &mut StateUpdate, rate: f32)
} else if !data.inputs.move_dir.is_approx_zero() {
data.inputs.move_dir
} else {
update.ori.0.xy()
update.ori.into()
};
// Smooth orientation
update.ori.0 = Dir::slerp_to_vec3(update.ori.0, ori_dir.into(), rate * data.dt.0);
update.ori = Dir::slerp_to_vec3(update.ori.look_dir(), ori_dir.into(), rate * data.dt.0).into();
}
/// Updates components to move player as if theyre swimming