Skip to content

Commit db94ae2

Browse files
JeroMiyaJeroMiya
committed
Re-implemented scene and prefab changes in unity 4.
1 parent 39514ff commit db94ae2

8 files changed

Lines changed: 1098 additions & 348 deletions

‎OSVR-Unity/Assets/OSVRUnity/Prefabs/AnalogInterface.prefab‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3-
--- !u!1 &187340
3+
--- !u!1 &175070
44
GameObject:
55
m_ObjectHideFlags: 0
66
m_PrefabParentObject: {fileID: 0}
77
m_PrefabInternal: {fileID: 100100000}
88
serializedVersion: 4
99
m_Component:
10-
- 4: {fileID: 418638}
11-
- 114: {fileID: 11438682}
10+
- 4: {fileID: 475070}
11+
- 114: {fileID: 11475070}
1212
m_Layer: 0
1313
m_Name: AnalogInterface
1414
m_TagString: Untagged
1515
m_Icon: {fileID: 0}
1616
m_NavMeshLayer: 0
1717
m_StaticEditorFlags: 0
1818
m_IsActive: 1
19-
--- !u!4 &418638
19+
--- !u!4 &475070
2020
Transform:
2121
m_ObjectHideFlags: 1
2222
m_PrefabParentObject: {fileID: 0}
2323
m_PrefabInternal: {fileID: 100100000}
24-
m_GameObject: {fileID: 187340}
24+
m_GameObject: {fileID: 175070}
2525
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
2626
m_LocalPosition: {x: 0, y: 0, z: 0}
2727
m_LocalScale: {x: 1, y: 1, z: 1}
2828
m_Children: []
2929
m_Father: {fileID: 0}
3030
m_RootOrder: 0
31-
--- !u!114 &11438682
31+
--- !u!114 &11475070
3232
MonoBehaviour:
3333
m_ObjectHideFlags: 1
3434
m_PrefabParentObject: {fileID: 0}
3535
m_PrefabInternal: {fileID: 100100000}
36-
m_GameObject: {fileID: 187340}
36+
m_GameObject: {fileID: 175070}
3737
m_Enabled: 1
3838
m_EditorHideFlags: 0
3939
m_Script: {fileID: 11500000, guid: c64efdc2d6901004499459f19b204544, type: 3}
@@ -49,5 +49,6 @@ Prefab:
4949
m_Modifications: []
5050
m_RemovedComponents: []
5151
m_ParentPrefab: {fileID: 0}
52-
m_RootGameObject: {fileID: 187340}
52+
m_RootGameObject: {fileID: 175070}
5353
m_IsPrefabParent: 1
54+
m_IsExploded: 1

‎OSVR-Unity/Assets/OSVRUnity/Prefabs/AnalogInterface.prefab.meta‎

Lines changed: 1 addition & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎OSVR-Unity/Assets/OSVRUnity/Prefabs/ButtonInterface.prefab‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3-
--- !u!1 &143726
3+
--- !u!1 &181240
44
GameObject:
55
m_ObjectHideFlags: 0
66
m_PrefabParentObject: {fileID: 0}
77
m_PrefabInternal: {fileID: 100100000}
88
serializedVersion: 4
99
m_Component:
10-
- 4: {fileID: 424054}
11-
- 114: {fileID: 11491248}
10+
- 4: {fileID: 481240}
11+
- 114: {fileID: 11481240}
1212
m_Layer: 0
1313
m_Name: ButtonInterface
1414
m_TagString: Untagged
1515
m_Icon: {fileID: 0}
1616
m_NavMeshLayer: 0
1717
m_StaticEditorFlags: 0
1818
m_IsActive: 1
19-
--- !u!4 &424054
19+
--- !u!4 &481240
2020
Transform:
2121
m_ObjectHideFlags: 1
2222
m_PrefabParentObject: {fileID: 0}
2323
m_PrefabInternal: {fileID: 100100000}
24-
m_GameObject: {fileID: 143726}
24+
m_GameObject: {fileID: 181240}
2525
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
2626
m_LocalPosition: {x: 0, y: 0, z: 0}
2727
m_LocalScale: {x: 1, y: 1, z: 1}
2828
m_Children: []
2929
m_Father: {fileID: 0}
3030
m_RootOrder: 0
31-
--- !u!114 &11491248
31+
--- !u!114 &11481240
3232
MonoBehaviour:
3333
m_ObjectHideFlags: 1
3434
m_PrefabParentObject: {fileID: 0}
3535
m_PrefabInternal: {fileID: 100100000}
36-
m_GameObject: {fileID: 143726}
36+
m_GameObject: {fileID: 181240}
3737
m_Enabled: 1
3838
m_EditorHideFlags: 0
3939
m_Script: {fileID: 11500000, guid: 6724792d0a561444c96a95c819782403, type: 3}
@@ -49,5 +49,6 @@ Prefab:
4949
m_Modifications: []
5050
m_RemovedComponents: []
5151
m_ParentPrefab: {fileID: 0}
52-
m_RootGameObject: {fileID: 143726}
52+
m_RootGameObject: {fileID: 181240}
5353
m_IsPrefabParent: 1
54+
m_IsExploded: 1

‎OSVR-Unity/Assets/OSVRUnity/Prefabs/ButtonInterface.prefab.meta‎

Lines changed: 1 addition & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎OSVR-Unity/Assets/OSVRUnity/Prefabs/VRDisplayUntracked.prefab‎

Lines changed: 2 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ GameObject:
1111
- 20: {fileID: 2000000}
1212
- 81: {fileID: 8100000}
1313
- 114: {fileID: 11400000}
14-
- 114: {fileID: 11491624}
15-
- 114: {fileID: 11437754}
1614
m_Layer: 0
1715
m_Name: VRDisplayUntracked
1816
m_TagString: Untagged
@@ -122,7 +120,6 @@ Camera:
122120
m_OcclusionCulling: 1
123121
m_StereoConvergence: 10
124122
m_StereoSeparation: .0219999999
125-
m_StereoMirrorMode: 0
126123
--- !u!81 &8100000
127124
AudioListener:
128125
m_ObjectHideFlags: 1
@@ -170,59 +167,15 @@ MonoBehaviour:
170167
m_EditorClassIdentifier:
171168
eye: 1
172169
cachedTransform: {fileID: 0}
173-
--- !u!114 &11437754
174-
MonoBehaviour:
175-
m_ObjectHideFlags: 1
176-
m_PrefabParentObject: {fileID: 0}
177-
m_PrefabInternal: {fileID: 100100000}
178-
m_GameObject: {fileID: 100000}
179-
m_Enabled: 1
180-
m_EditorHideFlags: 0
181-
m_Script: {fileID: 11500000, guid: db80e57e78593b64384f21c9a3022b68, type: 3}
182-
m_Name:
183-
m_EditorClassIdentifier:
184-
k1Red: 0
185-
k1Green: 0
186-
k1Blue: 0
187-
fullCenter: {x: .5, y: .5}
188-
leftCenter: {x: .5, y: .5}
189-
rightCenter: {x: .5, y: .5}
190-
distortionShader: {fileID: 4800000, guid: 1dffc394b375bda49bb119de26c0bb35, type: 3}
191-
--- !u!114 &11491624
192-
MonoBehaviour:
193-
m_ObjectHideFlags: 1
194-
m_PrefabParentObject: {fileID: 0}
195-
m_PrefabInternal: {fileID: 100100000}
196-
m_GameObject: {fileID: 100000}
197-
m_Enabled: 1
198-
m_EditorHideFlags: 0
199-
m_Script: {fileID: 11500000, guid: a288e4aec9950634b83d232abc73d1bb, type: 3}
200-
m_Name:
201-
m_EditorClassIdentifier:
202170
--- !u!1001 &100100000
203171
Prefab:
204172
m_ObjectHideFlags: 1
205173
serializedVersion: 2
206174
m_Modification:
207175
m_TransformParent: {fileID: 0}
208-
m_Modifications:
209-
- target: {fileID: 0}
210-
propertyPath: k1Red
211-
value: 0
212-
objectReference: {fileID: 0}
213-
- target: {fileID: 0}
214-
propertyPath: k1Green
215-
value: 0
216-
objectReference: {fileID: 0}
217-
- target: {fileID: 0}
218-
propertyPath: k1Blue
219-
value: 0
220-
objectReference: {fileID: 0}
221-
- target: {fileID: 0}
222-
propertyPath: distortionShader
223-
value:
224-
objectReference: {fileID: 4800000, guid: 1dffc394b375bda49bb119de26c0bb35, type: 3}
176+
m_Modifications: []
225177
m_RemovedComponents: []
226178
m_ParentPrefab: {fileID: 0}
227179
m_RootGameObject: {fileID: 100000}
228180
m_IsPrefabParent: 1
181+
m_IsExploded: 1

‎OSVR-Unity/Assets/OSVRUnity/Sample/UntrackedVRDisplayDemo.unity‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ NavMeshSettings:
7373
minRegionArea: 2
7474
widthInaccuracy: 16.666666
7575
heightInaccuracy: 10
76+
tileSizeHint: 0
7677
m_NavMesh: {fileID: 0}
7778
--- !u!1 &546153132
7879
GameObject:
@@ -1253,6 +1254,8 @@ GameObject:
12531254
- 20: {fileID: 955452068}
12541255
- 81: {fileID: 955452069}
12551256
- 114: {fileID: 955452067}
1257+
- 114: {fileID: 955452071}
1258+
- 114: {fileID: 955452070}
12561259
m_Layer: 0
12571260
m_Name: VRDisplayUntracked
12581261
m_TagString: Untagged
@@ -1330,6 +1333,35 @@ AudioListener:
13301333
m_PrefabInternal: {fileID: 803028027}
13311334
m_GameObject: {fileID: 955452065}
13321335
m_Enabled: 1
1336+
--- !u!114 &955452070
1337+
MonoBehaviour:
1338+
m_ObjectHideFlags: 0
1339+
m_PrefabParentObject: {fileID: 0}
1340+
m_PrefabInternal: {fileID: 0}
1341+
m_GameObject: {fileID: 955452065}
1342+
m_Enabled: 1
1343+
m_EditorHideFlags: 0
1344+
m_Script: {fileID: 11500000, guid: a288e4aec9950634b83d232abc73d1bb, type: 3}
1345+
m_Name:
1346+
m_EditorClassIdentifier:
1347+
--- !u!114 &955452071
1348+
MonoBehaviour:
1349+
m_ObjectHideFlags: 0
1350+
m_PrefabParentObject: {fileID: 0}
1351+
m_PrefabInternal: {fileID: 0}
1352+
m_GameObject: {fileID: 955452065}
1353+
m_Enabled: 1
1354+
m_EditorHideFlags: 0
1355+
m_Script: {fileID: 11500000, guid: db80e57e78593b64384f21c9a3022b68, type: 3}
1356+
m_Name:
1357+
m_EditorClassIdentifier:
1358+
k1Red: 0
1359+
k1Green: 0
1360+
k1Blue: 0
1361+
fullCenter: {x: .5, y: .5}
1362+
leftCenter: {x: .5, y: .5}
1363+
rightCenter: {x: .5, y: .5}
1364+
distortionShader: {fileID: 4800000, guid: 1dffc394b375bda49bb119de26c0bb35, type: 3}
13331365
--- !u!1001 &1400362904
13341366
Prefab:
13351367
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)