From 2125d60a4e541d3b7d785adc3e04b9c6895cd12a Mon Sep 17 00:00:00 2001
From: Lubosz Sarnecki <lubosz@gmail.com>
Date: Sun, 10 Mar 2024 21:02:57 +0100
Subject: [PATCH] Context: Maintain orientation of eye offset matrix.

---
 libraries/gpu/src/gpu/Context.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/libraries/gpu/src/gpu/Context.cpp b/libraries/gpu/src/gpu/Context.cpp
index 8dee120555..e5d1f87cd4 100644
--- a/libraries/gpu/src/gpu/Context.cpp
+++ b/libraries/gpu/src/gpu/Context.cpp
@@ -238,10 +238,14 @@ const Backend::TransformCamera& Backend::TransformCamera::recomputeDerived(const
 Backend::TransformCamera Backend::TransformCamera::getEyeCamera(int eye, const StereoState& _stereo, const Transform& xformView, Vec2 normalizedJitter) const {
     TransformCamera result = *this;
     Transform offsetTransform = xformView;
-    if (!_stereo._skybox) {
-        offsetTransform.postTranslate(-Vec3(_stereo._eyeViews[eye][3]));
+    glm::vec3 eyePosition = extractTranslation(_stereo._eyeViews[eye]);
+    glm::quat eyeOrientation = glmExtractRotation(_stereo._eyeViews[eye]);
+    if (!_stereo._skybox)
+    {
+        offsetTransform.postRotate(eyeOrientation).postTranslate(eyePosition);
     } else {
         // FIXME: If "skybox" the ipd is set to 0 for now, let s try to propose a better solution for this in the future
+        offsetTransform.postRotate(eyeOrientation);
     }
     result._projection = _stereo._eyeProjections[eye];
     normalizedJitter.x *= 2.0f;