Merge branch 'master' of https://github.com/JackD83/ALVR

alvr-org · Oct 13, 2020 · 9b9bc00 · 9b9bc00
2 parents 7f999b9 + a60f470
commit 9b9bc00
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 41 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/alvr/server_driver/Cargo.toml b/alvr/server_driver/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = 'alvr_server_driver'
-version = "12.3.0"
+version = "12.4.0"
 authors = ['Riccardo Zaglia <[email protected]>']
 license = 'MIT'
 edition = '2018'

diff --git a/alvr/web_server/src/main.rs b/alvr/web_server/src/main.rs
@@ -108,6 +108,28 @@ async fn client_discovery(session_manager: Arc<Mutex<SessionManager>>) {
             }
         }
 
+        // patch for Oculus Quest 2
+        {
+            let session_manager_ref = &mut session_manager.lock().unwrap();
+            let session_desc_ref = &mut session_manager_ref
+                .get_mut(SERVER_SESSION_UPDATE_ID, SessionUpdateType::Settings);
+
+            session_desc_ref.settings_cache.video.eye_fov = [
+                FovDefault {
+                    left: client_handshake_packet.client_fov[0].left,
+                    right: client_handshake_packet.client_fov[0].right,
+                    top: client_handshake_packet.client_fov[0].top,
+                    bottom: client_handshake_packet.client_fov[0].bottom,
+                },
+                FovDefault {
+                    left: client_handshake_packet.client_fov[1].left,
+                    right: client_handshake_packet.client_fov[1].right,
+                    top: client_handshake_packet.client_fov[1].top,
+                    bottom: client_handshake_packet.client_fov[1].bottom,
+                },
+            ];
+        }
+
         let settings = session_manager.lock().unwrap().get().to_settings();
 
         let video_width;