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

Prevent auto-glide from pitching too high up

Browse Source
This commit is contained in:
Ludvig Böklin 2021-05-20 15:49:07 +02:00
parent 270f89db6b
commit eacc49a961
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
voxygen/src/session/mod.rs
View File

@ -753,8 +753,10 @@ impl PlayState for SessionState {
} }
// If auto-gliding, point camera into the wind // If auto-gliding, point camera into the wind
if let Some(dir) = (self.auto_walk && self.client.borrow().is_gliding()) if let Some(dir) = self
.auto_walk
.then_some(self.client.borrow()) .then_some(self.client.borrow())
.filter(|client| client.is_gliding())
.and_then(|client| { .and_then(|client| {
let ecs = client.state().ecs(); let ecs = client.state().ecs();
let entity = client.entity(); let entity = client.entity();
@ -766,10 +768,23 @@ impl PlayState for SessionState {
.get(entity) .get(entity)
.map(|vel| fluid.relative_flow(vel).0) .map(|vel| fluid.relative_flow(vel).0)
.map(|rel_flow| { .map(|rel_flow| {
let is_wind_downwards = rel_flow.dot(Vec3::unit_z()).is_sign_negative();
if !self.free_look { if !self.free_look {
Plane::from(Dir::new(self.scene.camera().right())).projection( if is_wind_downwards {
rel_flow * self.inputs.look_dir.dot(rel_flow).signum(), self.scene.camera().forward_xy().into()
) } else {
let windwards = rel_flow
* self
.scene
.camera()
.forward_xy()
.dot(rel_flow.xy())
.signum();
Plane::from(Dir::new(self.scene.camera().right()))
.projection(windwards)
}
} else if is_wind_downwards {
Vec3::from(-rel_flow.xy())
} else { } else {
-rel_flow -rel_flow
} }