Skip to content

Commit d5afd25

Browse files
committed
- Added Distortion effect to VRDisplayTracked prefab.
- Changed Near camera property from .3 to .01 on VRDisplayTracked prefab. - Changed default screen dimensions to 1920x1080 in Project Settings. - VRHead: Made private variables private. Added Property for Camera. Added Distortion effect. - VREye: Added Property for Camera. Added Distortion effect. - Changed Quality Settings: Turned on 4x AA, turned off Shadows, set default to "Good" - Changed Fixed Timestep from 0.2 to 0.016667. This should improve camera movement. - Added a new demo scene and a sky material... just wanted another scene to work in. - Added OsvrDistortion.shader, OsvrDistortion.cs, and OsvrPostEffectsBase.cs which are modified versions of Unity's Image Effect shaders/scripts. Requires Pro or Unity 5.
1 parent 4e50815 commit d5afd25

18 files changed

Lines changed: 3788 additions & 32 deletions

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

Lines changed: 86 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ GameObject:
99
m_Component:
1010
- 4: {fileID: 431732}
1111
- 114: {fileID: 11431730}
12+
- 20: {fileID: 2017596}
1213
m_Layer: 0
1314
m_Name: RightEye
1415
m_TagString: Untagged
@@ -25,6 +26,7 @@ GameObject:
2526
m_Component:
2627
- 4: {fileID: 431734}
2728
- 114: {fileID: 11431732}
29+
- 20: {fileID: 2017594}
2830
m_Layer: 0
2931
m_Name: LeftEye
3032
m_TagString: Untagged
@@ -45,6 +47,7 @@ GameObject:
4547
- 114: {fileID: 11431734}
4648
- 114: {fileID: 11431736}
4749
- 114: {fileID: 11400556}
50+
- 114: {fileID: 11417594}
4851
m_Layer: 0
4952
m_Name: VRDisplayTracked
5053
m_TagString: Untagged
@@ -90,6 +93,70 @@ Transform:
9093
- {fileID: 431732}
9194
m_Father: {fileID: 0}
9295
m_RootOrder: 0
96+
--- !u!20 &2017594
97+
Camera:
98+
m_ObjectHideFlags: 1
99+
m_PrefabParentObject: {fileID: 0}
100+
m_PrefabInternal: {fileID: 100100000}
101+
m_GameObject: {fileID: 131734}
102+
m_Enabled: 1
103+
serializedVersion: 2
104+
m_ClearFlags: 1
105+
m_BackGroundColor: {r: .192156866, g: .301960796, b: .474509805, a: .0196078438}
106+
m_NormalizedViewPortRect:
107+
serializedVersion: 2
108+
x: 0
109+
y: 0
110+
width: 1
111+
height: 1
112+
near clip plane: .300000012
113+
far clip plane: 1000
114+
field of view: 60
115+
orthographic: 0
116+
orthographic size: 5
117+
m_Depth: 0
118+
m_CullingMask:
119+
serializedVersion: 2
120+
m_Bits: 4294967295
121+
m_RenderingPath: -1
122+
m_TargetTexture: {fileID: 0}
123+
m_TargetDisplay: 0
124+
m_HDR: 0
125+
m_OcclusionCulling: 1
126+
m_StereoConvergence: 10
127+
m_StereoSeparation: .0219999999
128+
--- !u!20 &2017596
129+
Camera:
130+
m_ObjectHideFlags: 1
131+
m_PrefabParentObject: {fileID: 0}
132+
m_PrefabInternal: {fileID: 100100000}
133+
m_GameObject: {fileID: 131732}
134+
m_Enabled: 1
135+
serializedVersion: 2
136+
m_ClearFlags: 1
137+
m_BackGroundColor: {r: .192156866, g: .301960796, b: .474509805, a: .0196078438}
138+
m_NormalizedViewPortRect:
139+
serializedVersion: 2
140+
x: 0
141+
y: 0
142+
width: 1
143+
height: 1
144+
near clip plane: .300000012
145+
far clip plane: 1000
146+
field of view: 60
147+
orthographic: 0
148+
orthographic size: 5
149+
m_Depth: 0
150+
m_CullingMask:
151+
serializedVersion: 2
152+
m_Bits: 4294967295
153+
m_RenderingPath: -1
154+
m_TargetTexture: {fileID: 0}
155+
m_TargetDisplay: 0
156+
m_HDR: 0
157+
m_OcclusionCulling: 1
158+
m_StereoConvergence: 10
159+
m_StereoSeparation: .0219999999
93160
--- !u!20 &2031736
94161
Camera:
95162
m_ObjectHideFlags: 1
@@ -106,7 +173,7 @@ Camera:
106173
y: 0
107174
width: 1
108175
height: 1
109-
near clip plane: .300000012
176+
near clip plane: .00999999978
110177
far clip plane: 1000
111178
field of view: 60
112179
orthographic: 0
@@ -141,6 +208,24 @@ MonoBehaviour:
141208
m_Name:
142209
m_EditorClassIdentifier:
143210
JsonDescriptorFile: {fileID: 4900000, guid: 903a53a7997a82c42b329c472b623a4e, type: 3}
211+
--- !u!114 &11417594
212+
MonoBehaviour:
213+
m_ObjectHideFlags: 1
214+
m_PrefabParentObject: {fileID: 0}
215+
m_PrefabInternal: {fileID: 100100000}
216+
m_GameObject: {fileID: 131736}
217+
m_Enabled: 1
218+
m_EditorHideFlags: 0
219+
m_Script: {fileID: 11500000, guid: db80e57e78593b64384f21c9a3022b68, type: 3}
220+
m_Name:
221+
m_EditorClassIdentifier:
222+
k1Red: 0
223+
k1Green: 0
224+
k1Blue: 0
225+
fullCenter: {x: .5, y: .5}
226+
leftCenter: {x: .5, y: .5}
227+
rightCenter: {x: .5, y: .5}
228+
distortionShader: {fileID: 4800000, guid: 1dffc394b375bda49bb119de26c0bb35, type: 3}
144229
--- !u!114 &11431730
145230
MonoBehaviour:
146231
m_ObjectHideFlags: 1

OSVR-Unity/Assets/OSVRUnity/Sample/Demo/Scenes/OSVRDemo.unity

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2330,6 +2330,10 @@ Prefab:
23302330
propertyPath: AppID
23312331
value: org.opengoggles.osvr-unity.sample.demo
23322332
objectReference: {fileID: 0}
2333+
- target: {fileID: 11436198, guid: 0b82dd794175b304a87805e4b38fbe84, type: 2}
2334+
propertyPath: m_Enabled
2335+
value: 1
2336+
objectReference: {fileID: 0}
23332337
m_RemovedComponents: []
23342338
m_ParentPrefab: {fileID: 100100000, guid: 0b82dd794175b304a87805e4b38fbe84, type: 2}
23352339
m_RootGameObject: {fileID: 1796457541}

0 commit comments

Comments
 (0)