Skip to content

Client kit render params #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 64 commits into from
Sep 13, 2015
Merged

Client kit render params #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
1cb1f9c
Added DisplayConfig object to DisplayInterface class.
DuFF14 Aug 18, 2015
6066157
Added placeholder functions for getting view/projection.
DuFF14 Aug 18, 2015
5132f52
Added Render() function placeholder to VREye
DuFF14 Aug 18, 2015
822955b
Added clientKit to VRHead for initializing DisplayInterface/DisplayCo…
DuFF14 Aug 18, 2015
c5017c5
Added placeholders for setting mono camera properties from DisplayCon…
DuFF14 Aug 18, 2015
3edd715
Added EndOfFrame coroutine and OnPreCull functions.
DuFF14 Aug 18, 2015
6c12d21
Merge branch 'master' of https://github.com/OSVR/OSVR-Unity into clie…
DuFF14 Aug 18, 2015
8c694f6
Removed DisplayInterface.cs
DuFF14 Aug 18, 2015
e21171b
Added utilities to convert Viewport Rects and Projection Matrices
DuFF14 Aug 18, 2015
819527b
Removed unnecessary functionality from VREye, and added some new func…
DuFF14 Aug 18, 2015
f128729
Removed unnecessary functionality from VRHead and added new functiona…
DuFF14 Aug 18, 2015
f4d4adb
Added DisplayController.cs, which gets a DisplayConfig and sets up ou…
DuFF14 Aug 18, 2015
e67ebbc
Added VRSurface.cs, which controls rendering for an eye.
DuFF14 Aug 18, 2015
0d35ecf
Added a test scene for DisplayController.
DuFF14 Aug 18, 2015
a3ea07b
Changed RowMajor to ColumnMajor.
DuFF14 Aug 18, 2015
cc4d490
Modified some comments.
DuFF14 Aug 19, 2015
f133eeb
Returning from SetupDisplay if client context is null.
DuFF14 Aug 19, 2015
51f93eb
Setting a flag when we are able to get the display config.
DuFF14 Aug 19, 2015
32e89e9
Added some debug statements to see what we're getting from clientkit.
DuFF14 Aug 19, 2015
3460730
Comment out call to SetDistortion because it's broken right now.
DuFF14 Aug 19, 2015
62b365e
Modified and refactored VRSurface creation code.
DuFF14 Aug 19, 2015
76c9ce8
Moved Distortion from Eye to Surface.
DuFF14 Aug 19, 2015
6e08ae7
Commented out calls to get pose because it's causing crashes.
DuFF14 Aug 19, 2015
06f834c
Changed DEFAULT_VIEWER and DEFAULT_SURFACE from 1 to 0. This is why w…
DuFF14 Aug 19, 2015
31d53a8
SetDistortion no longer crashes after previous commit.
DuFF14 Aug 19, 2015
af42c8b
Make sure DisplayController has a camera and VRHead doesn't.
DuFF14 Aug 19, 2015
5140f3f
Assign Surface to Eye.
DuFF14 Aug 19, 2015
9fc459e
Modified viewport rect conversion. Apparently OSVR.ClientKit.Viewport…
DuFF14 Aug 19, 2015
414e16b
Flipflopped on this, moved dummy Camera from DisplayController to VRH…
DuFF14 Aug 19, 2015
ad064ef
Added EyeCount getter, removed OnEnable,OnDisable, and added call to …
DuFF14 Aug 19, 2015
3d7a34a
Re-enabled head and eye pose tracking, as this works now.
DuFF14 Aug 19, 2015
9f6f950
Modified ConvertViewport to construct Rect with normalized rather tha…
DuFF14 Aug 20, 2015
a337d0c
Modifed ConvertMatrix
DuFF14 Aug 20, 2015
1bffbbb
commented out code for view matrix
DuFF14 Aug 20, 2015
cf372d4
Added SetViewMatrix to VRSurface
DuFF14 Aug 20, 2015
bbd8353
Fixed viewport error.
DuFF14 Aug 20, 2015
e6cee85
Added license headers and comments
DuFF14 Aug 24, 2015
5b4319f
Added public variable for setting near and far clipping planes in the…
DuFF14 Aug 24, 2015
6eb3660
Missing meta file, there is no longer anything in this folder, howeve…
DuFF14 Aug 24, 2015
9e9e125
Modified comments.
DuFF14 Aug 25, 2015
67cac9c
Refactored VRHead to VRViewer. Added VRViewer array to DisplayControl…
DuFF14 Aug 25, 2015
c2baee8
Updating client from ClientKit.Update and ClientKit.LateUpdate
DuFF14 Aug 31, 2015
f88fa62
Moved create eye loop into create viewer loop, so we can make eyes fo…
DuFF14 Aug 31, 2015
34ebafd
Modified UpdateEyePose to take a Pose3. It will be called from VRView…
DuFF14 Aug 31, 2015
5197e92
In OnPreCull -- Updating client, then updating head pose, eye poses, …
DuFF14 Sep 1, 2015
e088ec6
Remove Surface's Eye, because it doesn't need it. Added comments to V…
DuFF14 Sep 1, 2015
8296171
Updated two demo scenes, displayController.unity isn't intended to be…
DuFF14 Sep 1, 2015
37f752e
Added DisplayController prefab which would replace VRDisplayTracked i…
DuFF14 Sep 1, 2015
0281a51
Updated VRDisplayTracked prefab so that it is now effectively a "Disp…
DuFF14 Sep 1, 2015
11a3c78
Removed VRDisplayUntracked prefab and the only demo scene where it wa…
DuFF14 Sep 1, 2015
98ef32d
Update cachedTransform instead of transform.
DuFF14 Sep 1, 2015
ce0ece0
Refactored some private member variables to have leading underscore c…
DuFF14 Sep 2, 2015
40ed05f
Removed DeviceDescriptor.cs and Newtonsoft.Json.dll. JSON parsing dis…
DuFF14 Sep 2, 2015
a76c00b
A dded a camera component to VRDisplayTracked prefab and tagged it "M…
DuFF14 Sep 2, 2015
2f80bab
Added OnPreCull and EndOfFrame coroutine, which previously in VRViewer.
DuFF14 Sep 2, 2015
ccad22d
Set Applicatoin.targetFrameRate to TARGET_FRAME_RATE const
DuFF14 Sep 2, 2015
03f540a
UpdateClient for each viewer.
DuFF14 Sep 2, 2015
507c08d
Added a bunch of comments.
DuFF14 Sep 2, 2015
9a325ec
Added VRSurface[] and surfacecount variable. Added UpdateSurfaces and…
DuFF14 Sep 2, 2015
2adb1f6
Moved SetDistortion functions to VRSurface class.
DuFF14 Sep 2, 2015
ceb50ad
Added reference to VREye for a VRSurface, added Camera requirement to…
DuFF14 Sep 2, 2015
d97dfcb
Removed dummy camera from VRViewer onto DisplayController, as well as…
DuFF14 Sep 2, 2015
f1b8819
Added call to CheckDisplayStartup and setting flag when DisplayConfig…
DuFF14 Sep 10, 2015
5e8feb9
Merge branch 'master' into clientKitRenderParams
DuFF14 Sep 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
204 changes: 9 additions & 195 deletions OSVR-Unity/Assets/OSVRUnity/Prefabs/VRDisplayTracked.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,5 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &131732
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4
m_Component:
- 4: {fileID: 431732}
- 114: {fileID: 11431730}
- 20: {fileID: 2017596}
m_Layer: 0
m_Name: RightEye
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &131734
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4
m_Component:
- 4: {fileID: 431734}
- 114: {fileID: 11431732}
- 20: {fileID: 2017594}
m_Layer: 0
m_Name: LeftEye
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &131736
GameObject:
m_ObjectHideFlags: 0
Expand All @@ -42,42 +8,15 @@ GameObject:
serializedVersion: 4
m_Component:
- 4: {fileID: 431736}
- 20: {fileID: 2031736}
- 81: {fileID: 8131736}
- 114: {fileID: 11431734}
- 114: {fileID: 11431736}
- 114: {fileID: 11400556}
- 20: {fileID: 2065472}
- 114: {fileID: 11463916}
m_Layer: 0
m_Name: VRDisplayTracked
m_TagString: Untagged
m_TagString: MainCamera
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &431732
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 131732}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 431736}
m_RootOrder: 1
--- !u!4 &431734
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 131734}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 431736}
m_RootOrder: 0
--- !u!4 &431736
Transform:
m_ObjectHideFlags: 1
Expand All @@ -87,76 +26,10 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 431734}
- {fileID: 431732}
m_Children: []
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
--- !u!20 &2065472
Camera:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
Expand All @@ -165,7 +38,7 @@ Camera:
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: .257352948, g: .257352948, b: .257352948, a: .0196078438}
m_BackGroundColor: {r: .192156866, g: .301960796, b: .474509805, a: .0196078438}
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
Expand All @@ -177,7 +50,7 @@ Camera:
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: 1
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
Expand All @@ -188,76 +61,17 @@ Camera:
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: .0219999999
--- !u!81 &8131736
AudioListener:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 131736}
m_Enabled: 1
--- !u!114 &11400556
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: a288e4aec9950634b83d232abc73d1bb, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &11431730
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 131732}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 490e571217a2247e395abfef67b70c89, type: 3}
m_Name:
m_EditorClassIdentifier:
eye: 1
cachedTransform: {fileID: 0}
--- !u!114 &11431732
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 131734}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 490e571217a2247e395abfef67b70c89, type: 3}
m_Name:
m_EditorClassIdentifier:
eye: 0
cachedTransform: {fileID: 0}
--- !u!114 &11431734
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: 425e251a3200841b98a61cd7234fc119, type: 3}
m_Name:
m_EditorClassIdentifier:
viewMode: 0
stereoAmount: 1
maxStereo: .0299999993
--- !u!114 &11431736
--- !u!114 &11463916
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: d819a5e6a69cc5c46be733d8a56d387e, type: 3}
m_Script: {fileID: 11500000, guid: c2b982789045b4641a4c4898908314b3, type: 3}
m_Name:
m_EditorClassIdentifier:
path: /me/head
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
Expand Down
Loading