From 51c4b311325b6ce05f21011a8c32ab9c18dd28af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludvig=20B=C3=B6klin?= <ludvig.boklin@protonmail.com>
Date: Thu, 20 May 2021 15:49:07 +0200
Subject: [PATCH] Prevent auto-glide from pitching too high up

---
 voxygen/src/session/mod.rs | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/voxygen/src/session/mod.rs b/voxygen/src/session/mod.rs
index c66d0cfcb1..87fc07c724 100644
--- a/voxygen/src/session/mod.rs
+++ b/voxygen/src/session/mod.rs
@@ -753,8 +753,10 @@ impl PlayState for SessionState {
             }
 
             // 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())
+                .filter(|client| client.is_gliding())
                 .and_then(|client| {
                     let ecs = client.state().ecs();
                     let entity = client.entity();
@@ -766,10 +768,23 @@ impl PlayState for SessionState {
                         .get(entity)
                         .map(|vel| fluid.relative_flow(vel).0)
                         .map(|rel_flow| {
+                            let is_wind_downwards = rel_flow.dot(Vec3::unit_z()).is_sign_negative();
                             if !self.free_look {
-                                Plane::from(Dir::new(self.scene.camera().right())).projection(
-                                    rel_flow * self.inputs.look_dir.dot(rel_flow).signum(),
-                                )
+                                if is_wind_downwards {
+                                    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 {
                                 -rel_flow
                             }