Added "swap_eyes" handling.

Author: DuFF14

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

@@ -55,6 +55,12 @@ public string Note
         get { return _note; }
         set { _note = value; }
     }
+    private int _numDisplays = 1;
+    public int NumDisplays
+    {
+        get { return _numDisplays; }
+        set { _numDisplays = value; }
+    }
     //field of view
     private float _monocularHorizontal = 60f;
     public float MonocularHorizontal
@@ -105,12 +111,13 @@ public string DisplayMode
         get { return _displayMode; }
         set { _displayMode = value; }
     }
-    private int _numDisplays = 1;
-    public int NumDisplays
+    private int _swapEyes = 0;
+    public int SwapEyes
     {
-        get { return _numDisplays; }
-        set { _numDisplays = value; }
+        get { return _swapEyes; }
+        set { _swapEyes = value; }
     }
+    
     //distortion
     private float _k1Red = 0;
     public float K1Red
@@ -166,8 +173,8 @@ public int Rotate180
     //constructors
     public DeviceDescriptor() { }
     public DeviceDescriptor(string vendor, string model, string version, int numDisplays, string note, float monocularHorizontal, 
-        float monocularVertical, float overlapPercent, float pitchTilt, int width, int height, int videoInputs, string displayMode, float k1Red, 
-        float k1Green, float k1Blue, float leftRoll, float rightRoll, float centerProjX, float centerProjY, int rotate180)
+        float monocularVertical, float overlapPercent, float pitchTilt, int width, int height, int videoInputs, string displayMode, int swapEyes,
+        float k1Red, float k1Green, float k1Blue, float leftRoll, float rightRoll, float centerProjX, float centerProjY, int rotate180)
     {
         this._vendor = vendor;
         this._model = model;
@@ -182,6 +189,7 @@ public DeviceDescriptor(string vendor, string model, string version, int numDisp
         this._height = height;
         this._videoInputs = videoInputs;
         this._displayMode = displayMode;
+        this._swapEyes = swapEyes;
         this._k1Red = k1Red;
         this._k1Green = k1Green;
         this._k1Blue = k1Blue;
@@ -213,6 +221,7 @@ public override string ToString()
         .Append("height = ").AppendLine(Height.ToString())
         .Append("video_inputs = ").AppendLine(VideoInputs.ToString())
         .Append("display_mode = ").AppendLine(DisplayMode)
+        .Append("swapEyes = ").AppendLine(SwapEyes.ToString())
         .Append("\nDISTORTION\n")
         .Append("k1_red = ").AppendLine(K1Red.ToString())
         .Append("k1_green = ").AppendLine(K1Green.ToString())
@@ -301,7 +310,10 @@ public static DeviceDescriptor Parse(string deviceDescriptorJson)
                         break;
                     case "display_mode":
                         deviceDescriptor.DisplayMode = reader.ReadAsString();
-                        break;                   
+                        break;
+                    case "swapeyes":
+                        deviceDescriptor.SwapEyes = int.Parse(reader.ReadAsString());
+                        break;
                     case "k1_red":
                         deviceDescriptor.K1Red = float.Parse(reader.ReadAsString());
                         break;

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

@@ -48,6 +48,7 @@ public class VRHead : MonoBehaviour
             #region Private Variables
             private VREye _leftEye;
             private VREye _rightEye;
+            private bool swapEyes = false;
             private float _previousStereoAmount;
             private ViewMode _previousViewMode;
             private Camera _camera;
@@ -146,8 +147,8 @@ void UpdateStereoAmount()
                 if (stereoAmount != _previousStereoAmount)
                 {
                     stereoAmount = Mathf.Clamp(stereoAmount, 0, 1);
-                    _rightEye.cachedTransform.localPosition = Vector3.right * (maxStereo * stereoAmount);
-                    _leftEye.cachedTransform.localPosition = Vector3.left * (maxStereo * stereoAmount);
+                    _rightEye.cachedTransform.localPosition = (swapEyes ? Vector3.left : Vector3.right) * (maxStereo * stereoAmount);
+                    _leftEye.cachedTransform.localPosition = (swapEyes ? Vector3.right : Vector3.left) * (maxStereo * stereoAmount);
                     _previousStereoAmount = stereoAmount;                  
                 }
             }
@@ -206,7 +207,7 @@ void Init()
             /// </summary>
             private void GetDeviceDescription()
             {
-                _deviceDescriptor = GetComponent<DisplayInterface>().GetDeviceDescription();              
+                _deviceDescriptor = GetComponent<DisplayInterface>().GetDeviceDescription();
                 if (_deviceDescriptor != null)
                 {
                     switch (_deviceDescriptor.DisplayMode)
@@ -220,6 +221,7 @@ private void GetDeviceDescription()
                             viewMode = ViewMode.stereo;
                             break;
                     }
+                    swapEyes = _deviceDescriptor.SwapEyes > 0; //swap left and right eye positions?
                     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