Merge pull request #30 from DuFF14/Distortion

Distortion correction (requires Unity 5 or Unity 4 Pro - warns but still runs in Unity 4 free) and improvements to display json

Author: rpavlik

OSVR-Unity/Assets/OSVRUnity/Displays/Sensics_dSight_landscape.json

@@ -13,12 +13,6 @@
       "pitch_tilt": 0
     },
     "resolutions": [
-      {
-        "width": 1920,
-        "height": 1080,
-        "video_inputs": 2,
-        "display_mode": "full_screen"
-      },
       {
         "width": 1920,
         "height": 1080,
@@ -27,9 +21,9 @@
       }
     ],
     "distortion": {
-      "k1_red": 0,
-      "k1_green": 0,
-      "k1_blue": 0
+			"k1_red": 0.5,
+			"k1_green": 0.5,
+			"k1_blue": 0.5
     },
     "rendering": {
       "right_roll": 0,
@@ -42,4 +36,4 @@
       }
     ]
   }
-}
+}

OSVR-Unity/Assets/OSVRUnity/Prefabs/VRDisplayTracked.prefab

@@ -9,6 +9,7 @@ GameObject:
   m_Component:
   - 4: {fileID: 431732}
   - 114: {fileID: 11431730}
+  - 20: {fileID: 2017596}
   m_Layer: 0
   m_Name: RightEye
   m_TagString: Untagged
@@ -25,6 +26,7 @@ GameObject:
   m_Component:
   - 4: {fileID: 431734}
   - 114: {fileID: 11431732}
+  - 20: {fileID: 2017594}
   m_Layer: 0
   m_Name: LeftEye
   m_TagString: Untagged
@@ -45,6 +47,7 @@ GameObject:
   - 114: {fileID: 11431734}
   - 114: {fileID: 11431736}
   - 114: {fileID: 11400556}
+  - 114: {fileID: 11417594}
   m_Layer: 0
   m_Name: VRDisplayTracked
   m_TagString: Untagged
@@ -90,6 +93,70 @@ Transform:
   - {fileID: 431732}
   m_Father: {fileID: 0}
   m_RootOrder: 0
+--- !u!20 &2017594
+Camera:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 131734}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 1
+  m_BackGroundColor: {r: .192156866, g: .301960796, b: .474509805, a: .0196078438}
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: .300000012
+  far clip plane: 1000
+  field of view: 60
+  orthographic: 0
+  orthographic size: 5
+  m_Depth: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_HDR: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: .0219999999
+--- !u!20 &2017596
+Camera:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 131732}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 1
+  m_BackGroundColor: {r: .192156866, g: .301960796, b: .474509805, a: .0196078438}
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: .300000012
+  far clip plane: 1000
+  field of view: 60
+  orthographic: 0
+  orthographic size: 5
+  m_Depth: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_HDR: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: .0219999999
 --- !u!20 &2031736
 Camera:
   m_ObjectHideFlags: 1
@@ -106,7 +173,7 @@ Camera:
     y: 0
     width: 1
     height: 1
-  near clip plane: .300000012
+  near clip plane: .00999999978
   far clip plane: 1000
   field of view: 60
   orthographic: 0
@@ -141,6 +208,24 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   JsonDescriptorFile: {fileID: 4900000, guid: 903a53a7997a82c42b329c472b623a4e, type: 3}
+--- !u!114 &11417594
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 131736}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: db80e57e78593b64384f21c9a3022b68, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  k1Red: 0
+  k1Green: 0
+  k1Blue: 0
+  fullCenter: {x: .5, y: .5}
+  leftCenter: {x: .5, y: .5}
+  rightCenter: {x: .5, y: .5}
+  distortionShader: {fileID: 4800000, guid: 1dffc394b375bda49bb119de26c0bb35, type: 3}
 --- !u!114 &11431730
 MonoBehaviour:
   m_ObjectHideFlags: 1