Skip to content

Commit 34fd6f1

Browse files
committed
Merge pull request #71 from OSVR/clientKitRenderParams
Unity now retrieves the output of the computational display model from the OSVR-Core API
2 parents e98758a + 5e8feb9 commit 34fd6f1

22 files changed

+763
-3142
lines changed

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

Lines changed: 9 additions & 195 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,5 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3-
--- !u!1 &131732
4-
GameObject:
5-
m_ObjectHideFlags: 0
6-
m_PrefabParentObject: {fileID: 0}
7-
m_PrefabInternal: {fileID: 100100000}
8-
serializedVersion: 4
9-
m_Component:
10-
- 4: {fileID: 431732}
11-
- 114: {fileID: 11431730}
12-
- 20: {fileID: 2017596}
13-
m_Layer: 0
14-
m_Name: RightEye
15-
m_TagString: Untagged
16-
m_Icon: {fileID: 0}
17-
m_NavMeshLayer: 0
18-
m_StaticEditorFlags: 0
19-
m_IsActive: 1
20-
--- !u!1 &131734
21-
GameObject:
22-
m_ObjectHideFlags: 0
23-
m_PrefabParentObject: {fileID: 0}
24-
m_PrefabInternal: {fileID: 100100000}
25-
serializedVersion: 4
26-
m_Component:
27-
- 4: {fileID: 431734}
28-
- 114: {fileID: 11431732}
29-
- 20: {fileID: 2017594}
30-
m_Layer: 0
31-
m_Name: LeftEye
32-
m_TagString: Untagged
33-
m_Icon: {fileID: 0}
34-
m_NavMeshLayer: 0
35-
m_StaticEditorFlags: 0
36-
m_IsActive: 1
373
--- !u!1 &131736
384
GameObject:
395
m_ObjectHideFlags: 0
@@ -42,42 +8,15 @@ GameObject:
428
serializedVersion: 4
439
m_Component:
4410
- 4: {fileID: 431736}
45-
- 20: {fileID: 2031736}
46-
- 81: {fileID: 8131736}
47-
- 114: {fileID: 11431734}
48-
- 114: {fileID: 11431736}
49-
- 114: {fileID: 11400556}
11+
- 20: {fileID: 2065472}
12+
- 114: {fileID: 11463916}
5013
m_Layer: 0
5114
m_Name: VRDisplayTracked
52-
m_TagString: Untagged
15+
m_TagString: MainCamera
5316
m_Icon: {fileID: 0}
5417
m_NavMeshLayer: 0
5518
m_StaticEditorFlags: 0
5619
m_IsActive: 1
57-
--- !u!4 &431732
58-
Transform:
59-
m_ObjectHideFlags: 1
60-
m_PrefabParentObject: {fileID: 0}
61-
m_PrefabInternal: {fileID: 100100000}
62-
m_GameObject: {fileID: 131732}
63-
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
64-
m_LocalPosition: {x: 0, y: 0, z: 0}
65-
m_LocalScale: {x: 1, y: 1, z: 1}
66-
m_Children: []
67-
m_Father: {fileID: 431736}
68-
m_RootOrder: 1
69-
--- !u!4 &431734
70-
Transform:
71-
m_ObjectHideFlags: 1
72-
m_PrefabParentObject: {fileID: 0}
73-
m_PrefabInternal: {fileID: 100100000}
74-
m_GameObject: {fileID: 131734}
75-
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
76-
m_LocalPosition: {x: 0, y: 0, z: 0}
77-
m_LocalScale: {x: 1, y: 1, z: 1}
78-
m_Children: []
79-
m_Father: {fileID: 431736}
80-
m_RootOrder: 0
8120
--- !u!4 &431736
8221
Transform:
8322
m_ObjectHideFlags: 1
@@ -87,76 +26,10 @@ Transform:
8726
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
8827
m_LocalPosition: {x: 0, y: 0, z: 0}
8928
m_LocalScale: {x: 1, y: 1, z: 1}
90-
m_Children:
91-
- {fileID: 431734}
92-
- {fileID: 431732}
29+
m_Children: []
9330
m_Father: {fileID: 0}
9431
m_RootOrder: 0
95-
--- !u!20 &2017594
96-
Camera:
97-
m_ObjectHideFlags: 1
98-
m_PrefabParentObject: {fileID: 0}
99-
m_PrefabInternal: {fileID: 100100000}
100-
m_GameObject: {fileID: 131734}
101-
m_Enabled: 1
102-
serializedVersion: 2
103-
m_ClearFlags: 1
104-
m_BackGroundColor: {r: .192156866, g: .301960796, b: .474509805, a: .0196078438}
105-
m_NormalizedViewPortRect:
106-
serializedVersion: 2
107-
x: 0
108-
y: 0
109-
width: 1
110-
height: 1
111-
near clip plane: .300000012
112-
far clip plane: 1000
113-
field of view: 60
114-
orthographic: 0
115-
orthographic size: 5
116-
m_Depth: 0
117-
m_CullingMask:
118-
serializedVersion: 2
119-
m_Bits: 4294967295
120-
m_RenderingPath: -1
121-
m_TargetTexture: {fileID: 0}
122-
m_TargetDisplay: 0
123-
m_HDR: 0
124-
m_OcclusionCulling: 1
125-
m_StereoConvergence: 10
126-
m_StereoSeparation: .0219999999
127-
--- !u!20 &2017596
128-
Camera:
129-
m_ObjectHideFlags: 1
130-
m_PrefabParentObject: {fileID: 0}
131-
m_PrefabInternal: {fileID: 100100000}
132-
m_GameObject: {fileID: 131732}
133-
m_Enabled: 1
134-
serializedVersion: 2
135-
m_ClearFlags: 1
136-
m_BackGroundColor: {r: .192156866, g: .301960796, b: .474509805, a: .0196078438}
137-
m_NormalizedViewPortRect:
138-
serializedVersion: 2
139-
x: 0
140-
y: 0
141-
width: 1
142-
height: 1
143-
near clip plane: .300000012
144-
far clip plane: 1000
145-
field of view: 60
146-
orthographic: 0
147-
orthographic size: 5
148-
m_Depth: 0
149-
m_CullingMask:
150-
serializedVersion: 2
151-
m_Bits: 4294967295
152-
m_RenderingPath: -1
153-
m_TargetTexture: {fileID: 0}
154-
m_TargetDisplay: 0
155-
m_HDR: 0
156-
m_OcclusionCulling: 1
157-
m_StereoConvergence: 10
158-
m_StereoSeparation: .0219999999
159-
--- !u!20 &2031736
32+
--- !u!20 &2065472
16033
Camera:
16134
m_ObjectHideFlags: 1
16235
m_PrefabParentObject: {fileID: 0}
@@ -165,7 +38,7 @@ Camera:
16538
m_Enabled: 1
16639
serializedVersion: 2
16740
m_ClearFlags: 1
168-
m_BackGroundColor: {r: .257352948, g: .257352948, b: .257352948, a: .0196078438}
41+
m_BackGroundColor: {r: .192156866, g: .301960796, b: .474509805, a: .0196078438}
16942
m_NormalizedViewPortRect:
17043
serializedVersion: 2
17144
x: 0
@@ -177,7 +50,7 @@ Camera:
17750
field of view: 60
17851
orthographic: 0
17952
orthographic size: 5
180-
m_Depth: 1
53+
m_Depth: 0
18154
m_CullingMask:
18255
serializedVersion: 2
18356
m_Bits: 4294967295
@@ -188,76 +61,17 @@ Camera:
18861
m_OcclusionCulling: 1
18962
m_StereoConvergence: 10
19063
m_StereoSeparation: .0219999999
191-
--- !u!81 &8131736
192-
AudioListener:
193-
m_ObjectHideFlags: 1
194-
m_PrefabParentObject: {fileID: 0}
195-
m_PrefabInternal: {fileID: 100100000}
196-
m_GameObject: {fileID: 131736}
197-
m_Enabled: 1
198-
--- !u!114 &11400556
199-
MonoBehaviour:
200-
m_ObjectHideFlags: 1
201-
m_PrefabParentObject: {fileID: 0}
202-
m_PrefabInternal: {fileID: 100100000}
203-
m_GameObject: {fileID: 131736}
204-
m_Enabled: 1
205-
m_EditorHideFlags: 0
206-
m_Script: {fileID: 11500000, guid: a288e4aec9950634b83d232abc73d1bb, type: 3}
207-
m_Name:
208-
m_EditorClassIdentifier:
209-
--- !u!114 &11431730
210-
MonoBehaviour:
211-
m_ObjectHideFlags: 1
212-
m_PrefabParentObject: {fileID: 0}
213-
m_PrefabInternal: {fileID: 100100000}
214-
m_GameObject: {fileID: 131732}
215-
m_Enabled: 1
216-
m_EditorHideFlags: 0
217-
m_Script: {fileID: 11500000, guid: 490e571217a2247e395abfef67b70c89, type: 3}
218-
m_Name:
219-
m_EditorClassIdentifier:
220-
eye: 1
221-
cachedTransform: {fileID: 0}
222-
--- !u!114 &11431732
223-
MonoBehaviour:
224-
m_ObjectHideFlags: 1
225-
m_PrefabParentObject: {fileID: 0}
226-
m_PrefabInternal: {fileID: 100100000}
227-
m_GameObject: {fileID: 131734}
228-
m_Enabled: 1
229-
m_EditorHideFlags: 0
230-
m_Script: {fileID: 11500000, guid: 490e571217a2247e395abfef67b70c89, type: 3}
231-
m_Name:
232-
m_EditorClassIdentifier:
233-
eye: 0
234-
cachedTransform: {fileID: 0}
235-
--- !u!114 &11431734
236-
MonoBehaviour:
237-
m_ObjectHideFlags: 1
238-
m_PrefabParentObject: {fileID: 0}
239-
m_PrefabInternal: {fileID: 100100000}
240-
m_GameObject: {fileID: 131736}
241-
m_Enabled: 1
242-
m_EditorHideFlags: 0
243-
m_Script: {fileID: 11500000, guid: 425e251a3200841b98a61cd7234fc119, type: 3}
244-
m_Name:
245-
m_EditorClassIdentifier:
246-
viewMode: 0
247-
stereoAmount: 1
248-
maxStereo: .0299999993
249-
--- !u!114 &11431736
64+
--- !u!114 &11463916
25065
MonoBehaviour:
25166
m_ObjectHideFlags: 1
25267
m_PrefabParentObject: {fileID: 0}
25368
m_PrefabInternal: {fileID: 100100000}
25469
m_GameObject: {fileID: 131736}
25570
m_Enabled: 1
25671
m_EditorHideFlags: 0
257-
m_Script: {fileID: 11500000, guid: d819a5e6a69cc5c46be733d8a56d387e, type: 3}
72+
m_Script: {fileID: 11500000, guid: c2b982789045b4641a4c4898908314b3, type: 3}
25873
m_Name:
25974
m_EditorClassIdentifier:
260-
path: /me/head
26175
--- !u!1001 &100100000
26276
Prefab:
26377
m_ObjectHideFlags: 1

0 commit comments

Comments
 (0)