Fix to compensate for roll and overlap. Need to test with dSight.

Author: DuFF14

OSVR-Unity/Assets/OSVRUnity/src/VREye.cs

@@ -54,17 +54,19 @@ void Awake()
             #region Public Methods
             public void MatchCamera(Camera sourceCamera)
             {
-
-                /*camera.nearClipPlane = sourceCamera.nearClipPlane;
-                camera.farClipPlane = sourceCamera.farClipPlane;
-                camera.backgroundColor = sourceCamera.backgroundColor;
-                camera.clearFlags = sourceCamera.clearFlags;
-                camera.cullingMask = sourceCamera.cullingMask;*/
                 _camera.CopyFrom(sourceCamera);
                 SetViewportRects();
             }
-
-
+            //rotate each eye outward
+            public void SetEyeRotationY(float y)
+            {
+                cachedTransform.Rotate(0, y, 0, Space.Self);
+            }
+            //set the z rotation of the eye
+            public void SetEyeRoll(float rollAmount)
+            {
+                cachedTransform.Rotate(0, 0, rollAmount, Space.Self);
+            }
             #endregion
 
             #region Private Methods
@@ -95,7 +97,10 @@ private void SetViewportRects()
                         break;
                 }
             }
+            
             #endregion
+
+            
         }
     }
 }

OSVR-Unity/Assets/OSVRUnity/src/VRHead.cs

@@ -51,16 +51,24 @@ public class VRHead : MonoBehaviour
             float _previousStereoAmount;
             ViewMode _previousViewMode;
             private Camera _camera;
+            private DeviceDescriptor _deviceDescriptor;
             #endregion
 
             #region Init
             void Start()
             {
                 Init();
-                GetDeviceDescription();
                 CatalogEyes();
+                GetDeviceDescription();
+                MatchEyes(); //copy camera properties to each eye
+                //rotate each eye based on overlap percent, must do this after match eyes
+                if (_deviceDescriptor != null)
+                {
+                    SetEyeRotation(_deviceDescriptor.OverlapPercent, _deviceDescriptor.MonocularHorizontal);
+                    SetEyeRoll(_deviceDescriptor.LeftRoll, _deviceDescriptor.RightRoll);
+                }
+                
             }
-
             #endregion
 
             #region Loop
@@ -109,13 +117,11 @@ void UpdateStereoAmount()
                 }
             }
 
+            //this function finds and initializes each eye
             void CatalogEyes()
             {
                 foreach (VREye currentEye in GetComponentsInChildren<VREye>())
                 {
-                    //match:
-                    currentEye.MatchCamera(_camera);
-
                     //catalog:
                     switch (currentEye.eye)
                     {
@@ -130,6 +136,16 @@ void CatalogEyes()
                 }
             }
 
+            //this function matches the camera on each eye to the camera on the head
+            void MatchEyes()
+            {
+                foreach (VREye currentEye in GetComponentsInChildren<VREye>())
+                {
+                    //match:
+                    currentEye.MatchCamera(_camera);
+                }
+            }
+
             void Init()
             {
                 if (_camera == null)
@@ -153,11 +169,11 @@ void Init()
             /// </summary>
             private void GetDeviceDescription()
             {
-                DeviceDescriptor deviceDescriptor = GetComponent<DisplayInterface>().GetDeviceDescription();
+                _deviceDescriptor = GetComponent<DisplayInterface>().GetDeviceDescription();
                // Debug.Log(deviceDescriptor.ToString());
-                if (deviceDescriptor != null)
+                if (_deviceDescriptor != null)
                 {
-                    switch (deviceDescriptor.DisplayMode)
+                    switch (_deviceDescriptor.DisplayMode)
                     {
                         case "full_screen":
                             viewMode = ViewMode.mono;
@@ -168,12 +184,12 @@ private void GetDeviceDescription()
                             viewMode = ViewMode.stereo;
                             break;
                     }
-                    stereoAmount = Mathf.Clamp(deviceDescriptor.OverlapPercent, 0, 100);
-                    _camera.fieldOfView = Mathf.Clamp(deviceDescriptor.MonocularVertical, 0, 180); //unity camera FOV is vertical
-                    SetResolution(deviceDescriptor.Width, deviceDescriptor.Height);
-
+                    stereoAmount = Mathf.Clamp(_deviceDescriptor.OverlapPercent, 0, 100);
+                    SetResolution(_deviceDescriptor.Width, _deviceDescriptor.Height); //set resolution before FOV
+                    _camera.fieldOfView = Mathf.Clamp(_deviceDescriptor.MonocularVertical, 0, 180); //unity camera FOV is vertical
+            
                     //if the view needs to be rotated 180 degrees, create a parent game object that is flipped 180 degrees on the z axis.
-                    if (deviceDescriptor.Rotate180 > 0)
+                    if (_deviceDescriptor.Rotate180 > 0)
                     {
                         GameObject vrHeadParent = new GameObject();
                         vrHeadParent.name = this.transform.name + "_parent";
@@ -200,6 +216,48 @@ private void SetResolution(int width, int height)
                 UnityEditor.PlayerSettings.defaultIsFullScreen = true;
 #endif
             }
+            
+            //rotate each eye based on overlap percent and horizontal FOV
+            //Formula: ((OverlapPercent/100) * hFOV)/2
+            private void SetEyeRotation(float overlapPercent, float horizontalFov)
+            {
+                float overlap = overlapPercent* .01f * horizontalFov * 0.5f;
+                
+                //with a 90 degree FOV with 100% overlap, the eyes should not be rotated
+                //compare rotationY with half of FOV
+
+                float halfFOV = horizontalFov * 0.5f;
+                float rotateYAmount = Mathf.Abs(overlap - halfFOV);
+
+                foreach (VREye currentEye in GetComponentsInChildren<VREye>())
+                {
+                    switch (currentEye.eye)
+                    {
+                        case Eye.left:
+                            _leftEye.SetEyeRotationY(-rotateYAmount);
+                            break;
+                        case Eye.right:
+                            _rightEye.SetEyeRotationY(rotateYAmount);
+                            break;
+                    }
+                }
+            }
+            //rotate each eye on the z axis by the specified amount, in degrees
+            private void SetEyeRoll(float leftRoll, float rightRoll)
+            {
+                foreach (VREye currentEye in GetComponentsInChildren<VREye>())
+                {
+                    switch (currentEye.eye)
+                    {
+                        case Eye.left:
+                            _leftEye.SetEyeRoll(leftRoll);
+                            break;
+                        case Eye.right:
+                            _rightEye.SetEyeRoll(rightRoll);
+                            break;
+                    }
+                }
+            }
             #endregion
         }
     }